[GNUnet-SVN] r2176 - in GNUnet: . src/applications/transport

[grothoff]

Author: grothoff
Date: 2005-10-07 15:17:07 -0700 (Fri, 07 Oct 2005)
New Revision: 2176

Modified:
   GNUnet/AUTHORS
   GNUnet/ChangeLog
   GNUnet/src/applications/transport/transport.c
Log:
946

Modified: GNUnet/AUTHORS
===================================================================
--- GNUnet/AUTHORS      2005-10-07 19:42:07 UTC (rev 2175)
+++ GNUnet/AUTHORS      2005-10-07 22:17:07 UTC (rev 2176)
@@ -7,6 +7,7 @@
 Antti Salonen
 Blake Matheny <address@hidden>
 Eric Haumant
+Eric Noack <address@hidden>
 Felix von Leitner [ diet libc snprintf for win32 ]
 Gerd Knorr <address@hidden>
 Glenn McGrath <address@hidden>

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2005-10-07 19:42:07 UTC (rev 2175)
+++ GNUnet/ChangeLog    2005-10-07 22:17:07 UTC (rev 2176)
@@ -1,3 +1,6 @@
+Fri Oct  7 15:28:02 PDT 2005
+       Fixing Mantis #946.
+
 Thu Sep 15 23:56:39 PDT 2005
        Fixed various gcc 4.0 warnings.
 

Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c       2005-10-07 19:42:07 UTC 
(rev 2175)
+++ GNUnet/src/applications/transport/transport.c       2005-10-07 22:17:07 UTC 
(rev 2176)
@@ -415,11 +415,22 @@
   }
   tapi = tapis[ntohs(helo->protocol)];
   if (tapi == NULL) {
-    LOG(LOG_EVERYTHING,
+    if (ntohs(helo->protocol) != NAT_PROTOCOL_NUMBER) {
+      LOG(LOG_EVERYTHING,
        "Advertised transport type %d"
        " does not match any known transport.\n",
        ntohs(helo->protocol));
-    return SYSERR;
+      return SYSERR;
+    } else {
+      LOG(LOG_EVERYTHING,
+       "Advertised transport type is NAT,"
+       " but nat module is not loaded."
+       " Rudimentary sanity check enforced.\n");
+      if ((ntohs(helo->header.size) != P2P_hello_MESSAGE_size(helo)) ||
+       (ntohs(helo->header.type) != p2p_PROTO_hello) )
+       return SYSERR; /* obviously invalid */
+      return OK;
+    }
   } else
     return tapi->verifyHelo(helo);
 }