-moving DNS code into its own directory

3 files changed, 212 insertions, 0 deletions

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 003a90e24..417e200c2 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -40,6 +40,7 @@ gnunetinclude_HEADERS = \
   gnunet_datastore_plugin.h \
   gnunet_dht_service.h \
   gnunet_disk_lib.h \
+  gnunet_dnsparser_lib.h \
   gnunet_dv_service.h \
   gnunet_fragmentation_lib.h \
   gnunet_fs_service.h \
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
new file mode 100644
index 000000000..632145ae2
--- /dev/null
+++ b/src/include/gnunet_dns_service.h
@@ -0,0 +1,116 @@
+#ifndef GN_DNS_SERVICE_P_H
+#define GN_DNS_SERVICE_P_H
+
+#include "gnunet_common.h"
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+struct query_packet
+{
+  struct GNUNET_MessageHeader hdr;
+
+        /**
+         * The IP-Address this query was originally sent to
+         */
+  char orig_to[16];
+        /**
+         * The IP-Address this query was originally sent from
+         */
+  char orig_from[16];
+        /**
+         * The UDP-Portthis query was originally sent from
+         */
+  char addrlen;
+  uint16_t src_port GNUNET_PACKED;
+
+  unsigned char data[1];        /* The DNS-Packet */
+};
+
+struct query_packet_list
+{
+  struct query_packet_list *next GNUNET_PACKED;
+  struct query_packet_list *prev GNUNET_PACKED;
+  struct query_packet pkt;
+};
+
+enum GNUNET_DNS_ANSWER_Subtype
+{
+    /**
+     * Answers of this type contain a dns-packet that just has to be transmitted
+     */
+  GNUNET_DNS_ANSWER_TYPE_IP,
+
+    /**
+     * Answers of this type contain an incomplete dns-packet. The IP-Address
+     * is all 0s. The addroffset points to it.
+     */
+  GNUNET_DNS_ANSWER_TYPE_SERVICE,
+
+    /**
+     * Answers of this type contain an incomplete dns-packet as answer to a
+     * PTR-Query. The resolved name is not allocated. The addroffset points to it.
+     */
+  GNUNET_DNS_ANSWER_TYPE_REV,
+
+    /**
+     * Answers of this type contains an IP6-Address but traffic to this IP should
+     * be routed through the GNUNet.
+     */
+  GNUNET_DNS_ANSWER_TYPE_REMOTE_AAAA,
+
+    /**
+     * Answers of this type contains an IP4-Address but traffic to this IP should
+     * be routed through the GNUNet.
+     */
+  GNUNET_DNS_ANSWER_TYPE_REMOTE_A
+};
+
+struct GNUNET_vpn_service_descriptor
+{
+  GNUNET_HashCode peer GNUNET_PACKED;
+  GNUNET_HashCode service_descriptor GNUNET_PACKED;
+  uint64_t ports GNUNET_PACKED;
+  uint32_t service_type GNUNET_PACKED;
+};
+
+struct answer_packet
+{
+  /* General data */
+  struct GNUNET_MessageHeader hdr;
+  enum GNUNET_DNS_ANSWER_Subtype subtype GNUNET_PACKED;
+
+  char from[16];
+  char to[16];
+  char addrlen;
+  unsigned dst_port:16 GNUNET_PACKED;
+  /* -- */
+
+  /* Data for GNUNET_DNS_ANSWER_TYPE_SERVICE */
+  struct GNUNET_vpn_service_descriptor service_descr;
+  /* -- */
+
+  /* Data for GNUNET_DNS_ANSWER_TYPE_REV */
+  /* The offsett in octets from the beginning of the struct to the field
+   * in data where the IP-Address has to go. */
+  uint16_t addroffset GNUNET_PACKED;
+  /* -- */
+
+  /* Data for GNUNET_DNS_ANSWER_TYPE_REMOTE */
+  /* either 4 or 16 */
+  char addrsize;
+  unsigned char addr[16];
+  /* -- */
+
+  unsigned char data[1];
+};
+
+struct answer_packet_list
+{
+  struct answer_packet_list *next GNUNET_PACKED;
+  struct answer_packet_list *prev GNUNET_PACKED;
+  struct GNUNET_SERVER_Client *client;
+  struct answer_packet pkt;
+};
+GNUNET_NETWORK_STRUCT_END
+
+#endif
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
new file mode 100644
index 000000000..a9ed5b3b2
--- /dev/null
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -0,0 +1,95 @@
+#ifndef _GNVPN_DNSP_H_
+#define _GNVPN_DNSP_H_
+
+#include "platform.h"
+#include "gnunet_common.h"
+
+// DNS-Stuff
+GNUNET_NETWORK_STRUCT_BEGIN
+
+struct dns_static
+{
+  uint16_t id GNUNET_PACKED;
+
+  unsigned rd:1 GNUNET_PACKED;  // recursion desired (client -> server)
+  unsigned tc:1 GNUNET_PACKED;  // message is truncated
+  unsigned aa:1 GNUNET_PACKED;  // authoritative answer
+  unsigned op:4 GNUNET_PACKED;  // query:0, inverse q.:1, status: 2
+  unsigned qr:1 GNUNET_PACKED;  // query:0, response:1
+
+  unsigned rcode:4 GNUNET_PACKED;       // 0 No error
+  // 1 Format error
+  // 2 Server failure
+  // 3 Name Error
+  // 4 Not Implemented
+  // 5 Refused
+  unsigned z:3 GNUNET_PACKED;   // reserved
+  unsigned ra:1 GNUNET_PACKED;  // recursion available (server -> client)
+
+  uint16_t qdcount GNUNET_PACKED;       // number of questions
+  uint16_t ancount GNUNET_PACKED;       // number of answers
+  uint16_t nscount GNUNET_PACKED;       // number of authority-records
+  uint16_t arcount GNUNET_PACKED;       // number of additional records
+};
+GNUNET_NETWORK_STRUCT_END
+
+struct dns_pkt
+{
+  struct dns_static s;
+  unsigned char data[1];
+};
+
+struct dns_pkt_parsed
+{
+  struct dns_static s;
+  struct dns_query **queries;
+  struct dns_record **answers;
+  struct dns_record **nameservers;
+  struct dns_record **additional;
+};
+
+struct dns_query_line
+{
+  unsigned short type;
+  unsigned short class;
+};
+
+struct dns_query
+{
+  char *name;
+  unsigned char namelen;
+  unsigned short qtype;
+  unsigned short qclass;
+};
+
+struct dns_record_line
+{
+  unsigned short type;
+  unsigned short class;
+  unsigned int ttl;
+  unsigned short data_len;
+  unsigned char data;
+};
+
+struct dns_record
+{
+  char *name;
+  unsigned char namelen;
+  unsigned short type;
+  unsigned short class;
+  unsigned int ttl;
+  unsigned short data_len;
+  unsigned char *data;
+};
+
+
+struct dns_pkt_parsed *
+parse_dns_packet (struct dns_pkt *pkt);
+
+struct dns_pkt *
+unparse_dns_packet (struct dns_pkt_parsed *pkt);
+
+void
+free_parsed_dns_packet (struct dns_pkt_parsed *ppkt);
+
+#endif