tor

commit 694e3c57fd1af2cdaa4650d69c50f4108a8612f6
parent 380ae2b74b8c8762acc075d8d22bc5d6320655e1
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  9 Jan 2019 09:38:22 -0500

Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5

Diffstat:
A
changes/bug28995
 | 
5
+++++
M
src/lib/net/socketpair.c
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug28995 b/changes/bug28995
@@ -0,0 +1,5 @@
+  o Minor bugfix (IPv6):
+    Fix tor_ersatz_socketpair on IPv6-only systems.  Previously,
+    the IPv6 socket was bound using an address family of AF_INET
+    instead of AF_INET6.  Fixes bug 28995; bugfix on 0.3.5.1-alpha.
+    Patch from Kris Katterjohn.
diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c
@@ -62,7 +62,7 @@ get_local_listener(int family, int type)
     len = sizeof(sin);
   } else {
     sa = (struct sockaddr *) &sin6;
-    sin6.sin6_family = AF_INET;
+    sin6.sin6_family = AF_INET6;
     sin6.sin6_addr.s6_addr[15] = 1;
     len = sizeof(sin6);
   }