- Fix windows compile to compile with sldns.

git-svn-id: file:///svn/unbound/trunk@3024 be551aaa-1e26-0410-a405-d3ace91eadb9

configure

@@ -16955,7 +16955,7 @@ else
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 #include <openssl/conf.h>
-/* routine to load gost (from ldns) */
+/* routine to load gost (from sldns) */
 int load_gost_id(void)
 {
 	static int gost_id = 0;

configure.ac

@@ -614,7 +614,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 #include <openssl/conf.h>
-/* routine to load gost (from ldns) */
+/* routine to load gost (from sldns) */
 int load_gost_id(void)
 {
 	static int gost_id = 0;

doc/Changelog

@@ -1,5 +1,6 @@
 3 Dec 2013: Wouter
 	- Fix sldns to use sldns_ prefix for all ldns_ variables.
+	- Fix windows compile to compile with sldns.
 
 30 Nov 2013: Wouter
 	- Fix sldns to make globals use sldns_ prefix.  This fixes

doc/README

@@ -10,14 +10,11 @@ This software is under BSD license, see LICENSE for details.
   	http://unbound.net/svn/
 
 * Uses the following libraries; 
-  * ldns	http://www.nlnetlabs.nl/ldns/			(BSD license)
-    (required) can use ldns build directory directly with --with-ldns=path.
   * libevent	http://www.monkey.org/~provos/libevent/		(BSD license)
     (optional) can use builtin alternative instead.
+  * libexpat	(for the unbound-anchor helper program)		(MIT license)
 
 * Make and install: ./configure; make; make install
-  * --with-ldns=/path/to/ldns
-	It will dynamically link against it.
   * --with-libevent=/path/to/libevent
   	Can be set to either the system install or the build directory.
 	--with-libevent=no (default) gives a builtin alternative 
@@ -36,8 +33,8 @@ This software is under BSD license, see LICENSE for details.
 	programming errors, among which buffer overflows.  The program exits
 	with an error if an assertion fails (but the buffer did not overflow).
   * --enable-static-exe
-	This enables a debug option to statically link, against ldns and 
+	This enables a debug option to statically link against the
-	libevent libraries.
+	libevent library.
   * --enable-lock-checks
   	This enables a debug option to check lock and unlock calls. It needs
 	a recent pthreads library to work.

winrc/README.txt

@@ -43,28 +43,18 @@ Note, if your username contains a space, create a directory
 C:\msys\...\home\user to work in (click on MSYS; type: mkdir /home/user ).
 
 2. Install openssl, or compile it yourself.  http://www.openssl.org
-Ldns and unbound need the header files and libraries.  Static linking makes
+Unbounds need the header files and libraries.  Static linking makes
 things easier.  This is an open source library for cryptographic functions.
+And libexpat is needed.
 
-3. Compile LDNS
+3. Compile Unbound
-Get the source code tarball  http://nlnetlabs.nl/ldns
-Move it into the C:\msys\...\home\user directory.
-Double click on the MSYS icon and give these commands
-$ cd /home/user
-$ tar xzvf ldns-xxx.tar.gz
-$ cd ldns-xxx
-$ ./configure
-If you compiled openssl yourself, pass --with-ssl=../openssl-xxx
-$ make
-
-4. Compile Unbound
 Get the source code tarball  http://unbound.net
 Move it into the C:\msys\...\home\user directory.
 Double click on the MSYS icon and give these commands
 $ cd /home/user
 $ tar xzvf unbound-xxx.tar.gz
 $ cd unbound-xxx
-$ ./configure --enable-static-exe --with-ldns=../ldns-xxx
+$ ./configure --enable-static-exe
 If you compiled openssl yourself, pass --with-ssl=../openssl-xxx too.
 If you compiled libexpat yourself, pass --with-libexpat=../expat-install too.
 The configure options for libevent or threads are not applicable for 

winrc/anchor-update.c

@@ -79,37 +79,27 @@ do_lookup(struct ub_ctx* ctx, char* domain)
 	return result;
 }
 
-/** get answer into ldns rr list */
-static sldns_rr_list*
-result2answer(struct ub_result* result)
-{
-	sldns_pkt* p = NULL;
-	sldns_rr_list* a;
-	if(sldns_wire2pkt(&p, result->answer_packet, (size_t)result->answer_len) 
-		!= LDNS_STATUS_OK) 
-		return NULL;
-	a = sldns_pkt_answer(p);
-	sldns_pkt_set_answer(p, NULL);
-	sldns_pkt_free(p);
-	return a;
-}
-
 /** print result to file */
 static void
 do_print(struct ub_result* result, char* file)
 {
-	FILE* out;
+	FILE* out = fopen(file, "w");
-	sldns_rr_list* list = result2answer(result);
+	char s[65535], t[32];
-	if(!list) fatal("result2answer failed");
+	int i;
-	
-	out = fopen(file, "w");
 	if(!out) {
 		perror(file);
 		fatal("fopen failed");
 	}
-	sldns_rr_list_print(out, list);
+	i = 0;
+	while(result->data[i]) {
+		sldns_wire2str_rdata_buf((uint8_t*)result->data[i],
+			(size_t)result->len[i], s, sizeof(s),
+			(uint16_t)result->qtype)
+		sldns_wire2str_type_buf((uint16_t)result->qtype, t, sizeof(t));
+		fprintf(out, "%s\t%s\t%s\n", result->qname, t, s);
+		i++;
+	}
 	fclose(out);
-	sldns_rr_list_deep_free(list);
 }
 
 /** update domain to file */