[GNUnet-SVN] r19360 - in gnunet/src: include stream

[gnunet]

Author: harsha
Date: 2012-01-25 00:06:32 +0100 (Wed, 25 Jan 2012)
New Revision: 19360

Modified:
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/stream/stream_protocol.h
Log:
- moved stream message types to gnunet_protocols.h

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2012-01-24 20:28:30 UTC (rev 
19359)
+++ gnunet/src/include/gnunet_protocols.h       2012-01-24 23:06:32 UTC (rev 
19360)
@@ -1153,18 +1153,73 @@
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON 384
 
+/*******************************************************************************
+ * STREAM LIRBRARY MESSAGES
+ 
******************************************************************************/
 
 /**
  * Message containing data exchanged between stream end-points over mesh.
  */
 #define GNUNET_MESSAGE_TYPE_STREAM_DATA 400
 
+/**
+ * ACK message
+ */
+#define GNUNET_MESSAGE_TYPE_STREAM_ACK 401
 
 /**
- *  Next available: 416
+ * Handshake hello message
  */
+#define GNUNET_MESSAGE_TYPE_STREAM_HELLO 402
 
+/**
+ * Handshake hello acknowledgement message
+ */
+#define GNUNET_MESSAGE_TYPE_STREAM_HELLO_ACK 403
 
+/**
+ * Reset message
+ */
+#define GNUNET_MESSAGE_TYPE_STREAM_RESET 404
+
+/**
+ * Transmit close message (data transmission no longer possible after this
+ * message) 
+ */
+#define GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE 405
+
+/**
+ * Transmit close acknowledgement message
+ */
+#define GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE_ACK 406
+
+/**
+ * Receive close message (data is no loger read by the receiver after this
+ * message) 
+ */
+#define GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE 407
+
+/**
+ * Receive close acknowledgement message
+ */
+#define GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE_ACK 408
+
+/**
+ * Stream close message (data is no longer sent or read after this message)
+ */
+#define GNUNET_MESSAGE_TYPE_STREAM_CLOSE 409
+
+/**
+ * Close acknowledgement message
+ */
+#define GNUNET_MESSAGE_TYPE_STREAM_CLOSE_ACK 410
+
+
+/**
+ *  Next available: 420
+ */
+
+
 
/*******************************************************************************
  * 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-24 20:28:30 UTC (rev 19359)
+++ gnunet/src/stream/stream_protocol.h 2012-01-24 23:06:32 UTC (rev 19360)
@@ -39,70 +39,6 @@
 
 
 /**
- * Stream message types
- */
-enum GNUNET_STREAM_MessageType
-  {
-    /**
-     * Message containing data
-     */
-    GNUNET_STREAM_MESSAGE_DATA,
-
-    /**
-     * ACK message
-     */
-    GNUNET_STREAM_MESSAGE_ACK,
-
-    /**
-     * Handshake hello message
-     */
-    GNUNET_STREAM_MESSAGE_HELLO,
-
-    /**
-     * Handshake hello acknowledgement message
-     */
-    GNUNET_STREAM_MESSAGE_HELLO_ACK,
-
-    /**
-     * Reset message
-     */
-    GNUNET_STREAM_MESSAGE_RESET,
-
-    /**
-     * Transmit close message (data transmission no longer possible after this
-     * message) 
-     */
-    GNUNET_STREAM_MESSAGE_TRANSMIT_CLOSE,
-
-    /**
-     * Transmit close acknowledgement message
-     */
-    GNUNET_STREAM_MESSAGE_TRANSMIT_CLOSE_ACK,
-    
-    /**
-     * Receive close message (data is no loger read by the receiver after this
-     * message) 
-     */
-    GNUNET_STREAM_MESSAGE_RECEIVE_CLOSE,
-
-    /**
-     * Receive close acknowledgement message
-     */
-    GNUNET_STREAM_MESSAGE_RECEIVE_CLOSE_ACK,
-
-    /**
-     * Stream close message (data is no longer sent or read after this message)
-     */
-    GNUNET_STREAM_MESSAGE_CLOSE,
-
-    /**
-     * Close acknowledgement message
-     */
-    GNUNET_STREAM_MESSAGE_CLOSE_ACK
-  };
-
-
-/**
  * The stream message header
  *
  * The message can be of Data, Acknowledgement or both