diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-09 09:38:27 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-09 09:38:27 -0500 |
| commit | 0ed966fde111a892e3d0010cea3fd165b0c7972f (patch) | |
| tree | 96ecb83be7fb0b0ec7ab072596b8bb234c90ba20 | |
| parent | d890ec29aac33848a3965585965af5f2080206a4 (diff) | |
| parent | 694e3c57fd1af2cdaa4650d69c50f4108a8612f6 (diff) | |
| download | tor-0ed966fde111a892e3d0010cea3fd165b0c7972f.tar.gz tor-0ed966fde111a892e3d0010cea3fd165b0c7972f.zip | |
Merge branch 'maint-0.3.5'
| -rw-r--r-- | changes/bug28995 | 5 | ||||
| -rw-r--r-- | src/lib/net/socketpair.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug28995 b/changes/bug28995 new file mode 100644 index 0000000000..f76b6a085a --- /dev/null +++ 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 index 380338f15c..6a21581d87 100644 --- 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); } |