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