[GNUnet-SVN] r16861 - gnunet/src/nat

[gnunet]

Author: grothoff
Date: 2011-09-15 14:30:50 +0200 (Thu, 15 Sep 2011)
New Revision: 16861

Modified:
   gnunet/src/nat/nat.c
   gnunet/src/nat/test_nat_test.c
Log:
actually use external resolution code; fix SUID check

Modified: gnunet/src/nat/nat.c
===================================================================
--- gnunet/src/nat/nat.c        2011-09-15 12:21:39 UTC (rev 16860)
+++ gnunet/src/nat/nat.c        2011-09-15 12:30:50 UTC (rev 16861)
@@ -293,7 +293,8 @@
   unsigned int num_local_addrs;
 
   /**
-   * The our external address (according to config, UPnP may disagree...)
+   * Our external address (according to config, UPnP may disagree...),
+   * in dotted decimal notation, IPv4-only. Or NULL if not known.
    */
   char *external_address;
 
@@ -1106,15 +1107,6 @@
                                                   "EXTERNAL_ADDRESS",
                                                   &h->external_address);
   }
-  if ((h->external_address != NULL) &&
-      (inet_pton (AF_INET, h->external_address, &in_addr) != 1))
-  {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "nat",
-                     _("Malformed %s `%s' given in configuration!\n"),
-                     "EXTERNAL_ADDRESS", h->external_address);
-    GNUNET_free (h->external_address);
-    h->external_address = NULL;
-  }
   h->behind_nat =
       GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT");
   h->nat_punched =

Modified: gnunet/src/nat/test_nat_test.c
===================================================================
--- gnunet/src/nat/test_nat_test.c      2011-09-15 12:21:39 UTC (rev 16860)
+++ gnunet/src/nat/test_nat_test.c      2011-09-15 12:30:50 UTC (rev 16861)
@@ -108,23 +108,23 @@
 #endif
                     NULL);
 
-  nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
+  nat_res = GNUNET_OS_check_helper_binary ("gnunet-helper-nat-server");
   if (GNUNET_NO == nat_res)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
-                "gnunet-nat-server", "SUID not set");
+                "gnunet-helper-nat-server", "SUID not set");
     return 0;
   }
   if (GNUNET_SYSERR == nat_res)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
-                "gnunet-nat-server", "file not found");
+                "gnunet-helper-nat-server", "file not found");
     return 0;
   }
 
   gns =
-      GNUNET_OS_start_process (NULL, NULL, "gnunet-nat-server",
-                               "gnunet-nat-server",
+      GNUNET_OS_start_process (NULL, NULL, "gnunet-helper-nat-server",
+                               "gnunet-helper-nat-server",
 #if VERBOSE
                                "-L", "DEBUG",
 #endif