Fix split tunnel on ipv4 only networks #9982
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oskirby
reviewed
Oct 24, 2024
| @@ -484,6 +484,9 @@ bool WindowsSplitTunnel::getAddress(int adapterIndex, IN_ADDR* out_ipv4, | |||
| logger.debug() << "Ipv4 Conversation error" << WSAGetLastError(); | |||
| return false; | |||
| } | |||
| if (ipv6.empty()) { | |||
There was a problem hiding this comment.
As far as I can tell, there is nothing that explicitly initializes the contents of out_ipv6 when we follow this code path. It probably works in a debug build because it defaults to all zeros, but that may not be true when compiled for release. I would recommend setting some kind of value here to ensure we are not passing uninitialized data to the caller.
There was a problem hiding this comment.
Good catch! Did that.
oskirby
approved these changes
Oct 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Valentina notes on some "hotspot" networks split tunnel breaks.
From valentinas logs:
Currently we assume the local network adapter contains an ipv6. If not we bubble the error up the stack:
-> if not
InetPtonW(AF_INET6,..)will return false->
WindowsSplitTunnel::getAddresswill return false->
WindowsSplitTunnel::generateIPConfigurationwill return {} so 0 bytes-> this will cause the driver call
DeviceIoControl(m_driver, IOCTL_REGISTER_IP_ADDRESSES,..)to error as we don't send a valid blob-> this will cause this error message
logger.error() << "Failed to set Network Config";So let's bail the ipv6 conversation if there is none and send the info we have to the driver.