-moving tcpip structs to joint header, some more work on vpn service

2 files changed, 2 insertions, 86 deletions

diff --git a/src/dns/dnsparser.c b/src/dns/dnsparser.c
index 8346051d7..2e9e73f1c 100644
--- a/src/dns/dnsparser.c
+++ b/src/dns/dnsparser.c
@@ -31,6 +31,7 @@
 
 // DNS-Stuff
 GNUNET_NETWORK_STRUCT_BEGIN
+/* FIXME: replace this one with the one from tcpip_tun.h! */
 struct dns_header
 {
   uint16_t id GNUNET_PACKED;
diff --git a/src/dns/gnunet-service-dns_new.c b/src/dns/gnunet-service-dns_new.c
index 046630aac..968f850fb 100644
--- a/src/dns/gnunet-service-dns_new.c
+++ b/src/dns/gnunet-service-dns_new.c
@@ -30,92 +30,7 @@
 #include "dns_new.h"
 #include "gnunet_dns_service-new.h"
 #include "gnunet_statistics_service.h"
-
-/* see http://www.iana.org/assignments/ethernet-numbers */
-#ifndef ETH_P_IPV4
-#define ETH_P_IPV4 0x0800
-#endif
-
-#ifndef ETH_P_IPV6
-#define ETH_P_IPV6 0x86DD
-#endif
-
-GNUNET_NETWORK_STRUCT_BEGIN
-/**
- * Header from Linux TUN interface.
- */ 
-struct tun_header
-{
-  /**
-   * Some flags (unused).
-   */ 
-  uint16_t flags;
-
-  /**
-   * Here we get an ETH_P_-number.
-   */
-  uint16_t proto;
-};
-
-/**
- * Standard IPv4 header.
- */
-struct ip4_header
-{
-  unsigned header_length:4 GNUNET_PACKED;
-  unsigned version:4 GNUNET_PACKED;
-  uint8_t diff_serv;
-  uint16_t total_length GNUNET_PACKED;
-  uint16_t identification GNUNET_PACKED;
-  unsigned flags:3 GNUNET_PACKED;
-  unsigned fragmentation_offset:13 GNUNET_PACKED;
-  uint8_t ttl;
-  uint8_t protocol;
-  uint16_t checksum GNUNET_PACKED;
-  struct in_addr source_address GNUNET_PACKED;
-  struct in_addr destination_address GNUNET_PACKED;
-};
-
-/**
- * Standard IPv6 header.
- */
-struct ip6_header
-{
-  unsigned traffic_class_h:4 GNUNET_PACKED;
-  unsigned version:4 GNUNET_PACKED;
-  unsigned traffic_class_l:4 GNUNET_PACKED;
-  unsigned flow_label:20 GNUNET_PACKED;
-  uint16_t payload_length GNUNET_PACKED;
-  uint8_t next_header;
-  uint8_t hop_limit;
-  struct in6_addr source_address GNUNET_PACKED;
-  struct in6_addr destination_address GNUNET_PACKED;
-};
-
-/**
- * UDP packet header.
- */
-struct udp_packet
-{
-  uint16_t spt GNUNET_PACKED;
-  uint16_t dpt GNUNET_PACKED;
-  uint16_t len GNUNET_PACKED;
-  uint16_t crc GNUNET_PACKED;
-};
-
-/**
- * DNS header.
- */
-struct dns_header
-{
-  uint16_t id GNUNET_PACKED;
-  uint16_t flags GNUNET_PACKED;
-  uint16_t qdcount GNUNET_PACKED;
-  uint16_t ancount GNUNET_PACKED;
-  uint16_t nscount GNUNET_PACKED;
-  uint16_t arcount GNUNET_PACKED;
-};
-GNUNET_NETWORK_STRUCT_END
+#include "tcpip_tun.h"
 
 
 /**