2 files changed, 56 insertions, 65 deletions
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 323d0a0bf3..af4dd74b2f 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1153,15 +1153,70 @@ extern "C"
  */
 #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
+
+/**
+ * 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: 416
+ *  Next available: 420
  */
 
 
diff --git a/src/stream/stream_protocol.h b/src/stream/stream_protocol.h
index f4ad37fdd7..3f6155eb1d 100644
--- a/src/stream/stream_protocol.h
+++ b/src/stream/stream_protocol.h
@@ -39,70 +39,6 @@ extern "C"
 
 
 /**
- * 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