From 34bbea2eaae53172cdf6513ba9aefd7fe587d81d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 13 Oct 2014 14:35:41 +0100 Subject: [PATCH] COMPARISON FIXUP - get regress/ from wip.ipv6.2014-10-13.tip --- regress/Makefile.in | 10 +++++ regress/case-abbrevto.out | 2 +- regress/case-addr-multi-af.out | 10 ++--- regress/case-bogus-sortlist.err | 1 + regress/case-bogus-sortlist.out | 7 +++ regress/case-bogus-sortlist.sys | 2 + regress/case-datapluscname.out | 2 +- regress/case-manyptrwrongrty.out | 2 +- regress/case-ptr-aaaa-caps.err | 0 regress/case-ptr-aaaa-caps.out | 5 +++ regress/case-ptr-aaaa-caps.sys | 73 ++++++++++++++++++++++++++++++++ regress/case-ptrbaddom2.err | 0 regress/case-ptrbaddom2.out | 8 ++++ regress/case-ptrbaddom2.sys | 15 +++++++ regress/case-tcpallfail.out | 2 +- regress/case-tcpblock.out | 2 +- regress/case-tcpblockbrk.out | 2 +- regress/case-tcpblockwr.out | 6 +-- regress/case-v6-map.out | 4 +- regress/gdbwrap | 37 ++++++++++++++++ regress/init-bogus-sortlist.text | 3 ++ regress/r1test | 2 +- 22 files changed, 178 insertions(+), 17 deletions(-) create mode 100644 regress/case-bogus-sortlist.err create mode 100644 regress/case-bogus-sortlist.out create mode 100644 regress/case-bogus-sortlist.sys create mode 100644 regress/case-ptr-aaaa-caps.err create mode 100644 regress/case-ptr-aaaa-caps.out create mode 100644 regress/case-ptr-aaaa-caps.sys create mode 100644 regress/case-ptrbaddom2.err create mode 100644 regress/case-ptrbaddom2.out create mode 100644 regress/case-ptrbaddom2.sys create mode 100755 regress/gdbwrap create mode 100644 regress/init-bogus-sortlist.text diff --git a/regress/Makefile.in b/regress/Makefile.in index 7428965..94017cc 100644 --- a/regress/Makefile.in +++ b/regress/Makefile.in @@ -56,6 +56,16 @@ LINK_CMD= $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ %_playback: %_c.o hplayback.o $(HARNLOBJS) $(LINK_CMD) +.SECONDARY: $(addsuffix _c.o, $(CLIENTS)) +# Without this, make will remove _c.o after building . +# This wastes effort. (Debian bug #4073.) +# +# Also, it exposes us to a bug (in make 3.81, at least) which can +# cause make to run the rule for building without building +# _c.o! (Debian #756123.) +# +# See also Savannah #29620, http://savannah.gnu.org/bugs/index.php?29620 + adnshost_%: $(ADH_OBJS) h%.o $(HARNLOBJS) $(LINK_CMD) diff --git a/regress/case-abbrevto.out b/regress/case-abbrevto.out index 0bc268b..cdccc4b 100644 --- a/regress/case-abbrevto.out +++ b/regress/case-abbrevto.out @@ -24,9 +24,9 @@ greenend.org.uk flags 0 type HINFO(-) ownflags=a: timeout; nrrs=0; cname=$; owne greenend.org.uk flags 0 type MX(raw) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770 greenend.org.uk flags 0 type TXT(-) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770 greenend.org.uk flags 0 type RP(raw) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770 -greenend.org.uk flags 0 type A(addr) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770 greenend.org.uk flags 0 type NS(+addr) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770 greenend.org.uk flags 0 type MX(+addr) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770 greenend.org.uk flags 0 type SOA(822) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770 greenend.org.uk flags 0 type RP(822) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770 +greenend.org.uk flags 0 type A(addr) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770 rc=0 diff --git a/regress/case-addr-multi-af.out b/regress/case-addr-multi-af.out index 7fe4ea7..d34d03b 100644 --- a/regress/case-addr-multi-af.out +++ b/regress/case-addr-multi-af.out @@ -31,6 +31,7 @@ mx.dnserr.distorted.org.uk flags 3072 type 65537 A(addr) submitted mx.dnserr.distorted.org.uk flags 3072 type 65551 MX(+addr) submitted mx.dnserr.distorted.org.uk flags 3072 type 65537 A(addr) submitted mx.dnserr.distorted.org.uk flags 3072 type 65551 MX(+addr) submitted +maddr.dnserr.distorted.org.uk flags 0 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 maddr.dnserr.distorted.org.uk flags 0 type A(addr): OK; nrrs=6; cname=$; owner=$; ttl=14400 INET 198.51.100.1 INET 198.51.100.2 @@ -38,7 +39,6 @@ maddr.dnserr.distorted.org.uk flags 0 type A(addr): OK; nrrs=6; cname=$; owner=$ INET 203.0.113.1 INET 203.0.113.2 INET 192.0.2.1 -maddr.dnserr.distorted.org.uk flags 0 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 maddr.dnserr.distorted.org.uk flags 0 type A(addr): OK; nrrs=12; cname=$; owner=$; ttl=14400 INET 198.51.100.1 INET 198.51.100.2 @@ -55,6 +55,7 @@ maddr.dnserr.distorted.org.uk flags 0 type A(addr): OK; nrrs=12; cname=$; owner= maddr.dnserr.distorted.org.uk flags 0 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 mx.dnserr.distorted.org.uk flags 0 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 mx.dnserr.distorted.org.uk flags 0 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 +maddr.dnserr.distorted.org.uk flags 1024 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 maddr.dnserr.distorted.org.uk flags 1024 type A(addr): OK; nrrs=6; cname=$; owner=$; ttl=14400 INET 198.51.100.1 INET 198.51.100.2 @@ -62,7 +63,6 @@ maddr.dnserr.distorted.org.uk flags 1024 type A(addr): OK; nrrs=6; cname=$; owne INET 192.0.2.1 INET 192.0.2.2 INET 203.0.113.1 -maddr.dnserr.distorted.org.uk flags 1024 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 maddr.dnserr.distorted.org.uk flags 1024 type A(addr): OK; nrrs=6; cname=$; owner=$; ttl=14400 INET 198.51.100.1 INET 198.51.100.2 @@ -73,6 +73,7 @@ maddr.dnserr.distorted.org.uk flags 1024 type A(addr): OK; nrrs=6; cname=$; owne maddr.dnserr.distorted.org.uk flags 1024 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 mx.dnserr.distorted.org.uk flags 1024 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 mx.dnserr.distorted.org.uk flags 1024 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 +maddr.dnserr.distorted.org.uk flags 2048 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 maddr.dnserr.distorted.org.uk flags 2048 type A(addr): OK; nrrs=6; cname=$; owner=$; ttl=14400 INET6 2001:db8:2::2 INET6 2001:db8:2::1 @@ -88,9 +89,10 @@ maddr.dnserr.distorted.org.uk flags 2048 type A(addr): OK; nrrs=6; cname=$; owne INET6 2001:db8:3::2 INET6 2001:db8:1::1 INET6 2001:db8:1::2 -maddr.dnserr.distorted.org.uk flags 2048 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 mx.dnserr.distorted.org.uk flags 2048 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 mx.dnserr.distorted.org.uk flags 2048 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 +maddr.dnserr.distorted.org.uk flags 3072 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 +maddr.dnserr.distorted.org.uk flags 3072 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 maddr.dnserr.distorted.org.uk flags 3072 type A(addr): OK; nrrs=12; cname=$; owner=$; ttl=14400 INET 198.51.100.1 INET 198.51.100.2 @@ -104,7 +106,6 @@ maddr.dnserr.distorted.org.uk flags 3072 type A(addr): OK; nrrs=12; cname=$; own INET6 2001:db8:3::1 INET6 2001:db8:3::2 INET6 2001:db8:1::1 -maddr.dnserr.distorted.org.uk flags 3072 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 maddr.dnserr.distorted.org.uk flags 3072 type A(addr): OK; nrrs=12; cname=$; owner=$; ttl=14400 INET 198.51.100.1 INET 198.51.100.2 @@ -118,7 +119,6 @@ maddr.dnserr.distorted.org.uk flags 3072 type A(addr): OK; nrrs=12; cname=$; own INET6 2001:db8:3::2 INET6 2001:db8:1::1 INET6 2001:db8:1::2 -maddr.dnserr.distorted.org.uk flags 3072 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 mx.dnserr.distorted.org.uk flags 3072 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 mx.dnserr.distorted.org.uk flags 3072 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=14400 mx.dnserr.distorted.org.uk flags 0 type MX(+addr): OK; nrrs=4; cname=$; owner=$; ttl=14400 diff --git a/regress/case-bogus-sortlist.err b/regress/case-bogus-sortlist.err new file mode 100644 index 0000000..31d3eab --- /dev/null +++ b/regress/case-bogus-sortlist.err @@ -0,0 +1 @@ +adns failure: init: errno=EINVAL diff --git a/regress/case-bogus-sortlist.out b/regress/case-bogus-sortlist.out new file mode 100644 index 0000000..1e01772 --- /dev/null +++ b/regress/case-bogus-sortlist.out @@ -0,0 +1,7 @@ +adns debug: using nameserver 172.18.45.6 +adns: :2: prefix length 24 in sortlist overlaps address `198.51.100.1' +adns: :2: prefix length 10 in sortlist overlaps address `2001:db8:2::' +adns: :2: network address `255.0.0.0' in sortlist is not in classed ranges, must specify mask explicitly +adns: :2: mask length `33' invalid +adns: :2: mask length `129' invalid +rc=2 diff --git a/regress/case-bogus-sortlist.sys b/regress/case-bogus-sortlist.sys new file mode 100644 index 0000000..bc39fa8 --- /dev/null +++ b/regress/case-bogus-sortlist.sys @@ -0,0 +1,2 @@ +./adnstest bogus-sortlist +:1 chiark.greenend.org.uk diff --git a/regress/case-datapluscname.out b/regress/case-datapluscname.out index d5b36af..fa83e09 100644 --- a/regress/case-datapluscname.out +++ b/regress/case-datapluscname.out @@ -27,11 +27,11 @@ adns debug: ignoring RR with an unexpected owner 170.168.99.219.194.in-addr.arpa 170.99.219.194.in-addr.arpa flags 292 type MX(raw): No such data; nrrs=0; cname=170.168.99.219.194.in-addr.arpa; owner=170.99.219.194.in-addr.arpa; ttl=0 170.99.219.194.in-addr.arpa flags 292 type TXT(-): No such data; nrrs=0; cname=170.168.99.219.194.in-addr.arpa; owner=170.99.219.194.in-addr.arpa; ttl=0 170.99.219.194.in-addr.arpa flags 292 type RP(raw): No such data; nrrs=0; cname=170.168.99.219.194.in-addr.arpa; owner=170.99.219.194.in-addr.arpa; ttl=0 -170.99.219.194.in-addr.arpa flags 292 type A(addr): No such data; nrrs=0; cname=170.168.99.219.194.in-addr.arpa; owner=170.99.219.194.in-addr.arpa; ttl=0 170.99.219.194.in-addr.arpa flags 292 type NS(+addr): No such data; nrrs=0; cname=170.168.99.219.194.in-addr.arpa; owner=170.99.219.194.in-addr.arpa; ttl=0 170.99.219.194.in-addr.arpa flags 292 type MX(+addr): No such data; nrrs=0; cname=170.168.99.219.194.in-addr.arpa; owner=170.99.219.194.in-addr.arpa; ttl=0 170.99.219.194.in-addr.arpa flags 292 type SOA(822): No such data; nrrs=0; cname=170.168.99.219.194.in-addr.arpa; owner=170.99.219.194.in-addr.arpa; ttl=0 170.99.219.194.in-addr.arpa flags 292 type RP(822): No such data; nrrs=0; cname=170.168.99.219.194.in-addr.arpa; owner=170.99.219.194.in-addr.arpa; ttl=0 +170.99.219.194.in-addr.arpa flags 292 type A(addr): No such data; nrrs=0; cname=170.168.99.219.194.in-addr.arpa; owner=170.99.219.194.in-addr.arpa; ttl=0 170.99.219.194.in-addr.arpa flags 292 type PTR(checked): OK; nrrs=1; cname=$; owner=170.99.219.194.in-addr.arpa; ttl=171727 proxy.scoplife.gr 170.99.219.194.in-addr.arpa flags 292 type CNAME(-): OK; nrrs=1; cname=$; owner=170.99.219.194.in-addr.arpa; ttl=171726 diff --git a/regress/case-manyptrwrongrty.out b/regress/case-manyptrwrongrty.out index 6621afd..0a0d607 100644 --- a/regress/case-manyptrwrongrty.out +++ b/regress/case-manyptrwrongrty.out @@ -117,11 +117,11 @@ adns debug: TCP connected (NS=172.18.45.6) ns.asis.org.nz ns.bouquets.co.nz agate.co.nz -254.0.99.203.in-addr.arpa flags 292 type A(addr): No such data; nrrs=0; cname=$; owner=254.0.99.203.in-addr.arpa; ttl=539 254.0.99.203.in-addr.arpa flags 292 type NS(+addr): No such data; nrrs=0; cname=$; owner=254.0.99.203.in-addr.arpa; ttl=539 254.0.99.203.in-addr.arpa flags 292 type MX(+addr): No such data; nrrs=0; cname=$; owner=254.0.99.203.in-addr.arpa; ttl=540 254.0.99.203.in-addr.arpa flags 292 type SOA(822): No such data; nrrs=0; cname=$; owner=254.0.99.203.in-addr.arpa; ttl=540 254.0.99.203.in-addr.arpa flags 292 type RP(822): No such data; nrrs=0; cname=$; owner=254.0.99.203.in-addr.arpa; ttl=539 +254.0.99.203.in-addr.arpa flags 292 type A(addr): No such data; nrrs=0; cname=$; owner=254.0.99.203.in-addr.arpa; ttl=539 254.0.99.203.in-addr.arpa flags 292 type PTR(checked): Inconsistent resource records in DNS; nrrs=0; cname=$; owner=254.0.99.203.in-addr.arpa; ttl=86351 adns debug: reply not found, id 3151, query owner mail.safes.co.nz (NS=172.18.45.6) adns debug: reply not found, id 3152, query owner ns.bcc.co.nz (NS=172.18.45.6) diff --git a/regress/case-ptr-aaaa-caps.err b/regress/case-ptr-aaaa-caps.err new file mode 100644 index 0000000..e69de29 diff --git a/regress/case-ptr-aaaa-caps.out b/regress/case-ptr-aaaa-caps.out new file mode 100644 index 0000000..1cacfc2 --- /dev/null +++ b/regress/case-ptr-aaaa-caps.out @@ -0,0 +1,5 @@ +adns debug: using nameserver 172.18.45.6 +4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.D.1.0.8.A.B.0.1.0.0.2.IP6.ARPA flags 0 type 65548 PTR(checked) submitted +4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.D.1.0.8.A.B.0.1.0.0.2.IP6.ARPA flags 0 type PTR(checked): OK; nrrs=1; cname=$; owner=$; ttl=13516 + stratocaster.colo.distorted.org.uk +rc=0 diff --git a/regress/case-ptr-aaaa-caps.sys b/regress/case-ptr-aaaa-caps.sys new file mode 100644 index 0000000..4637e7c --- /dev/null +++ b/regress/case-ptr-aaaa-caps.sys @@ -0,0 +1,73 @@ +./adnstest default +:65548 4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.D.1.0.8.A.B.0.1.0.0.2.IP6.ARPA + start 1406162686.218685 + socket domain=AF_INET type=SOCK_DGRAM + socket=6 + +0.000153 + fcntl fd=6 cmd=F_GETFL + fcntl=~O_NONBLOCK&... + +0.000069 + fcntl fd=6 cmd=F_SETFL O_NONBLOCK|... + fcntl=OK + +0.000058 + sendto fd=6 addr=172.18.45.6:53 + 311f0100 00010000 00000000 01340130 01300130 01300130 01300130 01300130 + 01300130 01300130 01300130 01320130 01300130 01390144 01310130 01380141 + 01420130 01310130 01300132 03495036 04415250 4100000c 0001. + sendto=90 + +0.000569 + select max=7 rfds=[6] wfds=[] efds=[] to=1.999431 + select=1 rfds=[6] wfds=[] efds=[] + +0.227524 + recvfrom fd=6 buflen=512 + recvfrom=OK addr=172.18.45.6:53 + 311f8180 00010001 00040008 01340130 01300130 01300130 01300130 01300130 + 01300130 01300130 01300130 01320130 01300130 01390144 01310130 01380141 + 01420130 01310130 01300132 03495036 04415250 4100000c 0001c00c 000c0001 + 000034cc 00240c73 74726174 6f636173 74657204 636f6c6f 09646973 746f7274 + 6564036f 72670275 6b00c034 00020001 000034cc 000c0970 72656369 73696f6e + c078c034 00020001 000034cc 00090672 61646975 73c078c0 34000200 01000034 + cc000a07 76616d70 697265c0 78c03400 02000100 0034cc00 0d0a7465 6c656361 + 73746572 c078c0ae 00010001 000034cc 00043e31 cc92c0ae 001c0001 000034cc + 00102001 04701f09 1b980000 00000000 0002c0c3 00010001 000034cc 00043e31 + cc96c0c3 001c0001 000034cc 00102001 04701f09 1b980000 00000000 0006c096 + 00010001 000034cc 0004d40d c646c096 001c0001 000034cc 00102001 0ba80000 + 01d90000 00000000 0006c0d9 00010001 000034cc 0004d40d c647c0d9 001c0001 + 000034cc 00102001 0ba80000 01d90000 00000000 0007. + +0.000594 + sendto fd=6 addr=172.18.45.6:53 + 31200100 00010000 00000000 0c737472 61746f63 61737465 7204636f 6c6f0964 + 6973746f 72746564 036f7267 02756b00 001c0001. + sendto=52 + +0.000187 + recvfrom fd=6 buflen=512 + recvfrom=EAGAIN + +0.000064 + select max=7 rfds=[6] wfds=[] efds=[] to=1.999155 + select=1 rfds=[6] wfds=[] efds=[] + +0.002970 + recvfrom fd=6 buflen=512 + recvfrom=OK addr=172.18.45.6:53 + 31208180 00010001 0006000c 0c737472 61746f63 61737465 7204636f 6c6f0964 + 6973746f 72746564 036f7267 02756b00 001c0001 c00c001c 00010000 34cc0010 + 20010ba8 01d90002 00000000 00000004 c01e0002 00010000 34cc000f 09707265 + 63697369 6f6e026e 73c01ec0 1e000200 01000034 cc000906 72616469 7573c066 + c01e0002 00010000 34cc0012 0f6d7974 6869632d 62656173 74732d32 c066c01e + 00020001 000034cc 000d0a74 656c6563 61737465 72c066c0 1e000200 01000034 + cc00120f 6d797468 69632d62 65617374 732d31c0 66c01e00 02000100 0034cc00 + 09066368 6961726b c066c0e1 00010001 000034cc 0004d40d c5e5c0e1 001c0001 + 000034cc 00102001 0ba801e3 00000000 00000000 0000c077 00010001 000034cc + 00043e31 cc92c077 001c0001 000034cc 00102001 04701f09 1b980000 00000000 + 0002c05c 00010001 000034cc 0004d40d c646c05c 001c0001 000034cc 00102001 + 0ba80000 01d90000 00000000 0006c0aa 00010001 000034cc 0004d40d c647c0aa + 001c0001 000034cc 00102001 0ba80000 01d90000 00000000 0007c0c3 00010001 + 000034cc 00044538 adbec0c3 001c0001 000034cc 00102600 3c000000 0000f03c + 91fffe96 beacc08c 00010001 000034cc 00045d5d 8043c08c 001c0001 000034cc + 00102a00 10980000 00801000 00000000 0010. + +0.000940 + recvfrom fd=6 buflen=512 + recvfrom=EAGAIN + +0.000110 + close fd=6 + close=OK + +0.000199 diff --git a/regress/case-ptrbaddom2.err b/regress/case-ptrbaddom2.err new file mode 100644 index 0000000..e69de29 diff --git a/regress/case-ptrbaddom2.out b/regress/case-ptrbaddom2.out new file mode 100644 index 0000000..323c633 --- /dev/null +++ b/regress/case-ptrbaddom2.out @@ -0,0 +1,8 @@ +adns debug: using nameserver 172.18.45.6 +00.45.18.172.in-addr.arpa flags 0 type 65548 PTR(checked) submitted +6.945.18.172.in-addr.arpa flags 0 type 65548 PTR(checked) submitted +4.0.0.0.g.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.d.1.0.8.a.b.0.1.0.0.2.ip6.arpa flags 0 type 65548 PTR(checked) submitted +00.45.18.172.in-addr.arpa flags 0 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800 +6.945.18.172.in-addr.arpa flags 0 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800 +4.0.0.0.g.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.d.1.0.8.a.b.0.1.0.0.2.ip6.arpa flags 0 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800 +rc=0 diff --git a/regress/case-ptrbaddom2.sys b/regress/case-ptrbaddom2.sys new file mode 100644 index 0000000..71f86a2 --- /dev/null +++ b/regress/case-ptrbaddom2.sys @@ -0,0 +1,15 @@ +./adnstest default +:65548 00.45.18.172.in-addr.arpa 6.945.18.172.in-addr.arpa 4.0.0.0.g.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.d.1.0.8.a.b.0.1.0.0.2.ip6.arpa + start 1406163217.059538 + socket domain=AF_INET type=SOCK_DGRAM + socket=6 + +0.000157 + fcntl fd=6 cmd=F_GETFL + fcntl=~O_NONBLOCK&... + +0.000069 + fcntl fd=6 cmd=F_SETFL O_NONBLOCK|... + fcntl=OK + +0.000059 + close fd=6 + close=OK + +0.000414 diff --git a/regress/case-tcpallfail.out b/regress/case-tcpallfail.out index 799b0b5..4f11177 100644 --- a/regress/case-tcpallfail.out +++ b/regress/case-tcpallfail.out @@ -26,9 +26,9 @@ test.iwj.relativity.greenend.org.uk. flags 2 type HINFO(-): All nameservers fail test.iwj.relativity.greenend.org.uk. flags 2 type MX(raw): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800 test.iwj.relativity.greenend.org.uk. flags 2 type TXT(-): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800 test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800 -test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800 test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800 test.iwj.relativity.greenend.org.uk. flags 2 type RP(822): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800 +test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800 rc=0 diff --git a/regress/case-tcpblock.out b/regress/case-tcpblock.out index dc628d3..34c8b65 100644 --- a/regress/case-tcpblock.out +++ b/regress/case-tcpblock.out @@ -25,9 +25,9 @@ test.iwj.relativity.greenend.org.uk. flags 2 type HINFO(-): DNS query timed out; test.iwj.relativity.greenend.org.uk. flags 2 type MX(raw): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770 test.iwj.relativity.greenend.org.uk. flags 2 type TXT(-): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770 test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770 -test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770 test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770 test.iwj.relativity.greenend.org.uk. flags 2 type RP(822): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770 +test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770 rc=0 diff --git a/regress/case-tcpblockbrk.out b/regress/case-tcpblockbrk.out index 4b7e9bc..2b867e3 100644 --- a/regress/case-tcpblockbrk.out +++ b/regress/case-tcpblockbrk.out @@ -27,9 +27,9 @@ test.iwj.relativity.greenend.org.uk. flags 2 type HINFO(-): All nameservers fail test.iwj.relativity.greenend.org.uk. flags 2 type MX(raw): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798 test.iwj.relativity.greenend.org.uk. flags 2 type TXT(-): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798 test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798 -test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798 test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798 test.iwj.relativity.greenend.org.uk. flags 2 type RP(822): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798 +test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798 rc=0 diff --git a/regress/case-tcpblockwr.out b/regress/case-tcpblockwr.out index 4b84e30..f050875 100644 --- a/regress/case-tcpblockwr.out +++ b/regress/case-tcpblockwr.out @@ -59,7 +59,6 @@ test.iwj.relativity.greenend.org.uk. flags 2 type HINFO(-): No such data; nrrs=0 test.iwj.relativity.greenend.org.uk. flags 2 type MX(raw): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type TXT(-): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): No such data; nrrs=0; cname=$; owner=$; ttl=59 -test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): OK; nrrs=1; cname=$; owner=$; ttl=59 ns0.relativity.greenend.org.uk ok 0 ok "OK" ( INET 172.18.45.6 ) test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=59 @@ -77,7 +76,6 @@ test.iwj.relativity.greenend.org.uk. flags 2 type HINFO(-): No such data; nrrs=0 test.iwj.relativity.greenend.org.uk. flags 2 type MX(raw): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type TXT(-): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): No such data; nrrs=0; cname=$; owner=$; ttl=59 -test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): OK; nrrs=1; cname=$; owner=$; ttl=59 ns0.relativity.greenend.org.uk ok 0 ok "OK" ( INET 172.18.45.6 ) test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=59 @@ -95,11 +93,13 @@ test.iwj.relativity.greenend.org.uk. flags 2 type HINFO(-): No such data; nrrs=0 test.iwj.relativity.greenend.org.uk. flags 2 type MX(raw): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type TXT(-): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): No such data; nrrs=0; cname=$; owner=$; ttl=59 -test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): OK; nrrs=1; cname=$; owner=$; ttl=59 ns0.relativity.greenend.org.uk ok 0 ok "OK" ( INET 172.18.45.6 ) test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=59 ns0.relativity.greenend.org.uk hostmaster@relativity.greenend.org.uk 42 3600 120 6604800 60 +test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=59 +test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=59 +test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=59 test.iwj.relativity.greenend.org.uk. flags 2 type RP(822): No such data; nrrs=0; cname=$; owner=$; ttl=60 rc=0 diff --git a/regress/case-v6-map.out b/regress/case-v6-map.out index b9cf5db..28d4081 100644 --- a/regress/case-v6-map.out +++ b/regress/case-v6-map.out @@ -2,10 +2,10 @@ adns debug: using nameserver 172.29.199.224 distorted.org.uk flags 4096 type 65537 A(addr) submitted distorted.org.uk flags 4096 type 65551 MX(+addr) submitted distorted.org.uk flags 4096 type 65537 A(addr) submitted -distorted.org.uk flags 4096 type A(addr): OK; nrrs=1; cname=$; owner=$; ttl=14400 - INET6 ::ffff:172.29.199.180 distorted.org.uk flags 4096 type MX(+addr): OK; nrrs=1; cname=$; owner=$; ttl=14400 50 mail.distorted.org.uk ok 0 ok "OK" ( INET6 ::ffff:172.29.199.180 ) +distorted.org.uk flags 4096 type A(addr): OK; nrrs=1; cname=$; owner=$; ttl=14400 + INET6 ::ffff:172.29.199.180 distorted.org.uk flags 4096 type A(addr): OK; nrrs=1; cname=$; owner=$; ttl=14400 INET 172.29.199.180 rc=0 diff --git a/regress/gdbwrap b/regress/gdbwrap new file mode 100755 index 0000000..a01178b --- /dev/null +++ b/regress/gdbwrap @@ -0,0 +1,37 @@ +#!/bin/sh +set -e + +# For example, put this in x.gdb +# break adns__revparse_label +# break adns__revparse_done +# run +# and then +# ADNS_TEST_DEBUG='./gdbwrap -n x.gdb' ./r1test tcpptr +# +# gdbwrap can be passed arguments like +# *.gdb passed to gdb with -x +# -n exit with exit status 5 which makes r1test think "skipped" +# +# other arguments are taken to be the program name provided by +# whatever has been told to use gdbwrap (eg r1test) + +while true; do + case "$1" in + *.gdb) xgdb="-x $1"; shift;; + -n) x5='exit 5'; shift;; + *) break;; + esac +done + +exe=$1; shift + +exec 5<&0 6>&1 7>&2 +exec 0<>/dev/tty 1>&0 2>&0 + +set +e +ex="set args <&5 >&6 2>&7" +for a in "$@"; do + ex="$ex '$a'" +done +gdb --return-child-result -ex "$ex" $xgdb $exe +$x5 diff --git a/regress/init-bogus-sortlist.text b/regress/init-bogus-sortlist.text new file mode 100644 index 0000000..eea7114 --- /dev/null +++ b/regress/init-bogus-sortlist.text @@ -0,0 +1,3 @@ +nameserver 172.18.45.6 +sortlist 198.51.100.1/24 2001:db8:2::/10 0/32 ::/128 255.0.0.0 2/33 ::/129 +search dnserr.distorted.org.uk distorted.org.uk diff --git a/regress/r1test b/regress/r1test index 533fdab..b2549e7 100755 --- a/regress/r1test +++ b/regress/r1test @@ -67,7 +67,7 @@ fi set +e ADNS_TEST_REPORT_FD=3 ADNS_TEST_IN_FD=4 \ 3>>"$ocase.report" 4<&4 >"$ocase.out" 2>"$ocase.err" \ - $debug $playback $initflags"$initstring" $queryargs + $ADNS_TEST_DEBUG $playback $initflags"$initstring" $queryargs rc=$? set -e -- 2.30.2