diff options
Diffstat (limited to 'testcode')
-rw-r--r-- | testcode/asynclook.c | 2 | ||||
-rw-r--r-- | testcode/delayer.c | 2 | ||||
-rw-r--r-- | testcode/fake_event.c | 6 | ||||
-rw-r--r-- | testcode/perf.c | 6 | ||||
-rw-r--r-- | testcode/pktview.c | 4 | ||||
-rw-r--r-- | testcode/readhex.c | 4 | ||||
-rw-r--r-- | testcode/replay.c | 2 | ||||
-rw-r--r-- | testcode/streamtcp.c | 6 | ||||
-rw-r--r-- | testcode/testbound.c | 2 | ||||
-rw-r--r-- | testcode/testpkts.c | 10 | ||||
-rw-r--r-- | testcode/unitanchor.c | 4 | ||||
-rw-r--r-- | testcode/unitdname.c | 4 | ||||
-rw-r--r-- | testcode/unitldns.c | 6 | ||||
-rw-r--r-- | testcode/unitmain.c | 4 | ||||
-rw-r--r-- | testcode/unitmsgparse.c | 9 | ||||
-rw-r--r-- | testcode/unitneg.c | 2 | ||||
-rw-r--r-- | testcode/unitverify.c | 8 |
17 files changed, 42 insertions, 39 deletions
diff --git a/testcode/asynclook.c b/testcode/asynclook.c index 7e9ee77580a3..534489735bb2 100644 --- a/testcode/asynclook.c +++ b/testcode/asynclook.c @@ -48,7 +48,7 @@ #include "libunbound/context.h" #include "util/locks.h" #include "util/log.h" -#include "ldns/rrdef.h" +#include "sldns/rrdef.h" #ifdef UNBOUND_ALLOC_LITE #undef malloc #undef calloc diff --git a/testcode/delayer.c b/testcode/delayer.c index 7a90fc04ce78..050cbd23e759 100644 --- a/testcode/delayer.c +++ b/testcode/delayer.c @@ -50,7 +50,7 @@ #include <sys/time.h> #include "util/net_help.h" #include "util/config_file.h" -#include "ldns/sbuffer.h" +#include "sldns/sbuffer.h" #include <signal.h> /** number of reads per select for delayer */ diff --git a/testcode/fake_event.c b/testcode/fake_event.c index de453aaa28a9..4335a8f220b7 100644 --- a/testcode/fake_event.c +++ b/testcode/fake_event.c @@ -60,9 +60,9 @@ #include "testcode/testpkts.h" #include "util/log.h" #include "util/fptr_wlist.h" -#include "ldns/sbuffer.h" -#include "ldns/wire2str.h" -#include "ldns/str2wire.h" +#include "sldns/sbuffer.h" +#include "sldns/wire2str.h" +#include "sldns/str2wire.h" #include <signal.h> struct worker; struct daemon_remote; diff --git a/testcode/perf.c b/testcode/perf.c index c51eee4b161d..320cbc933e9e 100644 --- a/testcode/perf.c +++ b/testcode/perf.c @@ -50,9 +50,9 @@ #include "util/data/msgencode.h" #include "util/data/msgreply.h" #include "util/data/msgparse.h" -#include "ldns/sbuffer.h" -#include "ldns/wire2str.h" -#include "ldns/str2wire.h" +#include "sldns/sbuffer.h" +#include "sldns/wire2str.h" +#include "sldns/str2wire.h" #include <sys/time.h> /** usage information for perf */ diff --git a/testcode/pktview.c b/testcode/pktview.c index e59283fa854c..12e0d8edbb68 100644 --- a/testcode/pktview.c +++ b/testcode/pktview.c @@ -45,8 +45,8 @@ #include "util/data/msgparse.h" #include "testcode/unitmain.h" #include "testcode/readhex.h" -#include "ldns/sbuffer.h" -#include "ldns/parseutil.h" +#include "sldns/sbuffer.h" +#include "sldns/parseutil.h" /** usage information for pktview */ static void usage(char* argv[]) diff --git a/testcode/readhex.c b/testcode/readhex.c index d9aba09b7102..e871def0ec45 100644 --- a/testcode/readhex.c +++ b/testcode/readhex.c @@ -41,8 +41,8 @@ #include <ctype.h> #include "testcode/readhex.h" #include "util/log.h" -#include "ldns/sbuffer.h" -#include "ldns/parseutil.h" +#include "sldns/sbuffer.h" +#include "sldns/parseutil.h" /** skip whitespace */ static void diff --git a/testcode/replay.c b/testcode/replay.c index 5c1197146396..01b17a7f7d0c 100644 --- a/testcode/replay.c +++ b/testcode/replay.c @@ -50,7 +50,7 @@ #include "testcode/replay.h" #include "testcode/testpkts.h" #include "testcode/fake_event.h" -#include "ldns/str2wire.h" +#include "sldns/str2wire.h" /** max length of lines in file */ #define MAX_LINE_LEN 10240 diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c index d93ab966d564..c5919428a52e 100644 --- a/testcode/streamtcp.c +++ b/testcode/streamtcp.c @@ -51,9 +51,9 @@ #include "util/data/msgparse.h" #include "util/data/msgreply.h" #include "util/data/dname.h" -#include "ldns/sbuffer.h" -#include "ldns/str2wire.h" -#include "ldns/wire2str.h" +#include "sldns/sbuffer.h" +#include "sldns/str2wire.h" +#include "sldns/wire2str.h" #include <openssl/ssl.h> #include <openssl/rand.h> #include <openssl/err.h> diff --git a/testcode/testbound.c b/testcode/testbound.c index daf8ddd41547..fa361c4ead64 100644 --- a/testcode/testbound.c +++ b/testcode/testbound.c @@ -47,7 +47,7 @@ #include "testcode/fake_event.h" #include "daemon/remote.h" #include "util/config_file.h" -#include "ldns/keyraw.h" +#include "sldns/keyraw.h" #include <ctype.h> /** signal that this is a testbound compile */ diff --git a/testcode/testpkts.c b/testcode/testpkts.c index a494d9f01d7b..d1960a4108b5 100644 --- a/testcode/testpkts.c +++ b/testcode/testpkts.c @@ -27,11 +27,11 @@ struct sockaddr_storage; #include <ctype.h> #include "testcode/testpkts.h" #include "util/net_help.h" -#include "ldns/sbuffer.h" -#include "ldns/rrdef.h" -#include "ldns/pkthdr.h" -#include "ldns/str2wire.h" -#include "ldns/wire2str.h" +#include "sldns/sbuffer.h" +#include "sldns/rrdef.h" +#include "sldns/pkthdr.h" +#include "sldns/str2wire.h" +#include "sldns/wire2str.h" /** max size of a packet */ #define MAX_PACKETLEN 65536 diff --git a/testcode/unitanchor.c b/testcode/unitanchor.c index 8047eb2bf988..8819c5ab6643 100644 --- a/testcode/unitanchor.c +++ b/testcode/unitanchor.c @@ -43,8 +43,8 @@ #include "util/data/dname.h" #include "testcode/unitmain.h" #include "validator/val_anchor.h" -#include "ldns/sbuffer.h" -#include "ldns/rrdef.h" +#include "sldns/sbuffer.h" +#include "sldns/rrdef.h" /** test empty set */ static void diff --git a/testcode/unitdname.c b/testcode/unitdname.c index 83d829fae15b..238c3edf7ade 100644 --- a/testcode/unitdname.c +++ b/testcode/unitdname.c @@ -42,8 +42,8 @@ #include "util/log.h" #include "testcode/unitmain.h" #include "util/data/dname.h" -#include "ldns/sbuffer.h" -#include "ldns/str2wire.h" +#include "sldns/sbuffer.h" +#include "sldns/str2wire.h" /** put dname into buffer */ static sldns_buffer* diff --git a/testcode/unitldns.c b/testcode/unitldns.c index 65170a82526f..e27e46eaa926 100644 --- a/testcode/unitldns.c +++ b/testcode/unitldns.c @@ -41,9 +41,9 @@ #include "config.h" #include "util/log.h" #include "testcode/unitmain.h" -#include "ldns/sbuffer.h" -#include "ldns/str2wire.h" -#include "ldns/wire2str.h" +#include "sldns/sbuffer.h" +#include "sldns/str2wire.h" +#include "sldns/wire2str.h" /** verbose this unit test */ static int vbmp = 0; diff --git a/testcode/unitmain.c b/testcode/unitmain.c index 4673214adc04..09ebba329821 100644 --- a/testcode/unitmain.c +++ b/testcode/unitmain.c @@ -61,8 +61,8 @@ #include "nss.h" #endif -#include "ldns/rrdef.h" -#include "ldns/keyraw.h" +#include "sldns/rrdef.h" +#include "sldns/keyraw.h" #include "util/log.h" #include "testcode/unitmain.h" diff --git a/testcode/unitmsgparse.c b/testcode/unitmsgparse.c index b33a2408d4e7..627d10b78ec3 100644 --- a/testcode/unitmsgparse.c +++ b/testcode/unitmsgparse.c @@ -51,9 +51,9 @@ #include "util/net_help.h" #include "testcode/readhex.h" #include "testcode/testpkts.h" -#include "ldns/sbuffer.h" -#include "ldns/str2wire.h" -#include "ldns/wire2str.h" +#include "sldns/sbuffer.h" +#include "sldns/str2wire.h" +#include "sldns/wire2str.h" /** verbose message parse unit test */ static int vbmp = 0; @@ -497,9 +497,11 @@ testfromdrillfile(sldns_buffer* pkt, struct alloc_cache* alloc, void msgparse_test(void) { + time_t origttl = MAX_NEG_TTL; sldns_buffer* pkt = sldns_buffer_new(65553); sldns_buffer* out = sldns_buffer_new(65553); struct alloc_cache super_a, alloc; + MAX_NEG_TTL = 86400; /* init */ alloc_init(&super_a, NULL, 0); alloc_init(&alloc, &super_a, 2); @@ -536,4 +538,5 @@ void msgparse_test(void) alloc_clear(&super_a); sldns_buffer_free(pkt); sldns_buffer_free(out); + MAX_NEG_TTL = origttl; } diff --git a/testcode/unitneg.c b/testcode/unitneg.c index d3968409519e..36fa6b906e3f 100644 --- a/testcode/unitneg.c +++ b/testcode/unitneg.c @@ -45,7 +45,7 @@ #include "util/data/dname.h" #include "testcode/unitmain.h" #include "validator/val_neg.h" -#include "ldns/rrdef.h" +#include "sldns/rrdef.h" /** verbose unit test for negative cache */ static int negverbose = 0; diff --git a/testcode/unitverify.c b/testcode/unitverify.c index 2074f3c4ee22..078af0a9c7c5 100644 --- a/testcode/unitverify.c +++ b/testcode/unitverify.c @@ -56,10 +56,10 @@ #include "util/net_help.h" #include "util/module.h" #include "util/config_file.h" -#include "ldns/sbuffer.h" -#include "ldns/keyraw.h" -#include "ldns/str2wire.h" -#include "ldns/wire2str.h" +#include "sldns/sbuffer.h" +#include "sldns/keyraw.h" +#include "sldns/str2wire.h" +#include "sldns/wire2str.h" /** verbose signature test */ static int vsig = 0; |