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

Conflicts:
	src/or/circuitbuild.h
This commit is contained in:
George Kadianakis 2012-06-07 19:24:31 +03:00
parent da16c425ef
commit 443260ffd8
2 changed files with 6 additions and 2 deletions

View file

@ -137,6 +137,10 @@ const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr,
struct transport_t; struct transport_t;
int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port,
const struct transport_t **transport); 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 #endif

View file

@ -17,7 +17,7 @@
#include <time.h> #include <time.h>
/** The current version of tor-fw-helper. */ /** 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). /** 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 We're likely going to add the Intel UPnP library but nothing else comes to
@ -36,7 +36,7 @@ typedef struct {
int verbose; int verbose;
int help; int help;
int test_commandline; int test_commandline;
smartlist_t *ports_to_forward; struct smartlist_t *ports_to_forward;
int fetch_public_ip; int fetch_public_ip;
int nat_pmp_status; int nat_pmp_status;
int upnp_status; int upnp_status;