[GNUnet-SVN] r1176 - GNUnet/src/transports

[grothoff]

Author: grothoff
Date: 2005-06-30 13:44:13 -0700 (Thu, 30 Jun 2005)
New Revision: 1176

Modified:
   GNUnet/src/transports/http.c
   GNUnet/src/transports/tcp.c
   GNUnet/src/transports/tcp6.c
   GNUnet/src/transports/udp.c
   GNUnet/src/transports/udp6.c
Log:
bugfix

Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c        2005-06-30 20:34:10 UTC (rev 1175)
+++ GNUnet/src/transports/http.c        2005-06-30 20:44:13 UTC (rev 1176)
@@ -795,7 +795,9 @@
 
          if (YES == isBlacklisted(ipaddr)) {
            LOG(LOG_INFO,
-               _("Rejected blacklisted connection from %u.%u.%u.%u.\n"),
+               _("%s: Rejected connection from blacklisted "
+                 "address %u.%u.%u.%u.\n"),
+               "HTTP",
                PRIP(ntohl(*(int*)&clientAddr.sin_addr)));
            closefile(sock);
          } else {
@@ -1069,9 +1071,12 @@
   if (SYSERR == getPublicIPAddress(&haddr->ip)) {
     FREE(msg);
     LOG(LOG_WARNING,
-       _("Could not determine my public IP address.\n"));
+       _("HTTP: Could not determine my public IP address.\n"));
     return SYSERR;
   }
+  LOG(LOG_DEBUG,
+      "HTTP uses IP address %u.%u.%u.%u.\n",
+      PRIP(ntohl(*(int*)&haddr->ip)));  
   haddr->port = htons(port);
   haddr->reserved = htons(0);
   msg->senderAddressSize = htons(sizeof(HostAddress));

Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2005-06-30 20:34:10 UTC (rev 1175)
+++ GNUnet/src/transports/tcp.c 2005-06-30 20:44:13 UTC (rev 1176)
@@ -680,7 +680,9 @@
 
          if (YES == isBlacklisted(ipaddr)) {
            LOG(LOG_INFO,
-               _("Rejected blacklisted connection from %u.%u.%u.%u.\n"),
+               _("%s: Rejected connection from blacklisted "
+                 "address %u.%u.%u.%u.\n"),
+               "TCP",
                PRIP(ntohl(*(int*)&clientAddr.sin_addr)));
            SHUTDOWN(sock, 2);
            closefile(sock);
@@ -1051,6 +1053,9 @@
        _("Could not determine my public IP address.\n"));
     return SYSERR;
   }
+  LOG(LOG_DEBUG,
+      "TCP uses IP address %u.%u.%u.%u.\n",
+      PRIP(ntohl(*(int*)&haddr->ip)));
   haddr->port = htons(port);
   haddr->reserved = htons(0);
   msg->senderAddressSize = htons(sizeof(HostAddress));

Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c        2005-06-30 20:34:10 UTC (rev 1175)
+++ GNUnet/src/transports/tcp6.c        2005-06-30 20:44:13 UTC (rev 1176)
@@ -653,7 +653,8 @@
          if (YES == isBlacklisted((IP6addr*)&clientAddr.sin6_addr)) {
            char inet6[INET6_ADDRSTRLEN];
            LOG(LOG_INFO,
-               _("Rejected blacklisted connection from address %s.\n"),
+               _("%s: Rejected connection from blacklisted address %s.\n"),
+               "TCP6",
                inet_ntop(AF_INET6,
                          &clientAddr,
                          inet6,

Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2005-06-30 20:34:10 UTC (rev 1175)
+++ GNUnet/src/transports/udp.c 2005-06-30 20:44:13 UTC (rev 1176)
@@ -269,7 +269,9 @@
           sizeof(struct in_addr));
     if (YES == isBlacklisted(ipaddr)) {
       LOG(LOG_WARNING,
-         _("Sender %u.%u.%u.%u is blacklisted, dropping message.\n"),
+         _("%s: Rejected connection from blacklisted "
+           "address %u.%u.%u.%u.\n"),
+         "UDP",
          PRIP(ntohl(*(int*)&incoming.sin_addr)));
       goto RETRY; /* drop on the floor */
     }

Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c        2005-06-30 20:34:10 UTC (rev 1175)
+++ GNUnet/src/transports/udp6.c        2005-06-30 20:44:13 UTC (rev 1176)
@@ -265,7 +265,8 @@
     GNUNET_ASSERT(sizeof(struct in6_addr) == sizeof(IP6addr));
     if (YES == isBlacklisted((IP6addr*)&incoming.sin6_addr)) {
       LOG(LOG_WARNING,
-         _("Sender %s is blacklisted, dropping message.\n"),
+         _("%s: Rejected connection from blacklisted address %s.\n"),
+         "UDP6",
          inet_ntop(AF_INET6,
                    &incoming,
                    inet6,