diff options
Diffstat (limited to 'src/util/test_client.c')
-rw-r--r-- | src/util/test_client.c | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/src/util/test_client.c b/src/util/test_client.c index ad88874f2..bb7d5008a 100644 --- a/src/util/test_client.c +++ b/src/util/test_client.c | |||
@@ -71,25 +71,24 @@ copy_msg (void *cls, size_t size, void *buf) | |||
71 | */ | 71 | */ |
72 | static void | 72 | static void |
73 | echo_cb (void *cls, struct GNUNET_SERVER_Client *client, | 73 | echo_cb (void *cls, struct GNUNET_SERVER_Client *client, |
74 | const struct GNUNET_MessageHeader *message) | 74 | const struct GNUNET_MessageHeader *message) |
75 | { | 75 | { |
76 | struct CopyContext *cc; | 76 | struct CopyContext *cc; |
77 | struct GNUNET_MessageHeader *cpy; | 77 | struct GNUNET_MessageHeader *cpy; |
78 | 78 | ||
79 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 79 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
80 | "Receiving message from client, bouncing back\n"); | 80 | "Receiving message from client, bouncing back\n"); |
81 | GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == | 81 | GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size)); |
82 | ntohs (message->size)); | ||
83 | cc = GNUNET_malloc (sizeof (struct CopyContext)); | 82 | cc = GNUNET_malloc (sizeof (struct CopyContext)); |
84 | cc->client = client; | 83 | cc->client = client; |
85 | cpy = GNUNET_malloc (ntohs (message->size)); | 84 | cpy = GNUNET_malloc (ntohs (message->size)); |
86 | memcpy (cpy, message, ntohs (message->size)); | 85 | memcpy (cpy, message, ntohs (message->size)); |
87 | cc->cpy = cpy; | 86 | cc->cpy = cpy; |
88 | GNUNET_assert (NULL != | 87 | GNUNET_assert (NULL != |
89 | GNUNET_SERVER_notify_transmit_ready (client, | 88 | GNUNET_SERVER_notify_transmit_ready (client, |
90 | ntohs (message->size), | 89 | ntohs (message->size), |
91 | GNUNET_TIME_UNIT_SECONDS, | 90 | GNUNET_TIME_UNIT_SECONDS, |
92 | ©_msg, cc)); | 91 | ©_msg, cc)); |
93 | } | 92 | } |
94 | 93 | ||
95 | 94 | ||
@@ -105,13 +104,11 @@ recv_bounce (void *cls, const struct GNUNET_MessageHeader *got) | |||
105 | int *ok = cls; | 104 | int *ok = cls; |
106 | struct GNUNET_MessageHeader msg; | 105 | struct GNUNET_MessageHeader msg; |
107 | 106 | ||
108 | GNUNET_assert (got != NULL); /* timeout */ | 107 | GNUNET_assert (got != NULL); /* timeout */ |
109 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 108 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving bounce, checking content\n"); |
110 | "Receiving bounce, checking content\n"); | ||
111 | msg.type = htons (MY_TYPE); | 109 | msg.type = htons (MY_TYPE); |
112 | msg.size = htons (sizeof (struct GNUNET_MessageHeader)); | 110 | msg.size = htons (sizeof (struct GNUNET_MessageHeader)); |
113 | GNUNET_assert (0 == | 111 | GNUNET_assert (0 == memcmp (got, &msg, sizeof (struct GNUNET_MessageHeader))); |
114 | memcmp (got, &msg, sizeof (struct GNUNET_MessageHeader))); | ||
115 | GNUNET_CLIENT_disconnect (client, GNUNET_YES); | 112 | GNUNET_CLIENT_disconnect (client, GNUNET_YES); |
116 | client = NULL; | 113 | client = NULL; |
117 | GNUNET_SERVER_destroy (server); | 114 | GNUNET_SERVER_destroy (server); |
@@ -151,9 +148,9 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
151 | sa.sin_family = AF_INET; | 148 | sa.sin_family = AF_INET; |
152 | sa.sin_port = htons (PORT); | 149 | sa.sin_port = htons (PORT); |
153 | server = | 150 | server = |
154 | GNUNET_SERVER_create (NULL, NULL, sap, slens, | 151 | GNUNET_SERVER_create (NULL, NULL, sap, slens, |
155 | GNUNET_TIME_relative_multiply | 152 | GNUNET_TIME_relative_multiply |
156 | (GNUNET_TIME_UNIT_MILLISECONDS, 10000), GNUNET_NO); | 153 | (GNUNET_TIME_UNIT_MILLISECONDS, 10000), GNUNET_NO); |
157 | GNUNET_assert (server != NULL); | 154 | GNUNET_assert (server != NULL); |
158 | handlers[0].callback_cls = cls; | 155 | handlers[0].callback_cls = cls; |
159 | handlers[1].callback_cls = cls; | 156 | handlers[1].callback_cls = cls; |
@@ -161,15 +158,15 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
161 | client = GNUNET_CLIENT_connect (MYNAME, cfg); | 158 | client = GNUNET_CLIENT_connect (MYNAME, cfg); |
162 | GNUNET_assert (client != NULL); | 159 | GNUNET_assert (client != NULL); |
163 | GNUNET_assert (NULL != | 160 | GNUNET_assert (NULL != |
164 | GNUNET_CLIENT_notify_transmit_ready (client, | 161 | GNUNET_CLIENT_notify_transmit_ready (client, |
165 | sizeof (struct | 162 | sizeof (struct |
166 | GNUNET_MessageHeader), | 163 | GNUNET_MessageHeader), |
167 | GNUNET_TIME_UNIT_SECONDS, | 164 | GNUNET_TIME_UNIT_SECONDS, |
168 | GNUNET_NO, &make_msg, | 165 | GNUNET_NO, &make_msg, |
169 | NULL)); | 166 | NULL)); |
170 | GNUNET_CLIENT_receive (client, &recv_bounce, cls, | 167 | GNUNET_CLIENT_receive (client, &recv_bounce, cls, |
171 | GNUNET_TIME_relative_multiply | 168 | GNUNET_TIME_relative_multiply |
172 | (GNUNET_TIME_UNIT_MILLISECONDS, 10000)); | 169 | (GNUNET_TIME_UNIT_MILLISECONDS, 10000)); |
173 | } | 170 | } |
174 | 171 | ||
175 | 172 | ||
@@ -184,10 +181,9 @@ check () | |||
184 | 181 | ||
185 | cfg = GNUNET_CONFIGURATION_create (); | 182 | cfg = GNUNET_CONFIGURATION_create (); |
186 | GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT); | 183 | GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT); |
187 | GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "HOSTNAME", | 184 | GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "HOSTNAME", "localhost"); |
188 | "localhost"); | ||
189 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 185 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
190 | "localhost"); | 186 | "localhost"); |
191 | ok = 1; | 187 | ok = 1; |
192 | GNUNET_SCHEDULER_run (&task, &ok); | 188 | GNUNET_SCHEDULER_run (&task, &ok); |
193 | GNUNET_CONFIGURATION_destroy (cfg); | 189 | GNUNET_CONFIGURATION_destroy (cfg); |
@@ -201,11 +197,11 @@ main (int argc, char *argv[]) | |||
201 | 197 | ||
202 | GNUNET_log_setup ("test_client", | 198 | GNUNET_log_setup ("test_client", |
203 | #if VERBOSE | 199 | #if VERBOSE |
204 | "DEBUG", | 200 | "DEBUG", |
205 | #else | 201 | #else |
206 | "WARNING", | 202 | "WARNING", |
207 | #endif | 203 | #endif |
208 | NULL); | 204 | NULL); |
209 | ret += check (); | 205 | ret += check (); |
210 | 206 | ||
211 | return ret; | 207 | return ret; |