*/
#define GNUNET_MESSAGE_TYPE_ARM_RESULT 11
+/**
+ * Request to ARM to list all currently running services
+ */
+#define GNUNET_MESSAGE_TYPE_ARM_LIST 12
+
+/**
+ * Response from ARM for listing currently running services
+ */
+#define GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT 13
/*******************************************************************************
* HELLO message types
******************************************************************************/
/**
- * Type of messages between the gnunet-wlan-helper and the daemon
- *
+ * Type of data messages from the plugin to the gnunet-wlan-helper
*/
-#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA 40
+#define GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER 39
/**
- * Control messages between the gnunet-wlan-helper and the daemon
+ * Type of data messages from the gnunet-wlan-helper to the plugin
*/
+#define GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER 40
+/**
+ * Control message between the gnunet-wlan-helper and the daemon (with the MAC).
+ */
#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL 41
/**
*/
#define GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY 65
-/**
- * Notify clients about new peer-to-peer connections (before
- * key exchange and authentication).
- */
-#define GNUNET_MESSAGE_TYPE_CORE_NOTIFY_PRE_CONNECT 66
-
/**
* Notify clients about new peer-to-peer connections (triggered
* after key exchange).
*/
#define GNUNET_MESSAGE_TYPE_VPN_HELPER 185
+/**
+ * Type of messages containing an ICMP packet for a service.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_ICMP_TO_SERVICE 190
+
+/**
+ * Type of messages containing an ICMP packet for the Internet.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_ICMP_TO_INTERNET 191
+
+/**
+ * Type of messages containing an ICMP packet for the VPN
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_ICMP_TO_VPN 192
/**
* Type of messages containing an DNS request for a DNS exit service.
*/
-#define GNUNET_MESSAGE_TYPE_VPN_DNS_TO_INTERNET 194
+#define GNUNET_MESSAGE_TYPE_VPN_DNS_TO_INTERNET 193
/**
* Type of messages containing an DNS reply from a DNS exit service.
*/
-#define GNUNET_MESSAGE_TYPE_VPN_DNS_FROM_INTERNET 195
+#define GNUNET_MESSAGE_TYPE_VPN_DNS_FROM_INTERNET 194
/**
* Type of messages containing an TCP packet for a service.
*/
-#define GNUNET_MESSAGE_TYPE_VPN_TCP_TO_SERVICE_START 196
+#define GNUNET_MESSAGE_TYPE_VPN_TCP_TO_SERVICE_START 195
/**
* Type of messages containing an TCP packet for the Internet.
*/
-#define GNUNET_MESSAGE_TYPE_VPN_TCP_TO_INTERNET_START 197
+#define GNUNET_MESSAGE_TYPE_VPN_TCP_TO_INTERNET_START 196
+
+/**
+ * Type of messages containing an TCP packet of an established connection.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_TCP_DATA_TO_EXIT 197
/**
* Type of messages containing an TCP packet of an established connection.
*/
-#define GNUNET_MESSAGE_TYPE_VPN_TCP_DATA 198
+#define GNUNET_MESSAGE_TYPE_VPN_TCP_DATA_TO_VPN 198
/**
* Type of messages containing an UDP packet for a service.
*/
#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
/**
- * Next available: 416
+ * 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
+
+/*******************************************************************************
+ * FS-PUBLISH-HELPER IPC Messages
+ ******************************************************************************/
+
+/**
+ * Progress information from the helper: found a file
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_PROGRESS_FILE 420
+
+/**
+ * Progress information from the helper: found a directory
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_PROGRESS_DIRECTORY 421
+
+/**
+ * Error signal from the helper.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR 422
+
+/**
+ * Signal that helper skipped a file.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_SKIP_FILE 423
+
+/**
+ * Signal that helper is done scanning the directory tree.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_COUNTING_DONE 424
+
+/**
+ * Extracted meta data from the helper.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_META_DATA 425
+
+/**
+ * Signal that helper is done.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_FINISHED 426
+
+/*******************************************************************************
+ * NAMESTORE message types
+ ******************************************************************************/
+
+/**
+ * Request update and listing of a peer.
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_START 430
+
+/**
+ * Next available: 440
+ */
/*******************************************************************************
* TODO: we need a way to register message types centrally (via some webpage).