diff options
| author | Jacob Appelbaum <jacob@appelbaum.net> | 2011-06-19 02:31:13 -0700 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-06-20 20:01:46 -0400 |
| commit | 8b0d9452ca2053bbfba60750d169aaf52037cfcd (patch) | |
| tree | d191e6101621f5b114db1e724d87dbb5f6352a1c | |
| parent | 8653f31d8d534282795acb54ee500ef7d42d3a32 (diff) | |
| download | tor-8b0d9452ca2053bbfba60750d169aaf52037cfcd.tar.gz tor-8b0d9452ca2053bbfba60750d169aaf52037cfcd.zip | |
Fix tor-fw-helper-natpmp.c API usage
libnatpmp-20110618 changed the API that tor-fw-helper used and for a time
tor-fw-helper could not build against the newest libnatpmp. This patch brings
support for libnatpmp to tor-fw-helper.
| -rw-r--r-- | changes/bug3434 | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/changes/bug3434 b/changes/bug3434 new file mode 100644 index 0000000000..24ee518723 --- /dev/null +++ b/changes/bug3434 @@ -0,0 +1,2 @@ + o Minor bugfixes: + - Update tor-fw-helper to support libnatpmp-20110618; fixes 3434. diff --git a/configure.in b/configure.in index e5db37060f..12922ae2e5 100644 --- a/configure.in +++ b/configure.in @@ -545,7 +545,7 @@ if test "$natpmp" = "true"; then [ int r; natpmp_t natpmp; natpmpresp_t response; - r = initnatpmp(&natpmp);], + r = initnatpmp(&natpmp, 0, 0);], [printf("initnatpmp() returned %d (%s)\n", r, r?"FAILED":"SUCCESS"); exit(0);], [--with-libnatpmp-dir], diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c index 2630b8f5e0..f9d5d0d586 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -55,7 +55,7 @@ tor_natpmp_init(tor_fw_options_t *tor_fw_options, void *backend_state) if (tor_fw_options->verbose) fprintf(stdout, "V: natpmp init...\n"); - r = initnatpmp(&(state->natpmp)); + r = initnatpmp(&(state->natpmp), 0, 0); if (r == 0) { state->init = 1; fprintf(stdout, "tor-fw-helper: natpmp initialized...\n"); |