From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Wed, 7 Sep 2005 15:02:15 +0000 (+0000)
Subject: committed patch from Håkan Olsson
X-Git-Tag: release-1.0.0~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=807113e63e4ceec6f7c0a2ffa1fe527f940e668b;p=thirdparty%2Fldns.git

committed patch from Håkan Olsson
---

diff --git a/dnssec.c b/dnssec.c
index 63f1df99..5827d1af 100644
--- a/dnssec.c
+++ b/dnssec.c
@@ -24,6 +24,7 @@
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#include <openssl/md5.h>
 
 uint16_t
 ldns_calc_keytag(ldns_rr *key)
diff --git a/host2wire.c b/host2wire.c
index 86959dca..4fa87f18 100644
--- a/host2wire.c
+++ b/host2wire.c
@@ -162,7 +162,7 @@ ldns_hdr2buffer_wire(ldns_buffer *buffer, const ldns_pkt *packet)
 		ldns_buffer_write_u16(buffer, ldns_pkt_id(packet));
 		
 		flags = ldns_pkt_qr(packet) << 7
-		        | ldns_pkt_get_opcode(packet) << 6
+		        | ldns_pkt_get_opcode(packet) << 3
 		        | ldns_pkt_aa(packet) << 2
 		        | ldns_pkt_tc(packet) << 1
 		        | ldns_pkt_rd(packet);
diff --git a/ldns/dns.h b/ldns/dns.h
index c257d3dc..b2f2b021 100644
--- a/ldns/dns.h
+++ b/ldns/dns.h
@@ -14,6 +14,8 @@
 #ifndef _LDNS_DNS_H_
 #define _LDNS_DNS_H_
 
+#include <stdio.h>
+
 #include <ldns/util.h>
 #include <ldns/buffer.h>
 #include <ldns/common.h>
diff --git a/net.c b/net.c
index 0b140ff0..dda05672 100644
--- a/net.c
+++ b/net.c
@@ -325,6 +325,7 @@ ldns_udp_read_wire(int sockfd, size_t *size, struct sockaddr_storage *from,
 {
 	uint8_t *wire;
 	ssize_t wire_size;
+	socklen_t flen;
 
 	wire = LDNS_XMALLOC(uint8_t, LDNS_MAX_PACKETLEN);
 	if (!wire) {
@@ -333,7 +334,14 @@ ldns_udp_read_wire(int sockfd, size_t *size, struct sockaddr_storage *from,
 	}
 
 	wire_size = recvfrom(sockfd, wire, LDNS_MAX_PACKETLEN, 0, 
-			(struct sockaddr*) from, fromlen);
+			(struct sockaddr*) from, &flen);
+
+	if (from) {
+		if (fromlen) {
+			*fromlen = flen;
+		}
+		printf("from len %d\n", (int)flen);
+	}
 
 	if (wire_size == -1) {
 		if (errno == EAGAIN) {