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

[gnunet]

Author: wachs
Date: 2011-08-30 15:23:04 +0200 (Tue, 30 Aug 2011)
New Revision: 16644

Modified:
   gnunet/src/nat/test_nat_test.c
Log:
check if gnunet-nat-server is correctly installed


Modified: gnunet/src/nat/test_nat_test.c
===================================================================
--- gnunet/src/nat/test_nat_test.c      2011-08-30 13:16:07 UTC (rev 16643)
+++ gnunet/src/nat/test_nat_test.c      2011-08-30 13:23:04 UTC (rev 16644)
@@ -85,6 +85,8 @@
   };
   struct GNUNET_OS_Process *gns;
 
+  int nat_res;
+
   char *const argv_prog[] = {
     "test-nat-test",
     "-c",
@@ -105,6 +107,25 @@
                     "WARNING",
 #endif
                     NULL);
+
+  nat_res = GNUNET_OS_check_helper_binary ("gnunet-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");
+    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");
+    return 0;
+  }
+
   gns =
       GNUNET_OS_start_process (NULL, NULL, "gnunet-nat-server",
                                "gnunet-nat-server",