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

[gnunet]

Author: grothoff
Date: 2008-02-28 00:09:09 -0700 (Thu, 28 Feb 2008)
New Revision: 6484

Modified:
   GNUnet/src/transports/common.c
Log:
better reporting

Modified: GNUnet/src/transports/common.c
===================================================================
--- GNUnet/src/transports/common.c      2008-02-28 07:08:28 UTC (rev 6483)
+++ GNUnet/src/transports/common.c      2008-02-28 07:09:09 UTC (rev 6484)
@@ -206,7 +206,10 @@
 
   haddr = (HostAddress *) & hello[1];
   if ((ntohs (hello->senderAddressSize) != sizeof (HostAddress)) ||
-      (ntohs (hello->header.size) != GNUNET_sizeof_hello (hello)) )
+      (ntohs (hello->header.size) != GNUNET_sizeof_hello (hello)) ||
+      (0 ==
+       (ntohs (haddr->availability) &
+       (VERSION_AVAILABLE_IPV6 | VERSION_AVAILABLE_IPV4))) )
     {
       GNUNET_GE_BREAK_OP (NULL, 0);
       return GNUNET_SYSERR;     /* invalid (external error) */
@@ -217,15 +220,12 @@
       GNUNET_GE_BREAK (NULL, 0);
       return GNUNET_SYSERR;     /* invalid (internal error) */
     }
-  if ( (0 ==
-       (ntohs (haddr->availability) &
-        (VERSION_AVAILABLE_IPV6 | VERSION_AVAILABLE_IPV4)))
-       || ((0 != (ntohs (haddr->availability) & VERSION_AVAILABLE_IPV4))
-          &&
-          ((GNUNET_YES ==
-            is_blacklisted_ipv4 (&haddr->ipv4))
-           || (GNUNET_YES !=
-               is_whitelisted_ipv4 (&haddr->ipv4))))
+  if ( ((0 != (ntohs (haddr->availability) & VERSION_AVAILABLE_IPV4))
+       &&
+       ((GNUNET_YES ==
+         is_blacklisted_ipv4 (&haddr->ipv4))
+        || (GNUNET_YES !=
+            is_whitelisted_ipv4 (&haddr->ipv4))))
        || ((0 != (ntohs (haddr->availability) & VERSION_AVAILABLE_IPV6))
           &&
           ((GNUNET_YES ==