aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_server.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/test_server.c')
-rw-r--r--src/util/test_server.c66
1 files changed, 27 insertions, 39 deletions
diff --git a/src/util/test_server.c b/src/util/test_server.c
index 00d4352f8..577a841ff 100644
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -49,8 +49,7 @@ static int ok;
49 49
50 50
51static void 51static void
52finish_up (void *cls, 52finish_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
53 const struct GNUNET_SCHEDULER_TaskContext *tc)
54{ 53{
55 GNUNET_assert (ok == 6); 54 GNUNET_assert (ok == 6);
56 ok = 0; 55 ok = 0;
@@ -68,14 +67,12 @@ recv_fin_cb (void *cls,
68 GNUNET_assert (ok == 5); 67 GNUNET_assert (ok == 5);
69 ok = 6; 68 ok = 6;
70 GNUNET_SERVER_receive_done (client, GNUNET_OK); 69 GNUNET_SERVER_receive_done (client, GNUNET_OK);
71 GNUNET_SCHEDULER_add_now (&finish_up, 70 GNUNET_SCHEDULER_add_now (&finish_up, NULL);
72 NULL);
73} 71}
74 72
75 73
76static void 74static void
77first_reply_handler (void *cls, 75first_reply_handler (void *cls, const struct GNUNET_MessageHeader *msg)
78 const struct GNUNET_MessageHeader *msg)
79{ 76{
80 GNUNET_assert (ok == 4); 77 GNUNET_assert (ok == 4);
81 ok = 5; 78 ok = 5;
@@ -109,8 +106,7 @@ recv_cb (void *cls,
109 ok = 3; 106 ok = 3;
110 argclient = client; 107 argclient = client;
111 GNUNET_SERVER_client_keep (argclient); 108 GNUNET_SERVER_client_keep (argclient);
112 GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == 109 GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size));
113 ntohs (message->size));
114 GNUNET_assert (MY_TYPE == ntohs (message->type)); 110 GNUNET_assert (MY_TYPE == ntohs (message->type));
115 GNUNET_assert (NULL != 111 GNUNET_assert (NULL !=
116 GNUNET_SERVER_notify_transmit_ready (client, 112 GNUNET_SERVER_notify_transmit_ready (client,
@@ -128,9 +124,7 @@ static struct GNUNET_SERVER_MessageHandler handlers[] = {
128 124
129 125
130static size_t 126static size_t
131transmit_second_message (void *cls, 127transmit_second_message (void *cls, size_t size, void *buf)
132 size_t size,
133 void *buf)
134{ 128{
135 struct GNUNET_MessageHeader msg; 129 struct GNUNET_MessageHeader msg;
136 130
@@ -143,10 +137,8 @@ transmit_second_message (void *cls,
143 137
144 138
145static size_t 139static size_t
146transmit_initial_message (void *cls, 140transmit_initial_message (void *cls, size_t size, void *buf)
147 size_t size, 141{
148 void *buf)
149{
150 struct GNUNET_MessageHeader msg; 142 struct GNUNET_MessageHeader msg;
151 143
152 GNUNET_assert (ok == 1); 144 GNUNET_assert (ok == 1);
@@ -156,12 +148,12 @@ transmit_initial_message (void *cls,
156 msg.size = htons (sizeof (struct GNUNET_MessageHeader)); 148 msg.size = htons (sizeof (struct GNUNET_MessageHeader));
157 memcpy (buf, &msg, sizeof (struct GNUNET_MessageHeader)); 149 memcpy (buf, &msg, sizeof (struct GNUNET_MessageHeader));
158 GNUNET_assert (NULL != 150 GNUNET_assert (NULL !=
159 GNUNET_CLIENT_notify_transmit_ready (cc, 151 GNUNET_CLIENT_notify_transmit_ready (cc,
160 sizeof (struct GNUNET_MessageHeader), 152 sizeof (struct
161 TIMEOUT, 153 GNUNET_MessageHeader),
162 GNUNET_YES, 154 TIMEOUT, GNUNET_YES,
163 &transmit_second_message, 155 &transmit_second_message,
164 NULL)); 156 NULL));
165 GNUNET_CLIENT_receive (cc, &first_reply_handler, NULL, TIMEOUT); 157 GNUNET_CLIENT_receive (cc, &first_reply_handler, NULL, TIMEOUT);
166 return sizeof (struct GNUNET_MessageHeader); 158 return sizeof (struct GNUNET_MessageHeader);
167} 159}
@@ -171,10 +163,10 @@ static void
171task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 163task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
172{ 164{
173 struct sockaddr_in sa; 165 struct sockaddr_in sa;
174 struct sockaddr * sap[2]; 166 struct sockaddr *sap[2];
175 socklen_t slens[2]; 167 socklen_t slens[2];
176 168
177 sap[0] = (struct sockaddr*) &sa; 169 sap[0] = (struct sockaddr *) &sa;
178 slens[0] = sizeof (sa); 170 slens[0] = sizeof (sa);
179 sap[1] = NULL; 171 sap[1] = NULL;
180 slens[1] = 0; 172 slens[1] = 0;
@@ -184,28 +176,24 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
184#endif 176#endif
185 sa.sin_family = AF_INET; 177 sa.sin_family = AF_INET;
186 sa.sin_port = htons (PORT); 178 sa.sin_port = htons (PORT);
187 server = GNUNET_SERVER_create (NULL, 179 server = GNUNET_SERVER_create (NULL, NULL, sap, slens, TIMEOUT, GNUNET_NO);
188 NULL,
189 sap,
190 slens,
191 TIMEOUT,
192 GNUNET_NO);
193 GNUNET_assert (server != NULL); 180 GNUNET_assert (server != NULL);
194 GNUNET_SERVER_add_handlers (server, handlers); 181 GNUNET_SERVER_add_handlers (server, handlers);
195 cfg = GNUNET_CONFIGURATION_create (); 182 cfg = GNUNET_CONFIGURATION_create ();
196 GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT); 183 GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT);
197 GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME", "localhost"); 184 GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME",
198 GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", "localhost"); 185 "localhost");
199 cc = GNUNET_CLIENT_connect ("test-server", 186 GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
200 cfg); 187 "localhost");
188 cc = GNUNET_CLIENT_connect ("test-server", cfg);
201 GNUNET_assert (cc != NULL); 189 GNUNET_assert (cc != NULL);
202 GNUNET_assert (NULL != 190 GNUNET_assert (NULL !=
203 GNUNET_CLIENT_notify_transmit_ready (cc, 191 GNUNET_CLIENT_notify_transmit_ready (cc,
204 sizeof (struct GNUNET_MessageHeader), 192 sizeof (struct
205 TIMEOUT, 193 GNUNET_MessageHeader),
206 GNUNET_YES, 194 TIMEOUT, GNUNET_YES,
207 &transmit_initial_message, 195 &transmit_initial_message,
208 NULL)); 196 NULL));
209} 197}
210 198
211 199