[GNUnet-SVN] r5006 - in GNUnet: . src/server

[gnunet]

Author: grothoff
Date: 2007-06-10 16:26:19 -0600 (Sun, 10 Jun 2007)
New Revision: 5006

Modified:
   GNUnet/src/server/connection.c
   GNUnet/todo
Log:
fixed MTU bug

Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c      2007-06-10 21:44:25 UTC (rev 5005)
+++ GNUnet/src/server/connection.c      2007-06-10 22:26:19 UTC (rev 5006)
@@ -1491,7 +1491,6 @@
   int ret;
   SendEntry ** entries;
   unsigned int stotal;
-  unsigned int mtu;
 
   ENTRY();
   /* fast ways out */
@@ -1528,7 +1527,6 @@
         be->available_send_window,
         be->session.mtu);
 #endif
-  mtu = be->session.mtu;
   totalMessageSize = selectMessagesToSend(be, &priority);
   if (totalMessageSize == 0) {
     expireSendBufferEntries(be);
@@ -1543,9 +1541,6 @@
   }
   GE_ASSERT(ectx,
            totalMessageSize > sizeof(P2P_PACKET_HEADER));
-  GE_BREAK(ectx, mtu == be->session.mtu);
-  GE_BREAK(ectx, 
-          (be->session.mtu == 0) || (mtu >= totalMessageSize));
   if ( (be->session.mtu != 0) &&
        (totalMessageSize > be->session.mtu) ) {
     GE_BREAK(ectx, 0);
@@ -1561,8 +1556,12 @@
     /* transport session is gone! re-establish! */
     transport->disconnect(be->session.tsession);
     be->session.tsession = NULL;
-    if (OK == ensureTransportConnected(be))
-      ret = YES;
+    ensureTransportConnected(be);
+    /* This may have changed the MTU => need to re-do
+       everything.  Since we don't want to possibly
+       loop forever, give it another shot later;
+       so even if "ensureTransportConnected" succeded,
+       abort for now! */   
   }
   if (YES != ret) {
     /* transport's buffer full -- no point in
@@ -1585,10 +1584,6 @@
     be->inSendBuffer = NO;
     return NO;             /* deferr further */
   }
-  GE_BREAK(ectx, mtu == be->session.mtu);
-  GE_BREAK(ectx, 
-          (be->session.mtu == 0) || (mtu >= totalMessageSize));
-
   /* get permutation of SendBuffer Entries
      such that SE_FLAGS are obeyed */
   entries = permuteSendBuffer(be, &stotal);
@@ -1607,10 +1602,6 @@
   p2pHdr->sequenceNumber = htonl(be->lastSequenceNumberSend);
   p2pHdr->bandwidth = htonl(be->idealized_limit);
   p = sizeof(P2P_PACKET_HEADER);
-  GE_BREAK(ectx, mtu == be->session.mtu);
-  GE_BREAK(ectx, 
-          (be->session.mtu == 0) || (mtu >= totalMessageSize));
-
   for (i = 0; i < stotal; i++) {
     SendEntry * entry = entries[i];
 
@@ -1639,10 +1630,6 @@
     be->inSendBuffer = NO;
     return NO;
   }
-  GE_BREAK(ectx, mtu == be->session.mtu);
-  GE_BREAK(ectx, 
-          (be->session.mtu == 0) || (mtu >= totalMessageSize));
-
   /* still room left? try callbacks! */
   pos = scl_nextHead;
   while ( (pos != NULL) &&
@@ -1673,10 +1660,6 @@
     be->inSendBuffer = NO;
     return NO;
   }
-  GE_BREAK(ectx, mtu == be->session.mtu);
-  GE_BREAK(ectx, 
-          (be->session.mtu == 0) || (mtu >= totalMessageSize));
-
   /* finally padd with noise */
   if ( (p + sizeof(MESSAGE_HEADER) <= totalMessageSize) &&
        (p < totalMessageSize) &&
@@ -1696,9 +1679,6 @@
     if (stats != NULL)
       stats->change(stat_noise_sent, noiseLen);
   }
-  GE_BREAK(ectx, mtu == be->session.mtu);
-  GE_BREAK(ectx, 
-          (be->session.mtu == 0) || (mtu >= totalMessageSize));
   if ( ( (be->session.mtu != 0) &&
         (p > be->session.mtu) )
        || (p > totalMessageSize) ) {

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2007-06-10 21:44:25 UTC (rev 5005)
+++ GNUnet/todo 2007-06-10 22:26:19 UTC (rev 5006)
@@ -3,22 +3,22 @@
 Annotations:
   RC == Release Critical
 
-0.7.2 [5'07]:
+0.7.2 [6'07]:
 - new features:
   * HTTP transport (libcurl, libmicrohttpd) [#765] [likely 0.7.2a]
 - RC bugs:
-  * UDP assertion failure (mtu < size) [#1209]
   * session keys sent to wrong peers? => assertions added
 
-0.7.3 [7'07] (aka "features"):
+0.7.3 [8'07] (aka "features"):
 - chat support basics [RC]
 - insert meta-data under hash (md5? sha1? sha-512? GNUnet-URI?)
   as keyword (to allow getting meta-data from URI only) [RC]
 - old/new features:
   * SMTP transport (libesmtp)
   * SMTP logger
-  * support NAT-PMP (in addition to UPnP)?
-  * add bloomfilter to dstore?
+  * support NAT-PMP (in addition to UPnP)
+  * add bloomfilter to dstore
+  * asynchronous (or client-side?) DNS resolution (for peer-info stuff)
 - Documentation:
   * LJ article
 - Testcases:
@@ -32,7 +32,7 @@
 - Insert/Index a "shared directory" automatically [Nils]
   See also: https://gnunet.org/drupal/?q=node/97 [RC]
 - guard friendly connection count (#1018) [RC]
-- power insert [#854?]
+- power insert [#854]
 
 1.0.0 (aka "userfriendly"):
 - implement testbed for profiling