[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19240 - in gnunet/src: include stream
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19240 - in gnunet/src: include stream |
Date: |
Wed, 18 Jan 2012 15:01:03 +0100 |
Author: grothoff
Date: 2012-01-18 15:01:02 +0100 (Wed, 18 Jan 2012)
New Revision: 19240
Modified:
gnunet/src/include/gnunet_protocols.h
gnunet/src/stream/stream_protocol.h
Log:
-hints for stream lib development
Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h 2012-01-18 13:38:43 UTC (rev
19239)
+++ gnunet/src/include/gnunet_protocols.h 2012-01-18 14:01:02 UTC (rev
19240)
@@ -1186,9 +1186,16 @@
/**
- * Next available: 400
+ * Message containing data exchanged between stream end-points over mesh.
*/
+#define GNUNET_MESSAGE_TYPE_STREAM_DATA 400
+
+/**
+ * Next available: 416
+ */
+
+
/*******************************************************************************
* TODO: we need a way to register message types centrally (via some webpage).
* For now: unofficial extensions should start at 48k, internal extensions
Modified: gnunet/src/stream/stream_protocol.h
===================================================================
--- gnunet/src/stream/stream_protocol.h 2012-01-18 13:38:43 UTC (rev 19239)
+++ gnunet/src/stream/stream_protocol.h 2012-01-18 14:01:02 UTC (rev 19240)
@@ -35,12 +35,9 @@
#endif
#endif
-#include <sys/types.h>
+#include "gnunet_util_lib.h"
-#include "gnunet_stream_lib.h"
-#include "gnunet_mesh_service.h"
-
/**
* Stream message types
*/
@@ -113,21 +110,15 @@
struct GNUNET_STREAM_MessageHeader
{
/**
- * The GNUNET message header
+ * The GNUNET message header, types are from
GNUNET_MESSAGE_TYPE_STREAM_*-range.
*/
struct GNUNET_MessageHeader header;
/**
- * A number which identifies a session
+ * A number which identifies a session between the two peers.
*/
- uint16_t session_id;
+ uint32_t session_id;
- /**
- * The message type
- * ? Should we rather use the type field in GNUNET_MessageHeader ?
- */
- enum GNUNET_STREAM_MessageType type;
-
};
@@ -137,51 +128,72 @@
*/
struct GNUNET_STREAM_DataMessage
{
+
/**
- * Sequence number; Always starts with 0 and should wrap around.
- * Immune to Sequence Prediction Attack as we take cover under GNUNET's
secure
- * messaging
+ * Type is GNUNET_MESSAGE_TYPE_STREAM_DATA
*/
- uint32_t seq;
+ struct GNUNET_STREAM_MessageHeader header;
/**
* number of milliseconds to the soft deadline for sending acknowledgement
* measured from the time this message is received. It is optimal for the
* communication to send the ack within the soft deadline
*/
- uint16_t ack_deadline;
+ struct GNUNET_TIME_RelativeNBO ack_deadline;
/**
+ * Sequence number; starts with a random value. (Just in case
+ * someone breaks mesh and is able to try to do a Sequence
+ * Prediction Attack on us.)
+ */
+ uint32_t sequence_number;
+
+ /**
+ * Offset of the packet in the overall stream, modulo 2^32; allows
+ * the receiver to calculate where in the destination buffer the
+ * message should be placed.
+ */
+ uint32_t offset;
+
+ /**
* The data should be appended here
*/
};
/**
* The Selective Acknowledgement Bitmap
- *
- * ? WARNING ? Possibility for Denial of Service ??
- * ? Receiver may force the sender to mantain a buffer of ~ 64*64k !??
*/
typedef uint64_t GNUNET_STREAM_AckBitmap;
/**
- * The Acknowledgment Message, should be prefixed with Stream Message header
- * with its type set to GNUNET_STREAM_MESSAGE_ACK
+ * The Acknowledgment Message to confirm receipt of DATA.
*/
struct GNUNET_STREAM_AckMessage
{
+
/**
- * The sequence number of the Data Message upto which the receiver has filled
- * its buffer without any missing packets
+ * Type is GNUNET_MESSAGE_TYPE_STREAM_ACK
*/
- uint32_t base_seq;
+ struct GNUNET_STREAM_MessageHeader header;
/**
* The Selective Acknowledgement Bitmap. Computed relative to the base_seq
* (bit n corresponds to the Data message with sequence number base_seq+n)
*/
GNUNET_STREAM_AckBitmap bitmap;
+
+ /**
+ * The sequence number of the Data Message upto which the receiver has filled
+ * its buffer without any missing packets
+ */
+ uint32_t base_sequence_number;
+
+ /**
+ * Available buffer space past the last acknowledged buffer (for flow
control),
+ * in bytes.
+ */
+ uint32_t receive_window_remaining;
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19240 - in gnunet/src: include stream,
gnunet <=