diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-11-04 21:01:22 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-11-04 21:01:22 +0000 |
commit | 0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf (patch) | |
tree | ac53b9088e75b7041e14e3455698a75da085b3d7 /src/nat | |
parent | b6d09b511fbd61d3b36fde4c28624bed321bf4a1 (diff) | |
download | gnunet-0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf.tar.gz gnunet-0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf.zip |
-misc bugfixes, travel hacking
Diffstat (limited to 'src/nat')
-rw-r--r-- | src/nat/gnunet-nat-server.c | 4 | ||||
-rw-r--r-- | src/nat/test_nat_mini.c | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/nat/gnunet-nat-server.c b/src/nat/gnunet-nat-server.c index e971bd3b1..1a98cdc96 100644 --- a/src/nat/gnunet-nat-server.c +++ b/src/nat/gnunet-nat-server.c | |||
@@ -320,7 +320,11 @@ main (int argc, char *const argv[]) | |||
320 | GNUNET_PROGRAM_run (argc, argv, "gnunet-nat-server [options] PORT", | 320 | GNUNET_PROGRAM_run (argc, argv, "gnunet-nat-server [options] PORT", |
321 | _("GNUnet NAT traversal test helper daemon"), options, | 321 | _("GNUnet NAT traversal test helper daemon"), options, |
322 | &run, NULL)) | 322 | &run, NULL)) |
323 | { | ||
324 | GNUNET_free ((void*) argv); | ||
323 | return 1; | 325 | return 1; |
326 | } | ||
327 | GNUNET_free ((void*) argv); | ||
324 | return 0; | 328 | return 0; |
325 | } | 329 | } |
326 | 330 | ||
diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c index 2c6da3b57..f2e1ee97a 100644 --- a/src/nat/test_nat_mini.c +++ b/src/nat/test_nat_mini.c | |||
@@ -35,9 +35,6 @@ | |||
35 | #include "gnunet_scheduler_lib.h" | 35 | #include "gnunet_scheduler_lib.h" |
36 | #include "gnunet_nat_lib.h" | 36 | #include "gnunet_nat_lib.h" |
37 | 37 | ||
38 | |||
39 | #define VERBOSE GNUNET_NO | ||
40 | |||
41 | /* Time to wait before stopping NAT, in seconds */ | 38 | /* Time to wait before stopping NAT, in seconds */ |
42 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) | 39 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) |
43 | 40 | ||
@@ -104,20 +101,12 @@ main (int argc, char *const argv[]) | |||
104 | "-c", | 101 | "-c", |
105 | "test_nat_data.conf", | 102 | "test_nat_data.conf", |
106 | "-L", | 103 | "-L", |
107 | #if VERBOSE | ||
108 | "DEBUG", | ||
109 | #else | ||
110 | "WARNING", | 104 | "WARNING", |
111 | #endif | ||
112 | NULL | 105 | NULL |
113 | }; | 106 | }; |
114 | 107 | ||
115 | GNUNET_log_setup ("test-nat-mini", | 108 | GNUNET_log_setup ("test-nat-mini", |
116 | #if VERBOSE | ||
117 | "DEBUG", | ||
118 | #else | ||
119 | "WARNING", | 109 | "WARNING", |
120 | #endif | ||
121 | NULL); | 110 | NULL); |
122 | 111 | ||
123 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 112 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |