fix up adnstest for r_unknown; tests for r_unknown

diff --git a/changelog b/changelog
index e1fff881f02a24e67bdaff98f446167e69a8352c..d720b48b1767da5376547b670705678405f630f8 100644 (file)
--- a/changelog
+++ b/changelog
@@ -19,7 +19,7 @@ adns (1.1.999.0.2); urgency=medium
     which complain about plain `0' being passed where an enum is wanted).
 
   * Support for SRV RRs.
-  * Support for unknown RR types (according to RFC3597).
+  * Support for unknown RR types (according to RFC3597) via adns_r_unknown.
 
  --
 

diff --git a/client/adnstest.c b/client/adnstest.c
index cbc87bbb754ec12d42af6f7b07f3b1237ccbd627..d5ca68300bacbcd6ecddcfdc395666f13a06df9d 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -136,7 +136,7 @@ static const adns_rrtype defaulttypes[]= {
 
 static void dumptype(adns_status ri, const char *rrtn, const char *fmtn) {
   fprintf(stdout, "%s(%s)%s%s",
-         rrtn ? "?" : rrtn, ri ? "?" : fmtn ? fmtn : "-",
+         (!ri && rrtn) ? rrtn : "?", ri ? "?" : fmtn ? fmtn : "-",
          ri ? " " : "", ri ? adns_strerror(ri) : "");
 }
 

diff --git a/regress/case-unknown2.err b/regress/case-unknown2.err
new file mode 100644 (file)
index 0000000..2886e3c
--- /dev/null
+++ b/regress/case-unknown2.err
@@ -0,0 +1 @@
+adns debug: using nameserver 172.18.45.6

diff --git a/regress/case-unknown2.out b/regress/case-unknown2.out
new file mode 100644 (file)
index 0000000..94a2ab1
--- /dev/null
+++ b/regress/case-unknown2.out
@@ -0,0 +1,5 @@
+ucam.org TYPE2 \# 12 06636869 61726b02 6e73c01a
+ucam.org TYPE2 \# 11 08636869 6d616572 61 c0 35
+ucam.org TYPE2 \# 8 05726170 756ec035
+ucam.org TYPE2 \# 9 06626563 6b6574c0 35
+rc=0

diff --git a/regress/case-unknown2.sys b/regress/case-unknown2.sys
new file mode 100644 (file)
index 0000000..06cd175
--- /dev/null
+++ b/regress/case-unknown2.sys
@@ -0,0 +1,66 @@
+./adnshost default
+-t type2 -Qq ucam.org.
+ start 1144369677.011111
+ socket type=SOCK_DGRAM
+ socket=6
+ +0.000083
+ fcntl fd=6 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000049
+ fcntl fd=6 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000043
+ sendto fd=6 addr=172.18.45.6:53
+     311f0100 00010000 00000000 04756361 6d036f72 67000002 0001.
+ sendto=26
+ +0.000308
+ select max=7 rfds=[6] wfds=[] efds=[] to=1.999692
+ select=0 rfds=[] wfds=[] efds=[]
+ +2.-00406
+ select max=7 rfds=[6] wfds=[] efds=[] to=0.000098
+ select=0 rfds=[] wfds=[] efds=[]
+ +0.000987
+ sendto fd=6 addr=172.18.45.6:53
+     311f0100 00010000 00000000 04756361 6d036f72 67000002 0001.
+ sendto=26
+ +0.000244
+ select max=7 rfds=[6] wfds=[] efds=[] to=1.999756
+ select=0 rfds=[] wfds=[] efds=[]
+ +2.-00531
+ select max=7 rfds=[6] wfds=[] efds=[] to=0.000287
+ select=0 rfds=[] wfds=[] efds=[]
+ +0.000988
+ sendto fd=6 addr=172.18.45.6:53
+     311f0100 00010000 00000000 04756361 6d036f72 67000002 0001.
+ sendto=26
+ +0.000252
+ select max=7 rfds=[6] wfds=[] efds=[] to=1.999748
+ select=0 rfds=[] wfds=[] efds=[]
+ +2.-00540
+ select max=7 rfds=[6] wfds=[] efds=[] to=0.000288
+ select=0 rfds=[] wfds=[] efds=[]
+ +0.000989
+ sendto fd=6 addr=172.18.45.6:53
+     311f0100 00010000 00000000 04756361 6d036f72 67000002 0001.
+ sendto=26
+ +0.000237
+ select max=7 rfds=[6] wfds=[] efds=[] to=1.999763
+ select=1 rfds=[6] wfds=[] efds=[]
+ +1.961402
+ recvfrom fd=6 buflen=512 *addrlen=16
+ recvfrom=OK addr=172.18.45.6:53
+     311f8180 00010004 00040004 04756361 6d036f72 67000002 00010475 63616d03
+     6f726700 00020001 00054600 000c0663 68696172 6b026e73 c01ac01a 00020001
+     00054600 000b0863 68696d61 657261c0 35c01a00 02000100 05460000 08057261
+     70756ec0 35c01a00 02000100 05460000 09066265 636b6574 c035c01a 00020001
+     00054600 0002c02e c01a0002 00010005 46000002 c046c01a 00020001 00054600
+     0002c05d c01a0002 00010005 46000002 c071c02e 00010001 0001517c 0004c1c9
+     c8aac046 00010001 0001517c 0004836f 082ac05d 00010001 0001517c 0004836f
+     e86cc071 00010001 0001517c 0004cd86 e6ba.
+ +0.000366
+ recvfrom fd=6 buflen=512 *addrlen=16
+ recvfrom=EAGAIN
+ +0.000089
+ close fd=6
+ close=OK
+ +0.000187

diff --git a/regress/case-unknown33.err b/regress/case-unknown33.err
new file mode 100644 (file)
index 0000000..2886e3c
--- /dev/null
+++ b/regress/case-unknown33.err
@@ -0,0 +1 @@
+adns debug: using nameserver 172.18.45.6

diff --git a/regress/case-unknown33.out b/regress/case-unknown33.out
new file mode 100644 (file)
index 0000000..10be288
--- /dev/null
+++ b/regress/case-unknown33.out
@@ -0,0 +1,2 @@
+_jabber._tcp.jabber.org TYPE33 \# 18 001e001e 1495066a 61626265 72036f72 67 00
+rc=0

diff --git a/regress/case-unknown33.sys b/regress/case-unknown33.sys
new file mode 100644 (file)
index 0000000..c681d8a
--- /dev/null
+++ b/regress/case-unknown33.sys
@@ -0,0 +1,37 @@
+./adnshost default
+-t type33 -Qq _jabber._tcp.jabber.org
+ start 1144369693.043661
+ socket type=SOCK_DGRAM
+ socket=6
+ +0.000080
+ fcntl fd=6 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000045
+ fcntl fd=6 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000040
+ sendto fd=6 addr=172.18.45.6:53
+     311f0100 00010000 00000000 075f6a61 62626572 045f7463 70066a61 62626572
+     036f7267 00002100 01.
+ sendto=41
+ +0.000316
+ select max=7 rfds=[6] wfds=[] efds=[] to=1.999684
+ select=1 rfds=[6] wfds=[] efds=[]
+ +0.004580
+ recvfrom fd=6 buflen=512 *addrlen=16
+ recvfrom=OK addr=172.18.45.6:53
+     311f8180 00010001 00040005 075f6a61 62626572 045f7463 70066a61 62626572
+     036f7267 00002100 01c00c00 21000100 00031b00 12001e00 1e149506 6a616262
+     6572036f 726700c0 19000200 01000018 33001103 6e733107 6a657265 6d696503
+     636f6d00 c0190002 00010000 18330006 036e7332 c057c019 00020001 00001833
+     000c036e 73310562 6c616872 c05fc019 00020001 00001833 0010026e 73076f62
+     656c6973 6b036e65 7400c019 00010001 00000102 0004d0f5 d462c053 00010001
+     00029f11 0004d0f5 d41dc070 00010001 00029f11 0004d0f5 d41ec082 00010001
+     00029f13 00044051 6774c09a 00010001 00029f1d 00044761 e072.
+ +0.000369
+ recvfrom fd=6 buflen=512 *addrlen=16
+ recvfrom=EAGAIN
+ +0.000082
+ close fd=6
+ close=OK
+ +0.002395

diff --git a/regress/case-unknown5.err b/regress/case-unknown5.err
new file mode 100644 (file)
index 0000000..2886e3c
--- /dev/null
+++ b/regress/case-unknown5.err
@@ -0,0 +1 @@
+adns debug: using nameserver 172.18.45.6

diff --git a/regress/case-unknown5.out b/regress/case-unknown5.out
new file mode 100644 (file)
index 0000000..197296a
--- /dev/null
+++ b/regress/case-unknown5.out
@@ -0,0 +1,2 @@
+pop.chiark.greenend.org.uk TYPE5 \# 15 0c736572 76696365 2d6e616d 65 c0 10
+rc=0

diff --git a/regress/case-unknown5.sys b/regress/case-unknown5.sys
new file mode 100644 (file)
index 0000000..e40a21f
--- /dev/null
+++ b/regress/case-unknown5.sys
@@ -0,0 +1,45 @@
+./adnshost default
+-t type5 pop.chiark.greenend.org.uk
+ start 1144369700.944069
+ socket type=SOCK_DGRAM
+ socket=6
+ +0.000074
+ fcntl fd=6 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000048
+ fcntl fd=6 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000040
+ sendto fd=6 addr=172.18.45.6:53
+     311f0100 00010000 00000000 03706f70 06636869 61726b08 67726565 6e656e64
+     036f7267 02756b00 00050001.
+ sendto=44
+ +0.000311
+ select max=7 rfds=[6] wfds=[] efds=[] to=1.999689
+ select=0 rfds=[] wfds=[] efds=[]
+ +2.-00919
+ select max=7 rfds=[6] wfds=[] efds=[] to=0.000608
+ select=0 rfds=[] wfds=[] efds=[]
+ +0.000988
+ sendto fd=6 addr=172.18.45.6:53
+     311f0100 00010000 00000000 03706f70 06636869 61726b08 67726565 6e656e64
+     036f7267 02756b00 00050001.
+ sendto=44
+ +0.000264
+ select max=7 rfds=[6] wfds=[] efds=[] to=1.999736
+ select=1 rfds=[6] wfds=[] efds=[]
+ +0.004660
+ recvfrom fd=6 buflen=512 *addrlen=16
+ recvfrom=OK addr=172.18.45.6:53
+     311f8580 00010001 00020002 03706f70 06636869 61726b08 67726565 6e656e64
+     036f7267 02756b00 00050001 c00c0005 00010001 5180000f 0c736572 76696365
+     2d6e616d 65c010c0 17000200 01000151 80001103 6e73300a 72656c61 74697669
+     7479c017 c0170002 00010001 51800006 036e7331 c057c053 00010001 00015180
+     0004ac12 2d06c070 00010001 00015180 0004ac12 2d0b.
+ +0.000242
+ recvfrom fd=6 buflen=512 *addrlen=16
+ recvfrom=EAGAIN
+ +0.000074
+ close fd=6
+ close=OK
+ +0.000144