diff options
Diffstat (limited to 'src/util/test_server_with_client.c')
-rw-r--r-- | src/util/test_server_with_client.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c index 4157be250..5c36b7b03 100644 --- a/src/util/test_server_with_client.c +++ b/src/util/test_server_with_client.c | |||
@@ -41,8 +41,6 @@ static struct GNUNET_SERVER_Handle *server; | |||
41 | 41 | ||
42 | static struct GNUNET_CLIENT_Connection *client; | 42 | static struct GNUNET_CLIENT_Connection *client; |
43 | 43 | ||
44 | static struct GNUNET_SCHEDULER_Handle *sched; | ||
45 | |||
46 | static struct GNUNET_CONFIGURATION_Handle *cfg; | 44 | static struct GNUNET_CONFIGURATION_Handle *cfg; |
47 | 45 | ||
48 | static int ok; | 46 | static int ok; |
@@ -86,8 +84,7 @@ recv_cb (void *cls, | |||
86 | { | 84 | { |
87 | case 2: | 85 | case 2: |
88 | ok++; | 86 | ok++; |
89 | GNUNET_SCHEDULER_add_delayed (sched, | 87 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
90 | GNUNET_TIME_relative_multiply | ||
91 | (GNUNET_TIME_UNIT_MILLISECONDS, 50), | 88 | (GNUNET_TIME_UNIT_MILLISECONDS, 50), |
92 | &send_done, argclient); | 89 | &send_done, argclient); |
93 | break; | 90 | break; |
@@ -127,8 +124,7 @@ notify_disconnect (void *cls, struct GNUNET_SERVER_Client *client) | |||
127 | return; | 124 | return; |
128 | GNUNET_assert (ok == 5); | 125 | GNUNET_assert (ok == 5); |
129 | ok = 0; | 126 | ok = 0; |
130 | GNUNET_SCHEDULER_add_now (sched, | 127 | GNUNET_SCHEDULER_add_now (&clean_up, NULL); |
131 | &clean_up, NULL); | ||
132 | } | 128 | } |
133 | 129 | ||
134 | 130 | ||
@@ -167,15 +163,13 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
167 | slens[0] = sizeof (sa); | 163 | slens[0] = sizeof (sa); |
168 | sap[1] = NULL; | 164 | sap[1] = NULL; |
169 | slens[1] = 0; | 165 | slens[1] = 0; |
170 | sched = tc->sched; | ||
171 | memset (&sa, 0, sizeof (sa)); | 166 | memset (&sa, 0, sizeof (sa)); |
172 | #if HAVE_SOCKADDR_IN_SIN_LEN | 167 | #if HAVE_SOCKADDR_IN_SIN_LEN |
173 | sa.sin_len = sizeof (sa); | 168 | sa.sin_len = sizeof (sa); |
174 | #endif | 169 | #endif |
175 | sa.sin_family = AF_INET; | 170 | sa.sin_family = AF_INET; |
176 | sa.sin_port = htons (PORT); | 171 | sa.sin_port = htons (PORT); |
177 | server = GNUNET_SERVER_create (tc->sched, | 172 | server = GNUNET_SERVER_create (NULL, |
178 | NULL, | ||
179 | NULL, | 173 | NULL, |
180 | sap, | 174 | sap, |
181 | slens, | 175 | slens, |
@@ -192,7 +186,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
192 | "localhost"); | 186 | "localhost"); |
193 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 187 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
194 | "localhost"); | 188 | "localhost"); |
195 | client = GNUNET_CLIENT_connect (tc->sched, "test", cfg); | 189 | client = GNUNET_CLIENT_connect ("test", cfg); |
196 | GNUNET_assert (client != NULL); | 190 | GNUNET_assert (client != NULL); |
197 | GNUNET_CLIENT_notify_transmit_ready (client, | 191 | GNUNET_CLIENT_notify_transmit_ready (client, |
198 | 256, | 192 | 256, |