First implementation of tor-fw-helper.

tor-fw-helper is a command-line tool to wrap and abstract various
firewall port-forwarding tools.

This commit matches the state of Jacob's tor-fw-helper branch as of
23 September 2010.

  (commit msg by Nick)

1 files changed, 59 insertions, 1 deletions

diff --git a/configure.in b/configure.in
index 83eee4d348..ab3689db2d 100644
--- a/configure.in
+++ b/configure.in
@@ -59,6 +59,24 @@ AC_ARG_ENABLE(asciidoc,
         *) AC_MSG_ERROR(bad value for --disable-asciidoc) ;;
       esac], [asciidoc=true])
 
+# By default, we're not ready to ship a NAT-PMP aware Tor
+AC_ARG_ENABLE(nat-pmp,
+     AS_HELP_STRING(--enable-nat-pmp, enable NAT-PMP support),
+     [case "${enableval}" in
+        yes) natpmp=true ;;
+        no)  natpmp=false ;;
+        * ) AC_MSG_ERROR(bad value for --enable-nat-pmp) ;;
+      esac], [natpmp=false])
+
+# By default, we're not ready to ship a UPnP aware Tor
+AC_ARG_ENABLE(upnp,
+     AS_HELP_STRING(--enable-upnp, enable UPnP support),
+     [case "${enableval}" in
+        yes) upnp=true ;;
+        no)  upnp=false ;;
+        * ) AC_MSG_ERROR(bad value for --enable-upnp) ;;
+      esac], [upnp=false])
+
 
 AC_ARG_ENABLE(threads,
      AS_HELP_STRING(--disable-threads, disable multi-threading support))
@@ -135,6 +153,8 @@ AC_PATH_PROG([A2X], [a2x], none)
 
 AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue)
 
+AM_CONDITIONAL(USE_FW_HELPER, test x$natpmp = xtrue || x$upnp = xtrue)
+
 AC_PATH_PROG([SHA1SUM], [sha1sum], none)
 AC_PATH_PROG([OPENSSL], [openssl], none)
 
@@ -440,6 +460,44 @@ AC_SUBST(TOR_ZLIB_LIBS)
 
 dnl Make sure to enable support for large off_t if available.
 
+
+dnl ------------------------------------------------------
+dnl Where do you live, libnatpmp?  And how do we call you?
+dnl There are no packages for Debian or Redhat as of this patch
+
+if test "$natpmp" = "true"; then
+    AC_DEFINE(NAT_PMP, 1, [Define to 1 if we are building with nat-pmp.])
+    TOR_SEARCH_LIBRARY(libnatpmp, $trylibnatpmpdir, [-lnatpmp],
+        [#include <natpmp.h>],
+        [#include <natpmp.h>],
+        [   int r;
+            natpmp_t natpmp;
+            natpmpresp_t response;
+            r = initnatpmp(&natpmp);],
+            [printf("initnatpmp() returned %d (%s)\n", r, r?"FAILED":"SUCCESS");
+            exit(0);],
+        [--with-libnatpmp-dir],
+        [/usr/lib/])
+fi
+
+
+dnl ------------------------------------------------------
+dnl Where do you live, libminiupnpc?  And how do we call you?
+dnl There are no packages for Debian or Redhat as of this patch
+
+if test "$upnp" = "true"; then
+    AC_DEFINE(UPNP, 1, [Define to 1 if we are building with UPnP.])
+    TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc],
+        [#include <miniupnpc/miniwget.h>
+         #include <miniupnpc/miniupnpc.h>
+         #include <miniupnpc/upnpcommands.h>],
+        [void upnpDiscover(int delay, const char * multicastif,
+         const char * minissdpdsock, int sameport);],
+        [upnpDiscover(1, 0, 0, 0); exit(0);],
+        [--with-libminiupnpc-dir],
+        [/usr/lib/])
+fi
+
 AC_SYS_LARGEFILE
 
 AC_CHECK_HEADERS(unistd.h string.h signal.h sys/stat.h sys/types.h fcntl.h sys/fcntl.h sys/time.h errno.h assert.h time.h, , AC_MSG_WARN(Some headers were not found, compilation may fail.  If compilation succeeds, please send your orconfig.h to the developers so we can fix this warning.))
@@ -967,7 +1025,7 @@ fi
 
 CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
 
-AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample src/Makefile doc/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample src/Makefile doc/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile src/tools/tor-fw-helper/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
 AC_OUTPUT
 
 if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then