commit 443260ffd8370c0fddefad42479b957132e8d275 Author: George Kadianakis desnacked@riseup.net Date: Thu Jun 7 19:24:31 2012 +0300
Tweak code and pump the tor-fw-helper version.
Conflicts: src/or/circuitbuild.h --- src/or/circuitbuild.h | 4 ++++ src/tools/tor-fw-helper/tor-fw-helper.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index b3ebf09..7083db1 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -137,6 +137,10 @@ const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, struct transport_t; int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const struct transport_t **transport); +const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, + uint16_t port); + +int validate_pluggable_transports_config(void);
#endif
diff --git a/src/tools/tor-fw-helper/tor-fw-helper.h b/src/tools/tor-fw-helper/tor-fw-helper.h index 0981501..08f94d0 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper.h +++ b/src/tools/tor-fw-helper/tor-fw-helper.h @@ -17,7 +17,7 @@ #include <time.h>
/** The current version of tor-fw-helper. */ -#define tor_fw_version "0.1" +#define tor_fw_version "0.2"
/** This is an arbitrary hard limit - We currently have two (NAT-PMP and UPnP). We're likely going to add the Intel UPnP library but nothing else comes to @@ -36,7 +36,7 @@ typedef struct { int verbose; int help; int test_commandline; - smartlist_t *ports_to_forward; + struct smartlist_t *ports_to_forward; int fetch_public_ip; int nat_pmp_status; int upnp_status;