From 41cf51c0ed0dfc2f0a932575bd69651a12ae56b6 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 2 Nov 2011 10:11:09 +0000 Subject: [PATCH] --- src/transport/gnunet-service-transport_neighbours.c | 9 ++++++--- src/transport/plugin_transport_udp.c | 13 ++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 93a8c893c..f5720f407 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -1387,9 +1387,12 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to connect to peer `%s'\n", GNUNET_i2s (target)); #endif - GNUNET_assert (0 != - memcmp (target, &GST_my_identity, - sizeof (struct GNUNET_PeerIdentity))); + if (0 == memcmp (target, &GST_my_identity, + sizeof (struct GNUNET_PeerIdentity))) + { + /* my own hello */ + return; + } n = lookup_neighbour (target); if (NULL != n) diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index cc0f46851..25e5e9d5b 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c @@ -1454,15 +1454,6 @@ udp_broadcast_read (struct Plugin *plugin, struct GNUNET_NETWORK_Handle *rsock) return; } - if (GNUNET_YES == GNUNET_NAT_test_address (plugin->nat, - &((struct sockaddr_in *) addr)->sin_addr, - sizeof (struct in_addr))) - { - /* received my own beacon */ - return; - } - - mc = GNUNET_malloc(sizeof (struct MstContext)); struct sockaddr_in * av4 = (struct sockaddr_in *) &addr; @@ -2105,6 +2096,8 @@ libgnunet_plugin_transport_udp_init (void *cls) if (GNUNET_NETWORK_socket_bind (plugin->sockv4_broadcast, serverAddr, addrlen) != GNUNET_OK) { + LOG (GNUNET_ERROR_TYPE_WARNING, _("Failed to create IPv4 broadcast socket on port %d\n"), + ntohs (serverAddrv4.sin_port)); GNUNET_NETWORK_socket_close (plugin->sockv4_broadcast); plugin->sockv4_broadcast = NULL; } @@ -2113,6 +2106,8 @@ libgnunet_plugin_transport_udp_init (void *cls) int yes = 1; if (GNUNET_NETWORK_socket_setsockopt (plugin->sockv4_broadcast, SOL_SOCKET, SO_BROADCAST, &yes, sizeof(int)) != GNUNET_OK) { + LOG (GNUNET_ERROR_TYPE_WARNING, _("Failed to set IPv4 broadcast option for broadcast socket on port %d\n"), + ntohs (serverAddrv4.sin_port)); GNUNET_NETWORK_socket_close(plugin->sockv4_broadcast); plugin->sockv4_broadcast = NULL; } -- 2.25.1