[GNUnet-SVN] r18918 - in gnunet/src: dns include vpn

[gnunet]

Author: grothoff
Date: 2012-01-02 06:06:30 +0100 (Mon, 02 Jan 2012)
New Revision: 18918

Modified:
   gnunet/src/dns/dns_api.c
   gnunet/src/dns/gnunet-service-dns.c
   gnunet/src/include/gnunet_dns_service.h
   gnunet/src/vpn/gnunet-daemon-vpn.h
Log:
-again moving towards DNS API sanity

Modified: gnunet/src/dns/dns_api.c
===================================================================
--- gnunet/src/dns/dns_api.c    2012-01-02 05:03:07 UTC (rev 18917)
+++ gnunet/src/dns/dns_api.c    2012-01-02 05:06:30 UTC (rev 18918)
@@ -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 @@
 {
   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 @@
   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);

Modified: gnunet/src/dns/gnunet-service-dns.c
===================================================================
--- gnunet/src/dns/gnunet-service-dns.c 2012-01-02 05:03:07 UTC (rev 18917)
+++ gnunet/src/dns/gnunet-service-dns.c 2012-01-02 05:06:30 UTC (rev 18918)
@@ -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;

Modified: gnunet/src/include/gnunet_dns_service.h
===================================================================
--- gnunet/src/include/gnunet_dns_service.h     2012-01-02 05:03:07 UTC (rev 
18917)
+++ gnunet/src/include/gnunet_dns_service.h     2012-01-02 05:06:30 UTC (rev 
18918)
@@ -117,15 +117,7 @@
 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
  * a DNS reply is obtained.

Modified: gnunet/src/vpn/gnunet-daemon-vpn.h
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.h  2012-01-02 05:03:07 UTC (rev 18917)
+++ gnunet/src/vpn/gnunet-daemon-vpn.h  2012-01-02 05:06:30 UTC (rev 18918)
@@ -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;