diff options
Diffstat (limited to 'src/util/test_server_with_client.c')
-rw-r--r-- | src/util/test_server_with_client.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c index 5c36b7b03..4b9d84059 100644 --- a/src/util/test_server_with_client.c +++ b/src/util/test_server_with_client.c | |||
@@ -49,6 +49,7 @@ static void | |||
49 | send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 49 | send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
50 | { | 50 | { |
51 | struct GNUNET_SERVER_Client *argclient = cls; | 51 | struct GNUNET_SERVER_Client *argclient = cls; |
52 | |||
52 | GNUNET_assert (ok == 3); | 53 | GNUNET_assert (ok == 3); |
53 | ok++; | 54 | ok++; |
54 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); | 55 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); |
@@ -66,8 +67,7 @@ recv_cb (void *cls, | |||
66 | struct sockaddr_in *have; | 67 | struct sockaddr_in *have; |
67 | 68 | ||
68 | GNUNET_assert (GNUNET_OK == | 69 | GNUNET_assert (GNUNET_OK == |
69 | GNUNET_SERVER_client_get_address (argclient, | 70 | GNUNET_SERVER_client_get_address (argclient, &addr, &addrlen)); |
70 | &addr, &addrlen)); | ||
71 | 71 | ||
72 | GNUNET_assert (addrlen == sizeof (struct sockaddr_in)); | 72 | GNUNET_assert (addrlen == sizeof (struct sockaddr_in)); |
73 | have = addr; | 73 | have = addr; |
@@ -81,21 +81,21 @@ recv_cb (void *cls, | |||
81 | GNUNET_assert (0 == memcmp (&sa, addr, addrlen)); | 81 | GNUNET_assert (0 == memcmp (&sa, addr, addrlen)); |
82 | GNUNET_free (addr); | 82 | GNUNET_free (addr); |
83 | switch (ok) | 83 | switch (ok) |
84 | { | 84 | { |
85 | case 2: | 85 | case 2: |
86 | ok++; | 86 | ok++; |
87 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 87 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
88 | (GNUNET_TIME_UNIT_MILLISECONDS, 50), | 88 | (GNUNET_TIME_UNIT_MILLISECONDS, 50), |
89 | &send_done, argclient); | 89 | &send_done, argclient); |
90 | break; | 90 | break; |
91 | case 4: | 91 | case 4: |
92 | ok++; | 92 | ok++; |
93 | GNUNET_CLIENT_disconnect (client, GNUNET_YES); | 93 | GNUNET_CLIENT_disconnect (client, GNUNET_YES); |
94 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); | 94 | GNUNET_SERVER_receive_done (argclient, GNUNET_OK); |
95 | break; | 95 | break; |
96 | default: | 96 | default: |
97 | GNUNET_assert (0); | 97 | GNUNET_assert (0); |
98 | } | 98 | } |
99 | 99 | ||
100 | } | 100 | } |
101 | 101 | ||
@@ -156,10 +156,10 @@ static void | |||
156 | task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 156 | task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
157 | { | 157 | { |
158 | struct sockaddr_in sa; | 158 | struct sockaddr_in sa; |
159 | struct sockaddr * sap[2]; | 159 | struct sockaddr *sap[2]; |
160 | socklen_t slens[2]; | 160 | socklen_t slens[2]; |
161 | 161 | ||
162 | sap[0] = (struct sockaddr*) &sa; | 162 | sap[0] = (struct sockaddr *) &sa; |
163 | slens[0] = sizeof (sa); | 163 | slens[0] = sizeof (sa); |
164 | sap[1] = NULL; | 164 | sap[1] = NULL; |
165 | slens[1] = 0; | 165 | slens[1] = 0; |
@@ -172,7 +172,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
172 | server = GNUNET_SERVER_create (NULL, | 172 | server = GNUNET_SERVER_create (NULL, |
173 | NULL, | 173 | NULL, |
174 | sap, | 174 | sap, |
175 | slens, | 175 | slens, |
176 | GNUNET_TIME_relative_multiply | 176 | GNUNET_TIME_relative_multiply |
177 | (GNUNET_TIME_UNIT_MILLISECONDS, 250), | 177 | (GNUNET_TIME_UNIT_MILLISECONDS, 250), |
178 | GNUNET_NO); | 178 | GNUNET_NO); |
@@ -182,8 +182,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
182 | GNUNET_SERVER_disconnect_notify (server, ¬ify_disconnect, cls); | 182 | GNUNET_SERVER_disconnect_notify (server, ¬ify_disconnect, cls); |
183 | cfg = GNUNET_CONFIGURATION_create (); | 183 | cfg = GNUNET_CONFIGURATION_create (); |
184 | GNUNET_CONFIGURATION_set_value_number (cfg, "test", "PORT", PORT); | 184 | GNUNET_CONFIGURATION_set_value_number (cfg, "test", "PORT", PORT); |
185 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME", | 185 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME", "localhost"); |
186 | "localhost"); | ||
187 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 186 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
188 | "localhost"); | 187 | "localhost"); |
189 | client = GNUNET_CLIENT_connect ("test", cfg); | 188 | client = GNUNET_CLIENT_connect ("test", cfg); |