-eliminating duplicate struct definitions

5 files changed, 30 insertions, 225 deletions

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 345c1316c..441ffeefd 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -82,7 +82,7 @@ gnunet_service_dns_DEPENDENCIES = \
   libgnunetdnsstub.la
 
 libgnunetdnsparser_la_SOURCES = \
- dnsparser.c dnsparser.h
+ dnsparser.c 
 libgnunetdnsparser_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
   -lidn
diff --git a/src/dns/dnsparser.c b/src/dns/dnsparser.c
index 18ef4c219..68b882279 100644
--- a/src/dns/dnsparser.c
+++ b/src/dns/dnsparser.c
@@ -31,7 +31,7 @@
 #endif
 #include "gnunet_util_lib.h"
 #include "gnunet_dnsparser_lib.h"
-#include "dnsparser.h"
+#include "gnunet_tun_lib.h"
 
 
 /**
@@ -235,7 +235,7 @@ parse_query (const char *udp_payload,
              struct GNUNET_DNSPARSER_Query *q)
 {
   char *name;
-  struct query_line ql;
+  struct GNUNET_TUN_DnsQueryLine ql;
 
   name = parse_name (udp_payload, 
                      udp_payload_length,
@@ -243,7 +243,7 @@ parse_query (const char *udp_payload,
   if (NULL == name)
     return GNUNET_SYSERR;
   q->name = name;
-  if (*off + sizeof (struct query_line) > udp_payload_length)
+  if (*off + sizeof (struct GNUNET_TUN_DnsQueryLine) > udp_payload_length)
     return GNUNET_SYSERR;
   memcpy (&ql, &udp_payload[*off], sizeof (ql));
   *off += sizeof (ql);
@@ -270,12 +270,12 @@ parse_record (const char *udp_payload,
               struct GNUNET_DNSPARSER_Record *r)
 {
   char *name;
-  struct record_line rl;
+  struct GNUNET_TUN_DnsRecordLine rl;
   size_t old_off;
-  struct soa_data soa;
+  struct GNUNET_TUN_DnsSoaRecord soa;
   uint16_t mxpref;
   uint16_t data_len;
-  struct srv_data srv;
+  struct GNUNET_TUN_DnsSrvRecord srv;
   char *ndup;
   char *tok;
 
@@ -285,7 +285,7 @@ parse_record (const char *udp_payload,
   if (NULL == name)
     return GNUNET_SYSERR;
   r->name = name;
-  if (*off + sizeof (struct record_line) > udp_payload_length)
+  if (*off + sizeof (struct GNUNET_TUN_DnsRecordLine) > udp_payload_length)
     return GNUNET_SYSERR;
   memcpy (&rl, &udp_payload[*off], sizeof (rl));
   (*off) += sizeof (rl);
@@ -320,15 +320,15 @@ parse_record (const char *udp_payload,
                                      off, 0);
     if ( (NULL == r->data.soa->mname) ||
          (NULL == r->data.soa->rname) ||
-         (*off + sizeof (struct soa_data) > udp_payload_length) )
+         (*off + sizeof (struct GNUNET_TUN_DnsSoaRecord) > udp_payload_length) )
       return GNUNET_SYSERR;
-    memcpy (&soa, &udp_payload[*off], sizeof (struct soa_data));
+    memcpy (&soa, &udp_payload[*off], sizeof (struct GNUNET_TUN_DnsSoaRecord));
     r->data.soa->serial = ntohl (soa.serial);
     r->data.soa->refresh = ntohl (soa.refresh);
     r->data.soa->retry = ntohl (soa.retry);
     r->data.soa->expire = ntohl (soa.expire);
     r->data.soa->minimum_ttl = ntohl (soa.minimum);
-    (*off) += sizeof (struct soa_data);
+    (*off) += sizeof (struct GNUNET_TUN_DnsSoaRecord);
     if (old_off + data_len != *off) 
       return GNUNET_SYSERR;
     return GNUNET_OK;
@@ -352,10 +352,10 @@ parse_record (const char *udp_payload,
     if (NULL == strstr (r->name, "._"))
       return GNUNET_SYSERR; /* necessary string from "._$PROTO" not present */
     old_off = *off;
