aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-01-02 05:06:30 +0000
committerChristian Grothoff <christian@grothoff.org>2012-01-02 05:06:30 +0000
commit8025ab3ecdbaf1d0e5128bb21a443545848139ae (patch)
treea2c106c19a31028ad28aa498b1183695e1111c76
parentb75373955d92c8ac1e9554182025843c01cbb96c (diff)
downloadgnunet-8025ab3ecdbaf1d0e5128bb21a443545848139ae.tar.gz
gnunet-8025ab3ecdbaf1d0e5128bb21a443545848139ae.zip
-again moving towards DNS API sanity
-rw-r--r--src/dns/dns_api.c11
-rw-r--r--src/dns/gnunet-service-dns.c10
-rw-r--r--src/include/gnunet_dns_service.h8
-rw-r--r--src/vpn/gnunet-daemon-vpn.h10
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 @@
38 38
39struct query_packet_list 39struct query_packet_list
40{ 40{
41 struct query_packet_list *next GNUNET_PACKED; 41 struct query_packet_list *next;
42 struct query_packet_list *prev GNUNET_PACKED; 42 struct query_packet_list *prev;
43 struct query_packet pkt; 43 struct query_packet pkt;
44}; 44};
45 45
46 46
47
48struct GNUNET_DNS_Handle 47struct GNUNET_DNS_Handle
49{ 48{
50 struct query_packet_list *head; 49 struct query_packet_list *head;
@@ -279,8 +278,8 @@ GNUNET_DNS_queue_request_v4 (struct GNUNET_DNS_Handle *h,
279{ 278{
280 size_t len = sizeof (struct query_packet) + udp_packet_len - 1; 279 size_t len = sizeof (struct query_packet) + udp_packet_len - 1;
281 struct query_packet_list *query = 280 struct query_packet_list *query =
282 GNUNET_malloc (len + sizeof (struct answer_packet_list) - 281 GNUNET_malloc (len + sizeof (struct query_packet_list) -
283 sizeof (struct answer_packet)); 282 sizeof (struct query_packet));
284 query->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_QUERY_DNS); 283 query->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_QUERY_DNS);
285 query->pkt.hdr.size = htons (len); 284 query->pkt.hdr.size = htons (len);
286 memcpy (query->pkt.orig_to, dst_ip, 4); 285 memcpy (query->pkt.orig_to, dst_ip, 4);
@@ -314,7 +313,7 @@ GNUNET_DNS_queue_request_v6 (struct GNUNET_DNS_Handle *h,
314 size_t len = 313 size_t len =
315 sizeof (struct query_packet) + udp_packet_len - 1; 314 sizeof (struct query_packet) + udp_packet_len - 1;
316 struct query_packet_list *query = 315 struct query_packet_list *query =
317 GNUNET_malloc (len + sizeof (struct answer_packet_list) - 316 GNUNET_malloc (len + sizeof (struct query_packet_list) -
318 sizeof (struct answer_packet)); 317 sizeof (struct answer_packet));
319 query->pkt.hdr.type = 318 query->pkt.hdr.type =
320 htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_QUERY_DNS); 319 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 @@
45 45
46 46
47 47
48struct answer_packet_list
49{
50 struct answer_packet_list *next GNUNET_PACKED;
51 struct answer_packet_list *prev GNUNET_PACKED;
52 struct GNUNET_SERVER_Client *client;
53 struct answer_packet pkt;
54};
55
56
57
48static struct GNUNET_MESH_Handle *mesh_handle; 58static struct GNUNET_MESH_Handle *mesh_handle;
49 59
50static struct GNUNET_CONNECTION_TransmitHandle *server_notify; 60static 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
117GNUNET_NETWORK_STRUCT_END 117GNUNET_NETWORK_STRUCT_END
118 118
119 119
120struct answer_packet_list
121{
122 struct answer_packet_list *next GNUNET_PACKED;
123 struct answer_packet_list *prev GNUNET_PACKED;
124 struct GNUNET_SERVER_Client *client;
125 struct answer_packet pkt;
126};
127
128 120
129/** 121/**
130 * Type of a function to be called by the DNS API whenever 122 * 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 @@
28 28
29#include "gnunet_dns_service.h" 29#include "gnunet_dns_service.h"
30 30
31struct answer_packet_list
32{
33 struct answer_packet_list *next GNUNET_PACKED;
34 struct answer_packet_list *prev GNUNET_PACKED;
35 struct GNUNET_SERVER_Client *client;
36 struct answer_packet pkt;
37};
38
39
40
31extern struct answer_packet_list *answer_proc_head; 41extern struct answer_packet_list *answer_proc_head;
32 42
33extern struct answer_packet_list *answer_proc_tail; 43extern struct answer_packet_list *answer_proc_tail;