From: ian Date: Sun, 15 Aug 1999 14:24:15 +0000 (+0000) Subject: Print error message string in hostaddr. X-Git-Tag: privaterel-1999-09-25-egnor~8 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=a6f1dc921497192972a5c1f578d7484eae832e9f Print error message string in hostaddr. --- diff --git a/regress/case-abbrev.out b/regress/case-abbrev.out index d50f6a0..aa96308 100644 --- a/regress/case-abbrev.out +++ b/regress/case-abbrev.out @@ -29,11 +29,11 @@ greenend.org.uk flags 0 type TXT(-) ownflags=a: nodata; nrrs=0; cname=$; owner=$ greenend.org.uk flags 0 type RP(raw) ownflags=a: nodata; nrrs=0; cname=$; owner=$; ttl=86400 greenend.org.uk flags 0 type A(addr) ownflags=a: nodata; nrrs=0; cname=$; owner=$; ttl=86400 greenend.org.uk flags 0 type NS(+addr) ownflags=a: ok; nrrs=2; cname=$; owner=$; ttl=86400 - ns0.relativity.greenend.org.uk ok ( INET 172.18.45.6 ) - ns1.relativity.greenend.org.uk ok ( INET 172.18.45.65 ) + ns0.relativity.greenend.org.uk ok "OK" ( INET 172.18.45.6 ) + ns1.relativity.greenend.org.uk ok "OK" ( INET 172.18.45.65 ) greenend.org.uk flags 0 type PTR(checked) ownflags=a: nodata; nrrs=0; cname=$; owner=$; ttl=86400 greenend.org.uk flags 0 type MX(+addr) ownflags=a: ok; nrrs=1; cname=$; owner=$; ttl=86400 - 10 chiark.greenend.org.uk ok ( INET 195.224.76.132 ) + 10 chiark.greenend.org.uk ok "OK" ( INET 195.224.76.132 ) greenend.org.uk flags 0 type SOA(822) ownflags=a: ok; nrrs=1; cname=$; owner=$; ttl=86400 ns.chiark.greenend.org.uk hostmaster@greenend.org.uk 1999061300 28800 7200 604800 86400 greenend.org.uk flags 0 type RP(822) ownflags=a: nodata; nrrs=0; cname=$; owner=$; ttl=86400 diff --git a/regress/case-brokenmail.err b/regress/case-brokenmail.err new file mode 100644 index 0000000..e69de29 diff --git a/regress/case-brokenmail.out b/regress/case-brokenmail.out new file mode 100644 index 0000000..d40908d --- /dev/null +++ b/regress/case-brokenmail.out @@ -0,0 +1,38 @@ +adns debug: using nameserver 172.18.45.6 +broken-mail.test.iwj.relativity.greenend.org.uk. flags 0 type 15 MX(raw) submitted +broken-mail.test.iwj.relativity.greenend.org.uk. flags 0 type 65551 MX(+addr) submitted +broken-mail.test.iwj.relativity.greenend.org.uk. flags 256 type 15 MX(raw) submitted +broken-mail.test.iwj.relativity.greenend.org.uk. flags 256 type 65551 MX(+addr) submitted +broken-mail.test.iwj.relativity.greenend.org.uk. flags 260 type 15 MX(raw) submitted +broken-mail.test.iwj.relativity.greenend.org.uk. flags 260 type 65551 MX(+addr) submitted +broken-mail.test.iwj.relativity.greenend.org.uk. flags 0 type MX(raw): OK; nrrs=4; cname=$; owner=$; ttl=60 + 10 manyaddrs.test.iwj.relativity.greenend.org.uk + 20 host.broken-delg.test.iwj.relativity.greenend.org.uk + 30 172.18.45.36 + 40 cname-ptr.test.iwj.relativity.greenend.org.uk +broken-mail.test.iwj.relativity.greenend.org.uk. flags 256 type MX(raw): OK; nrrs=4; cname=$; owner=$; ttl=60 + 10 manyaddrs.test.iwj.relativity.greenend.org.uk + 20 host.broken-delg.test.iwj.relativity.greenend.org.uk + 30 172.18.45.36 + 40 cname-ptr.test.iwj.relativity.greenend.org.uk +broken-mail.test.iwj.relativity.greenend.org.uk. flags 260 type MX(raw): OK; nrrs=4; cname=$; owner=broken-mail.test.iwj.relativity.greenend.org.uk; ttl=60 + 10 manyaddrs.test.iwj.relativity.greenend.org.uk + 20 host.broken-delg.test.iwj.relativity.greenend.org.uk + 30 172.18.45.36 + 40 cname-ptr.test.iwj.relativity.greenend.org.uk +broken-mail.test.iwj.relativity.greenend.org.uk. flags 0 type MX(+addr): OK; nrrs=4; cname=$; owner=$; ttl=30 + 10 manyaddrs.test.iwj.relativity.greenend.org.uk ok "OK" ( INET 127.0.0.1 INET 172.18.45.6 INET 172.18.45.1 INET 172.18.45.35 ) + 20 host.broken-delg.test.iwj.relativity.greenend.org.uk timeout "DNS query timed out" ? + 30 172.18.45.36 nxdomain "No such domain" ( ) + 40 cname-ptr.test.iwj.relativity.greenend.org.uk prohibitedcname "DNS data refers to an alias" ( ) +broken-mail.test.iwj.relativity.greenend.org.uk. flags 256 type MX(+addr): OK; nrrs=4; cname=$; owner=$; ttl=30 + 10 manyaddrs.test.iwj.relativity.greenend.org.uk ok "OK" ( INET 127.0.0.1 INET 172.18.45.6 INET 172.18.45.1 INET 172.18.45.35 ) + 20 host.broken-delg.test.iwj.relativity.greenend.org.uk timeout "DNS query timed out" ? + 30 172.18.45.36 nxdomain "No such domain" ( ) + 40 cname-ptr.test.iwj.relativity.greenend.org.uk ok "OK" ( INET 172.18.45.37 ) +broken-mail.test.iwj.relativity.greenend.org.uk. flags 260 type MX(+addr): OK; nrrs=4; cname=$; owner=broken-mail.test.iwj.relativity.greenend.org.uk; ttl=30 + 10 manyaddrs.test.iwj.relativity.greenend.org.uk ok "OK" ( INET 127.0.0.1 INET 172.18.45.6 INET 172.18.45.1 INET 172.18.45.35 ) + 20 host.broken-delg.test.iwj.relativity.greenend.org.uk timeout "DNS query timed out" ? + 30 172.18.45.36 nxdomain "No such domain" ( ) + 40 cname-ptr.test.iwj.relativity.greenend.org.uk ok "OK" ( INET 172.18.45.37 ) +rc=0 diff --git a/regress/case-brokenmail.sys b/regress/case-brokenmail.sys new file mode 100644 index 0000000..9514d6b --- /dev/null +++ b/regress/case-brokenmail.sys @@ -0,0 +1,516 @@ +default +:15,65551 broken-mail.test.iwj.relativity.greenend.org.uk. 256/broken-mail.test.iwj.relativity.greenend.org.uk. 0x104/broken-mail.test.iwj.relativity.greenend.org.uk. + start 934726868.117908 + socket type=SOCK_DGRAM + socket=4 + +0.000425 + fcntl fd=4 cmd=F_GETFL + fcntl=~O_NONBLOCK&... + +0.000059 + fcntl fd=4 cmd=F_SETFL O_NONBLOCK|... + fcntl=OK + +0.000043 + sendto fd=4 addr=172.18.45.6:53 + 311f0100 00010000 00000000 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01. + sendto=65 + +0.001836 + sendto fd=4 addr=172.18.45.6:53 + 31200100 00010000 00000000 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01. + sendto=65 + +0.002502 + sendto fd=4 addr=172.18.45.6:53 + 31210100 00010000 00000000 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01. + sendto=65 + +0.001986 + sendto fd=4 addr=172.18.45.6:53 + 31220100 00010000 00000000 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01. + sendto=65 + +0.002269 + sendto fd=4 addr=172.18.45.6:53 + 31230100 00010000 00000000 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01. + sendto=65 + +0.001950 + sendto fd=4 addr=172.18.45.6:53 + 31240100 00010000 00000000 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01. + sendto=65 + +0.001914 + select max=5 rfds=[4] wfds=[] efds=[] to=1.987543 + select=1 rfds=[4] wfds=[] efds=[] + +0.000654 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 311f8580 00010004 00010005 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01c00c00 0f000100 00003c00 38001404 686f7374 0b62726f 6b656e2d 64656c67 + 04746573 74036977 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 + 6702756b 00c00c00 0f000100 00003c00 10001e03 31373202 31380234 35023336 + 00c00c00 0f000100 00003c00 0e002809 636e616d 652d7074 72c060c0 0c000f00 + 01000000 3c000e00 0a096d61 6e796164 647273c0 60c06000 02000100 00003c00 + 06036e73 30c069c0 c9000100 01000000 3c0004ac 122d23c0 c9000100 01000000 + 3c0004ac 122d06c0 c9000100 01000000 3c0004ac 122d01c0 c9000100 01000000 + 3c00047f 000001c0 e1000100 01000151 800004ac 122d06. + +0.001320 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 31208580 00010004 00010005 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01c00c00 0f000100 00003c00 10001e03 31373202 31380234 35023336 00c00c00 + 0f000100 00003c00 31002809 636e616d 652d7074 72047465 73740369 776a0a72 + 656c6174 69766974 79086772 65656e65 6e64036f 72670275 6b00c00c 000f0001 + 0000003c 000e000a 096d616e 79616464 7273c075 c00c000f 00010000 003c0015 + 00140468 6f73740b 62726f6b 656e2d64 656c67c0 75c07500 02000100 00003c00 + 06036e73 30c07ec0 a8000100 01000000 3c0004ac 122d23c0 a8000100 01000000 + 3c0004ac 122d06c0 a8000100 01000000 3c0004ac 122d01c0 a8000100 01000000 + 3c00047f 000001c0 e1000100 01000151 800004ac 122d06. + +0.001688 + sendto fd=4 addr=172.18.45.6:53 + 31250100 00010000 00000000 03313732 02313802 34350233 36000001 0001. + sendto=30 + +0.000653 + sendto fd=4 addr=172.18.45.6:53 + 31260100 00010000 00000000 09636e61 6d652d70 74720474 65737403 69776a0a + 72656c61 74697669 74790867 7265656e 656e6403 6f726702 756b0000 010001. + sendto=63 + +0.000825 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.001147 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 31218580 00010004 00010005 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01c00c00 0f000100 00003c00 31002809 636e616d 652d7074 72047465 73740369 + 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 6b00c00c + 000f0001 0000003c 000e000a 096d616e 79616464 7273c059 c00c000f 00010000 + 003c0015 00140468 6f73740b 62726f6b 656e2d64 656c67c0 59c00c00 0f000100 + 00003c00 10001e03 31373202 31380234 35023336 00c05900 02000100 00003c00 + 06036e73 30c062c0 8c000100 01000000 3c0004ac 122d23c0 8c000100 01000000 + 3c0004ac 122d06c0 8c000100 01000000 3c0004ac 122d01c0 8c000100 01000000 + 3c00047f 000001c0 e1000100 01000151 800004ac 122d06. + +0.001330 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 31228580 00010004 00010005 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01c00c00 0f000100 00003c00 31000a09 6d616e79 61646472 73047465 73740369 + 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 6b00c00c + 000f0001 0000003c 00150014 04686f73 740b6272 6f6b656e 2d64656c 67c059c0 + 0c000f00 01000000 3c001000 1e033137 32023138 02343502 333600c0 0c000f00 + 01000000 3c000e00 2809636e 616d652d 707472c0 59c05900 02000100 00003c00 + 06036e73 30c062c0 4f000100 01000000 3c0004ac 122d23c0 4f000100 01000000 + 3c0004ac 122d06c0 4f000100 01000000 3c0004ac 122d01c0 4f000100 01000000 + 3c00047f 000001c0 e1000100 01000151 800004ac 122d06. + +0.001524 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.001003 + sendto fd=4 addr=172.18.45.6:53 + 31290100 00010000 00000000 03313732 02313802 34350233 36000001 0001. + sendto=30 + +0.000569 + sendto fd=4 addr=172.18.45.6:53 + 312a0100 00010000 00000000 09636e61 6d652d70 74720474 65737403 69776a0a + 72656c61 74697669 74790867 7265656e 656e6403 6f726702 756b0000 010001. + sendto=63 + +0.000842 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 31238580 00010004 00010005 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01c00c00 0f000100 00003c00 38001404 686f7374 0b62726f 6b656e2d 64656c67 + 04746573 74036977 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 + 6702756b 00c00c00 0f000100 00003c00 10001e03 31373202 31380234 35023336 + 00c00c00 0f000100 00003c00 0e002809 636e616d 652d7074 72c060c0 0c000f00 + 01000000 3c000e00 0a096d61 6e796164 647273c0 60c06000 02000100 00003c00 + 06036e73 30c069c0 c9000100 01000000 3c0004ac 122d23c0 c9000100 01000000 + 3c0004ac 122d06c0 c9000100 01000000 3c0004ac 122d01c0 c9000100 01000000 + 3c00047f 000001c0 e1000100 01000151 800004ac 122d06. + +0.001306 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 31248580 00010004 00010005 0b62726f 6b656e2d 6d61696c 04746573 74036977 + 6a0a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000f00 + 01c00c00 0f000100 00003c00 10001e03 31373202 31380234 35023336 00c00c00 + 0f000100 00003c00 31002809 636e616d 652d7074 72047465 73740369 776a0a72 + 656c6174 69766974 79086772 65656e65 6e64036f 72670275 6b00c00c 000f0001 + 0000003c 000e000a 096d616e 79616464 7273c075 c00c000f 00010000 003c0015 + 00140468 6f73740b 62726f6b 656e2d64 656c67c0 75c07500 02000100 00003c00 + 06036e73 30c07ec0 a8000100 01000000 3c0004ac 122d23c0 a8000100 01000000 + 3c0004ac 122d06c0 a8000100 01000000 3c0004ac 122d01c0 a8000100 01000000 + 3c00047f 000001c0 e1000100 01000151 800004ac 122d06. + +0.001507 + sendto fd=4 addr=172.18.45.6:53 + 312b0100 00010000 00000000 03313732 02313802 34350233 36000001 0001. + sendto=30 + +0.000637 + sendto fd=4 addr=172.18.45.6:53 + 312c0100 00010000 00000000 09636e61 6d652d70 74720474 65737403 69776a0a + 72656c61 74697669 74790867 7265656e 656e6403 6f726702 756b0000 010001. + sendto=63 + +0.000932 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000931 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 31258583 00010000 00000000 03313732 02313802 34350233 36000001 0001. + +0.000242 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 31268580 00010002 00010001 09636e61 6d652d70 74720474 65737403 69776a0a + 72656c61 74697669 74790867 7265656e 656e6403 6f726702 756b0000 010001c0 + 0c000500 01000000 3c002903 70747204 74657374 0369776a 0a72656c 61746976 + 69747908 67726565 6e656e64 036f7267 02756b00 c04b0001 00010000 003c0004 + ac122d25 c04f0002 00010000 003c0006 036e7330 c058c090 00010001 00015180 + 0004ac12 2d06. + +0.000737 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 31298583 00010000 00000000 03313732 02313802 34350233 36000001 0001. + +0.000223 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 312a8580 00010002 00010001 09636e61 6d652d70 74720474 65737403 69776a0a + 72656c61 74697669 74790867 7265656e 656e6403 6f726702 756b0000 010001c0 + 0c000500 01000000 3c002903 70747204 74657374 0369776a 0a72656c 61746976 + 69747908 67726565 6e656e64 036f7267 02756b00 c04b0001 00010000 003c0004 + ac122d25 c04f0002 00010000 003c0006 036e7330 c058c090 00010001 00015180 + 0004ac12 2d06. + +0.000756 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 312b8583 00010000 00000000 03313732 02313802 34350233 36000001 0001. + +0.000291 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=OK addr=172.18.45.6:53 + 312c8580 00010002 00010001 09636e61 6d652d70 74720474 65737403 69776a0a + 72656c61 74697669 74790867 7265656e 656e6403 6f726702 756b0000 010001c0 + 0c000500 01000000 3c002903 70747204 74657374 0369776a 0a72656c 61746976 + 69747908 67726565 6e656e64 036f7267 02756b00 c04b0001 00010000 003c0004 + ac122d25 c04f0002 00010000 003c0006 036e7330 c058c090 00010001 00015180 + 0004ac12 2d06. + +0.000726 + recvfrom fd=4 buflen=512 *addrlen=16 + recvfrom=EAGAIN + +0.000162 + select max=5 rfds=[4] wfds=[] efds=[] to=1.980649 + select=0 rfds=[] wfds=[] efds=[] + +2.-04341 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000794 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000608 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000695 + select max=5 rfds=[4] wfds=[] efds=[] to=1.997903 + select=0 rfds=[] wfds=[] efds=[] + +2.007910 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000823 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000611 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000571 + select max=5 rfds=[4] wfds=[] efds=[] to=1.997995 + select=0 rfds=[] wfds=[] efds=[] + +2.007991 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000694 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000579 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000571 + select max=5 rfds=[4] wfds=[] efds=[] to=1.998156 + select=0 rfds=[] wfds=[] efds=[] + +2.008157 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000655 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000749 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000606 + select max=5 rfds=[4] wfds=[] efds=[] to=1.997990 + select=0 rfds=[] wfds=[] efds=[] + +2.007995 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000836 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000612 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000631 + select max=5 rfds=[4] wfds=[] efds=[] to=1.997921 + select=0 rfds=[] wfds=[] efds=[] + +2.007925 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000699 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000725 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000606 + select max=5 rfds=[4] wfds=[] efds=[] to=1.997970 + select=0 rfds=[] wfds=[] efds=[] + +2.007965 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000739 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000582 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000570 + select max=5 rfds=[4] wfds=[] efds=[] to=1.998109 + select=0 rfds=[] wfds=[] efds=[] + +2.008104 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000641 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000598 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000716 + select max=5 rfds=[4] wfds=[] efds=[] to=1.998045 + select=0 rfds=[] wfds=[] efds=[] + +2.008043 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000646 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000576 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000594 + select max=5 rfds=[4] wfds=[] efds=[] to=1.998184 + select=0 rfds=[] wfds=[] efds=[] + +2.008190 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000673 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000578 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000572 + select max=5 rfds=[4] wfds=[] efds=[] to=1.998177 + select=0 rfds=[] wfds=[] efds=[] + +2.008168 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000659 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000577 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000571 + select max=5 rfds=[4] wfds=[] efds=[] to=1.998193 + select=0 rfds=[] wfds=[] efds=[] + +2.008199 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000653 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000604 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000573 + select max=5 rfds=[4] wfds=[] efds=[] to=1.998170 + select=0 rfds=[] wfds=[] efds=[] + +2.008181 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000699 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000589 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000758 + select max=5 rfds=[4] wfds=[] efds=[] to=1.997954 + select=0 rfds=[] wfds=[] efds=[] + +2.008126 + sendto fd=4 addr=172.18.45.6:53 + 31270100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000684 + sendto fd=4 addr=172.18.45.6:53 + 31280100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000582 + sendto fd=4 addr=172.18.45.6:53 + 312d0100 00010000 00000000 04686f73 740b6272 6f6b656e 2d64656c 67047465 + 73740369 776a0a72 656c6174 69766974 79086772 65656e65 6e64036f 72670275 + 6b000001 0001. + sendto=70 + +0.000578 + select max=5 rfds=[4] wfds=[] efds=[] to=1.998156 + select=0 rfds=[] wfds=[] efds=[] + +2.007969 + close fd=4 + close=OK + +0.000812 diff --git a/regress/case-mailboxes.out b/regress/case-mailboxes.out index 98edaf4..61d1757 100644 --- a/regress/case-mailboxes.out +++ b/regress/case-mailboxes.out @@ -1,7 +1,7 @@ adns debug: using nameserver 172.18.45.6 silly-rp.test.iwj.relativity.greenend.org.uk flags 0 type 131089 RP(822) submitted silly-rp.test.iwj.relativity.greenend.org.uk flags 0 type RP(822): OK; nrrs=6; cname=$; owner=$; ttl=60 - <> . + . . i@ucam.org . i.j@ucam.org . "i..j"@ucam.org . diff --git a/regress/case-owner.out b/regress/case-owner.out index d683c98..4ebf6ff 100644 --- a/regress/case-owner.out +++ b/regress/case-owner.out @@ -30,7 +30,7 @@ chiark.greenend.org.uk flags 4 type A(addr): OK; nrrs=1; cname=$; owner=chiark.g chiark.greenend.org.uk flags 4 type NS(+addr): No such data; nrrs=0; cname=$; owner=chiark.greenend.org.uk; ttl=86400 chiark.greenend.org.uk flags 4 type PTR(checked): No such data; nrrs=0; cname=$; owner=chiark.greenend.org.uk; ttl=86400 chiark.greenend.org.uk flags 4 type MX(+addr): OK; nrrs=1; cname=$; owner=chiark.greenend.org.uk; ttl=86400 - 5 permutation-city.greenend.org.uk ok ( INET 195.224.76.134 ) + 5 permutation-city.greenend.org.uk ok "OK" ( INET 195.224.76.134 ) chiark.greenend.org.uk flags 4 type SOA(822): No such data; nrrs=0; cname=$; owner=chiark.greenend.org.uk; ttl=86400 chiark.greenend.org.uk flags 4 type RP(822): No such data; nrrs=0; cname=$; owner=chiark.greenend.org.uk; ttl=86400 rc=0 diff --git a/regress/case-rootqueryall-as.out b/regress/case-rootqueryall-as.out index a62a9ab..d195c54 100644 --- a/regress/case-rootqueryall-as.out +++ b/regress/case-rootqueryall-as.out @@ -53,19 +53,19 @@ adns debug: using nameserver 172.18.45.6 . flags 0 type RP(raw): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 0 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 0 type NS(+addr): OK; nrrs=13; cname=$; owner=$; ttl=518399 - I.ROOT-SERVERS.NET ok ( INET 192.36.148.17 ) - F.ROOT-SERVERS.NET ok ( INET 192.5.5.241 ) - G.ROOT-SERVERS.NET ok ( INET 192.112.36.4 ) - J.ROOT-SERVERS.NET ok ( INET 198.41.0.10 ) - K.ROOT-SERVERS.NET ok ( INET 193.0.14.129 ) - L.ROOT-SERVERS.NET ok ( INET 198.32.64.12 ) - M.ROOT-SERVERS.NET ok ( INET 202.12.27.33 ) - A.ROOT-SERVERS.NET ok ( INET 198.41.0.4 ) - H.ROOT-SERVERS.NET ok ( INET 128.63.2.53 ) - B.ROOT-SERVERS.NET ok ( INET 128.9.0.107 ) - C.ROOT-SERVERS.NET ok ( INET 192.33.4.12 ) - D.ROOT-SERVERS.NET ok ( INET 128.8.10.90 ) - E.ROOT-SERVERS.NET ok ( INET 192.203.230.10 ) + I.ROOT-SERVERS.NET ok "OK" ( INET 192.36.148.17 ) + F.ROOT-SERVERS.NET ok "OK" ( INET 192.5.5.241 ) + G.ROOT-SERVERS.NET ok "OK" ( INET 192.112.36.4 ) + J.ROOT-SERVERS.NET ok "OK" ( INET 198.41.0.10 ) + K.ROOT-SERVERS.NET ok "OK" ( INET 193.0.14.129 ) + L.ROOT-SERVERS.NET ok "OK" ( INET 198.32.64.12 ) + M.ROOT-SERVERS.NET ok "OK" ( INET 202.12.27.33 ) + A.ROOT-SERVERS.NET ok "OK" ( INET 198.41.0.4 ) + H.ROOT-SERVERS.NET ok "OK" ( INET 128.63.2.53 ) + B.ROOT-SERVERS.NET ok "OK" ( INET 128.9.0.107 ) + C.ROOT-SERVERS.NET ok "OK" ( INET 192.33.4.12 ) + D.ROOT-SERVERS.NET ok "OK" ( INET 128.8.10.90 ) + E.ROOT-SERVERS.NET ok "OK" ( INET 192.203.230.10 ) . flags 0 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 0 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 0 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=77975 @@ -95,19 +95,19 @@ adns debug: using nameserver 172.18.45.6 . flags 1 type RP(raw): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 1 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 1 type NS(+addr): OK; nrrs=13; cname=$; owner=$; ttl=518399 - G.ROOT-SERVERS.NET ok ( INET 192.112.36.4 ) - J.ROOT-SERVERS.NET ok ( INET 198.41.0.10 ) - K.ROOT-SERVERS.NET ok ( INET 193.0.14.129 ) - L.ROOT-SERVERS.NET ok ( INET 198.32.64.12 ) - M.ROOT-SERVERS.NET ok ( INET 202.12.27.33 ) - A.ROOT-SERVERS.NET ok ( INET 198.41.0.4 ) - H.ROOT-SERVERS.NET ok ( INET 128.63.2.53 ) - B.ROOT-SERVERS.NET ok ( INET 128.9.0.107 ) - C.ROOT-SERVERS.NET ok ( INET 192.33.4.12 ) - D.ROOT-SERVERS.NET ok ( INET 128.8.10.90 ) - E.ROOT-SERVERS.NET ok ( INET 192.203.230.10 ) - I.ROOT-SERVERS.NET ok ( INET 192.36.148.17 ) - F.ROOT-SERVERS.NET ok ( INET 192.5.5.241 ) + G.ROOT-SERVERS.NET ok "OK" ( INET 192.112.36.4 ) + J.ROOT-SERVERS.NET ok "OK" ( INET 198.41.0.10 ) + K.ROOT-SERVERS.NET ok "OK" ( INET 193.0.14.129 ) + L.ROOT-SERVERS.NET ok "OK" ( INET 198.32.64.12 ) + M.ROOT-SERVERS.NET ok "OK" ( INET 202.12.27.33 ) + A.ROOT-SERVERS.NET ok "OK" ( INET 198.41.0.4 ) + H.ROOT-SERVERS.NET ok "OK" ( INET 128.63.2.53 ) + B.ROOT-SERVERS.NET ok "OK" ( INET 128.9.0.107 ) + C.ROOT-SERVERS.NET ok "OK" ( INET 192.33.4.12 ) + D.ROOT-SERVERS.NET ok "OK" ( INET 128.8.10.90 ) + E.ROOT-SERVERS.NET ok "OK" ( INET 192.203.230.10 ) + I.ROOT-SERVERS.NET ok "OK" ( INET 192.36.148.17 ) + F.ROOT-SERVERS.NET ok "OK" ( INET 192.5.5.241 ) . flags 1 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 1 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 1 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=70372 diff --git a/regress/case-rootqueryall.out b/regress/case-rootqueryall.out index 1441916..fea6831 100644 --- a/regress/case-rootqueryall.out +++ b/regress/case-rootqueryall.out @@ -58,19 +58,19 @@ adns debug: reply not found, id 312e, query owner (NS=172.18.45.6) . flags 0 type RP(raw): No such data; nrrs=0; cname=$; owner=$; ttl=86400 . flags 0 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 0 type NS(+addr): OK; nrrs=13; cname=$; owner=$; ttl=305624 - I.ROOT-SERVERS.NET ok ( INET 192.36.148.17 ) - F.ROOT-SERVERS.NET ok ( INET 192.5.5.241 ) - G.ROOT-SERVERS.NET ok ( INET 192.112.36.4 ) - J.ROOT-SERVERS.NET ok ( INET 198.41.0.10 ) - K.ROOT-SERVERS.NET ok ( INET 193.0.14.129 ) - L.ROOT-SERVERS.NET ok ( INET 198.32.64.12 ) - M.ROOT-SERVERS.NET ok ( INET 202.12.27.33 ) - A.ROOT-SERVERS.NET ok ( INET 198.41.0.4 ) - H.ROOT-SERVERS.NET ok ( INET 128.63.2.53 ) - B.ROOT-SERVERS.NET ok ( INET 128.9.0.107 ) - C.ROOT-SERVERS.NET ok ( INET 192.33.4.12 ) - D.ROOT-SERVERS.NET ok ( INET 128.8.10.90 ) - E.ROOT-SERVERS.NET ok ( INET 192.203.230.10 ) + I.ROOT-SERVERS.NET ok "OK" ( INET 192.36.148.17 ) + F.ROOT-SERVERS.NET ok "OK" ( INET 192.5.5.241 ) + G.ROOT-SERVERS.NET ok "OK" ( INET 192.112.36.4 ) + J.ROOT-SERVERS.NET ok "OK" ( INET 198.41.0.10 ) + K.ROOT-SERVERS.NET ok "OK" ( INET 193.0.14.129 ) + L.ROOT-SERVERS.NET ok "OK" ( INET 198.32.64.12 ) + M.ROOT-SERVERS.NET ok "OK" ( INET 202.12.27.33 ) + A.ROOT-SERVERS.NET ok "OK" ( INET 198.41.0.4 ) + H.ROOT-SERVERS.NET ok "OK" ( INET 128.63.2.53 ) + B.ROOT-SERVERS.NET ok "OK" ( INET 128.9.0.107 ) + C.ROOT-SERVERS.NET ok "OK" ( INET 192.33.4.12 ) + D.ROOT-SERVERS.NET ok "OK" ( INET 128.8.10.90 ) + E.ROOT-SERVERS.NET ok "OK" ( INET 192.203.230.10 ) . flags 0 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=599 . flags 0 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=86400 . flags 0 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=51616 @@ -106,19 +106,19 @@ adns debug: reply not found, id 3139, query owner (NS=172.18.45.6) . flags 1 type RP(raw): No such data; nrrs=0; cname=$; owner=$; ttl=86399 . flags 1 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=598 . flags 1 type NS(+addr): OK; nrrs=13; cname=$; owner=$; ttl=305623 - G.ROOT-SERVERS.NET ok ( INET 192.112.36.4 ) - J.ROOT-SERVERS.NET ok ( INET 198.41.0.10 ) - K.ROOT-SERVERS.NET ok ( INET 193.0.14.129 ) - L.ROOT-SERVERS.NET ok ( INET 198.32.64.12 ) - M.ROOT-SERVERS.NET ok ( INET 202.12.27.33 ) - A.ROOT-SERVERS.NET ok ( INET 198.41.0.4 ) - H.ROOT-SERVERS.NET ok ( INET 128.63.2.53 ) - B.ROOT-SERVERS.NET ok ( INET 128.9.0.107 ) - C.ROOT-SERVERS.NET ok ( INET 192.33.4.12 ) - D.ROOT-SERVERS.NET ok ( INET 128.8.10.90 ) - E.ROOT-SERVERS.NET ok ( INET 192.203.230.10 ) - I.ROOT-SERVERS.NET ok ( INET 192.36.148.17 ) - F.ROOT-SERVERS.NET ok ( INET 192.5.5.241 ) + G.ROOT-SERVERS.NET ok "OK" ( INET 192.112.36.4 ) + J.ROOT-SERVERS.NET ok "OK" ( INET 198.41.0.10 ) + K.ROOT-SERVERS.NET ok "OK" ( INET 193.0.14.129 ) + L.ROOT-SERVERS.NET ok "OK" ( INET 198.32.64.12 ) + M.ROOT-SERVERS.NET ok "OK" ( INET 202.12.27.33 ) + A.ROOT-SERVERS.NET ok "OK" ( INET 198.41.0.4 ) + H.ROOT-SERVERS.NET ok "OK" ( INET 128.63.2.53 ) + B.ROOT-SERVERS.NET ok "OK" ( INET 128.9.0.107 ) + C.ROOT-SERVERS.NET ok "OK" ( INET 192.33.4.12 ) + D.ROOT-SERVERS.NET ok "OK" ( INET 128.8.10.90 ) + E.ROOT-SERVERS.NET ok "OK" ( INET 192.203.230.10 ) + I.ROOT-SERVERS.NET ok "OK" ( INET 192.36.148.17 ) + F.ROOT-SERVERS.NET ok "OK" ( INET 192.5.5.241 ) . flags 1 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=598 . flags 1 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=598 . flags 1 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=46580 diff --git a/src/adns.h b/src/adns.h index 90c4eeb..9caf44f 100644 --- a/src/adns.h +++ b/src/adns.h @@ -626,19 +626,24 @@ adns_status adns_rr_info(adns_rrtype type, * syntax is INET followed by the dotted quad (from inet_ntoa). * Currently only IPv4 is supported. * + * Text strings (as in adns_rr_txt) appear inside double quotes, and + * use \" and \\ to represent " and \, and \xHH to represent + * characters not in the range 32-126. + * * Hostname with addresses (adns_rr_hostaddr): this consists of the - * hostname, as usual, followed by the adns_status value (as an - * abbreviation) for the address lookup, followed by zero or more + * hostname, as usual, followed by the adns_status value, as an + * abbreviation, and then a descriptive string (encoded as if it were + * a piece of text), for the address lookup, followed by zero or more * addresses enclosed in ( and ). If the result was a permanent * failure, then a single ? appears instead of the ( ). If the * result was a temporary failure then an empty pair of parentheses * appears (which a space in between). For example, one of the NS - * records for greenend.org.uk comes out like - * ns.chiark.greenend.org.uk ok ( INET 195.224.76.132 ) + * records for greenend.org.uk comes out like + * ns.chiark.greenend.org.uk ok "OK" ( INET 195.224.76.132 ) * an MX referring to a nonexistent host might come out like: - * 50 sun2.nsfnet-relay.ac.uk nxdomain ( ) + * 50 sun2.nsfnet-relay.ac.uk nxdomain "No such domain" ( ) * and if nameserver information is not available you might get: - * dns2.spong.dyn.ml.org timeout ? + * dns2.spong.dyn.ml.org timeout "DNS query timed out" ? */ const char *adns_strerror(adns_status st); diff --git a/src/types.c b/src/types.c index 53b40e2..f7c1810 100644 --- a/src/types.c +++ b/src/types.c @@ -545,13 +545,18 @@ static void mf_hostaddr(adns_query qu, void *datap) { } static adns_status csp_hostaddr(vbuf *vb, const adns_rr_hostaddr *rrp) { + const char *errstr; adns_status st; int i; - st= csp_domain(vb,rrp->host); if (st) return st; + st= csp_domain(vb,rrp->host); if (st) return st; CSP_ADDSTR(" "); CSP_ADDSTR(adns_errabbrev(rrp->astatus)); + + CSP_ADDSTR(" "); + errstr= adns_strerror(rrp->astatus); + st= csp_qstring(vb,errstr,strlen(errstr)); if (st) return st; if (rrp->naddrs >= 0) { CSP_ADDSTR(" (");