#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_PEERINFO_NOTIFY 41
+#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_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
-/**
- * Welcome message between TCP transports.
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME 60
+/*******************************************************************************
+ * NAT message types
+ ******************************************************************************/
/**
- * Message to force transport to update bandwidth assignment
+ * Message to ask NAT server to perform traversal test
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_ATS 61
+#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.
- */
-#define GNUNET_MESSAGE_TYPE_CORE_REQUEST_INFO 72
-
-/**
- * Response from server about (possibly updated) P2P
- * connection configuration.
- */
-#define GNUNET_MESSAGE_TYPE_CORE_CONFIGURATION_INFO 73
-
/**
* Request from client to transmit message.
*/
*/
#define GNUNET_MESSAGE_TYPE_CORE_SEND 76
-/**
- * Request from client asking to connect to a peer.
- */
-#define GNUNET_MESSAGE_TYPE_CORE_REQUEST_CONNECT 77
/**
* Request for peer iteration from CORE service.
*/
#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.
*/
#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
- */
-
-/**
- * Local DHT route request type
- */
-#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE 142
-
-/**
- * Local generic DHT route result type
- */
-#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT 143
-
-/**
- * P2P DHT route request type
- */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE 144
-
-/**
- * P2P DHT route result type
- */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT 145
+/*******************************************************************************
+ * DHT message types
+ ******************************************************************************/
/**
- * Local generic DHT message stop type
+ * Client wants to store item in DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_STOP 146
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT 142
/**
- * Local and P2P DHT PUT message
- * (encapsulated in DHT_ROUTE message)
+ * Client wants to lookup item in DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_PUT 147
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET 143
/**
- * Local and P2P DHT GET message
- * (encapsulated in DHT_ROUTE message)
+ * Client wants to stop search in DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_GET 148
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET_STOP 144
/**
- * Local and P2P DHT Get result message
+ * Service returns result to client.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_GET_RESULT 149
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT 145
/**
- * Local and P2P DHT find peer message
+ * Peer is storing data in DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER 150
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_PUT 146
/**
- * Local and P2P DHT find peer result message
+ * Peer tries to find data in DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT 151
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_GET 147
/**
- * P2P DHT PING request type
+ * Data is returned to peer from DHT.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_PING 152
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_RESULT 148
-/**
- * DHT Control message type, for telling the
- * DHT to alter its current operation somehow.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_CONTROL 153
-
-/**
- * Local control message type, tells peer to start
- * issuing malicious GET requests.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET 154
-/**
- * Local control message type, tells peer to start
- * issuing malicious PUT requests.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT 155
-
-/**
- * Local control message type, tells peer to start
- * dropping all requests.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_DROP 156
+/*******************************************************************************
+ * HOSTLIST message types
+ ******************************************************************************/
/**
* Hostlist advertisement message
#define GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT 160
+/*******************************************************************************
+ * STATISTICS message types
+ ******************************************************************************/
+
/**
* Set a statistical value.
*/
#define GNUNET_MESSAGE_TYPE_STATISTICS_WATCH_VALUE 173
+/*******************************************************************************
+ * VPN message types
+ ******************************************************************************/
+
/**
* Type of messages between the gnunet-vpn-helper and the daemon
*/
/**
* Type of messages containing an UDP packet for a service
*/
-#define GNUNET_MESSAGE_TYPE_SERVICE_UDP 186
+#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP 186
/**
* Type of messages containing an UDP packet from a service
*/
-#define GNUNET_MESSAGE_TYPE_SERVICE_UDP_BACK 187
+#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP_BACK 187
/**
* Type of messages containing an TCP packet for a service
*/
-#define GNUNET_MESSAGE_TYPE_SERVICE_TCP 188
+#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_TCP 188
/**
* Type of messages containing an TCP packet from a service
*/
-#define GNUNET_MESSAGE_TYPE_SERVICE_TCP_BACK 189
-
+#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_TCP_BACK 189
/**
- * Type of messages between the gnunet-wlan-helper and the daemon
- *
+ * Type of messages containing an UDP packet for a remote host
*/
-
-#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA 195
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP 190
/**
- * Control messages between the gnunet-wlan-helper and the daemon
+ * Type of messages containing an UDP packet from a remote host
*/
-
-#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL 196
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP_BACK 191
/**
- * Type of messages for advertisement over wlan
+ * Type of messages containing an TCP packet for a remote host
*/
-#define GNUNET_MESSAGE_TYPE_WLAN_ADVERTISEMENT 197
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP 192
/**
- * Type of messages for data over the wlan
+ * Type of messages containing an TCP packet from a remote host
*/
+#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP_BACK 193
-#define GNUNET_MESSAGE_TYPE_WLAN_DATA 198
-
-/**
- * Fragment of a message
- */
-
-#define GNUNET_MESSAGE_TYPE_WLAN_FRAGMENT 199
-
-/**
- * Fragment ack of a message
- */
-
-#define GNUNET_MESSAGE_TYPE_WLAN_FRAGMENT_ACK 200
+/*******************************************************************************
+ * VPN-DNS message types
+ ******************************************************************************/
/**
* Type of messages to query the local service-dns
*/
-#define GNUNET_MESSAGE_TYPE_LOCAL_QUERY_DNS 205
+#define GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_QUERY_DNS 205
/**
* Type of messages the local service-dns responds with
*/
-#define GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS 206
+#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 message used to transport messages throug a MESH-tunnel
+ * Type of message used to transport messages throug a MESH-tunnel (LEGACY)
*/
#define GNUNET_MESSAGE_TYPE_MESH 215
/**
* Type of message used to send another peer which messages we want to receive
- * through a mesh-tunnel.
+ * through a mesh-tunnel (LEGACY)
*/
#define GNUNET_MESSAGE_TYPE_MESH_HELLO 216
-/**
- * MESH message types (WiP)
- */
-
/**
* Request the creation of a path
*/
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE 256
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE 256
/**
* Request the modification of an existing path
*/
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_CHANGE 257
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_CHANGE 257
/**
- * Request the addition to a new branch to a path
+ * Notify that a connection of a path is no longer valid
*/
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_ADD 258
+#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_MESH_PATH_CHANGED 259
+
+/**
+ * Transport data in the mesh (origin->end) unicast
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_UNICAST 260
/**
- * Transport data in the mesh (origin->end)
+ * Transport data to all peers in a tunnel
*/
-#define GNUNET_MESSAGE_TYPE_MESH_DATA_GO 260
+#define GNUNET_MESSAGE_TYPE_MESH_MULTICAST 261
/**
* Transport data back in the mesh (end->origin)
- * (not sure if this is the right way, should be some other solution)
*/
-#define GNUNET_MESSAGE_TYPE_MESH_DATA_BACK 261
+#define GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN 262
+
+/**
+ * Send origin an ACK that the path is complete
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_ACK 263
+
+/**
+ * Avoid path timeouts
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE 264
+
+/**
+ * Request the destuction of a path
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY 265
+
+/**
+ * Request the destruction of a whole tunnel
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY 266
/**
* We need flow control
*/
-#define GNUNET_MESSAGE_TYPE_MESH_SPEED_NOTIFY 262
+#define GNUNET_MESSAGE_TYPE_MESH_SPEED_NOTIFY 270
-/* FIXME: Document */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT 272
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE 273
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY 274
+/**
+ * Connect to the mesh service, specifying subscriptions
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT 272
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT_PEER_ADD 275
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT_PEER_DEL 276
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT_PEER_BY_TYPE 277
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT_PEER_CANCEL 278
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_CONNECTED 279
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_DISCONNECTED 280
+/**
+ * Ask the mesh service to create a new tunnel
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE 273
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_REQUEST_TRANSMIT_READY 281
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_NOTIFY_TRANSMIT_READY 282
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA 283
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA_BROADCAST 284
+/**
+ * Ask the mesh service to destroy a tunnel
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY 274
/**
- * 640kb should be enough for everybody
+ * 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_RESERVE_END 288
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD_BY_TYPE 277
/**
- * MESH message types END
+ * 640kb should be enough for everybody
*/
+#define GNUNET_MESSAGE_TYPE_MESH_RESERVE_END 288
+/*******************************************************************************
+ * CHAT message types START
+ ******************************************************************************/
+
/**
* Message sent from client to join a chat room.
*/
#define GNUNET_MESSAGE_TYPE_CHAT_P2P_CONFIRMATION_RECEIPT 311
+/*******************************************************************************
+ * NSE (network size estimation) message types
+ ******************************************************************************/
+
/**
- * Type used to match 'all' message types.
+ * client->service message indicating start
*/
-#define GNUNET_MESSAGE_TYPE_ALL 65535
+#define GNUNET_MESSAGE_TYPE_NSE_START 321
-/*
- TODO:
- - applications (FS, VPN, TRACEKIT, TBENCH)
-*/
+/**
+ * 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
-/* BELOW: experimental student-DHT protocol codes */
+/**
+ * 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
/**
- * Request to join a CAN DHT
+ * Type of the 'struct AddressUpdateMessage' sent by clients to ATS
+ * to inform ATS about performance changes.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_CAN_JOIN_REQUEST 1174
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_UPDATE 342
/**
- * Response to join request of a CAN DHT
+ * Type of the 'struct AddressDestroyedMessage' sent by clients to ATS
+ * to inform ATS about an address being unavailable.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_CAN_JOIN_REPLY 1175
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_DESTROYED 343
/**
- * Messages for swapping locations
+ * Type of the 'struct AddressSuggestionMessage' sent by ATS to clients
+ * to suggest switching to a different address.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_GET_NEIGHBOURLIST_REQUEST 1180
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION 344
-#define GNUNET_MESSAGE_TYPE_DHT_GET_NEIGHBOURLIST_RESULT 1181
+/**
+ * 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
-#define GNUNET_MESSAGE_TYPE_DHT_SWAP_LOCATION_REQUEST 1182
+/**
+ * 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
-#define GNUNET_MESSAGE_TYPE_DHT_SWAP_LOCATION_ACK 1183
+
+/*******************************************************************************
+ * 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).
+ ******************************************************************************/
/**
- * Freenet hello message
+ * Type used to match 'all' message types.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_FREENET_HELLO 1184
+#define GNUNET_MESSAGE_TYPE_ALL 65535
#if 0 /* keep Emacsens' auto-indent happy */