[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20848 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20848 - gnunet/src/transport |
Date: |
Mon, 2 Apr 2012 13:20:40 +0200 |
Author: wachs
Date: 2012-04-02 13:20:40 +0200 (Mon, 02 Apr 2012)
New Revision: 20848
Modified:
gnunet/src/transport/plugin_transport_http.c
gnunet/src/transport/transport.conf.in
Log:
fixing 0002249: report only new addresses
Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c 2012-04-02 10:19:19 UTC
(rev 20847)
+++ gnunet/src/transport/plugin_transport_http.c 2012-04-02 11:20:40 UTC
(rev 20848)
@@ -873,8 +873,7 @@
default:
return NULL;
}
-
-
+ return NULL;
}
static void
@@ -900,17 +899,15 @@
GNUNET_CONTAINER_DLL_insert (plugin->ipv4_addr_head,
plugin->ipv4_addr_tail, w_t4);
- }
-#if DEBUG_HTTP
+
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Notifying transport to add IPv4 address `%s'\n",
http_plugin_address_to_string (NULL, &w_t4->addr,
sizeof (struct
IPv4HttpAddress)));
-#endif
plugin->env->notify_address (plugin->env->cls, add_remove, &w_t4->addr,
sizeof (struct IPv4HttpAddress));
-
+ }
break;
case AF_INET6:
w_t6 = find_address (plugin, addr, addrlen);
@@ -923,16 +920,15 @@
GNUNET_CONTAINER_DLL_insert (plugin->ipv6_addr_head,
plugin->ipv6_addr_tail, w_t6);
- }
-#if DEBUG_HTTP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Notifying transport to add IPv6 address `%s'\n",
http_plugin_address_to_string (NULL, &w_t6->addr6,
sizeof (struct
IPv6HttpAddress)));
-#endif
- plugin->env->notify_address (plugin->env->cls, add_remove, &w_t6->addr6,
+ plugin->env->notify_address (plugin->env->cls, add_remove, &w_t6->addr6,
sizeof (struct IPv6HttpAddress));
+ }
break;
default:
return;
@@ -954,15 +950,15 @@
{
case AF_INET:
w_t4 = find_address (plugin, addr, addrlen);
+ if (w_t4 == NULL)
return;
-#if DEBUG_HTTP
+
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Notifying transport to remove IPv4 address `%s'\n",
http_plugin_address_to_string (NULL, &w_t4->addr,
sizeof (struct
IPv4HttpAddress)));
-#endif
plugin->env->notify_address (plugin->env->cls, add_remove, &w_t4->addr,
sizeof (struct IPv4HttpAddress));
@@ -974,13 +970,13 @@
w_t6 = find_address (plugin, addr, addrlen);
if (w_t6 == NULL)
return;
-#if DEBUG_HTTP
+
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Notifying transport to remove IPv6 address `%s'\n",
http_plugin_address_to_string (NULL, &w_t6->addr6,
sizeof (struct
IPv6HttpAddress)));
-#endif
+
plugin->env->notify_address (plugin->env->cls, add_remove, &w_t6->addr6,
sizeof (struct IPv6HttpAddress));
@@ -1008,15 +1004,13 @@
socklen_t addrlen)
{
GNUNET_assert (cls != NULL);
-#if DEBUG_HTTP
struct Plugin *plugin = cls;
-#endif
-#if DEBUG_HTTP
+
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"NPMC called %s to address `%s'\n",
(add_remove == GNUNET_NO) ? "remove" : "add",
GNUNET_a2s (addr, addrlen));
-#endif
+
switch (add_remove)
{
case GNUNET_YES:
Modified: gnunet/src/transport/transport.conf.in
===================================================================
--- gnunet/src/transport/transport.conf.in 2012-04-02 10:19:19 UTC (rev
20847)
+++ gnunet/src/transport/transport.conf.in 2012-04-02 11:20:40 UTC (rev
20848)
@@ -9,7 +9,7 @@
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-PLUGINS = tcp
+PLUGINS = tcp http
UNIXPATH = /tmp/gnunet-service-transport.sock
BLACKLIST_FILE = $SERVICEHOME/blacklist
# This could possibly be relaxed
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20848 - gnunet/src/transport,
gnunet <=