-again moving towards DNS API sanity

diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c
index 7a1577365969b88c49667b408c9ff717af34821b..b434fc1e7247725158bd401d7791ef06e337f301 100644 (file)
--- 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 7d24e630fbfaf76a10be002328da488da7c7273d..15f0ea49250732661460210f5966beff2555fb58 100644 (file)
--- 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 d697b9c16b903e11c316aa0d09d6d50ad1cd7a8f..329a083ff7668afb61c0e2d3220aabbe230a356d 100644 (file)
--- 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 c2970402c86756b23aa0da0e5e77035c8a497b83..e4c259ec4a9152c35b925eceeaeb9064f0f5597a 100644 (file)
--- 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;