#define GNUNET_MESSAGE_TYPE_ARM_STOP 9
/**
- * Response from ARM: service is now up.
+ * Request ARM service itself to shutdown.
*/
-#define GNUNET_MESSAGE_TYPE_ARM_IS_UP 10
+#define GNUNET_MESSAGE_TYPE_ARM_SHUTDOWN 10
/**
- * Response from ARM: service is now down.
- * (failed to start it or shut it down).
+ * Response from ARM.
*/
-#define GNUNET_MESSAGE_TYPE_ARM_IS_DOWN 11
+#define GNUNET_MESSAGE_TYPE_ARM_RESULT 11
-/**
- * Response from ARM: service status is unknown.
- */
-#define GNUNET_MESSAGE_TYPE_ARM_IS_UNKNOWN 12
-
-/**
- * Request ARM service shutdown.
- */
-#define GNUNET_MESSAGE_TYPE_ARM_SHUTDOWN 13
-
-/**
- * Acknowledge service shutting down, disconnect
- * indicates service stopped.
- */
-#define GNUNET_MESSAGE_TYPE_ARM_SHUTDOWN_ACK 14
/*******************************************************************************
* HELLO message types
*/
#define GNUNET_MESSAGE_TYPE_DHT_P2P_RESULT 148
+/**
+ * Request / receive information about transiting GETs
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET 149
+
+/**
+ * Request / receive information about transiting GET responses
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET_RESP 150
+
+/**
+ * Request / receive information about transiting PUTs
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT 151
+
+/**
+ * Request / receive information about transiting PUT responses (TODO)
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT_RESP 152
+
/*******************************************************************************
* HOSTLIST message types
#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP_BACK 193
+
+/**
+ * Type of messages containing an TCP packet for a service.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_TCP_TO_SERVICE_START 196
+
+/**
+ * Type of messages containing an TCP packet for the Internet.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_TCP_TO_INTERNET_START 197
+
+/**
+ * Type of messages containing an TCP packet of an established connection.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_TCP_DATA 198
+
+/**
+ * Type of messages containing an UDP packet for a service.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_UDP_TO_SERVICE 199
+
+/**
+ * Type of messages containing an UDP packet for the Internet.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_UDP_TO_INTERNET 200
+
+/**
+ * Type of messages containing an UDP packet from a remote host
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_UDP_REPLY 201
+
+
+/**
+ * Client asks VPN service to setup an IP to redirect traffic
+ * via an exit node to some global IP address.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP 202
+
+/**
+ * Client asks VPN service to setup an IP to redirect traffic
+ * to some peer offering a service.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE 203
+
+/**
+ * VPN service responds to client with an IP to use for the
+ * requested redirection.
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP 204
+
+
/*******************************************************************************
* VPN-DNS message types
******************************************************************************/
*/
#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_ANSWER_DNS 209
+/**
+ * Initial message from client to DNS service for registration.
+ */
+#define GNUNET_MESSAGE_TYPE_DNS_CLIENT_INIT 211
+
+/**
+ * Type of messages between the gnunet-helper-dns and the service
+ */
+#define GNUNET_MESSAGE_TYPE_DNS_CLIENT_REQUEST 212
+
+/**
+ * Type of messages between the gnunet-helper-dns and the service
+ */
+#define GNUNET_MESSAGE_TYPE_DNS_CLIENT_RESPONSE 213
+
+/**
+ * Type of messages between the gnunet-helper-dns and the service
+ */
+#define GNUNET_MESSAGE_TYPE_DNS_HELPER 214
/*******************************************************************************
*/
#define GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS 341
+/**
+ * Type of the 'struct RequestAddressMessage' sent by clients to ATS
+ * to request an address to help connect.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL 342
+
/**
* Type of the 'struct AddressUpdateMessage' sent by clients to ATS
* to inform ATS about performance changes.
*/
-#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_UPDATE 342
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_UPDATE 343
/**
* 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
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_DESTROYED 344
/**
* 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
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION 345
/**
* 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_ATS_PEER_INFORMATION 346
/**
* Type of the 'struct ReservationRequestMessage' sent by clients to ATS
* to ask for inbound bandwidth reservations.
*/
-#define GNUNET_MESSAGE_TYPE_ATS_RESERVATION_REQUEST 346
+#define GNUNET_MESSAGE_TYPE_ATS_RESERVATION_REQUEST 347
/**
* Type of the 'struct ReservationResultMessage' sent by ATS to clients
* in response to a reservation request.
*/
-#define GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT 347
+#define GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT 348
/**
* Type of the 'struct ChangePreferenceMessage' sent by clients to ATS
* to ask for allocation preference changes.
*/
-#define GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_CHANGE 348
+#define GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_CHANGE 349
/**
* 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_ATS_SESSION_RELEASE 350
/**
* Type of the 'struct AddressUseMessage' sent by ATS to client
* to confirm that an address is used or not used anymore
*/
-#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_IN_USE 350
+#define GNUNET_MESSAGE_TYPE_ATS_ADDRESS_IN_USE 351
+
+
/*******************************************************************************
/**
* Request to look addresses of peers in server.
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_LOOKUP 367
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING 367
/**
* Response to the address lookup request.
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY 368
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY 368
/**
* Register a client that wants to do blacklisting.
#define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT 378
/**
- * Request to look up addresses of peers.
+ * Request to monitor addresses used by a peer or all peers.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE 380
+
+/**
+ * Message send by a peer to notify the other to keep the session alive
+ * and measure latency in a regular interval
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_PEER_ADDRESS_LOOKUP 379
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE 381
/**
- * Request to iterate over all known addresses.
+ * Response to a GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE message to
+ * measure latency in a regular interval
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE 380
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE 382
+
/**
- * Message send by a peer to notify the other to keep the session alive.
+ * Request to iterate over all known addresses.
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE 381
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE_RESPONSE 383
/**
* Message send by a peer to notify the other to keep the session alive.
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON 382
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON 384
/**