(no commit message)

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 93a8c893c4759f460d4de91b0f05c8a0193ba9f2..f5720f407b36f7c5e719835b66c0d8adf3a41aa2 100644 (file)
--- 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 cc0f468516ef165d48abc8edec2ded310ee59d16..25e5e9d5b72146a98fd8c818ffe16bec11afacbd 100644 (file)
--- 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;
         }