diff options
author | George Kadianakis <desnacked@riseup.net> | 2012-06-29 19:32:34 +0300 |
---|---|---|
committer | George Kadianakis <desnacked@riseup.net> | 2012-09-05 18:23:28 +0300 |
commit | 44fe717524408d247ab10e3794438232d81d66dc (patch) | |
tree | 51c23d566b2812aeeac0e24bfad88fecfa8d7159 /src/or | |
parent | 443260ffd8370c0fddefad42479b957132e8d275 (diff) | |
download | tor-44fe717524408d247ab10e3794438232d81d66dc.tar.gz tor-44fe717524408d247ab10e3794438232d81d66dc.zip |
General tweaks and fixes for Nick's comments.
* Add changes/ files.
* Edit the tor-fw-helper manpage.
* Fix check-spaces.
* Add prototype for get_list_of_ports_to_forward().
* Fix tor_parse_long() TCP port range.
* Improve doc. of tor_check_port_forwarding().
* Check for overflows in tor_check_port_forwarding().
* Demote successful port forwarding to LOG_INFO.
Conflicts:
src/common/address.c
src/or/circuitbuild.c
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/config.c | 10 | ||||
-rw-r--r-- | src/or/config.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index ad422efcdc..a4af22a377 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7275,10 +7275,12 @@ get_list_of_ports_to_forward(void) smartlist_add_asprintf(ports_to_forward, "%d:%d", port, port); /* Get ports of transport proxies */ - smartlist_t *transport_ports = get_transport_proxy_ports(); - if (transport_ports) { - smartlist_add_all(ports_to_forward, transport_ports); - smartlist_free(transport_ports); + { + smartlist_t *transport_ports = get_transport_proxy_ports(); + if (transport_ports) { + smartlist_add_all(ports_to_forward, transport_ports); + smartlist_free(transport_ports); + } } if (!smartlist_len(ports_to_forward)) { diff --git a/src/or/config.h b/src/or/config.h index dd76edcf1d..d207965849 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -82,6 +82,8 @@ void save_transport_to_state(const char *transport_name, const tor_addr_t *addr, uint16_t port); char *get_stored_bindaddr_for_server_transport(const char *transport); +smartlist_t *get_list_of_ports_to_forward(void); + int getinfo_helper_config(control_connection_t *conn, const char *question, char **answer, const char **errmsg); |