Tweak code and pump the tor-fw-helper version.

Conflicts:
	src/or/circuitbuild.h

diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h
index b3ebf094a83ada778af419f9e8985af1cd93daac..7083db12fbd16723936707048af95776425c5004 100644 (file)
--- 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 0981501c9e5697196dad2c8967ebace3fb118047..08f94d083027ae31fae97974b1287b47c02bdc4b 100644 (file)
--- 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;