diff options
Diffstat (limited to 'src/util/test_server.c')
-rw-r--r-- | src/util/test_server.c | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/src/util/test_server.c b/src/util/test_server.c index 8adde5346..625829042 100644 --- a/src/util/test_server.c +++ b/src/util/test_server.c | |||
@@ -61,7 +61,7 @@ finish_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
61 | 61 | ||
62 | static void | 62 | static void |
63 | recv_fin_cb (void *cls, struct GNUNET_SERVER_Client *client, | 63 | recv_fin_cb (void *cls, struct GNUNET_SERVER_Client *client, |
64 | const struct GNUNET_MessageHeader *message) | 64 | const struct GNUNET_MessageHeader *message) |
65 | { | 65 | { |
66 | GNUNET_assert (ok == 5); | 66 | GNUNET_assert (ok == 5); |
67 | ok = 6; | 67 | ok = 6; |
@@ -98,20 +98,19 @@ reply_msg (void *cls, size_t size, void *buf) | |||
98 | 98 | ||
99 | static void | 99 | static void |
100 | recv_cb (void *cls, struct GNUNET_SERVER_Client *client, | 100 | recv_cb (void *cls, struct GNUNET_SERVER_Client *client, |
101 | const struct GNUNET_MessageHeader *message) | 101 | const struct GNUNET_MessageHeader *message) |
102 | { | 102 | { |
103 | GNUNET_assert (ok == 2); | 103 | GNUNET_assert (ok == 2); |
104 | ok = 3; | 104 | ok = 3; |
105 | argclient = client; | 105 | argclient = client; |
106 | GNUNET_SERVER_client_keep (argclient); | 106 | GNUNET_SERVER_client_keep (argclient); |
107 | GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == | 107 | GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size)); |
108 | ntohs (message->size)); | ||
109 | GNUNET_assert (MY_TYPE == ntohs (message->type)); | 108 | GNUNET_assert (MY_TYPE == ntohs (message->type)); |
110 | GNUNET_assert (NULL != | 109 | GNUNET_assert (NULL != |
111 | GNUNET_SERVER_notify_transmit_ready (client, | 110 | GNUNET_SERVER_notify_transmit_ready (client, |
112 | ntohs (message->size), | 111 | ntohs (message->size), |
113 | TIMEOUT, &reply_msg, | 112 | TIMEOUT, &reply_msg, |
114 | NULL)); | 113 | NULL)); |
115 | } | 114 | } |
116 | 115 | ||
117 | 116 | ||
@@ -139,7 +138,7 @@ static size_t | |||
139 | transmit_initial_message (void *cls, size_t size, void *buf) | 138 | transmit_initial_message (void *cls, size_t size, void *buf) |
140 | { | 139 | { |
141 | struct GNUNET_MessageHeader msg; | 140 | struct GNUNET_MessageHeader msg; |
142 | 141 | ||
143 | GNUNET_assert (ok == 1); | 142 | GNUNET_assert (ok == 1); |
144 | ok = 2; | 143 | ok = 2; |
145 | GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader)); | 144 | GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader)); |
@@ -147,12 +146,12 @@ transmit_initial_message (void *cls, size_t size, void *buf) | |||
147 | msg.size = htons (sizeof (struct GNUNET_MessageHeader)); | 146 | msg.size = htons (sizeof (struct GNUNET_MessageHeader)); |
148 | memcpy (buf, &msg, sizeof (struct GNUNET_MessageHeader)); | 147 | memcpy (buf, &msg, sizeof (struct GNUNET_MessageHeader)); |
149 | GNUNET_assert (NULL != | 148 | GNUNET_assert (NULL != |
150 | GNUNET_CLIENT_notify_transmit_ready (cc, | 149 | GNUNET_CLIENT_notify_transmit_ready (cc, |
151 | sizeof (struct | 150 | sizeof (struct |
152 | GNUNET_MessageHeader), | 151 | GNUNET_MessageHeader), |
153 | TIMEOUT, GNUNET_YES, | 152 | TIMEOUT, GNUNET_YES, |
154 | &transmit_second_message, | 153 | &transmit_second_message, |
155 | NULL)); | 154 | NULL)); |
156 | GNUNET_CLIENT_receive (cc, &first_reply_handler, NULL, TIMEOUT); | 155 | GNUNET_CLIENT_receive (cc, &first_reply_handler, NULL, TIMEOUT); |
157 | return sizeof (struct GNUNET_MessageHeader); | 156 | return sizeof (struct GNUNET_MessageHeader); |
158 | } | 157 | } |
@@ -181,18 +180,18 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
181 | cfg = GNUNET_CONFIGURATION_create (); | 180 | cfg = GNUNET_CONFIGURATION_create (); |
182 | GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT); | 181 | GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT); |
183 | GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME", | 182 | GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME", |
184 | "localhost"); | 183 | "localhost"); |
185 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 184 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
186 | "localhost"); | 185 | "localhost"); |
187 | cc = GNUNET_CLIENT_connect ("test-server", cfg); | 186 | cc = GNUNET_CLIENT_connect ("test-server", cfg); |
188 | GNUNET_assert (cc != NULL); | 187 | GNUNET_assert (cc != NULL); |
189 | GNUNET_assert (NULL != | 188 | GNUNET_assert (NULL != |
190 | GNUNET_CLIENT_notify_transmit_ready (cc, | 189 | GNUNET_CLIENT_notify_transmit_ready (cc, |
191 | sizeof (struct | 190 | sizeof (struct |
192 | GNUNET_MessageHeader), | 191 | GNUNET_MessageHeader), |
193 | TIMEOUT, GNUNET_YES, | 192 | TIMEOUT, GNUNET_YES, |
194 | &transmit_initial_message, | 193 | &transmit_initial_message, |
195 | NULL)); | 194 | NULL)); |
196 | } | 195 | } |
197 | 196 | ||
198 | 197 | ||