-adding DNS exit-from-mesh functionality to gnunet-service-dns

2 files changed, 4 insertions, 80 deletions

diff --git a/src/include/gnunet_applications.h b/src/include/gnunet_applications.h
index d9df78d33..5feaeec6b 100644
--- a/src/include/gnunet_applications.h
+++ b/src/include/gnunet_applications.h
@@ -50,30 +50,6 @@ extern "C"
  */
 #define GNUNET_APPLICATION_TYPE_INTERNET_RESOLVER 2
 
-/**
- * Internet HTTP gateway (port 80).
- */
-#define GNUNET_APPLICATION_TYPE_INTERNET_HTTP_GATEWAY 3
-
-/**
- * Internet HTTPS gateway (port 443).
- */
-#define GNUNET_APPLICATION_TYPE_INTERNET_HTTPS_GATEWAY 4
-
-/**
- * Internet TCP gateway (any port).
- */
-#define GNUNET_APPLICATION_TYPE_INTERNET_TCP_GATEWAY 5
-
-/**
- * Internet UDP gateway (any port).
- */
-#define GNUNET_APPLICATION_TYPE_INTERNET_UDP_GATEWAY 6
-
-/**
- * GNUnet VPN Search Engine (searches HTTP sites hosted within GNUnet) [example]
- */
-#define GNUNET_APPLICATION_TYPE_GNUNET_SEARCH 7
 
 /**
  * Internet IPv4 gateway (any TCP/UDP/ICMP).
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 52ae26e00..bda20e37d 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -593,47 +593,16 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_VPN_HELPER 185
 
-/**
- * Type of messages containing an UDP packet for a service
- */
-#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP 186
-
-/**
- * Type of messages containing an UDP packet from a service
- */
-#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
 
 /**
- * Type of messages containing an TCP packet from a service
+ * Type of messages containing an DNS request for a DNS exit service.
  */
-#define GNUNET_MESSAGE_TYPE_VPN_SERVICE_TCP_BACK 189
+#define GNUNET_MESSAGE_TYPE_VPN_DNS_TO_INTERNET 194
 
 /**
- * Type of messages containing an UDP packet for a remote host
+ * Type of messages containing an DNS reply from a DNS exit service.
  */
-#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP 190
-
-/**
- * Type of messages containing an UDP packet from a remote host
- */
-#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP_BACK 191
-
-/**
- * Type of messages containing an TCP packet for a remote host
- */
-#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP 192
-
-/**
- * Type of messages containing an TCP packet from a remote host
- */
-#define GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP_BACK 193
-
-
+#define GNUNET_MESSAGE_TYPE_VPN_DNS_FROM_INTERNET 195
 
 /**
  * Type of messages containing an TCP packet for a service.
@@ -689,26 +658,6 @@ extern "C"
  * VPN-DNS message types
  ******************************************************************************/
 
-/**
- * Type of messages to query the local service-dns
- */
-#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
 
 /**
  * Initial message from client to DNS service for registration.
@@ -746,7 +695,6 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_MESH_HELLO 216
 
-
 /**
  * Request the creation of a path
  */