mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 12:22:14 +02:00
Code

Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-07-03 13:16:37 -04:00
commit 32d9d69350
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug26568 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (controller):
- Report the port correctly when a port is configured to bind to "auto".
Fixes bug 26568; bugfix on 0.3.4.1-alpha.

5
src/or/connection.c
View File

@ -1260,12 +1260,15 @@ connection_listener_new(const struct sockaddr *listensockaddr,
gotPort = usePort; gotPort = usePort;
} else { } else {
tor_addr_t addr2; tor_addr_t addr2;
if (tor_addr_from_getsockname(&addr2, s)<0) { struct sockaddr_storage ss;
socklen_t ss_len=sizeof(ss);
if (getsockname(s, (struct sockaddr*)&ss, &ss_len)<0) {
log_warn(LD_NET, "getsockname() couldn't learn address for %s: %s", log_warn(LD_NET, "getsockname() couldn't learn address for %s: %s",
conn_type_to_string(type), conn_type_to_string(type),
tor_socket_strerror(tor_socket_errno(s))); tor_socket_strerror(tor_socket_errno(s)));
gotPort = 0; gotPort = 0;
} }
tor_addr_from_sockaddr(&addr2, (struct sockaddr*)&ss, &gotPort);
} }
#ifdef HAVE_SYS_UN_H #ifdef HAVE_SYS_UN_H
/* /*