diff options
| author | George Kadianakis <desnacked@riseup.net> | 2012-06-07 19:16:18 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2012-09-05 18:04:34 +0300 |
| commit | cd05f35d2cdf50d31108428cf5c19549d468dbc0 (patch) | |
| tree | dc9379c4e24762af4d5fda709a145adf2b6a6dfe /src/common/util.h | |
| parent | 64b2a64310a66a3e22403917ecdef38263ba0483 (diff) | |
| download | tor-cd05f35d2cdf50d31108428cf5c19549d468dbc0.tar.gz tor-cd05f35d2cdf50d31108428cf5c19549d468dbc0.zip | |
Refactor tor to support the new tor-fw-helper protocol.
Add handle_fw_helper_output(), a function responsible for parsing the
output of tor-fw-helper. Refactor tor_check_port_forwarding() and
run_scheduled_events() accordingly too.
We now issue warnings when we get control output from tor-fw-helper,
and we log the verbose output of tor-fw-helper in LOG_INFO.
Conflicts:
src/common/util.c
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/util.h b/src/common/util.h index 69335eddb2..a6944ac894 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -373,7 +373,8 @@ void write_pidfile(char *filename); /* Port forwarding */ void tor_check_port_forwarding(const char *filename, - int dir_port, int or_port, time_t now); + struct smartlist_t *ports_to_forward, + time_t now); typedef struct process_handle_t process_handle_t; typedef struct process_environment_t process_environment_t; |