[GNUnet-SVN] r5186 - GNUnet/src/server

[gnunet]

Author: grothoff
Date: 2007-06-29 22:54:16 -0600 (Fri, 29 Jun 2007)
New Revision: 5186

Modified:
   GNUnet/src/server/handler.c
Log:
check blacklist very early on


Modified: GNUnet/src/server/handler.c
===================================================================
--- GNUnet/src/server/handler.c 2007-06-30 04:47:12 UTC (rev 5185)
+++ GNUnet/src/server/handler.c 2007-06-30 04:54:16 UTC (rev 5186)
@@ -492,19 +492,6 @@
                          unsigned int size) {
   int ret;
 
-  if ( (sender != NULL) &&
-       (YES == identity->isBlacklistedStrict(sender) ) ) {
-    EncName enc;
-    IF_GELOG(ectx,
-            GE_DEBUG,
-            hash2enc(&sender->hashPubKey,
-                     &enc));
-    GE_LOG(ectx,
-          GE_DEBUG,
-          "Strictly blacklisted peer `%s' sent message, dropping for now.\n",
-          (char*)&enc);
-    return;
-  }
   if ( (tsession != NULL) &&
        (sender != NULL) &&
        (0 != memcmp(sender,
@@ -584,6 +571,21 @@
     FREE(mp);
     return;
   }
+  /* check for blacklisting */
+  if (YES == identity->isBlacklistedStrict(&mp->sender)) {
+    EncName enc;
+    IF_GELOG(ectx,
+            GE_DEBUG | GE_DEVELOPER | GE_REQUEST,
+            hash2enc(&sender->hashPubKey,
+                     &enc));
+    GE_LOG(ectx,
+          GE_DEBUG | GE_DEVELOPER | GE_REQUEST,
+          "Strictly blacklisted peer `%s' sent message, dropping for now.\n",
+          (char*)&enc);
+    FREE(mp->msg);
+    FREE(mp);
+    return;
+  }
   if ( (mp->tsession != NULL) &&
        (0 != memcmp(&mp->sender,
                    &mp->tsession->peer,
@@ -594,7 +596,7 @@
     return;
   }
 
-  /* acquire buffer */
+  /* try to increment session reference count */
   if (SYSERR == transport->associate(mp->tsession))
     mp->tsession = NULL;