diff options
Diffstat (limited to 'src/transport/plugin_transport_http_new.c')
-rw-r--r-- | src/transport/plugin_transport_http_new.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/transport/plugin_transport_http_new.c b/src/transport/plugin_transport_http_new.c index 042c977f5..66f79b3c4 100644 --- a/src/transport/plugin_transport_http_new.c +++ b/src/transport/plugin_transport_http_new.c | |||
@@ -420,7 +420,7 @@ create_session (struct Plugin *plugin, const struct GNUNET_PeerIdentity *target, | |||
420 | s->transmit_cont = cont; | 420 | s->transmit_cont = cont; |
421 | s->transmit_cont_cls = cont_cls; | 421 | s->transmit_cont_cls = cont_cls; |
422 | s->next = NULL; | 422 | s->next = NULL; |
423 | s->delay = GNUNET_TIME_absolute_get_forever(); | 423 | s->next_receive = GNUNET_TIME_absolute_get_forever(); |
424 | return s; | 424 | return s; |
425 | } | 425 | } |
426 | 426 | ||
@@ -487,7 +487,7 @@ http_plugin_send (void *cls, const struct GNUNET_PeerIdentity *target, | |||
487 | int res = GNUNET_SYSERR; | 487 | int res = GNUNET_SYSERR; |
488 | 488 | ||
489 | #if DEBUG_HTTP | 489 | #if DEBUG_HTTP |
490 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, | 490 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
491 | "Sending %u bytes to peer `%s' on address `%s' %X %i\n", msgbuf_size, | 491 | "Sending %u bytes to peer `%s' on address `%s' %X %i\n", msgbuf_size, |
492 | GNUNET_i2s (target), ((addr != NULL) && (addrlen != 0)) ? http_plugin_address_to_string(plugin, addr, addrlen) : "<inbound>", session, force_address); | 492 | GNUNET_i2s (target), ((addr != NULL) && (addrlen != 0)) ? http_plugin_address_to_string(plugin, addr, addrlen) : "<inbound>", session, force_address); |
493 | #endif | 493 | #endif |
@@ -497,7 +497,7 @@ http_plugin_send (void *cls, const struct GNUNET_PeerIdentity *target, | |||
497 | /* look for existing connection */ | 497 | /* look for existing connection */ |
498 | s = lookup_session (plugin, target, session, addr, addrlen, 1); | 498 | s = lookup_session (plugin, target, session, addr, addrlen, 1); |
499 | #if DEBUG_HTTP | 499 | #if DEBUG_HTTP |
500 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, | 500 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
501 | "%s existing session: %s\n", (s!=NULL) ? "Found" : "NOT Found", ((s != NULL) && (s->inbound == GNUNET_YES)) ? "inbound" : "outbound"); | 501 | "%s existing session: %s\n", (s!=NULL) ? "Found" : "NOT Found", ((s != NULL) && (s->inbound == GNUNET_YES)) ? "inbound" : "outbound"); |
502 | #endif | 502 | #endif |
503 | 503 | ||
@@ -514,7 +514,7 @@ http_plugin_send (void *cls, const struct GNUNET_PeerIdentity *target, | |||
514 | } | 514 | } |
515 | 515 | ||
516 | #if DEBUG_HTTP | 516 | #if DEBUG_HTTP |
517 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, | 517 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
518 | "Initiiating new connection to peer `%s'\n", | 518 | "Initiiating new connection to peer `%s'\n", |
519 | GNUNET_i2s (target)); | 519 | GNUNET_i2s (target)); |
520 | #endif | 520 | #endif |
@@ -541,7 +541,7 @@ http_plugin_send (void *cls, const struct GNUNET_PeerIdentity *target, | |||
541 | if (s->inbound == GNUNET_NO) | 541 | if (s->inbound == GNUNET_NO) |
542 | { | 542 | { |
543 | #if DEBUG_HTTP | 543 | #if DEBUG_HTTP |
544 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, | 544 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
545 | "Using outbound client session to send to `%s'\n", | 545 | "Using outbound client session to send to `%s'\n", |
546 | GNUNET_i2s (target)); | 546 | GNUNET_i2s (target)); |
547 | #endif | 547 | #endif |
@@ -553,7 +553,7 @@ http_plugin_send (void *cls, const struct GNUNET_PeerIdentity *target, | |||
553 | server_send (s, msg); | 553 | server_send (s, msg); |
554 | res = msgbuf_size; | 554 | res = msgbuf_size; |
555 | #if DEBUG_HTTP | 555 | #if DEBUG_HTTP |
556 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, | 556 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
557 | "Using inbound server session to send to `%s'\n", | 557 | "Using inbound server session to send to `%s'\n", |
558 | GNUNET_i2s (target)); | 558 | GNUNET_i2s (target)); |
559 | #endif | 559 | #endif |
@@ -754,7 +754,9 @@ nat_port_map_callback (void *cls, int add_remove, const struct sockaddr *addr, | |||
754 | socklen_t addrlen) | 754 | socklen_t addrlen) |
755 | { | 755 | { |
756 | GNUNET_assert (cls != NULL); | 756 | GNUNET_assert (cls != NULL); |
757 | #if DEBUG_HTTP | ||
757 | struct Plugin *plugin = cls; | 758 | struct Plugin *plugin = cls; |
759 | #endif | ||
758 | static int limit; | 760 | static int limit; |
759 | #if DEBUG_HTTP | 761 | #if DEBUG_HTTP |
760 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, | 762 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
@@ -790,7 +792,7 @@ start_report_addresses (struct Plugin *plugin) | |||
790 | GNUNET_SERVICE_get_server_addresses (plugin->name, plugin->env->cfg, | 792 | GNUNET_SERVICE_get_server_addresses (plugin->name, plugin->env->cfg, |
791 | &addrs, &addrlens); | 793 | &addrs, &addrlens); |
792 | #if 0 | 794 | #if 0 |
793 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, | 795 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
794 | _("FOUND %u addresses\n"),res); | 796 | _("FOUND %u addresses\n"),res); |
795 | #endif | 797 | #endif |
796 | 798 | ||