-defining proper structs for vpn-exit mesh communication

[oweals/gnunet.git] / src / include / gnunet_protocols.h

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 81b5ce6b8520d7bb303596c92cf39b66d58363bb..5257e2587accd45c0ab5af51a5013b5c454c73b0 100644 (file)
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -78,31 +78,15 @@ extern "C"
 #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
@@ -533,6 +517,26 @@ extern "C"
  */
 #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
@@ -630,6 +634,57 @@ extern "C"
 #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
  ******************************************************************************/
@@ -655,6 +710,25 @@ extern "C"
  */
 #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
 
 
 /*******************************************************************************
@@ -1020,12 +1094,12 @@ extern "C"
 /**
  * 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.
@@ -1083,12 +1157,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT 378
 
 /**
- * Request to look up addresses of peers.
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_PEER_ADDRESS_LOOKUP 379
-
-/**
- * Request to iterate over all known addresses.
+ * Request to monitor addresses used by a peer or all peers.
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE 380
 
@@ -1105,10 +1174,15 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE 382
 
 
+/**
+ * Request to iterate over all known addresses.
+ */
+#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 383
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON 384
 
 
 /**