-building IPv4 TCP reply messages for TUN

[oweals/gnunet.git] / src / vpn / gnunet-vpn-packet.h

diff --git a/src/vpn/gnunet-vpn-packet.h b/src/vpn/gnunet-vpn-packet.h
index 47fa6984722efda80fd789cca0958a884420fbf9..835ffb8a3627647228566f81aa43323fc40d4c01 100644 (file)
--- a/src/vpn/gnunet-vpn-packet.h
+++ b/src/vpn/gnunet-vpn-packet.h
@@ -3,6 +3,9 @@
 
 #include "platform.h"
 #include "gnunet_common.h"
+#include "gnunet_dnsparser_lib.h"
+
+GNUNET_NETWORK_STRUCT_BEGIN
 
 // Headers
 struct pkt_tun
@@ -20,8 +23,8 @@ struct ip6_hdr
   unsigned paylgth:16 GNUNET_PACKED;
   unsigned nxthdr:8 GNUNET_PACKED;
   unsigned hoplmt:8 GNUNET_PACKED;
-  unsigned char sadr[16];
-  unsigned char dadr[16];
+  struct in6_addr sadr;
+  struct in6_addr dadr;
 };
 
 struct ip_hdr
@@ -40,8 +43,8 @@ struct ip_hdr
   unsigned proto:8 GNUNET_PACKED;
   unsigned chks:16 GNUNET_PACKED;
 
-  unsigned sadr:32 GNUNET_PACKED;
-  unsigned dadr:32 GNUNET_PACKED;
+  struct in_addr sadr GNUNET_PACKED;
+  struct in_addr dadr GNUNET_PACKED;
 };
 
 #define TCP_FLAG_SYN 2
@@ -74,81 +77,8 @@ struct icmp_hdr
   unsigned code:8 GNUNET_PACKED;
   unsigned chks:16 GNUNET_PACKED;
 };
+GNUNET_NETWORK_STRUCT_END
 
-// DNS-Stuff
-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
-};
-
-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 udp_dns
 {
@@ -156,6 +86,8 @@ struct udp_dns
   struct dns_pkt data;
 };
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 // Complete Packets
 struct tun_pkt
 {
@@ -246,5 +178,6 @@ struct ip_icmp
   struct ip_hdr ip_hdr;
   struct icmp_hdr icmp_hdr;
 };
+GNUNET_NETWORK_STRUCT_END
 
 #endif