diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-12 14:01:32 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-12 14:01:32 +0000 |
commit | e08f18602518053e63e7550466cb52a39269aaf5 (patch) | |
tree | 4f373fbbf965985c5eb3d9ed6e5bb22ab2cd0250 /src/transport/plugin_transport_http.c | |
parent | 55089a84f206a44059d7ba0ab0972236e93585af (diff) | |
download | gnunet-e08f18602518053e63e7550466cb52a39269aaf5.tar.gz gnunet-e08f18602518053e63e7550466cb52a39269aaf5.zip |
minor changes to debug output
Diffstat (limited to 'src/transport/plugin_transport_http.c')
-rw-r--r-- | src/transport/plugin_transport_http.c | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index b81d40614..247db2964 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -327,6 +327,7 @@ struct Session | |||
327 | */ | 327 | */ |
328 | unsigned int recv_force_disconnect; | 328 | unsigned int recv_force_disconnect; |
329 | 329 | ||
330 | |||
330 | /** | 331 | /** |
331 | * id for next session | 332 | * id for next session |
332 | * NOTE: 0 is not an ID, zero is not defined. A correct ID is always > 0 | 333 | * NOTE: 0 is not an ID, zero is not defined. A correct ID is always > 0 |
@@ -884,7 +885,7 @@ static void mhd_write_mst_cb (void *cls, | |||
884 | if (delay.value > 0) | 885 | if (delay.value > 0) |
885 | { | 886 | { |
886 | #if DEBUG_HTTP | 887 | #if DEBUG_HTTP |
887 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"Connection %X: Inbound quota management: delay next read for %llu ms \n", ps, delay.value); | 888 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Inbound quota management: delay next read for %llu ms \n", ps, delay.value); |
888 | #endif | 889 | #endif |
889 | pc->reset_task = GNUNET_SCHEDULER_add_delayed (pc->plugin->env->sched, delay, &reset_inbound_quota_delay, pc); | 890 | pc->reset_task = GNUNET_SCHEDULER_add_delayed (pc->plugin->env->sched, delay, &reset_inbound_quota_delay, pc); |
890 | } | 891 | } |
@@ -961,6 +962,9 @@ mhd_send_callback (void *cls, uint64_t pos, char *buf, size_t max) | |||
961 | remove_http_message(ps,msg); | 962 | remove_http_message(ps,msg); |
962 | } | 963 | } |
963 | } | 964 | } |
965 | #if DEBUG_CONNECTIONS | ||
966 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: MHD has sent %u bytes\n", ps, bytes_read); | ||
967 | #endif | ||
964 | return bytes_read; | 968 | return bytes_read; |
965 | } | 969 | } |
966 | 970 | ||
@@ -972,7 +976,7 @@ mhd_send_callback (void *cls, uint64_t pos, char *buf, size_t max) | |||
972 | * already exists and create a new one if not. | 976 | * already exists and create a new one if not. |
973 | */ | 977 | */ |
974 | static int | 978 | static int |
975 | mdh_access_cb (void *cls, | 979 | mhd_access_cb (void *cls, |
976 | struct MHD_Connection *mhd_connection, | 980 | struct MHD_Connection *mhd_connection, |
977 | const char *url, | 981 | const char *url, |
978 | const char *method, | 982 | const char *method, |
@@ -1180,6 +1184,9 @@ mdh_access_cb (void *cls, | |||
1180 | { | 1184 | { |
1181 | if (pc->delay.value == 0) | 1185 | if (pc->delay.value == 0) |
1182 | { | 1186 | { |
1187 | #if DEBUG_HTTP | ||
1188 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: PUT with %u bytes forwarded to MST\n", ps, *upload_data_size); | ||
1189 | #endif | ||
1183 | res = GNUNET_SERVER_mst_receive(ps->msgtok, ps, upload_data, *upload_data_size, GNUNET_NO, GNUNET_NO); | 1190 | res = GNUNET_SERVER_mst_receive(ps->msgtok, ps, upload_data, *upload_data_size, GNUNET_NO, GNUNET_NO); |
1184 | (*upload_data_size) = 0; | 1191 | (*upload_data_size) = 0; |
1185 | } | 1192 | } |
@@ -1316,15 +1323,15 @@ static void http_server_daemon_v4_run (void *cls, | |||
1316 | 1323 | ||
1317 | #if DEBUG_SCHEDULING | 1324 | #if DEBUG_SCHEDULING |
1318 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | 1325 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) |
1319 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_READ_READY\n"); | 1326 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_READ_READY\n"); |
1320 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) | 1327 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) |
1321 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n"); | 1328 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n"); |
1322 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) | 1329 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) |
1323 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n"); | 1330 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n"); |
1324 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP)) | 1331 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP)) |
1325 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_STARTUP\n"); | 1332 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_STARTUP\n"); |
1326 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | 1333 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) |
1327 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n"); | 1334 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n"); |
1328 | #endif | 1335 | #endif |
1329 | 1336 | ||
1330 | GNUNET_assert(cls !=NULL); | 1337 | GNUNET_assert(cls !=NULL); |
@@ -1351,15 +1358,15 @@ static void http_server_daemon_v6_run (void *cls, | |||
1351 | 1358 | ||
1352 | #if DEBUG_SCHEDULING | 1359 | #if DEBUG_SCHEDULING |
1353 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | 1360 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) |
1354 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_READ_READY\n"); | 1361 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_READ_READY\n"); |
1355 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) | 1362 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) |
1356 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n"); | 1363 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n"); |
1357 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) | 1364 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) |
1358 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n"); | 1365 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n"); |
1359 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP)) | 1366 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP)) |
1360 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_STARTUP\n"); | 1367 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_STARTUP\n"); |
1361 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | 1368 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) |
1362 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n"); | 1369 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n"); |
1363 | #endif | 1370 | #endif |
1364 | 1371 | ||
1365 | GNUNET_assert(cls !=NULL); | 1372 | GNUNET_assert(cls !=NULL); |
@@ -1542,7 +1549,7 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr) | |||
1542 | if ( msg->pos == msg->size) | 1549 | if ( msg->pos == msg->size) |
1543 | { | 1550 | { |
1544 | #if DEBUG_CONNECTIONS | 1551 | #if DEBUG_CONNECTIONS |
1545 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"Connection %X: Message with %u bytes sent, removing message from queue \n",ps, msg->pos); | 1552 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes sent, removing message from queue \n",ps, msg->pos); |
1546 | #endif | 1553 | #endif |
1547 | /* Calling transmit continuation */ | 1554 | /* Calling transmit continuation */ |
1548 | if (NULL != ps->pending_msgs_tail->transmit_cont) | 1555 | if (NULL != ps->pending_msgs_tail->transmit_cont) |
@@ -1584,7 +1591,7 @@ static void curl_receive_mst_cb (void *cls, | |||
1584 | if (delay.value > 0) | 1591 | if (delay.value > 0) |
1585 | { | 1592 | { |
1586 | #if DEBUG_HTTP | 1593 | #if DEBUG_HTTP |
1587 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"Connection %X: Inbound quota management: delay next read for %llu ms \n", ps, delay.value); | 1594 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Inbound quota management: delay next read for %llu ms \n", ps, delay.value); |
1588 | #endif | 1595 | #endif |
1589 | pc->reset_task = GNUNET_SCHEDULER_add_delayed (pc->plugin->env->sched, delay, &reset_inbound_quota_delay, pc); | 1596 | pc->reset_task = GNUNET_SCHEDULER_add_delayed (pc->plugin->env->sched, delay, &reset_inbound_quota_delay, pc); |
1590 | } | 1597 | } |
@@ -2989,7 +2996,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
2989 | MHD_USE_IPv6, | 2996 | MHD_USE_IPv6, |
2990 | port, | 2997 | port, |
2991 | &mhd_accept_cb, | 2998 | &mhd_accept_cb, |
2992 | plugin , &mdh_access_cb, plugin, | 2999 | plugin , &mhd_access_cb, plugin, |
2993 | MHD_OPTION_SOCK_ADDR, tmp, | 3000 | MHD_OPTION_SOCK_ADDR, tmp, |
2994 | MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32, | 3001 | MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32, |
2995 | //MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6, | 3002 | //MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6, |
@@ -3016,7 +3023,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
3016 | MHD_NO_FLAG, | 3023 | MHD_NO_FLAG, |
3017 | port, | 3024 | port, |
3018 | &mhd_accept_cb, | 3025 | &mhd_accept_cb, |
3019 | plugin , &mdh_access_cb, plugin, | 3026 | plugin , &mhd_access_cb, plugin, |
3020 | MHD_OPTION_SOCK_ADDR, (struct sockaddr_in *)plugin->bind4_address, | 3027 | MHD_OPTION_SOCK_ADDR, (struct sockaddr_in *)plugin->bind4_address, |
3021 | MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32, | 3028 | MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32, |
3022 | //MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6, | 3029 | //MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6, |
@@ -3066,7 +3073,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
3066 | GNUNET_asprintf(&tmp,"with IPv6 enabled"); | 3073 | GNUNET_asprintf(&tmp,"with IPv6 enabled"); |
3067 | if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_NO)) | 3074 | if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_NO)) |
3068 | GNUNET_asprintf(&tmp,"with NO IP PROTOCOL enabled"); | 3075 | GNUNET_asprintf(&tmp,"with NO IP PROTOCOL enabled"); |
3069 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"HTTP Server with %s could not be started on port %u! %s plugin failed!\n",tmp, port, PROTOCOL_PREFIX); | 3076 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,_("HTTP Server with %s could not be started on port %u! %s plugin failed!\n"),tmp, port, PROTOCOL_PREFIX); |
3070 | GNUNET_free (tmp); | 3077 | GNUNET_free (tmp); |
3071 | GNUNET_free (component_name); | 3078 | GNUNET_free (component_name); |
3072 | LIBGNUNET_PLUGIN_TRANSPORT_DONE (api); | 3079 | LIBGNUNET_PLUGIN_TRANSPORT_DONE (api); |