diff options
Diffstat (limited to 'src/nat/test_nat_test.c')
-rw-r--r-- | src/nat/test_nat_test.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index 520d82d92..b1e6235f9 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c | |||
@@ -65,12 +65,12 @@ report_success (void *cls, int success) | |||
65 | * Main function run with scheduler. | 65 | * Main function run with scheduler. |
66 | */ | 66 | */ |
67 | static void | 67 | static void |
68 | run (void *cls, | 68 | run (void *cls, char *const *args, const char *cfgfile, |
69 | char *const *args, | 69 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
70 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
71 | { | 70 | { |
72 | tst = GNUNET_NAT_test_start (cfg, GNUNET_YES, | 71 | tst = |
73 | 1285, 1285, &report_success, NULL); | 72 | GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285, &report_success, |
73 | NULL); | ||
74 | if (NULL == tst) | 74 | if (NULL == tst) |
75 | return; | 75 | return; |
76 | end = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL); | 76 | end = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL); |
@@ -105,16 +105,16 @@ main (int argc, char *const argv[]) | |||
105 | "WARNING", | 105 | "WARNING", |
106 | #endif | 106 | #endif |
107 | NULL); | 107 | NULL); |
108 | gns = GNUNET_OS_start_process (NULL, NULL, | 108 | gns = |
109 | "gnunet-nat-server", "gnunet-nat-server", | 109 | GNUNET_OS_start_process (NULL, NULL, "gnunet-nat-server", |
110 | "gnunet-nat-server", | ||
110 | #if VERBOSE | 111 | #if VERBOSE |
111 | "-L", "DEBUG", | 112 | "-L", "DEBUG", |
112 | #endif | 113 | #endif |
113 | "-c", "test_nat_test_data.conf", | 114 | "-c", "test_nat_test_data.conf", "12345", NULL); |
114 | "12345", NULL); | ||
115 | GNUNET_assert (NULL != gns); | 115 | GNUNET_assert (NULL != gns); |
116 | GNUNET_PROGRAM_run (5, argv_prog, | 116 | GNUNET_PROGRAM_run (5, argv_prog, "test-nat-test", "nohelp", options, &run, |
117 | "test-nat-test", "nohelp", options, &run, NULL); | 117 | NULL); |
118 | GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM)); | 118 | GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM)); |
119 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); | 119 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); |
120 | GNUNET_OS_process_close (gns); | 120 | GNUNET_OS_process_close (gns); |