From: George Kadianakis <desnacked@riseup.net>
Date: Wed, 5 Sep 2012 17:17:25 +0000 (+0300)
Subject: Figure out ORPort and DirPort even when 'auto' is used.
X-Git-Tag: tor-0.2.4.2-alpha~26^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4edc57caa5c4a7d4d46d30bf0150a7f70e8dcccb;p=thirdparty%2Ftor.git

Figure out ORPort and DirPort even when 'auto' is used.

Use router_get_advertised_{dir,or}_port() functions instead of
get_primary_{dir,or}_port().
---

diff --git a/src/or/config.c b/src/or/config.c
index a4af22a377..02afa1e275 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -7266,11 +7266,11 @@ get_list_of_ports_to_forward(void)
   /** XXX TODO tor-fw-helper does not support forwarding ports to
       other hosts than the local one. If the user is binding to a
       different IP address, tor-fw-helper won't work.  */
-  port = get_primary_or_port();  /* Get ORPort */
+  port = router_get_advertised_or_port(get_options());  /* Get ORPort */
   if (port)
     smartlist_add_asprintf(ports_to_forward, "%d:%d", port, port);
 
-  port = get_primary_dir_port(); /* Get DirPort */
+  port = router_get_advertised_dir_port(get_options(), 0); /* Get DirPort */
   if (port)
     smartlist_add_asprintf(ports_to_forward, "%d:%d", port, port);