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

[gnunet]

Author: bratao
Date: 2015-08-27 07:25:57 +0200 (Thu, 27 Aug 2015)
New Revision: 36275

Modified:
   gnunet/src/nat/nat.conf
   gnunet/src/nat/nat_stun.c
   gnunet/src/nat/test_stun.c
Log:
Fix review . PATCH 1/3

Modified: gnunet/src/nat/nat.conf
===================================================================
--- gnunet/src/nat/nat.conf     2015-08-25 18:43:07 UTC (rev 36274)
+++ gnunet/src/nat/nat.conf     2015-08-27 05:25:57 UTC (rev 36275)
@@ -52,7 +52,7 @@
 USE_STUN = YES
 STUN_FREQUENCY = 5 min
 # Default list of stun servers
-STUN_SERVERS = stun.services.mozilla.com:3478 stun.ekiga.net:3478
+STUN_SERVERS = stun.gnunet.org stun.services.mozilla.com:3478 
stun.ekiga.net:3478
 
 
 [gnunet-nat-server]

Modified: gnunet/src/nat/nat_stun.c
===================================================================
--- gnunet/src/nat/nat_stun.c   2015-08-25 18:43:07 UTC (rev 36274)
+++ gnunet/src/nat/nat_stun.c   2015-08-27 05:25:57 UTC (rev 36275)
@@ -565,9 +565,10 @@
     {
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "Failed DNS");
         GNUNET_free(rh);
+        GNUNET_free(server_copy);
+
         return GNUNET_NO;
     }
 
-
     return GNUNET_OK;
 }

Modified: gnunet/src/nat/test_stun.c
===================================================================
--- gnunet/src/nat/test_stun.c  2015-08-25 18:43:07 UTC (rev 36274)
+++ gnunet/src/nat/test_stun.c  2015-08-27 05:25:57 UTC (rev 36275)
@@ -241,8 +241,13 @@
                                     fn,
                                     "gnunet-service-resolver",
                                     "-c", "test_stun.conf", NULL);
-    GNUNET_assert (NULL != proc);
 
+    if (NULL != proc)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "This test was unable to start 
gnunet-service-resolver, and it is required to run ...\n");
+      exit(1);
+    }
+
     GNUNET_PROGRAM_run (3, argv_prog, "test-stun", "nohelp", options, &run, 
NULL);
 
     /* Now kill the resolver */
@@ -253,6 +258,7 @@
     GNUNET_OS_process_wait (proc);
     GNUNET_OS_process_destroy (proc);
     proc = NULL;
+    GNUNET_free (fn);
 
     
        return ret;