#endif
#endif
+/*******************************************************************************
+ * UTIL message types
+ ******************************************************************************/
+
/**
* Test if service is online.
*/
#define GNUNET_MESSAGE_TYPE_TEST 1
+/**
+ * Dummy messages for testing / benchmarking.
+ */
+#define GNUNET_MESSAGE_TYPE_DUMMY 2
+
+/*******************************************************************************
+ * RESOLVER message types
+ ******************************************************************************/
/**
* Request DNS resolution.
*/
-#define GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST 2
+#define GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST 4
/**
* Response to a DNS resolution request.
*/
-#define GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE 3
-
+#define GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE 5
+/*******************************************************************************
+ * ARM message types
+ ******************************************************************************/
/**
* Request to ARM to start a service.
*/
#define GNUNET_MESSAGE_TYPE_ARM_SHUTDOWN_ACK 14
+/*******************************************************************************
+ * HELLO message types
+ ******************************************************************************/
+
/**
* HELLO message used for communicating peer addresses.
* Managed by libgnunethello.
*/
#define GNUNET_MESSAGE_TYPE_HELLO 16
+/*******************************************************************************
+ * FRAGMENTATION message types
+ ******************************************************************************/
+
/**
* FRAGMENT of a larger message.
* Managed by libgnunetfragment.
*/
#define GNUNET_MESSAGE_TYPE_FRAGMENT 18
+/**
+ * Acknowledgement of a FRAGMENT of a larger message.
+ * Managed by libgnunetfragment.
+ */
+#define GNUNET_MESSAGE_TYPE_FRAGMENT_ACK 19
+
+/*******************************************************************************
+ * TRANSPORT message types
+ ******************************************************************************/
/**
* Message from the core saying that the transport
#define GNUNET_MESSAGE_TYPE_TRANSPORT_SEND 23
/**
- * Confirmation from TRANSPORT that message for
- * transmission has been queued (and that the next
- * message to this peer can now be passed to the
- * service). Note that this confirmation does NOT
- * imply that the message was fully transmitted.
+ * Confirmation from TRANSPORT that message for transmission has been
+ * queued (and that the next message to this peer can now be passed to
+ * the service). Note that this confirmation does NOT imply that the
+ * message was fully transmitted.
*/
#define GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK 24
*/
#define GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY 30
-
/**
* Reply from blacklisting client (answer to blacklist query).
*/
#define GNUNET_MESSAGE_TYPE_TRANSPORT_PONG 33
/**
- * Message for TRANSPORT asking that a connection
- * be initiated with a peer.
+ * Message for transport service from a client asking that a
+ * connection be initiated with another peer.
*/
#define GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT 34
/**
- * Request update and listing of a peer.
+ * Transport CONNECT message exchanged between transport services to
+ * indicate that a session should be marked as 'connected'.
*/
-#define GNUNET_MESSAGE_TYPE_PEERINFO_GET 37
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT 35
/**
- * Request update and listing of all peers.
+ * Transport DISCONNECT message exchanged between transport services to
+ * indicate that a connection should be dropped.
*/
-#define GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL 38
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT 36
/**
- * Information about one of the peers.
+ * Request to look up addresses of peers.
*/
-#define GNUNET_MESSAGE_TYPE_PEERINFO_INFO 39
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_PEER_ADDRESS_LOOKUP 37
/**
- * End of information about other peers.
+ * Request to iterate over all known addresses.
*/
-#define GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END 40
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE 38
/**
- * Start notifying this client about all changes to
- * the known peers until it disconnects.
+ * Message send by a peer to notify the other to keep the session alive.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE 39
+
+/*******************************************************************************
+ * Transport-WLAN message types
+ ******************************************************************************/
+
+/**
+ * Type of messages between the gnunet-wlan-helper and the daemon
+ *
+ */
+#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA 40
+
+/**
+ * Control messages between the gnunet-wlan-helper and the daemon
+ */
+
+#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL 41
+
+/**
+ * Type of messages for advertisement over wlan
*/
-#define GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY 41
+#define GNUNET_MESSAGE_TYPE_WLAN_ADVERTISEMENT 42
+
+/**
+ * Type of messages for data over the wlan
+ */
+#define GNUNET_MESSAGE_TYPE_WLAN_DATA 43
+
+
+/*******************************************************************************
+ * Transport-DV message types
+ ******************************************************************************/
/**
* DV service to DV Plugin message, when a message is
*/
#define GNUNET_MESSAGE_TYPE_DV_DISCONNECT 50
-/**
- * TCP NAT probe message, send from NAT'd peer to
- * other peer to establish bi-directional communication
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE 51
+/*******************************************************************************
+ * Transport-UDP message types
+ ******************************************************************************/
/**
* Normal UDP message type.
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE 52
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE 56
/**
- * Fragmented part of a UDP message.
+ * UDP ACK.
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE_PART 53
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK 57
-/**
- * UDP NAT probe message, send from NAT'd peer to
- * other peer to negotiate punched address/port
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE 55
+/*******************************************************************************
+ * Transport-TCP message types
+ ******************************************************************************/
/**
- * UDP NAT probe reply, sent from a non-NAT'd peer to
- * a NAT'd one to inform it we got the probe and of the
- * address/port seen
+ * TCP NAT probe message, send from NAT'd peer to
+ * other peer to establish bi-directional communication
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_REPLY 56
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE 60
/**
- * UDP NAT probe confirmation, sent from a NAT'd peer to
- * a non-NAT'd one to inform it which port to send to us
- * on
+ * Welcome message between TCP transports.
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_CONFIRM 57
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME 61
/**
- * UDP NAT probe keepalive, once a hole is punched the NAT'd peer
- * needs to keep the hole alive
+ * Message to force transport to update bandwidth assignment (LEGACY)
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_KEEPALIVE 58
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_ATS 62
+
+/*******************************************************************************
+ * NAT message types
+ ******************************************************************************/
/**
- * Welcome message between TCP transports.
+ * Message to ask NAT server to perform traversal test
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME 60
+#define GNUNET_MESSAGE_TYPE_NAT_TEST 63
+
+/*******************************************************************************
+ * CORE message types
+ ******************************************************************************/
/**
* Initial setup message from core client to core.
#define GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND 71
/**
- * Request from client to "configure" P2P connection.
+ * Request from client to transmit message.
*/
-#define GNUNET_MESSAGE_TYPE_CORE_REQUEST_INFO 72
+#define GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST 74
/**
- * Response from server about (possibly updated) P2P
- * connection configuration.
+ * Confirmation from core that message can now be sent
*/
-#define GNUNET_MESSAGE_TYPE_CORE_CONFIGURATION_INFO 73
+#define GNUNET_MESSAGE_TYPE_CORE_SEND_READY 75
/**
- * Request from client with message to transmit.
+ * Client with message to transmit (after SEND_READY confirmation
+ * was received).
*/
-#define GNUNET_MESSAGE_TYPE_CORE_SEND 74
+#define GNUNET_MESSAGE_TYPE_CORE_SEND 76
+
+
+/**
+ * Request for peer iteration from CORE service.
+ */
+#define GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS 78
/**
- * Request from client asking to connect to a peer.
+ * Last reply from core to request for peer iteration from CORE service.
*/
-#define GNUNET_MESSAGE_TYPE_CORE_REQUEST_CONNECT 75
+#define GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS_END 79
/**
- * Request from client asking to call back with all connected peers.
+ * Check whether a given peer is currently connected to CORE.
*/
-#define GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS 76
+#define GNUNET_MESSAGE_TYPE_CORE_PEER_CONNECTED 80
/**
* Session key exchange between peers.
*/
-#define GNUNET_MESSAGE_TYPE_CORE_SET_KEY 80
+#define GNUNET_MESSAGE_TYPE_CORE_SET_KEY 81
/**
* Encapsulation for an encrypted message between peers.
*/
-#define GNUNET_MESSAGE_TYPE_CORE_ENCRYPTED_MESSAGE 81
+#define GNUNET_MESSAGE_TYPE_CORE_ENCRYPTED_MESSAGE 82
/**
* Check that other peer is alive (challenge).
*/
-#define GNUNET_MESSAGE_TYPE_CORE_PING 82
+#define GNUNET_MESSAGE_TYPE_CORE_PING 83
/**
* Confirmation that other peer is alive.
*/
-#define GNUNET_MESSAGE_TYPE_CORE_PONG 83
+#define GNUNET_MESSAGE_TYPE_CORE_PONG 84
/**
* Request by the other peer to terminate the connection.
*/
-#define GNUNET_MESSAGE_TYPE_CORE_HANGUP 84
+#define GNUNET_MESSAGE_TYPE_CORE_HANGUP 85
+
+/**
+ * gzip-compressed type map of the sender
+ */
+#define GNUNET_MESSAGE_TYPE_CORE_COMPRESSED_TYPE_MAP 86
+
+/**
+ * uncompressed type map of the sender
+ */
+#define GNUNET_MESSAGE_TYPE_CORE_BINARY_TYPE_MAP 87
+
+/*******************************************************************************
+ * DATASTORE message types
+ ******************************************************************************/
/**
* Message sent by datastore client on join.
/**
* Message sent by datastore client to get random data.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_GET_RANDOM 98
+#define GNUNET_MESSAGE_TYPE_DATASTORE_GET_REPLICATION 98
+
+/**
+ * Message sent by datastore client to get random data.
+ */
+#define GNUNET_MESSAGE_TYPE_DATASTORE_GET_ZERO_ANONYMITY 99
/**
* Message sent by datastore to client providing requested data
* (in response to GET or GET_RANDOM request).
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA 99
+#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA 100
/**
* Message sent by datastore to client signaling end of matching data.
* This message will also be sent for "GET_RANDOM", even though
* "GET_RANDOM" returns at most one data item.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END 100
+#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END 101
/**
* Message sent by datastore client to remove data.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE 101
+#define GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE 102
/**
* Message sent by datastore client to drop the database.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_DROP 102
+#define GNUNET_MESSAGE_TYPE_DATASTORE_DROP 103
+
+/*******************************************************************************
+ * FS message types
+ ******************************************************************************/
/**
* Message sent by fs client to start indexing.
#define GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP 139
+/*******************************************************************************
+ * DHT message types
+ ******************************************************************************/
+
/**
- * DHT Message Types
+ * Client wants to store item in DHT.
*/
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT 142
/**
- * Local DHT route request type
+ * Client wants to lookup item in DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE 142
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET 143
/**
- * Local generic DHT route result type
+ * Client wants to stop search in DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT 143
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET_STOP 144
/**
- * P2P DHT route request type
+ * Service returns result to client.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE 144
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT 145
/**
- * P2P DHT route result type
+ * Peer is storing data in DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT 145
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_PUT 146
/**
- * Local generic DHT message stop type
+ * Peer tries to find data in DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_STOP 146
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_GET 147
/**
- * Local and P2P DHT PUT message
- * (encapsulated in DHT_ROUTE message)
+ * Data is returned to peer from DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_PUT 147
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_RESULT 148
+
+
+/*******************************************************************************
+ * HOSTLIST message types
+ ******************************************************************************/
/**
- * Local and P2P DHT GET message
- * (encapsulated in DHT_ROUTE message)
+ * Hostlist advertisement message
*/
-#define GNUNET_MESSAGE_TYPE_DHT_GET 148
+#define GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT 160
+
+
+/*******************************************************************************
+ * STATISTICS message types
+ ******************************************************************************/
/**
- * Local and P2P DHT Get result message
+ * Set a statistical value.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_GET_RESULT 149
+#define GNUNET_MESSAGE_TYPE_STATISTICS_SET 168
/**
- * Local and P2P DHT find peer message
+ * Get a statistical value(s).
*/
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER 150
+#define GNUNET_MESSAGE_TYPE_STATISTICS_GET 169
/**
- * Local and P2P DHT find peer result message
+ * Response to a STATISTICS_GET message (with value).
*/
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT 151
+#define GNUNET_MESSAGE_TYPE_STATISTICS_VALUE 170
/**
- * P2P DHT PING request type
+ * Response to a STATISTICS_GET message (end of value stream).
*/
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_PING 152
+#define GNUNET_MESSAGE_TYPE_STATISTICS_END 171
/**
- * DHT Control message type, for telling the
- * DHT to alter its current operation somehow.
+ * Watch changes to a statistical value. Message format is the same
+ * as for GET, except that the subsystem and entry name must be given.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_CONTROL 153
+#define GNUNET_MESSAGE_TYPE_STATISTICS_WATCH 172
/**
- * Local control message type, tells peer to start
- * issuing malicious GET requests.
+ * Changes to a watched value.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET 154
+#define GNUNET_MESSAGE_TYPE_STATISTICS_WATCH_VALUE 173
+
+
+/*******************************************************************************
+ * VPN message types
+ ******************************************************************************/
/**
- * Local control message type, tells peer to start
- * issuing malicious PUT requests.
+ * Type of messages between the gnunet-vpn-helper and the daemon
*/
-#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT 155
+#define GNUNET_MESSAGE_TYPE_VPN_HELPER 185
/**
- * Local control message type, tells peer to start
- * dropping all requests.
+ * Type of messages containing an UDP packet for a service
*/
-#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_DROP 156
+#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP 186
/**
- * Hostlist advertisement message
+ * Type of messages containing an UDP packet from a service
*/
-#define GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT 160
+#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP_BACK 187
+/**
+ * Type of messages containing an TCP packet for a service
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_TCP 188
/**
- * Set a statistical value.
+ * Type of messages containing an TCP packet from a service
*/
-#define GNUNET_MESSAGE_TYPE_STATISTICS_SET 168
+#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_TCP_BACK 189
/**
- * Get a statistical value(s).
+ * Type of messages containing an UDP packet for a remote host
*/
-#define GNUNET_MESSAGE_TYPE_STATISTICS_GET 169
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP 190
/**
- * Response to a STATISTICS_GET message (with value).
+ * Type of messages containing an UDP packet from a remote host
*/
-#define GNUNET_MESSAGE_TYPE_STATISTICS_VALUE 170
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP_BACK 191
/**
- * Response to a STATISTICS_GET message (end of value stream).
+ * Type of messages containing an TCP packet for a remote host
*/
-#define GNUNET_MESSAGE_TYPE_STATISTICS_END 171
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP 192
/**
- * Watch changes to a statistical value. Message format is the same
- * as for GET, except that the subsystem and entry name must be given.
+ * Type of messages containing an TCP packet from a remote host
*/
-#define GNUNET_MESSAGE_TYPE_STATISTICS_WATCH 172
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP_BACK 193
+
+
+/*******************************************************************************
+ * VPN-DNS message types
+ ******************************************************************************/
/**
- * Changes to a watched value.
+ * Type of messages to query the local service-dns
*/
-#define GNUNET_MESSAGE_TYPE_STATISTICS_WATCH_VALUE 173
+#define GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_QUERY_DNS 205
+/**
+ * Type of messages the local service-dns responds with
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS 206
+/**
+ * Type of messages to instruct the local service-dns to rehijack the dns
+ */
+#define GNUNET_MESSAGE_TYPE_REHIJACK 207
+/**
+ * Type of messages to send a DNS-query to another peer
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_QUERY_DNS 208
+/**
+ * Type of messages to send a DNS-answer to another peer
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_ANSWER_DNS 209
+
+/*******************************************************************************
+ * MESH message types
+ ******************************************************************************/
+
/**
- * Type of messages between the gnunet-vpn-helper and the daemon
+ * Type of message used to transport messages throug a MESH-tunnel (LEGACY)
*/
-#define GNUNET_MESSAGE_TYPE_VPN_HELPER 185
+#define GNUNET_MESSAGE_TYPE_MESH 215
+/**
+ * Type of message used to send another peer which messages we want to receive
+ * through a mesh-tunnel (LEGACY)
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_HELLO 216
/**
- * Type of messages between the gnunet-wlan-helper and the daemon
- *
+ * Request the creation of a path
*/
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE 256
-#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA 195
+/**
+ * Request the modification of an existing path
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_CHANGE 257
/**
- * Control messages between the gnunet-wlan-helper and the daemon
+ * Notify that a connection of a path is no longer valid
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN 258
+
+/**
+ * At some point, the route will spontaneously change
*/
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_CHANGED 259
-#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL 196
+/**
+ * Transport data in the mesh (origin->end) unicast
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_UNICAST 260
/**
- * Type of messages for advertisement over wlan
+ * Transport data to all peers in a tunnel
*/
-#define GNUNET_MESSAGE_TYPE_WLAN_ADVERTISEMENT 197
+#define GNUNET_MESSAGE_TYPE_MESH_MULTICAST 261
+/**
+ * Transport data back in the mesh (end->origin)
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN 262
/**
- * Type of messages to query the local service-dns
+ * Send origin an ACK that the path is complete
*/
-#define GNUNET_MESSAGE_TYPE_LOCAL_QUERY_DNS 205
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_ACK 263
+
/**
- * Type of messages the local service-dns responds with
+ * Avoid path timeouts
*/
-#define GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS 206
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE 264
+/**
+ * Request the destuction of a path
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY 265
/**
- * Type used to match 'all' message types.
+ * Request the destruction of a whole tunnel
*/
-#define GNUNET_MESSAGE_TYPE_ALL 65535
+#define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY 266
-/*
- TODO:
- - applications (FS, VPN, CHAT, TRACEKIT, TBENCH)
-*/
+/**
+ * We need flow control
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_SPEED_NOTIFY 270
+
+/**
+ * Connect to the mesh service, specifying subscriptions
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT 272
+
+/**
+ * Ask the mesh service to create a new tunnel
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE 273
+
+/**
+ * Ask the mesh service to destroy a tunnel
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY 274
+
+/**
+ * Ask the mesh service to add a peer to an existing tunnel
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD 275
+
+/**
+ * Ask the mesh service to remove a peer from a tunnel
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_DEL 276
+/**
+ * Ask the mesh service to add a peer offering a service to an existing tunnel
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD_BY_TYPE 277
+
+/**
+ * 640kb should be enough for everybody
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_RESERVE_END 288
-/* BELOW: experimental student-DHT protocol codes */
+/*******************************************************************************
+ * CHAT message types START
+ ******************************************************************************/
/**
- * Request to join a CAN DHT
+ * Message sent from client to join a chat room.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_CAN_JOIN_REQUEST 1174
+#define GNUNET_MESSAGE_TYPE_CHAT_JOIN_REQUEST 300
/**
- * Response to join request of a CAN DHT
+ * Message sent to client to indicate joining of another room member.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_CAN_JOIN_REPLY 1175
+#define GNUNET_MESSAGE_TYPE_CHAT_JOIN_NOTIFICATION 301
/**
- * Messages for swapping locations
+ * Message sent to client to indicate leaving of another room member.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_GET_NEIGHBOURLIST_REQUEST 1180
+#define GNUNET_MESSAGE_TYPE_CHAT_LEAVE_NOTIFICATION 302
-#define GNUNET_MESSAGE_TYPE_DHT_GET_NEIGHBOURLIST_RESULT 1181
+/**
+ * Notification sent by service to client indicating that we've received a chat
+ * message.
+ */
+#define GNUNET_MESSAGE_TYPE_CHAT_MESSAGE_NOTIFICATION 303
-#define GNUNET_MESSAGE_TYPE_DHT_SWAP_LOCATION_REQUEST 1182
+/**
+ * Request sent by client to transmit a chat message to another room members.
+ */
+#define GNUNET_MESSAGE_TYPE_CHAT_TRANSMIT_REQUEST 304
-#define GNUNET_MESSAGE_TYPE_DHT_SWAP_LOCATION_ACK 1183
+/**
+ * Receipt sent from a message receiver to the service to confirm delivery of
+ * a chat message.
+ */
+#define GNUNET_MESSAGE_TYPE_CHAT_CONFIRMATION_RECEIPT 305
+
+/**
+ * Notification sent from the service to the original sender
+ * to acknowledge delivery of a chat message.
+ */
+#define GNUNET_MESSAGE_TYPE_CHAT_CONFIRMATION_NOTIFICATION 306
+
+/**
+ * P2P message sent to indicate joining of another room member.
+ */
+#define GNUNET_MESSAGE_TYPE_CHAT_P2P_JOIN_NOTIFICATION 307
/**
- * Freenet hello message
+ * P2P message sent to indicate leaving of another room member.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_FREENET_HELLO 1184
+#define GNUNET_MESSAGE_TYPE_CHAT_P2P_LEAVE_NOTIFICATION 308
+
+/**
+ * P2P message sent to a newly connected peer to request its known clients in
+ * order to synchronize room members.
+ */
+#define GNUNET_MESSAGE_TYPE_CHAT_P2P_SYNC_REQUEST 309
+
+/**
+ * Notification sent from one peer to another to indicate that we have received
+ * a chat message.
+ */
+#define GNUNET_MESSAGE_TYPE_CHAT_P2P_MESSAGE_NOTIFICATION 310
+
+/**
+ * P2P receipt confirming delivery of a chat message.
+ */
+#define GNUNET_MESSAGE_TYPE_CHAT_P2P_CONFIRMATION_RECEIPT 311
+
+
+/*******************************************************************************
+ * NSE (network size estimation) message types
+ ******************************************************************************/
+
+/**
+ * client->service message indicating start
+ */
+#define GNUNET_MESSAGE_TYPE_NSE_START 321
+
+/**
+ * P2P message sent from nearest peer
+ */
+#define GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD 322
+
+/**
+ * service->client message indicating
+ */
+#define GNUNET_MESSAGE_TYPE_NSE_ESTIMATE 323
+
+
+/*******************************************************************************
+ * PEERINFO message types
+ ******************************************************************************/
+
+/**
+ * Request update and listing of a peer.
+ */
+#define GNUNET_MESSAGE_TYPE_PEERINFO_GET 330
+
+/**
+ * Request update and listing of all peers.
+ */
+#define GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL 331
+
+/**
+ * Information about one of the peers.
+ */
+#define GNUNET_MESSAGE_TYPE_PEERINFO_INFO 332
+
+/**
+ * End of information about other peers.
+ */
+#define GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END 333
+
+/**
+ * Start notifying this client about all changes to
+ * the known peers until it disconnects.
+ */
+#define GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY 334
+
+/*******************************************************************************
+ * ATS message types
+ ******************************************************************************/
+
+/**
+ * Type of the 'struct ClientStartMessage' sent by clients to ATS to
+ * identify the type of the client.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_START 340
+
+/**
+ * Type of the 'struct RequestAddressMessage' sent by clients to ATS
+ * to request an address to help connect.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS 341
+
+/**
+ * Type of the 'struct AddressUpdateMessage' sent by clients to ATS
+ * to inform ATS about performance changes.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_UPDATE 342
+
+/**
+ * Type of the 'struct AddressDestroyedMessage' sent by clients to ATS
+ * to inform ATS about an address being unavailable.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_DESTROYED 343
+
+/**
+ * Type of the 'struct AddressSuggestionMessage' sent by ATS to clients
+ * to suggest switching to a different address.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION 344
+
+/**
+ * Type of the 'struct PeerInformationMessage' sent by ATS to clients
+ * to inform about QoS for a particular connection.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_PEER_INFORMATION 345
+
+/**
+ * Type of the 'struct ReservationRequestMessage' sent by clients to ATS
+ * to ask for inbound bandwidth reservations.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_RESERVATION_REQUEST 346
+
+/**
+ * Type of the 'struct ReservationResultMessage' sent by ATS to clients
+ * in response to a reservation request.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT 347
+
+/**
+ * Type of the 'struct ChangePreferenceMessage' sent by clients to ATS
+ * to ask for allocation preference changes.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_CHANGE 348
+
+/**
+ * Type of the 'struct SessionReleaseMessage' sent by ATS to client
+ * to confirm that a session ID was destroyed.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE 349
+
+
+/*******************************************************************************
+ * TODO: we need a way to register message types centrally (via some webpage).
+ * For now: unofficial extensions should start at 48k, internal extensions
+ * define here should leave some room (4-10 additional messages to the previous
+ * extension).
+ ******************************************************************************/
+
+/**
+ * Type used to match 'all' message types.
+ */
+#define GNUNET_MESSAGE_TYPE_ALL 65535
#if 0 /* keep Emacsens' auto-indent happy */