diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-05-14 08:33:14 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-05-14 08:33:14 +0000 |
commit | 845c1c5a2825fb8120fab349ac22113396bb5eea (patch) | |
tree | 2fdae121cf091bc7274d07f2f070a4a931ba8fb6 /src | |
parent | 72069b90f7bc3bc6a98a7ae4e447006349863b36 (diff) | |
download | gnunet-845c1c5a2825fb8120fab349ac22113396bb5eea.tar.gz gnunet-845c1c5a2825fb8120fab349ac22113396bb5eea.zip |
compile error in udp
additional debug messages for transport connections
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/gnunet-service-transport_clients.c | 5 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 10 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp.c | 9 | ||||
-rw-r--r-- | src/transport/transport_api.c | 3 |
4 files changed, 20 insertions, 7 deletions
diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c index db2718f4e..c7c148fbd 100644 --- a/src/transport/gnunet-service-transport_clients.c +++ b/src/transport/gnunet-service-transport_clients.c | |||
@@ -704,7 +704,12 @@ try_connect_if_allowed (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
704 | int result) | 704 | int result) |
705 | { | 705 | { |
706 | if (GNUNET_OK != result) | 706 | if (GNUNET_OK != result) |
707 | { | ||
708 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
709 | "Blacklist refuses connection attempt to peer `%s'\n", | ||
710 | GNUNET_i2s (peer)); | ||
707 | return; /* not allowed */ | 711 | return; /* not allowed */ |
712 | } | ||
708 | GST_neighbours_try_connect (peer); | 713 | GST_neighbours_try_connect (peer); |
709 | } | 714 | } |
710 | 715 | ||
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 8886a344c..32a0706dc 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -1840,12 +1840,16 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target) | |||
1840 | struct NeighbourMapEntry *n; | 1840 | struct NeighbourMapEntry *n; |
1841 | 1841 | ||
1842 | if (NULL == neighbours) | 1842 | if (NULL == neighbours) |
1843 | return; /* during shutdown, do nothing */ | 1843 | { |
1844 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1845 | "Asked to connect to peer `%s' during shutdown\n", | ||
1846 | GNUNET_i2s (target)); | ||
1847 | return; /* during shutdown, do nothing */ | ||
1848 | } | ||
1844 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1849 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1845 | "Asked to connect to peer `%s'\n", | 1850 | "Asked to connect to peer `%s'\n", |
1846 | GNUNET_i2s (target)); | 1851 | GNUNET_i2s (target)); |
1847 | if (0 == | 1852 | if (0 == memcmp (target, &GST_my_identity, sizeof (struct GNUNET_PeerIdentity))) |
1848 | memcmp (target, &GST_my_identity, sizeof (struct GNUNET_PeerIdentity))) | ||
1849 | { | 1853 | { |
1850 | /* refuse to connect to myself */ | 1854 | /* refuse to connect to myself */ |
1851 | /* FIXME: can this happen? Is this not an API violation? */ | 1855 | /* FIXME: can this happen? Is this not an API violation? */ |
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 253425a1a..ea1b616a2 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c | |||
@@ -2681,7 +2681,7 @@ setup_sockets (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6, struct | |||
2681 | else | 2681 | else |
2682 | { | 2682 | { |
2683 | #if HAVE_SOCKADDR_IN_SIN_LEN | 2683 | #if HAVE_SOCKADDR_IN_SIN_LEN |
2684 | serverAddrv6->sin6_len = sizeof (serverAddrv6); | 2684 | serverAddrv6->sin6_len = sizeof (struct sockaddr_in6); |
2685 | #endif | 2685 | #endif |
2686 | serverAddrv6->sin6_family = AF_INET6; | 2686 | serverAddrv6->sin6_family = AF_INET6; |
2687 | serverAddrv6->sin6_addr = in6addr_any; | 2687 | serverAddrv6->sin6_addr = in6addr_any; |
@@ -2691,8 +2691,9 @@ setup_sockets (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6, struct | |||
2691 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv6 port %d\n", | 2691 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv6 port %d\n", |
2692 | ntohs (serverAddrv6->sin6_port)); | 2692 | ntohs (serverAddrv6->sin6_port)); |
2693 | tries = 0; | 2693 | tries = 0; |
2694 | while (GNUNET_NETWORK_socket_bind (plugin->sockv6, serverAddrv6, addrlen) != | 2694 | while (GNUNET_OK != GNUNET_NETWORK_socket_bind (plugin->sockv6, |
2695 | GNUNET_OK) | 2695 | (struct sockaddr *) serverAddrv6, |
2696 | addrlen)) | ||
2696 | { | 2697 | { |
2697 | serverAddrv6->sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /* Find a good, non-root port */ | 2698 | serverAddrv6->sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /* Find a good, non-root port */ |
2698 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2699 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
@@ -2727,7 +2728,7 @@ setup_sockets (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6, struct | |||
2727 | else | 2728 | else |
2728 | { | 2729 | { |
2729 | #if HAVE_SOCKADDR_IN_SIN_LEN | 2730 | #if HAVE_SOCKADDR_IN_SIN_LEN |
2730 | serverAddrv4->sin_len = sizeof (serverAddrv4); | 2731 | serverAddrv4->sin_len = sizeof (struct sockaddr_in); |
2731 | #endif | 2732 | #endif |
2732 | serverAddrv4->sin_family = AF_INET; | 2733 | serverAddrv4->sin_family = AF_INET; |
2733 | serverAddrv4->sin_addr.s_addr = INADDR_ANY; | 2734 | serverAddrv4->sin_addr.s_addr = INADDR_ANY; |
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c index 8dc4c7a42..ac37274c6 100644 --- a/src/transport/transport_api.c +++ b/src/transport/transport_api.c | |||
@@ -1055,6 +1055,9 @@ send_try_connect (void *cls, size_t size, void *buf) | |||
1055 | tch->cb (tch->cb_cls, GNUNET_SYSERR); | 1055 | tch->cb (tch->cb_cls, GNUNET_SYSERR); |
1056 | GNUNET_CONTAINER_DLL_remove (tch->th->tc_head, tch->th->tc_tail, tch); | 1056 | GNUNET_CONTAINER_DLL_remove (tch->th->tc_head, tch->th->tc_tail, tch); |
1057 | GNUNET_free (tch); | 1057 | GNUNET_free (tch); |
1058 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
1059 | "Discarding `%s' request to `%4s' due to error in transport service connection.\n", "REQUEST_CONNECT", | ||
1060 | GNUNET_i2s (&tch->pid)); | ||
1058 | return 0; | 1061 | return 0; |
1059 | } | 1062 | } |
1060 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1063 | LOG (GNUNET_ERROR_TYPE_DEBUG, |