[GNUnet-SVN] r19935 - gnunet/src/stream

[gnunet]

Author: grothoff
Date: 2012-02-22 15:36:20 +0100 (Wed, 22 Feb 2012)
New Revision: 19935

Modified:
   gnunet/src/stream/stream_api.c
   gnunet/src/stream/stream_protocol.h
Log:
-stuff

Modified: gnunet/src/stream/stream_api.c
===================================================================
--- gnunet/src/stream/stream_api.c      2012-02-22 13:56:23 UTC (rev 19934)
+++ gnunet/src/stream/stream_api.c      2012-02-22 14:36:20 UTC (rev 19935)
@@ -297,6 +297,8 @@
 };
 
 
+
+
 /**
  * The IO Handle
  */
@@ -580,12 +582,12 @@
   ack_packet = -1;
   /* Find the last acknowledged packet */
   for (packet=0; packet < 64; packet++)
-    {
+    {      
       if (GNUNET_YES == ackbitmap_is_bit_set (&io_handle->ack_bitmap,
                                               packet))
-        {
-          ack_packet = packet;
-        }
+       ack_packet = packet;        
+      else if (NULL == io_handle->messages[packet])
+       break;
     }
   /* Resend packets which weren't ack'ed */
   for (packet=0; packet < ack_packet; packet++)
@@ -601,13 +603,15 @@
     }
   packet = ack_packet + 1;
   /* Now send new packets if there is enough buffer space */
-  while (io_handle->receive_window_available -=
-         io_handle->messages[packet]->header.header.size > 0)
+  while ( (NULL != io_handle->messages[packet]) &&
+         (io_handle->receive_window_available >= ntohs 
(io_handle->messages[packet]->header.header.size)) )
     {
+      io_handle->receive_window_available -= ntohs 
(io_handle->messages[packet]->header.header.size);
       queue_message (socket,
                      &io_handle->messages[packet]->header,
                      &write_data_finish_cb,
                      io_handle);
+      packet++;
     }
 }
 
@@ -1851,25 +1855,23 @@
   const void *sweep;
 
   /* There is already a write request pending */
-  if (NULL != socket->write_handle) return NULL;
-  if (!(STATE_ESTABLISHED == socket->state 
-        || STATE_RECEIVE_CLOSE_WAIT == socket->state
-        || STATE_RECEIVE_CLOSED == socket->state))
+  if (NULL != socket->write_handle)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  if (!((STATE_ESTABLISHED == socket->state)
+        || (STATE_RECEIVE_CLOSE_WAIT == socket->state)
+        || (STATE_RECEIVE_CLOSED == socket->state)))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "Attempting to write on a closed (OR) not-yet-established"
                   "stream\n"); 
       return NULL;
-    }
-      
-  num_needed_packets = ceil (size / max_payload_size);
-  if (64 < num_needed_packets) 
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Given buffer cannot be accommodated in 64 packets\n");
-      num_needed_packets = 64;
-    }
-
+    } 
+  if (GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH * max_payload_size < size)
+    size = GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH  * max_payload_size;
+  num_needed_packets = (size + (max_payload_size - 1)) / max_payload_size;
   io_handle = GNUNET_malloc (sizeof (struct GNUNET_STREAM_IOHandle));
   io_handle->receive_window_available = socket->receive_window_available;
   sweep = data;

Modified: gnunet/src/stream/stream_protocol.h
===================================================================
--- gnunet/src/stream/stream_protocol.h 2012-02-22 13:56:23 UTC (rev 19934)
+++ gnunet/src/stream/stream_protocol.h 2012-02-22 14:36:20 UTC (rev 19935)
@@ -97,7 +97,13 @@
    */
 };
 
+
 /**
+ * Number of bits in GNUNET_STREAM_AckBitmap
+ */
+#define GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH 64
+
+/**
  * The Selective Acknowledgement Bitmap
  */
 typedef uint64_t GNUNET_STREAM_AckBitmap;