[tor-commits] [tor/release-0.3.4] Partially revert "Use tor_addr_from_getsockname() in several places"

[nickm at torproject.org]

commit dfdf32404cd93671646481f6f3c129591a6901d7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 2 16:11:02 2018 -0400

    Partially revert "Use tor_addr_from_getsockname() in several places"
    
    This reverts part of commit 6ed384b827dce21ea3a44b587, in order to
    fix bug 26568.  Bugfix on 0.3.4.1-alpha.
---
 changes/bug26568    | 3 +++
 src/or/connection.c | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug26568 b/changes/bug26568
new file mode 100644
index 000000000..0c4c05d04
--- /dev/null
+++ b/changes/bug26568
@@ -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.
diff --git a/src/or/connection.c b/src/or/connection.c
index 5185b45b1..7283a8104 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1260,12 +1260,15 @@ connection_listener_new(const struct sockaddr *listensockaddr,
       gotPort = usePort;
     } else {
       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",
                  conn_type_to_string(type),
                  tor_socket_strerror(tor_socket_errno(s)));
         gotPort = 0;
       }
+      tor_addr_from_sockaddr(&addr2, (struct sockaddr*)&ss, &gotPort);
     }
 #ifdef HAVE_SYS_UN_H
   /*