wip

[oweals/gnunet.git] / src / arm / gnunet-service-arm_interceptor.c

diff --git a/src/arm/gnunet-service-arm_interceptor.c b/src/arm/gnunet-service-arm_interceptor.c
index 1dff8f01db3f1eb0c6bff8dc2310117dfe81cc13..c86530b6f603fc72dbf106de27a6b8295deda3a5 100644 (file)
--- a/src/arm/gnunet-service-arm_interceptor.c
+++ b/src/arm/gnunet-service-arm_interceptor.c
@@ -715,7 +715,7 @@ fc_acceptConnection (void *cls,
 
   if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY))
     {
-      GNUNET_NETWORK_socket_close (sli->listeningSocket);
+      GNUNET_assert (GNUNET_OK == GNUNET_NETWORK_socket_close (sli->listeningSocket));
       closeClientAndServiceSockets (fc, REASON_ERROR);
       GNUNET_free (sli);
       return;
@@ -788,6 +788,7 @@ service_try_to_connect (const struct sockaddr *addr,
          addrlen);
   serviceListeningInfo->service_addr_len = addrlen;
   serviceListeningInfo->listeningSocket = sock;
+  serviceListeningInfo->fc = fc;
   serviceListeningInfo->acceptTask =
     GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                    serviceListeningInfo->listeningSocket,
@@ -864,7 +865,7 @@ start_forwarding (void *cls,
       if ( (strncmp (listen_address, "[::]:", 5) == 0) || (strncmp (listen_address, "::", 2) == 0) )
        {
          memset (&target_ipv6, 0, sizeof (target_ipv6));
-         inet_pton (AF_INET6, "::1", &target_ipv6.sin6_addr);
+         target_ipv6.sin6_addr = in6addr_loopback;
          target_ipv6.sin6_family = AF_INET6;
          target_ipv6.sin6_port = v6->sin6_port;
          v6 = &target_ipv6;
@@ -1093,6 +1094,8 @@ createListeningSocket (struct sockaddr *sa,
       sock = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
       break;
     case AF_UNIX:
+      if (strcmp(GNUNET_a2s (sa, addr_len), "@") == 0) /* Do not bind to blank UNIX path! */
+        return;
       sock = GNUNET_NETWORK_socket_create (PF_UNIX, SOCK_STREAM, 0);
       break;
     default:
@@ -1125,7 +1128,7 @@ createListeningSocket (struct sockaddr *sa,
   if (GNUNET_NETWORK_socket_bind
       (sock, (const struct sockaddr *) sa, addr_len) != GNUNET_OK)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                  _("Unable to bind listening socket for service `%s' to address `%s': %s\n"),
                  serviceName,
                  GNUNET_a2s (sa, addr_len),