[GNUnet-SVN] r10463 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2010-03-01 18:29:45 +0100 (Mon, 01 Mar 2010)
New Revision: 10463

Modified:
   gnunet/src/core/gnunet-service-core.c
Log:
support multi-message encapsulations

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-03-01 16:50:43 UTC (rev 
10462)
+++ gnunet/src/core/gnunet-service-core.c       2010-03-01 17:29:45 UTC (rev 
10463)
@@ -2005,9 +2005,6 @@
 }
 
 
-
-
-
 /**
  * Handle CORE_SEND request.
  *
@@ -2021,7 +2018,6 @@
                     const struct GNUNET_MessageHeader *message)
 {
   const struct SendMessage *sm;
-  const struct GNUNET_MessageHeader *mh;
   struct Neighbour *n;
   struct MessageEntry *prev;
   struct MessageEntry *pos;
@@ -2043,14 +2039,6 @@
     }
   sm = (const struct SendMessage *) message;
   msize -= sizeof (struct SendMessage);
-  mh = (const struct GNUNET_MessageHeader *) &sm[1];
-  if (msize != ntohs (mh->size))
-    {
-      GNUNET_break (0);
-      if (client != NULL)
-        GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
-    }
   n = find_neighbour (&sm->peer);
   if (n == NULL)
     n = create_neighbour (&sm->peer);
@@ -2120,7 +2108,7 @@
   e->deadline = GNUNET_TIME_absolute_ntoh (sm->deadline);
   e->priority = ntohl (sm->priority);
   e->size = msize;
-  memcpy (&e[1], mh, msize);
+  memcpy (&e[1], &sm[1], msize);
 
   /* insert, keep list sorted by deadline */
   prev = NULL;