commit 4edc57caa5c4a7d4d46d30bf0150a7f70e8dcccb
Author: George Kadianakis <desnac...@riseup.net>
Date: Wed Sep 5 20:17:25 2012 +0300
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().
---
src/or/config.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/or/config.c b/src/or/config.c
index a4af22a..02afa1e 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);
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
