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

[grothoff]

Author: grothoff
Date: 2005-09-04 17:26:46 -0700 (Sun, 04 Sep 2005)
New Revision: 2059

Modified:
   GNUnet/src/server/connection.c
Log:
asserts

Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c      2005-09-04 09:55:44 UTC (rev 2058)
+++ GNUnet/src/server/connection.c      2005-09-05 00:26:46 UTC (rev 2059)
@@ -867,6 +867,7 @@
  *
  * @param *priority is set to the achieved message priority
  * @return total number of bytes of messages selected
+ *   including P2P message header.
  */
 static unsigned int selectMessagesToSend(BufferEntry * be,
                                         unsigned int * priority) {
@@ -999,7 +1000,7 @@
        return 0; /* can not send, BPS available is too small */
       }
     }
-    totalMessageSize = be->session.mtu - sizeof(P2P_PACKET_HEADER);
+    totalMessageSize = be->session.mtu;
   } /* end MTU > 0 */
   return totalMessageSize;
 }
@@ -1332,7 +1333,7 @@
     be->inSendBuffer = NO;
     return; /* deferr further */
   }
-  totalMessageSize += sizeof(P2P_PACKET_HEADER);
+  GNUNET_ASSERT(totalMessageSize > sizeof(P2P_PACKET_HEADER));
 
   /* check if we (sender) have enough bandwidth available
      if so, trigger callbacks on selected entries; if either
@@ -1366,6 +1367,7 @@
       continue;
     if (entry->knapsackSolution == YES) {
       GNUNET_ASSERT(entry->callback == NULL);
+      GNUNET_ASSERT(p + entry->len <= totalMessageSize);
       memcpy(&plaintextMsg[p],
             entry->closure,
             entry->len);
@@ -1762,6 +1764,8 @@
       = &copyCallback;
     se->closure
       = MALLOC(sizeof(P2P_hangup_MESSAGE));
+    se->knapsackSolution 
+      = NO;
     memcpy(se->closure,
           &hangup,
           sizeof(P2P_hangup_MESSAGE));
@@ -3029,6 +3033,7 @@
     entry->transmissionTime = cronTime(NULL) + maxdelay;
     entry->callback = callback;
     entry->closure = closure;
+    entry->knapsackSolution = NO;
     appendToBuffer(be,
                   entry);
   } else {