diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-06-23 11:09:21 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-06-23 11:09:21 +0000 |
commit | c12e4b8e8200a0d87b16543b673bb61cb7fd9325 (patch) | |
tree | 64d43b45318431d1373e34ef8bd72ee4060b2ad0 /src | |
parent | ce34c0bba3ca7ce734a90a08918cf7568ed9ab4c (diff) | |
download | gnunet-c12e4b8e8200a0d87b16543b673bb61cb7fd9325.tar.gz gnunet-c12e4b8e8200a0d87b16543b673bb61cb7fd9325.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/plugin_transport_http.c | 29 | ||||
-rw-r--r-- | src/transport/test_plugin_transport_http.c | 2 |
2 files changed, 17 insertions, 14 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index 311e0717b..350a0f3cf 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -196,17 +196,6 @@ struct Session | |||
196 | size_t addr_out_len; | 196 | size_t addr_out_len; |
197 | 197 | ||
198 | /** | 198 | /** |
199 | * Sender's ip address to distinguish between incoming connections | ||
200 | */ | ||
201 | //char * addr_inbound_str; | ||
202 | |||
203 | |||
204 | /** | ||
205 | * Sender's ip address specified by transport | ||
206 | */ | ||
207 | //struct sockaddr_in * addr_outbound; | ||
208 | |||
209 | /** | ||
210 | * Did we initiate the connection (GNUNET_YES) or the other peer (GNUNET_NO)? | 199 | * Did we initiate the connection (GNUNET_YES) or the other peer (GNUNET_NO)? |
211 | */ | 200 | */ |
212 | int is_client; | 201 | int is_client; |
@@ -248,14 +237,29 @@ struct Session | |||
248 | */ | 237 | */ |
249 | struct GNUNET_CRYPTO_HashAsciiEncoded hash; | 238 | struct GNUNET_CRYPTO_HashAsciiEncoded hash; |
250 | 239 | ||
251 | //struct HTTP_Message * pending_outbound_msg; | 240 | /** |
241 | * Head of dll used to store outbound messages | ||
242 | */ | ||
252 | struct HTTP_Message * pending_outbound_msg_head; | 243 | struct HTTP_Message * pending_outbound_msg_head; |
244 | |||
245 | /** | ||
246 | * Tail of dll used to store outbound messages | ||
247 | */ | ||
253 | struct HTTP_Message * pending_outbound_msg_tail; | 248 | struct HTTP_Message * pending_outbound_msg_tail; |
254 | 249 | ||
250 | /** | ||
251 | * Incoming message | ||
252 | */ | ||
255 | struct HTTP_Message * pending_inbound_msg; | 253 | struct HTTP_Message * pending_inbound_msg; |
256 | 254 | ||
255 | /** | ||
256 | * curl handle for outbound transmissions | ||
257 | */ | ||
257 | CURL *curl_handle; | 258 | CURL *curl_handle; |
258 | 259 | ||
260 | /** | ||
261 | * Message tokenizer for incoming data | ||
262 | */ | ||
259 | struct GNUNET_SERVER_MessageStreamTokenizer * msgtok; | 263 | struct GNUNET_SERVER_MessageStreamTokenizer * msgtok; |
260 | }; | 264 | }; |
261 | 265 | ||
@@ -297,7 +301,6 @@ static GNUNET_SCHEDULER_TaskIdentifier http_task_v4; | |||
297 | */ | 301 | */ |
298 | static GNUNET_SCHEDULER_TaskIdentifier http_task_v6; | 302 | static GNUNET_SCHEDULER_TaskIdentifier http_task_v6; |
299 | 303 | ||
300 | |||
301 | /** | 304 | /** |
302 | * The task sending data | 305 | * The task sending data |
303 | */ | 306 | */ |
diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c index 4daa21de6..6ac925512 100644 --- a/src/transport/test_plugin_transport_http.c +++ b/src/transport/test_plugin_transport_http.c | |||
@@ -517,7 +517,7 @@ receive (void *cls, | |||
517 | const char *sender_address, | 517 | const char *sender_address, |
518 | uint16_t sender_address_len) | 518 | uint16_t sender_address_len) |
519 | { | 519 | { |
520 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testcase recieved new message from peer `%s' (`%s') with type %u and length %u\n", GNUNET_i2s(peer), sender_address, ntohs(message->type), ntohs(message->size)); | 520 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testcase recieved new message from peer `%s' with type %u and length %u\n", GNUNET_i2s(peer), ntohs(message->type), ntohs(message->size)); |
521 | if ((ntohs(message->type) == 40) && (fail_multiple_msgs_in_transmission == 1)) | 521 | if ((ntohs(message->type) == 40) && (fail_multiple_msgs_in_transmission == 1)) |
522 | fail_multiple_msgs_in_transmission++; | 522 | fail_multiple_msgs_in_transmission++; |
523 | if ((ntohs(message->type) == 41) && (fail_multiple_msgs_in_transmission == 2)) | 523 | if ((ntohs(message->type) == 41) && (fail_multiple_msgs_in_transmission == 2)) |