Commit 694e3c57 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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

parents 380ae2b7 c59b572e

changes/bug28995

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/lib/net/socketpair.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

  }