From 8025ab3ecdbaf1d0e5128bb21a443545848139ae Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 2 Jan 2012 05:06:30 +0000
Subject: -again moving towards DNS API sanity

---
 src/dns/dns_api.c                | 11 +++++------
 src/dns/gnunet-service-dns.c     | 10 ++++++++++
 src/include/gnunet_dns_service.h |  8 --------
 src/vpn/gnunet-daemon-vpn.h      | 10 ++++++++++
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c
index 7a1577365..b434fc1e7 100644
--- a/src/dns/dns_api.c
+++ b/src/dns/dns_api.c
@@ -38,13 +38,12 @@
 
 struct query_packet_list
 {
-  struct query_packet_list *next GNUNET_PACKED;
-  struct query_packet_list *prev GNUNET_PACKED;
+  struct query_packet_list *next;
+  struct query_packet_list *prev;
   struct query_packet pkt;
 };
 
 
-
 struct GNUNET_DNS_Handle
 {
   struct query_packet_list *head;
@@ -279,8 +278,8 @@ GNUNET_DNS_queue_request_v4 (struct GNUNET_DNS_Handle *h,
 {
   size_t len = sizeof (struct query_packet) + udp_packet_len - 1;
   struct query_packet_list *query =
-    GNUNET_malloc (len + sizeof (struct answer_packet_list) -
-		   sizeof (struct answer_packet));
+    GNUNET_malloc (len + sizeof (struct query_packet_list) -
+		   sizeof (struct query_packet));
   query->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_QUERY_DNS);
   query->pkt.hdr.size = htons (len);
   memcpy (query->pkt.orig_to, dst_ip, 4);
@@ -314,7 +313,7 @@ GNUNET_DNS_queue_request_v6 (struct GNUNET_DNS_Handle *h,
   size_t len =
     sizeof (struct query_packet) + udp_packet_len - 1;
   struct query_packet_list *query =
-    GNUNET_malloc (len + sizeof (struct answer_packet_list) -
+    GNUNET_malloc (len + sizeof (struct query_packet_list) -
 		   sizeof (struct answer_packet));
   query->pkt.hdr.type =
     htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_QUERY_DNS);
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index 7d24e630f..15f0ea492 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -45,6 +45,16 @@
 
 
 
+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;
+};
+
+
+
 static struct GNUNET_MESH_Handle *mesh_handle;
 
 static struct GNUNET_CONNECTION_TransmitHandle *server_notify;
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index d697b9c16..329a083ff 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -117,14 +117,6 @@ struct answer_packet
 GNUNET_NETWORK_STRUCT_END
 
 
-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;
-};
-
 
 /**
  * Type of a function to be called by the DNS API whenever
diff --git a/src/vpn/gnunet-daemon-vpn.h b/src/vpn/gnunet-daemon-vpn.h
index c2970402c..e4c259ec4 100644
--- a/src/vpn/gnunet-daemon-vpn.h
+++ b/src/vpn/gnunet-daemon-vpn.h
@@ -28,6 +28,16 @@
 
 #include "gnunet_dns_service.h"
 
+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;
+};
+
+
+
 extern struct answer_packet_list *answer_proc_head;
 
 extern struct answer_packet_list *answer_proc_tail;
-- 
cgit v1.2.3