Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/907?usp=email
to look at the new patch set (#2).
Change subject: socket: don't transfer bind family to socket in case of ANY
address
......................................................................
socket: don't transfer bind family to socket in case of ANY address
With the introduction of multisocket, we need to transfer the
AI family of the bound address to the socket, as it may differ
from what was set globally.
However, this operation makes sense only when getaddrinfo()
for bind is performed on a non-empty hostname.
An empty hostname (ANY) may return AF_INET which will break
following connection attempts to v6 only remotes.
Change-Id: I27f305d3ae9bf650bab409e99173688d9f88ab65
Signed-off-by: Antonio Quartulli <[email protected]>
---
M src/openvpn/socket.c
1 file changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/07/907/2
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 6b32e30..be7395d 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -1724,9 +1724,19 @@
gai_strerror(status));
}
- /* the resolved 'local entry' might have a different family than what
- * was globally configured */
- sock->info.af = sock->info.lsa->bind_local->ai_family;
+ /* the address family returned by openvpn_getaddrinfo() should be
+ * taken into consideration only if we really passed an hostname
+ * to resolve. Otherwise its value is not useful to us and may
+ * actually break our socket, i.e. when it returns AF_INET
+ * but our remote is v6 only.
+ */
+ if (sock->local_host)
+ {
+ /* the resolved 'local entry' might have a different family than
+ * what was globally configured
+ */
+ sock->info.af = sock->info.lsa->bind_local->ai_family;
+ }
}
gc_free(&gc);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/907?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I27f305d3ae9bf650bab409e99173688d9f88ab65
Gerrit-Change-Number: 907
Gerrit-PatchSet: 2
Gerrit-Owner: ordex <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
