diff options
Diffstat (limited to 'src/util/test_server.c')
-rw-r--r-- | src/util/test_server.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/util/test_server.c b/src/util/test_server.c index 78e2d52bf..00d4352f8 100644 --- a/src/util/test_server.c +++ b/src/util/test_server.c | |||
@@ -45,8 +45,6 @@ static struct GNUNET_SERVER_Client *argclient; | |||
45 | 45 | ||
46 | static struct GNUNET_CONFIGURATION_Handle *cfg; | 46 | static struct GNUNET_CONFIGURATION_Handle *cfg; |
47 | 47 | ||
48 | static struct GNUNET_SCHEDULER_Handle *sched; | ||
49 | |||
50 | static int ok; | 48 | static int ok; |
51 | 49 | ||
52 | 50 | ||
@@ -70,8 +68,7 @@ recv_fin_cb (void *cls, | |||
70 | GNUNET_assert (ok == 5); | 68 | GNUNET_assert (ok == 5); |
71 | ok = 6; | 69 | ok = 6; |
72 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 70 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
73 | GNUNET_SCHEDULER_add_now (sched, | 71 | GNUNET_SCHEDULER_add_now (&finish_up, |
74 | &finish_up, | ||
75 | NULL); | 72 | NULL); |
76 | } | 73 | } |
77 | 74 | ||
@@ -181,15 +178,13 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
181 | slens[0] = sizeof (sa); | 178 | slens[0] = sizeof (sa); |
182 | sap[1] = NULL; | 179 | sap[1] = NULL; |
183 | slens[1] = 0; | 180 | slens[1] = 0; |
184 | sched = tc->sched; | ||
185 | memset (&sa, 0, sizeof (sa)); | 181 | memset (&sa, 0, sizeof (sa)); |
186 | #if HAVE_SOCKADDR_IN_SIN_LEN | 182 | #if HAVE_SOCKADDR_IN_SIN_LEN |
187 | sa.sin_len = sizeof (sa); | 183 | sa.sin_len = sizeof (sa); |
188 | #endif | 184 | #endif |
189 | sa.sin_family = AF_INET; | 185 | sa.sin_family = AF_INET; |
190 | sa.sin_port = htons (PORT); | 186 | sa.sin_port = htons (PORT); |
191 | server = GNUNET_SERVER_create (tc->sched, | 187 | server = GNUNET_SERVER_create (NULL, |
192 | NULL, | ||
193 | NULL, | 188 | NULL, |
194 | sap, | 189 | sap, |
195 | slens, | 190 | slens, |
@@ -201,8 +196,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
201 | GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT); | 196 | GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT); |
202 | GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME", "localhost"); | 197 | GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME", "localhost"); |
203 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", "localhost"); | 198 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", "localhost"); |
204 | cc = GNUNET_CLIENT_connect (tc->sched, | 199 | cc = GNUNET_CLIENT_connect ("test-server", |
205 | "test-server", | ||
206 | cfg); | 200 | cfg); |
207 | GNUNET_assert (cc != NULL); | 201 | GNUNET_assert (cc != NULL); |
208 | GNUNET_assert (NULL != | 202 | GNUNET_assert (NULL != |