[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17907 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17907 - gnunet/src/transport |
Date: |
Wed, 2 Nov 2011 11:11:09 +0100 |
Author: wachs
Date: 2011-11-02 11:11:09 +0100 (Wed, 02 Nov 2011)
New Revision: 17907
Modified:
gnunet/src/transport/gnunet-service-transport_neighbours.c
gnunet/src/transport/plugin_transport_udp.c
Log:
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-11-02
09:59:51 UTC (rev 17906)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-11-02
10:11:09 UTC (rev 17907)
@@ -1387,9 +1387,12 @@
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)
Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2011-11-02 09:59:51 UTC (rev
17906)
+++ gnunet/src/transport/plugin_transport_udp.c 2011-11-02 10:11:09 UTC (rev
17907)
@@ -1454,15 +1454,6 @@
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 @@
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 @@
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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17907 - gnunet/src/transport,
gnunet <=