-    if (*off + sizeof (struct srv_data) > udp_payload_length)
+    if (*off + sizeof (struct GNUNET_TUN_DnsSrvRecord) > udp_payload_length)
       return GNUNET_SYSERR;
-    memcpy (&srv, &udp_payload[*off], sizeof (struct srv_data));    
-    (*off) += sizeof (struct srv_data);
+    memcpy (&srv, &udp_payload[*off], sizeof (struct GNUNET_TUN_DnsSrvRecord));    
+    (*off) += sizeof (struct GNUNET_TUN_DnsSrvRecord);
     r->data.srv = GNUNET_malloc (sizeof (struct GNUNET_DNSPARSER_SrvRecord));
     r->data.srv->priority = ntohs (srv.prio);
     r->data.srv->weight = ntohs (srv.weight);
@@ -685,9 +685,9 @@ add_query (char *dst,
            const struct GNUNET_DNSPARSER_Query *query)
 {
   int ret;
-  struct query_line ql;
+  struct GNUNET_TUN_DnsQueryLine ql;
 
-  ret = add_name (dst, dst_len - sizeof (struct query_line), off, query->name);
+  ret = add_name (dst, dst_len - sizeof (struct GNUNET_TUN_DnsQueryLine), off, query->name);
   if (ret != GNUNET_OK)
     return ret;
   ql.type = htons (query->type);
@@ -745,7 +745,7 @@ add_soa (char *dst,
          size_t *off,
          const struct GNUNET_DNSPARSER_SoaRecord *soa)
 {
-  struct soa_data sd;
+  struct GNUNET_TUN_DnsSoaRecord sd;
   int ret;
 
   if ( (GNUNET_OK != (ret = add_name (dst,
@@ -757,7 +757,7 @@ add_soa (char *dst,
                                       off,
                                       soa->rname)) ) )
     return ret;
-  if (*off + sizeof (struct soa_data) > dst_len)
+  if (*off + sizeof (struct GNUNET_TUN_DnsSoaRecord) > dst_len)
     return GNUNET_NO;
   sd.serial = htonl (soa->serial);
   sd.refresh = htonl (soa->refresh);
@@ -788,10 +788,10 @@ add_srv (char *dst,
          size_t *off,
          const struct GNUNET_DNSPARSER_SrvRecord *srv)
 {
-  struct srv_data sd;
+  struct GNUNET_TUN_DnsSrvRecord sd;
   int ret;
 
-  if (*off + sizeof (struct srv_data) > dst_len)
+  if (*off + sizeof (struct GNUNET_TUN_DnsSrvRecord) > dst_len)
     return GNUNET_NO;
   sd.prio = htons (srv->priority);
   sd.weight = htons (srv->weight);
@@ -828,7 +828,7 @@ add_record (char *dst,
   int ret;
   size_t start;
   size_t pos;
-  struct record_line rl;
+  struct GNUNET_TUN_DnsRecordLine rl;
   char *name;
   
   start = *off;
@@ -842,14 +842,14 @@ add_record (char *dst,
                      record->data.srv->service,
                      record->data.srv->proto,
                      record->data.srv->domain_name);
-  ret = add_name (dst, dst_len - sizeof (struct record_line), off, name);
+  ret = add_name (dst, dst_len - sizeof (struct GNUNET_TUN_DnsRecordLine), off, name);
   if (name != record->name)
     GNUNET_free (name);
   if (GNUNET_OK != ret)
     return ret;
   /* '*off' is now the position where we will need to write the record line */
 
-  pos = *off + sizeof (struct record_line);
+  pos = *off + sizeof (struct GNUNET_TUN_DnsRecordLine);
   switch (record->type)
   { 
   case GNUNET_DNSPARSER_TYPE_MX:
@@ -883,7 +883,7 @@ add_record (char *dst,
     return GNUNET_NO;
   }
 
-  if (pos - (*off + sizeof (struct record_line)) > UINT16_MAX)
+  if (pos - (*off + sizeof (struct GNUNET_TUN_DnsRecordLine)) > UINT16_MAX)
   {
     /* record data too long */
     *off = start;
@@ -892,8 +892,8 @@ add_record (char *dst,
   rl.type = htons (record->type);
   rl.class = htons (record->class);
   rl.ttl = htonl (GNUNET_TIME_absolute_get_remaining (record->expiration_time).rel_value_us / 1000LL / 1000LL); /* in seconds */
-  rl.data_len = htons ((uint16_t) (pos - (*off + sizeof (struct record_line))));
-  memcpy (&dst[*off], &rl, sizeof (struct record_line));
+  rl.data_len = htons ((uint16_t) (pos - (*off + sizeof (struct GNUNET_TUN_DnsRecordLine))));
+  memcpy (&dst[*off], &rl, sizeof (struct GNUNET_TUN_DnsRecordLine));
   *off = pos;
   return GNUNET_OK;  
 }
diff --git a/src/dns/dnsparser.h b/src/dns/dnsparser.h
deleted file mode 100644
index d312f8931..000000000
--- a/src/dns/dnsparser.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-      This file is part of GNUnet
-      (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
-
-      GNUnet is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published
-      by the Free Software Foundation; either version 2, or (at your
-      option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      General Public License for more details.
-
-      You should have received a copy of the GNU General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
- */
-
-/**
- * @file dns/dnsparser.h
- * @brief helper library to parse DNS packets. 
- * @author Philipp Toelke
- * @author Christian Grothoff
- * @author Martin Schanzenbach
- */
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/* FIXME: replace this one with the one from tcpip_tun.h!? */
-/**
- * Head of a any DNS message.
- */
-struct GNUNET_TUN_DnsHeader
-{
-  /**
-   * Request/response ID. (NBO)
-   */
-  uint16_t id GNUNET_PACKED;
-
-  /**
-   * Flags for the operation.
-   */
-  struct GNUNET_DNSPARSER_Flags flags; 
-
-  /**
-   * number of questions (NBO)
-   */
-  uint16_t query_count GNUNET_PACKED;
-
-  /**
-   * number of answers (NBO)
-   */
-  uint16_t answer_rcount GNUNET_PACKED;
-
-  /**
-   * number of authority-records (NBO)
-   */
-  uint16_t authority_rcount GNUNET_PACKED;
-
-  /**
-   * number of additional records (NBO)
-   */
-  uint16_t additional_rcount GNUNET_PACKED;
-};
-
-
-/**
- * DNS query prefix.
- */
-struct query_line
-{
-  /**
-   * Desired type (GNUNET_DNSPARSER_TYPE_XXX). (NBO)
-   */
-  uint16_t type GNUNET_PACKED;
-
-  /**
-   * Desired class (usually GNUNET_DNSPARSER_CLASS_INTERNET). (NBO)
-   */
-  uint16_t class GNUNET_PACKED;
-};
-
-
-/**
- * General DNS record prefix.
- */
-struct record_line
-{
-  /**
-   * Record type (GNUNET_DNSPARSER_TYPE_XXX). (NBO)
-   */
-  uint16_t type GNUNET_PACKED;
-
-  /**
-   * Record class (usually GNUNET_DNSPARSER_CLASS_INTERNET). (NBO)
-   */
-  uint16_t class GNUNET_PACKED;
-
-  /**
-   * Expiration for the record (in seconds). (NBO)
-   */
-  uint32_t ttl GNUNET_PACKED;
-
-  /**
-   * Number of bytes of data that follow. (NBO)
-   */
-  uint16_t data_len GNUNET_PACKED;
-};
-
-
-/**
- * Payload of DNS SOA record (header).
- */
-struct soa_data
-{
-  /**
-   * The version number of the original copy of the zone.   (NBO)
-   */
-  uint32_t serial GNUNET_PACKED;
-  
-  /**
-   * Time interval before the zone should be refreshed. (NBO)
-   */
-  uint32_t refresh GNUNET_PACKED;
-  
-  /**
-   * Time interval that should elapse before a failed refresh should
-   * be retried. (NBO)
-   */
-  uint32_t retry GNUNET_PACKED;
- 
-  /**
-   * Time value that specifies the upper limit on the time interval
-   * that can elapse before the zone is no longer authoritative. (NBO)
-   */
-  uint32_t expire GNUNET_PACKED;
-
-  /**
-   * The bit minimum TTL field that should be exported with any RR
-   * from this zone. (NBO)
-   */
-  uint32_t minimum GNUNET_PACKED;
-};
-
-
-/**
- * Payload of DNS SRV record (header).
- */
-struct srv_data
-{
-
-  /**
-   * Preference for this entry (lower value is higher preference).  Clients
-   * will contact hosts from the lowest-priority group first and fall back
-   * to higher priorities if the low-priority entries are unavailable. (NBO)
-   */
-  uint16_t prio GNUNET_PACKED;
-
-  /**
-   * Relative weight for records with the same priority.  Clients will use
-   * the hosts of the same (lowest) priority with a probability proportional
-   * to the weight given. (NBO)
-   */
-  uint16_t weight GNUNET_PACKED;
-
-  /**
-   * TCP or UDP port of the service. (NBO)
-   */
-  uint16_t port GNUNET_PACKED;
-
-  /* followed by 'target' name */
-};
-
-
-/**
- * Payload of GNS VPN record
- */
-struct vpn_data
-{
-  /**
-   * The peer to contact
-   */
-  struct GNUNET_HashCode peer;
-
-  /**
-   * The protocol to use
-   */
-  uint16_t proto GNUNET_PACKED;
-
-
-  /* followed by the servicename / identifier / password (0-terminated) */
-};
-
-GNUNET_NETWORK_STRUCT_END
diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c
index ece96db71..ed09d49b1 100644
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/dns/gnunet-dns-monitor.c
@@ -94,9 +94,9 @@ get_class (uint16_t class)
   static char buf[6];
   switch (class)
   {
-  case GNUNET_DNSPARSER_CLASS_INTERNET: return "IN";
-  case GNUNET_DNSPARSER_CLASS_CHAOS: return "CHAOS";
-  case GNUNET_DNSPARSER_CLASS_HESIOD: return "HESIOD";
+  case GNUNET_TUN_DNS_CLASS_INTERNET: return "IN";
+  case GNUNET_TUN_DNS_CLASS_CHAOS: return "CHAOS";
+  case GNUNET_TUN_DNS_CLASS_HESIOD: return "HESIOD";
   }
   GNUNET_snprintf (buf, sizeof (buf), "%u", (unsigned int) class);
   return buf;
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index 4a94283ab..ac410d3ed 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -835,7 +835,7 @@ handle_client_response (void *cls GNUNET_UNUSED,
       /* if query changed to answer, move past DNS resolution phase... */
       if ( (RP_QUERY == rr->phase) &&
            (rr->payload_length > sizeof (struct GNUNET_TUN_DnsHeader)) &&
-           ((struct GNUNET_DNSPARSER_Flags*)&(((struct GNUNET_TUN_DnsHeader*) rr->payload)->flags))->query_or_response == 1)
+           ((struct GNUNET_TUN_DnsFlags*)&(((struct GNUNET_TUN_DnsHeader*) rr->payload)->flags))->query_or_response == 1)
       {
         rr->phase = RP_INTERNET_DNS;
         GNUNET_array_grow (rr->client_wait_list,