diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-09-15 15:19:55 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-09-15 15:19:55 +0000 |
commit | 3be103811791856cf2a9aa5e9498aafaea12b7f3 (patch) | |
tree | 273b4eca8ec924ce671a5fd45c44d62d0ac43099 /src | |
parent | d679c947473c2bb99e29126c92d5157d60fe3e22 (diff) | |
download | gnunet-3be103811791856cf2a9aa5e9498aafaea12b7f3.tar.gz gnunet-3be103811791856cf2a9aa5e9498aafaea12b7f3.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/plugin_transport_http.c | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index c2f8a6091..bd2c39ecb 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -53,11 +53,11 @@ | |||
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | #define DEBUG_HTTP GNUNET_NO | 55 | #define DEBUG_HTTP GNUNET_NO |
56 | #define DEBUG_CURL GNUNET_NO | 56 | #define DEBUG_CURL GNUNET_YES |
57 | #define DEBUG_MHD GNUNET_NO | 57 | #define DEBUG_MHD GNUNET_YES |
58 | #define DEBUG_CONNECTIONS GNUNET_NO | 58 | #define DEBUG_CONNECTIONS GNUNET_NO |
59 | #define DEBUG_SESSION_SELECTION GNUNET_NO | 59 | #define DEBUG_SESSION_SELECTION GNUNET_NO |
60 | 60 | #define DEBUG_SCHEDULING GNUNET_NO | |
61 | #define CURL_TCP_NODELAY GNUNET_YES | 61 | #define CURL_TCP_NODELAY GNUNET_YES |
62 | 62 | ||
63 | #define INBOUND GNUNET_NO | 63 | #define INBOUND GNUNET_NO |
@@ -732,7 +732,7 @@ static void mhd_termination_cb (void *cls, struct MHD_Connection * connection, v | |||
732 | if (ps == NULL) | 732 | if (ps == NULL) |
733 | return; | 733 | return; |
734 | struct HTTP_PeerContext * pc = ps->peercontext; | 734 | struct HTTP_PeerContext * pc = ps->peercontext; |
735 | 735 | ||
736 | if (connection==ps->recv_endpoint) | 736 | if (connection==ps->recv_endpoint) |
737 | { | 737 | { |
738 | #if DEBUG_CONNECTIONS | 738 | #if DEBUG_CONNECTIONS |
@@ -1152,7 +1152,7 @@ http_server_daemon_prepare (struct Plugin *plugin , struct MHD_Daemon *daemon_ha | |||
1152 | if (haveto == MHD_YES) | 1152 | if (haveto == MHD_YES) |
1153 | tv.value = (uint64_t) timeout; | 1153 | tv.value = (uint64_t) timeout; |
1154 | else | 1154 | else |
1155 | tv = GNUNET_TIME_UNIT_FOREVER_REL; | 1155 | tv = GNUNET_TIME_UNIT_SECONDS; |
1156 | GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max); | 1156 | GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max); |
1157 | GNUNET_NETWORK_fdset_copy_native (wws, &ws, max); | 1157 | GNUNET_NETWORK_fdset_copy_native (wws, &ws, max); |
1158 | GNUNET_NETWORK_fdset_copy_native (wes, &es, max); | 1158 | GNUNET_NETWORK_fdset_copy_native (wes, &es, max); |
@@ -1207,6 +1207,19 @@ static void http_server_daemon_v4_run (void *cls, | |||
1207 | { | 1207 | { |
1208 | struct Plugin *plugin = cls; | 1208 | struct Plugin *plugin = cls; |
1209 | 1209 | ||
1210 | #ifdef DEBUG_SCHEDULING | ||
1211 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | ||
1212 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_READ_READY\n"); | ||
1213 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) | ||
1214 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n"); | ||
1215 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) | ||
1216 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n"); | ||
1217 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP)) | ||
1218 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_STARTUP\n"); | ||
1219 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | ||
1220 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n"); | ||
1221 | #endif | ||
1222 | |||
1210 | GNUNET_assert(cls !=NULL); | 1223 | GNUNET_assert(cls !=NULL); |
1211 | plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK; | 1224 | plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK; |
1212 | 1225 | ||
@@ -1228,6 +1241,19 @@ static void http_server_daemon_v6_run (void *cls, | |||
1228 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 1241 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
1229 | { | 1242 | { |
1230 | struct Plugin *plugin = cls; | 1243 | struct Plugin *plugin = cls; |
1244 | |||
1245 | #ifdef DEBUG_SCHEDULING | ||
1246 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | ||
1247 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_READ_READY\n"); | ||
1248 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) | ||
1249 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n"); | ||
1250 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) | ||
1251 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n"); | ||
1252 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP)) | ||
1253 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_STARTUP\n"); | ||
1254 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | ||
1255 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n"); | ||
1256 | #endif | ||
1231 | 1257 | ||
1232 | GNUNET_assert(cls !=NULL); | 1258 | GNUNET_assert(cls !=NULL); |
1233 | plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK; | 1259 | plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK; |