Fix review . PATCH 1/3

diff --git a/src/nat/nat.conf b/src/nat/nat.conf
index 04cecf70b9327bf20327950d2ac96b80542e2b09..4b1add109be158698fecada2cc96d758a1221637 100644 (file)
--- a/src/nat/nat.conf
+++ b/src/nat/nat.conf
@@ -52,7 +52,7 @@ DYNDNS_FREQUENCY = 7 min
 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]

diff --git a/src/nat/nat_stun.c b/src/nat/nat_stun.c
index 4d1afb3bb5087ab356ff9bc9f843cfc53b228c00..57b25e20a3553a7cae8138446b1253f1f716e09c 100644 (file)
--- a/src/nat/nat_stun.c
+++ b/src/nat/nat_stun.c
@@ -565,9 +565,10 @@ GNUNET_NAT_stun_make_request(char * server, int port,
     {
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "Failed DNS");
         GNUNET_free(rh);
+        GNUNET_free(server_copy);
+
         return GNUNET_NO;
     }
 
-
     return GNUNET_OK;
 }

diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c
index 3988dc053734708d64c99a1e25b6a5e0e6aa3fb1..f146619692f5b1c94911dc41e025fcac153a2e70 100644 (file)
--- a/src/nat/test_stun.c
+++ b/src/nat/test_stun.c
@@ -241,7 +241,12 @@ main (int argc, char *const argv[])
                                     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);
 
@@ -253,6 +258,7 @@ main (int argc, char *const argv[])
     GNUNET_OS_process_wait (proc);
     GNUNET_OS_process_destroy (proc);
     proc = NULL;
+    GNUNET_free (fn);
 
     
        return ret;