From: Bruno Cabral <bcabral@uw.edu>
Date: Thu, 27 Aug 2015 05:25:57 +0000 (+0000)
Subject: Fix review . PATCH 1/3
X-Git-Tag: initial-import-from-subversion-38251~1467
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6e1bde4fb5a4c4c8a88fa2470b69e95e537f6ab8;p=oweals%2Fgnunet.git

Fix review . PATCH 1/3
---

diff --git a/src/nat/nat.conf b/src/nat/nat.conf
index 04cecf70b..4b1add109 100644
--- 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 4d1afb3bb..57b25e20a 100644
--- 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 3988dc053..f14661969 100644
--- 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;