diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-06 01:12:57 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-06 01:12:57 +0000 |
commit | 9fac6b6eefdc9144053f736fd388cb2199a97046 (patch) | |
tree | 82740a981b7f6ae973d915aa77797acd9db668b2 /src/transport/plugin_transport_http.c | |
parent | 23d8d343d5c70481ecf78ec4fafc698907f3e8a9 (diff) | |
download | gnunet-9fac6b6eefdc9144053f736fd388cb2199a97046.tar.gz gnunet-9fac6b6eefdc9144053f736fd388cb2199a97046.zip |
-removing legacy ifdefs, fixing log statements
Diffstat (limited to 'src/transport/plugin_transport_http.c')
-rw-r--r-- | src/transport/plugin_transport_http.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index 48db6a372..4f9279495 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -786,23 +786,17 @@ http_plugin_send (void *cls, | |||
786 | 786 | ||
787 | if (session->inbound == GNUNET_NO) | 787 | if (session->inbound == GNUNET_NO) |
788 | { | 788 | { |
789 | #if DEBUG_HTTP | ||
790 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, | 789 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
791 | "Using outbound client session %p to send to `%s'\n", session, | 790 | "Using outbound client session %p to send to `%s'\n", session, |
792 | GNUNET_i2s (&session->target)); | 791 | GNUNET_i2s (&session->target)); |
793 | #endif | ||
794 | |||
795 | client_send (session, msg); | 792 | client_send (session, msg); |
796 | res = msgbuf_size; | 793 | res = msgbuf_size; |
797 | } | 794 | } |
798 | if (session->inbound == GNUNET_YES) | 795 | if (session->inbound == GNUNET_YES) |
799 | { | 796 | { |
800 | #if DEBUG_HTTP | ||
801 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, | 797 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
802 | "Using inbound server %p session to send to `%s'\n", session, | 798 | "Using inbound server %p session to send to `%s'\n", session, |
803 | GNUNET_i2s (&session->target)); | 799 | GNUNET_i2s (&session->target)); |
804 | #endif | ||
805 | |||
806 | server_send (session, msg); | 800 | server_send (session, msg); |
807 | res = msgbuf_size; | 801 | res = msgbuf_size; |
808 | } | 802 | } |
@@ -1556,11 +1550,8 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
1556 | /* Report addresses to transport service */ | 1550 | /* Report addresses to transport service */ |
1557 | start_report_addresses (plugin); | 1551 | start_report_addresses (plugin); |
1558 | 1552 | ||
1559 | #if DEBUG_HTTP | ||
1560 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, | 1553 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
1561 | "Plugin `%s' loaded\n", plugin->name); | 1554 | "Plugin `%s' loaded\n", plugin->name); |
1562 | #endif | ||
1563 | |||
1564 | return api; | 1555 | return api; |
1565 | } | 1556 | } |
1566 | 1557 | ||
@@ -1588,10 +1579,8 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) | |||
1588 | s = plugin->head; | 1579 | s = plugin->head; |
1589 | while (s != NULL) | 1580 | while (s != NULL) |
1590 | { | 1581 | { |
1591 | #if DEBUG_HTTP | ||
1592 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, | 1582 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
1593 | "Disconnecting `%s' \n", GNUNET_i2s (&s->target)); | 1583 | "Disconnecting `%s' \n", GNUNET_i2s (&s->target)); |
1594 | #endif | ||
1595 | if (s->inbound == GNUNET_NO) | 1584 | if (s->inbound == GNUNET_NO) |
1596 | GNUNET_assert (GNUNET_OK == client_disconnect (s)); | 1585 | GNUNET_assert (GNUNET_OK == client_disconnect (s)); |
1597 | else | 1586 | else |
@@ -1599,15 +1588,11 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) | |||
1599 | s = s->next; | 1588 | s = s->next; |
1600 | } | 1589 | } |
1601 | 1590 | ||
1602 | #if DEBUG_HTTP | ||
1603 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Stopping server\n"); | 1591 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Stopping server\n"); |
1604 | #endif | ||
1605 | /* Stop server */ | 1592 | /* Stop server */ |
1606 | server_stop (plugin); | 1593 | server_stop (plugin); |
1607 | 1594 | ||
1608 | #if DEBUG_HTTP | ||
1609 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Stopping client\n"); | 1595 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "Stopping client\n"); |
1610 | #endif | ||
1611 | /* Stop client */ | 1596 | /* Stop client */ |
1612 | client_stop (plugin); | 1597 | client_stop (plugin); |
1613 | 1598 | ||
@@ -1639,17 +1624,12 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) | |||
1639 | s = t; | 1624 | s = t; |
1640 | } | 1625 | } |
1641 | 1626 | ||
1642 | |||
1643 | #if DEBUG_HTTP | ||
1644 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, | 1627 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, |
1645 | "Plugin `%s' unloaded\n", plugin->name); | 1628 | "Plugin `%s' unloaded\n", plugin->name); |
1646 | #endif | ||
1647 | |||
1648 | GNUNET_free_non_null (plugin->server_addr_v4); | 1629 | GNUNET_free_non_null (plugin->server_addr_v4); |
1649 | GNUNET_free_non_null (plugin->server_addr_v6); | 1630 | GNUNET_free_non_null (plugin->server_addr_v6); |
1650 | GNUNET_free (plugin); | 1631 | GNUNET_free (plugin); |
1651 | GNUNET_free (api); | 1632 | GNUNET_free (api); |
1652 | |||
1653 | return NULL; | 1633 | return NULL; |
1654 | } | 1634 | } |
1655 | 1635 | ||