diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-02 05:06:30 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-02 05:06:30 +0000 |
commit | 8025ab3ecdbaf1d0e5128bb21a443545848139ae (patch) | |
tree | a2c106c19a31028ad28aa498b1183695e1111c76 /src/dns/dns_api.c | |
parent | b75373955d92c8ac1e9554182025843c01cbb96c (diff) | |
download | gnunet-8025ab3ecdbaf1d0e5128bb21a443545848139ae.tar.gz gnunet-8025ab3ecdbaf1d0e5128bb21a443545848139ae.zip |
-again moving towards DNS API sanity
Diffstat (limited to 'src/dns/dns_api.c')
-rw-r--r-- | src/dns/dns_api.c | 11 |
1 files changed, 5 insertions, 6 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 | ||
39 | struct query_packet_list | 39 | struct 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 | |||
48 | struct GNUNET_DNS_Handle | 47 | struct 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); |