diff options
author | Bruno Cabral <bcabral@uw.edu> | 2015-08-27 05:25:57 +0000 |
---|---|---|
committer | Bruno Cabral <bcabral@uw.edu> | 2015-08-27 05:25:57 +0000 |
commit | 6e1bde4fb5a4c4c8a88fa2470b69e95e537f6ab8 (patch) | |
tree | dae3ea1c836579c74313e61b9c32fb97f1268435 /src/nat | |
parent | 7c872ff3d58a3e75682dd2375058903ea233265f (diff) | |
download | gnunet-6e1bde4fb5a4c4c8a88fa2470b69e95e537f6ab8.tar.gz gnunet-6e1bde4fb5a4c4c8a88fa2470b69e95e537f6ab8.zip |
Fix review . PATCH 1/3
Diffstat (limited to 'src/nat')
-rw-r--r-- | src/nat/nat.conf | 2 | ||||
-rw-r--r-- | src/nat/nat_stun.c | 3 | ||||
-rw-r--r-- | src/nat/test_stun.c | 8 |
3 files changed, 10 insertions, 3 deletions
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 | |||
52 | USE_STUN = YES | 52 | USE_STUN = YES |
53 | STUN_FREQUENCY = 5 min | 53 | STUN_FREQUENCY = 5 min |
54 | # Default list of stun servers | 54 | # Default list of stun servers |
55 | STUN_SERVERS = stun.services.mozilla.com:3478 stun.ekiga.net:3478 | 55 | STUN_SERVERS = stun.gnunet.org stun.services.mozilla.com:3478 stun.ekiga.net:3478 |
56 | 56 | ||
57 | 57 | ||
58 | [gnunet-nat-server] | 58 | [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, | |||
565 | { | 565 | { |
566 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "Failed DNS"); | 566 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "Failed DNS"); |
567 | GNUNET_free(rh); | 567 | GNUNET_free(rh); |
568 | GNUNET_free(server_copy); | ||
569 | |||
568 | return GNUNET_NO; | 570 | return GNUNET_NO; |
569 | } | 571 | } |
570 | 572 | ||
571 | |||
572 | return GNUNET_OK; | 573 | return GNUNET_OK; |
573 | } | 574 | } |
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[]) | |||
241 | fn, | 241 | fn, |
242 | "gnunet-service-resolver", | 242 | "gnunet-service-resolver", |
243 | "-c", "test_stun.conf", NULL); | 243 | "-c", "test_stun.conf", NULL); |
244 | GNUNET_assert (NULL != proc); | 244 | |
245 | if (NULL != proc) | ||
246 | { | ||
247 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "This test was unable to start gnunet-service-resolver, and it is required to run ...\n"); | ||
248 | exit(1); | ||
249 | } | ||
245 | 250 | ||
246 | GNUNET_PROGRAM_run (3, argv_prog, "test-stun", "nohelp", options, &run, NULL); | 251 | GNUNET_PROGRAM_run (3, argv_prog, "test-stun", "nohelp", options, &run, NULL); |
247 | 252 | ||
@@ -253,6 +258,7 @@ main (int argc, char *const argv[]) | |||
253 | GNUNET_OS_process_wait (proc); | 258 | GNUNET_OS_process_wait (proc); |
254 | GNUNET_OS_process_destroy (proc); | 259 | GNUNET_OS_process_destroy (proc); |
255 | proc = NULL; | 260 | proc = NULL; |
261 | GNUNET_free (fn); | ||
256 | 262 | ||
257 | 263 | ||
258 | return ret; | 264 | return ret; |