New TCP tests.

diff --git a/regress/case-1stservbroken.err b/regress/case-1stservbroken.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regress/case-1stservbroken.out b/regress/case-1stservbroken.out
new file mode 100644 (file)
index 0000000..8a1790c
--- /dev/null
+++ b/regress/case-1stservbroken.out
@@ -0,0 +1,39 @@
+adns debug: using nameserver 172.18.45.2
+adns debug: using nameserver 172.18.45.6
+trunc.test.iwj.relativity.greenend.org.uk flags 0 type 12 PTR(raw) submitted
+adns warning: datagram receive error: Connection refused
+adns debug: TCP connected (NS=172.18.45.2)
+adns warning: TCP connection failed: read: Broken pipe (NS=172.18.45.2)
+adns debug: TCP connected (NS=172.18.45.6)
+trunc.test.iwj.relativity.greenend.org.uk flags 0 type PTR(raw): OK; nrrs=30; cname=$; owner=$; ttl=60
+ long.domain.to.force.truncation.0.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.1.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.2.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.3.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.4.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.5.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.6.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.7.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.8.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.9.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.10.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.11.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.12.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.13.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.14.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.15.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.16.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.17.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.18.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.19.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.20.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.21.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.22.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.23.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.24.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.25.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.26.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.27.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.28.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.29.test.iwj.relativity.greenend.org.uk
+rc=0

diff --git a/regress/case-1stservbroken.sys b/regress/case-1stservbroken.sys
new file mode 100644 (file)
index 0000000..97d861e
--- /dev/null
+++ b/regress/case-1stservbroken.sys
@@ -0,0 +1,182 @@
+1stservbroken
+:12 trunc.test.iwj.relativity.greenend.org.uk
+ start 940100522.187436
+ socket type=SOCK_DGRAM
+ socket=4
+ +0.000592
+ fcntl fd=4 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000614
+ fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000566
+ sendto fd=4 addr=172.18.45.2:53
+     311f0100 00010000 00000000 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
+ sendto=59
+ +0.006062
+ select max=5 rfds=[4] wfds=[] efds=[] to=1.993938
+ select=1 rfds=[4] wfds=[] efds=[]
+ +0.001590
+ recvfrom fd=4 buflen=512 *addrlen=16
+ recvfrom=ECONNREFUSED
+ +0.000661
+ select max=5 rfds=[4] wfds=[] efds=[] to=1.991687
+ select=0 rfds=[] wfds=[] efds=[]
+ +2.-08754
+ select max=5 rfds=[4] wfds=[] efds=[] to=0.000441
+ select=0 rfds=[] wfds=[] efds=[]
+ +0.009803
+ sendto fd=4 addr=172.18.45.6:53
+     311f0100 00010000 00000000 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
+ sendto=59
+ +0.002097
+ select max=5 rfds=[4] wfds=[] efds=[] to=1.997903
+ select=1 rfds=[4] wfds=[] efds=[]
+ +0.000971
+ recvfrom fd=4 buflen=512 *addrlen=16
+ recvfrom=OK addr=172.18.45.6:53
+     311f8380 00010008 00000000 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001c0 0c000c00
+     01000000 3c004704 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275
+     6e636174 696f6e01 30047465 73740369 776a0a72 656c6174 69766974 79086772
+     65656e65 6e64036f 72670275 6b00c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0131 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0132 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0133 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0134 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0135 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0136 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0137 c069.
+ +0.004198
+ socket type=SOCK_STREAM
+ socket=5
+ +0.004875
+ fcntl fd=5 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000570
+ fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000554
+ connect fd=5 addr=172.18.45.2:53
+ connect=EINPROGRESS
+ +0.000793
+ recvfrom fd=4 buflen=512 *addrlen=16
+ recvfrom=EAGAIN
+ +0.000784
+ select max=6 rfds=[4] wfds=[5] efds=[] to=13.988226
+ select=1 rfds=[] wfds=[5] efds=[]
+ +0.001148
+ read fd=5 buflen=1
+ read=OK empty
+ +0.001123
+ write fd=5
+     003b311f 01000001 00000000 00000574 72756e63 04746573 74036977 6a0a7265
+     6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000c00 01.
+ write=61
+ +0.003548
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.982407
+ select=1 rfds=[5] wfds=[] efds=[]
+ +0.001355
+ read fd=5 buflen=2
+ read=EPIPE
+ +0.001444
+ close fd=5
+ close=OK
+ +0.000660
+ socket type=SOCK_STREAM
+ socket=5
+ +0.004654
+ fcntl fd=5 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000570
+ fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000602
+ connect fd=5 addr=172.18.45.6:53
+ connect=EINPROGRESS
+ +0.001046
+ select max=6 rfds=[4] wfds=[5] efds=[] to=14.000000
+ select=1 rfds=[] wfds=[5] efds=[]
+ +0.000999
+ read fd=5 buflen=1
+ read=EAGAIN
+ +0.000579
+ write fd=5
+     003b311f 01000001 00000000 00000574 72756e63 04746573 74036977 6a0a7265
+     6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000c00 01.
+ write=61
+ +0.004802
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.965696
+ select=1 rfds=[5] wfds=[] efds=[]
+ +0.001239
+ read fd=5 buflen=2
+ read=OK
+     0638.
+ +0.000653
+ read fd=5 buflen=1592
+ read=OK
+     311f8580 0001001e 00010001 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001c0 0c000c00
+     01000000 3c004704 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275
+     6e636174 696f6e01 30047465 73740369 776a0a72 656c6174 69766974 79086772
+     65656e65 6e64036f 72670275 6b00c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0131 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0132 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0133 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0134 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0135 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0136 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0137 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0138 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0139 c069c00c
+     000c0001 0000003c 0025046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0231 30c069c0 0c000c00 01000000 3c002504 6c6f6e67
+     06646f6d 61696e02 746f0566 6f726365 0a747275 6e636174 696f6e02 3131c069
+     c00c000c 00010000 003c0025 046c6f6e 6706646f 6d61696e 02746f05 666f7263
+     650a7472 756e6361 74696f6e 023132c0 69c00c00 0c000100 00003c00 25046c6f
+     6e670664 6f6d6169 6e02746f 05666f72 63650a74 72756e63 6174696f 6e023133
+     c069c00c 000c0001 0000003c 0025046c 6f6e6706 646f6d61 696e0274 6f05666f
+     7263650a 7472756e 63617469 6f6e0231 34c069c0 0c000c00 01000000 3c002504
+     6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275 6e636174 696f6e02
+     3135c069 c00c000c 00010000 003c0025 046c6f6e 6706646f 6d61696e 02746f05
+     666f7263 650a7472 756e6361 74696f6e 023136c0 69c00c00 0c000100 00003c00
+     25046c6f 6e670664 6f6d6169 6e02746f 05666f72 63650a74 72756e63 6174696f
+     6e023137 c069c00c 000c0001 0000003c 0025046c 6f6e6706 646f6d61 696e0274
+     6f05666f 7263650a 7472756e 63617469 6f6e0231 38c069c0 0c000c00 01000000
+     3c002504 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275 6e636174
+     696f6e02 3139c069 c00c000c 00010000 003c0025 046c6f6e 6706646f 6d61696e
+     02746f05 666f7263 650a7472 756e6361 74696f6e 023230c0 69c00c00 0c000100
+     00003c00 25046c6f 6e670664 6f6d6169 6e02746f 05666f72 63650a74 72756e63
+     6174696f 6e023231 c069c00c 000c0001 0000003c 0025046c 6f6e6706 646f6d61
+     696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0232 32c069c0 0c000c00
+     01000000 3c002504 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275
+     6e636174 696f6e02 3233c069 c00c000c 00010000 003c0025 046c6f6e 6706646f
+     6d61696e 02746f05 666f7263 650a7472 756e6361 74696f6e 023234c0 69c00c00
+     0c000100 00003c00 25046c6f 6e670664 6f6d6169 6e02746f 05666f72 63650a74
+     72756e63 6174696f 6e023235 c069c00c 000c0001 0000003c 0025046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0232 36c069c0
+     0c000c00 01000000 3c002504 6c6f6e67 06646f6d 61696e02 746f0566 6f726365
+     0a747275 6e636174 696f6e02 3237c069 c00c000c 00010000 003c0025 046c6f6e
+     6706646f 6d61696e 02746f05 666f7263 650a7472 756e6361 74696f6e 023238c0
+     69c00c00 0c000100 00003c00 25046c6f 6e670664 6f6d6169 6e02746f 05666f72
+     63650a74 72756e63 6174696f 6e023239 c069c069 00020001 0000003c 0006036e
+     7330c072 036e7330 c0720001 00010001 51800004 ac122d06.
+ +0.008947
+ read fd=5 buflen=1594
+ read=EAGAIN
+ +0.032609
+ close fd=4
+ close=OK
+ +0.051246
+ close fd=5
+ close=OK
+ +0.001019

diff --git a/regress/case-1stservtotcp.err b/regress/case-1stservtotcp.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regress/case-1stservtotcp.out b/regress/case-1stservtotcp.out
new file mode 100644 (file)
index 0000000..fe2f632
--- /dev/null
+++ b/regress/case-1stservtotcp.out
@@ -0,0 +1,37 @@
+adns debug: using nameserver 10.0.0.1
+adns debug: using nameserver 172.18.45.6
+trunc.test.iwj.relativity.greenend.org.uk flags 0 type 12 PTR(raw) submitted
+adns warning: TCP connection failed: unable to make connection: timed out (NS=10.0.0.1)
+adns debug: TCP connected (NS=172.18.45.6)
+trunc.test.iwj.relativity.greenend.org.uk flags 0 type PTR(raw): OK; nrrs=30; cname=$; owner=$; ttl=59
+ long.domain.to.force.truncation.0.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.1.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.2.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.3.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.4.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.5.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.6.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.7.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.8.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.9.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.10.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.11.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.12.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.13.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.14.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.15.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.16.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.17.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.18.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.19.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.20.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.21.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.22.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.23.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.24.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.25.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.26.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.27.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.28.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.29.test.iwj.relativity.greenend.org.uk
+rc=0

diff --git a/regress/case-1stservtotcp.sys b/regress/case-1stservtotcp.sys
new file mode 100644 (file)
index 0000000..84a851c
--- /dev/null
+++ b/regress/case-1stservtotcp.sys
@@ -0,0 +1,159 @@
+1stservto
+:12 trunc.test.iwj.relativity.greenend.org.uk
+ start 940100259.965940
+ socket type=SOCK_DGRAM
+ socket=4
+ +0.000698
+ fcntl fd=4 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000611
+ fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000582
+ sendto fd=4 addr=10.0.0.1:53
+     311f0100 00010000 00000000 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
+ sendto=59
+ +0.006634
+ select max=5 rfds=[4] wfds=[] efds=[] to=1.993366
+ select=0 rfds=[] wfds=[] efds=[]
+ +2.-05507
+ sendto fd=4 addr=172.18.45.6:53
+     311f0100 00010000 00000000 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
+ sendto=59
+ +0.002310
+ select max=5 rfds=[4] wfds=[] efds=[] to=1.997690
+ select=1 rfds=[4] wfds=[] efds=[]
+ +0.000996
+ recvfrom fd=4 buflen=512 *addrlen=16
+ recvfrom=OK addr=172.18.45.6:53
+     311f8380 00010008 00000000 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001c0 0c000c00
+     01000000 3c004704 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275
+     6e636174 696f6e01 30047465 73740369 776a0a72 656c6174 69766974 79086772
+     65656e65 6e64036f 72670275 6b00c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0131 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0132 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0133 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0134 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0135 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0136 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0137 c069.
+ +0.004379
+ socket type=SOCK_STREAM
+ socket=5
+ +0.009970
+ fcntl fd=5 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000612
+ fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000602
+ connect fd=5 addr=10.0.0.1:53
+ connect=EINPROGRESS
+ +0.000850
+ recvfrom fd=4 buflen=512 *addrlen=16
+ recvfrom=EAGAIN
+ +0.000646
+ select max=6 rfds=[4] wfds=[5] efds=[] to=13.982941
+ select=0 rfds=[] wfds=[] efds=[]
+ +14.-10600
+ close fd=5
+ close=OK
+ +0.000750
+ socket type=SOCK_STREAM
+ socket=5
+ +0.004957
+ fcntl fd=5 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000593
+ fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000582
+ connect fd=5 addr=172.18.45.6:53
+ connect=EINPROGRESS
+ +0.001140
+ select max=6 rfds=[4] wfds=[5] efds=[] to=13.991978
+ select=1 rfds=[] wfds=[5] efds=[]
+ +0.001038
+ read fd=5 buflen=1
+ read=EAGAIN
+ +0.001203
+ write fd=5
+     003b311f 01000001 00000000 00000574 72756e63 04746573 74036977 6a0a7265
+     6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000c00 01.
+ write=61
+ +0.007301
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=15.975977
+ select=1 rfds=[5] wfds=[] efds=[]
+ +0.001431
+ read fd=5 buflen=2
+ read=OK
+     0638.
+ +0.001841
+ read fd=5 buflen=1592
+ read=OK
+     311f8580 0001001e 00010001 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001c0 0c000c00
+     01000000 3c004704 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275
+     6e636174 696f6e01 30047465 73740369 776a0a72 656c6174 69766974 79086772
+     65656e65 6e64036f 72670275 6b00c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0131 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0132 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0133 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0134 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0135 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0136 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0137 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0138 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0139 c069c00c
+     000c0001 0000003c 0025046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0231 30c069c0 0c000c00 01000000 3c002504 6c6f6e67
+     06646f6d 61696e02 746f0566 6f726365 0a747275 6e636174 696f6e02 3131c069
+     c00c000c 00010000 003c0025 046c6f6e 6706646f 6d61696e 02746f05 666f7263
+     650a7472 756e6361 74696f6e 023132c0 69c00c00 0c000100 00003c00 25046c6f
+     6e670664 6f6d6169 6e02746f 05666f72 63650a74 72756e63 6174696f 6e023133
+     c069c00c 000c0001 0000003c 0025046c 6f6e6706 646f6d61 696e0274 6f05666f
+     7263650a 7472756e 63617469 6f6e0231 34c069c0 0c000c00 01000000 3c002504
+     6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275 6e636174 696f6e02
+     3135c069 c00c000c 00010000 003c0025 046c6f6e 6706646f 6d61696e 02746f05
+     666f7263 650a7472 756e6361 74696f6e 023136c0 69c00c00 0c000100 00003c00
+     25046c6f 6e670664 6f6d6169 6e02746f 05666f72 63650a74 72756e63 6174696f
+     6e023137 c069c00c 000c0001 0000003c 0025046c 6f6e6706 646f6d61 696e0274
+     6f05666f 7263650a 7472756e 63617469 6f6e0231 38c069c0 0c000c00 01000000
+     3c002504 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275 6e636174
+     696f6e02 3139c069 c00c000c 00010000 003c0025 046c6f6e 6706646f 6d61696e
+     02746f05 666f7263 650a7472 756e6361 74696f6e 023230c0 69c00c00 0c000100
+     00003c00 25046c6f 6e670664 6f6d6169 6e02746f 05666f72 63650a74 72756e63
+     6174696f 6e023231 c069c00c 000c0001 0000003c 0025046c 6f6e6706 646f6d61
+     696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0232 32c069c0 0c000c00
+     01000000 3c002504 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275
+     6e636174 696f6e02 3233c069 c00c000c 00010000 003c0025 046c6f6e 6706646f
+     6d61696e 02746f05 666f7263 650a7472 756e6361 74696f6e 023234c0 69c00c00
+     0c000100 00003c00 25046c6f 6e670664 6f6d6169 6e02746f 05666f72 63650a74
+     72756e63 6174696f 6e023235 c069c00c 000c0001 0000003c 0025046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0232 36c069c0
+     0c000c00 01000000 3c002504 6c6f6e67 06646f6d 61696e02 746f0566 6f726365
+     0a747275 6e636174 696f6e02 3237c069 c00c000c 00010000 003c0025 046c6f6e
+     6706646f 6d61696e 02746f05 666f7263 650a7472 756e6361 74696f6e 023238c0
+     69c00c00 0c000100 00003c00 25046c6f 6e670664 6f6d6169 6e02746f 05666f72
+     63650a74 72756e63 6174696f 6e023239 c069c069 00020001 0000003c 0006036e
+     7330c072 036e7330 c0720001 00010001 51800004 ac122d06.
+ +1.-990207
+ read fd=5 buflen=1594
+ read=EAGAIN
+ +0.040526
+ close fd=4
+ close=OK
+ +0.065240
+ close fd=5
+ close=OK
+ +0.000982

diff --git a/regress/case-2ndservok.err b/regress/case-2ndservok.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regress/case-2ndservok.out b/regress/case-2ndservok.out
new file mode 100644 (file)
index 0000000..2c72438
--- /dev/null
+++ b/regress/case-2ndservok.out
@@ -0,0 +1,6 @@
+adns debug: using nameserver 172.18.45.36
+adns debug: using nameserver 172.18.45.6
+davenant.relativity.greenend.org.uk flags 0 type 1 A(-) submitted
+davenant.relativity.greenend.org.uk flags 0 type A(-): OK; nrrs=1; cname=$; owner=$; ttl=86400
+ 172.18.45.6
+rc=0

diff --git a/regress/case-2ndservok.sys b/regress/case-2ndservok.sys
new file mode 100644 (file)
index 0000000..8ca8f83
--- /dev/null
+++ b/regress/case-2ndservok.sys
@@ -0,0 +1,47 @@
+2ndserver
+:1 davenant.relativity.greenend.org.uk
+ start 940100095.012145
+ socket type=SOCK_DGRAM
+ socket=4
+ +0.000173
+ fcntl fd=4 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000053
+ fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000042
+ sendto fd=4 addr=172.18.45.36:53
+     311f0100 00010000 00000000 08646176 656e616e 740a7265 6c617469 76697479
+     08677265 656e656e 64036f72 6702756b 00000100 01.
+ sendto=53
+ +0.001041
+ select max=5 rfds=[4] wfds=[] efds=[] to=1.998959
+ select=0 rfds=[] wfds=[] efds=[]
+ +2.-04931
+ select max=5 rfds=[4] wfds=[] efds=[] to=0.003890
+ select=0 rfds=[] wfds=[] efds=[]
+ +0.009910
+ sendto fd=4 addr=172.18.45.6:53
+     311f0100 00010000 00000000 08646176 656e616e 740a7265 6c617469 76697479
+     08677265 656e656e 64036f72 6702756b 00000100 01.
+ sendto=53
+ +0.000863
+ select max=5 rfds=[4] wfds=[] efds=[] to=1.999137
+ select=1 rfds=[4] wfds=[] efds=[]
+ +0.000126
+ recvfrom fd=4 buflen=512 *addrlen=16
+ recvfrom=OK addr=172.18.45.6:53
+     311f8580 00010001 00030003 08646176 656e616e 740a7265 6c617469 76697479
+     08677265 656e656e 64036f72 6702756b 00000100 01c00c00 01000100 01518000
+     04ac122d 060a7265 6c617469 76697479 08677265 656e656e 64036f72 6702756b
+     00000200 01000151 80000603 6e7330c0 45c04500 02000100 01518000 06036e73
+     31c045c0 45000200 01000151 80000603 6e7332c0 45c06b00 01000100 01518000
+     04ac122d 06c07d00 01000100 01518000 04ac122d 41c08f00 01000100 01518000
+     04ac122d 01.
+ +0.001026
+ recvfrom fd=4 buflen=512 *addrlen=16
+ recvfrom=EAGAIN
+ +0.000423
+ close fd=4
+ close=OK
+ +0.000435

diff --git a/regress/case-2ndservtcp.err b/regress/case-2ndservtcp.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regress/case-2ndservtcp.out b/regress/case-2ndservtcp.out
new file mode 100644 (file)
index 0000000..857176d
--- /dev/null
+++ b/regress/case-2ndservtcp.out
@@ -0,0 +1,37 @@
+adns debug: using nameserver 172.18.45.36
+adns debug: using nameserver 172.18.45.6
+trunc.test.iwj.relativity.greenend.org.uk flags 0 type 12 PTR(raw) submitted
+adns warning: TCP connection failed: connect/read: No route to host (NS=172.18.45.36)
+adns debug: TCP connected (NS=172.18.45.6)
+trunc.test.iwj.relativity.greenend.org.uk flags 0 type PTR(raw): OK; nrrs=30; cname=$; owner=$; ttl=60
+ long.domain.to.force.truncation.0.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.1.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.2.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.3.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.4.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.5.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.6.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.7.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.8.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.9.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.10.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.11.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.12.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.13.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.14.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.15.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.16.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.17.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.18.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.19.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.20.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.21.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.22.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.23.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.24.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.25.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.26.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.27.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.28.test.iwj.relativity.greenend.org.uk
+ long.domain.to.force.truncation.29.test.iwj.relativity.greenend.org.uk
+rc=0

diff --git a/regress/case-2ndservtcp.sys b/regress/case-2ndservtcp.sys
new file mode 100644 (file)
index 0000000..5267730
--- /dev/null
+++ b/regress/case-2ndservtcp.sys
@@ -0,0 +1,165 @@
+2ndserver
+:12 trunc.test.iwj.relativity.greenend.org.uk
+ start 940100083.268555
+ socket type=SOCK_DGRAM
+ socket=4
+ +0.000169
+ fcntl fd=4 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000053
+ fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000040
+ sendto fd=4 addr=172.18.45.36:53
+     311f0100 00010000 00000000 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
+ sendto=59
+ +0.001167
+ select max=5 rfds=[4] wfds=[] efds=[] to=1.998833
+ select=0 rfds=[] wfds=[] efds=[]
+ +2.-01463
+ select max=5 rfds=[4] wfds=[] efds=[] to=0.000296
+ select=0 rfds=[] wfds=[] efds=[]
+ +0.009912
+ sendto fd=4 addr=172.18.45.6:53
+     311f0100 00010000 00000000 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
+ sendto=59
+ +0.001357
+ select max=5 rfds=[4] wfds=[] efds=[] to=1.998643
+ select=1 rfds=[4] wfds=[] efds=[]
+ +0.000126
+ recvfrom fd=4 buflen=512 *addrlen=16
+ recvfrom=OK addr=172.18.45.6:53
+     311f8380 00010008 00000000 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001c0 0c000c00
+     01000000 3c004704 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275
+     6e636174 696f6e01 30047465 73740369 776a0a72 656c6174 69766974 79086772
+     65656e65 6e64036f 72670275 6b00c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0131 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0132 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0133 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0134 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0135 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0136 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0137 c069.
+ +0.002022
+ socket type=SOCK_STREAM
+ socket=5
+ +0.000905
+ fcntl fd=5 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000041
+ fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000038
+ connect fd=5 addr=172.18.45.36:53
+ connect=EINPROGRESS
+ +0.000162
+ recvfrom fd=4 buflen=512 *addrlen=16
+ recvfrom=EAGAIN
+ +0.000062
+ select max=6 rfds=[4] wfds=[5] efds=[] to=13.996770
+ select=1 rfds=[] wfds=[5] efds=[]
+ +1.-14443
+ read fd=5 buflen=1
+ read=EHOSTUNREACH
+ +0.000193
+ close fd=5
+ close=OK
+ +0.000146
+ socket type=SOCK_STREAM
+ socket=5
+ +0.000678
+ fcntl fd=5 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000042
+ fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000039
+ connect fd=5 addr=172.18.45.6:53
+ connect=EINPROGRESS
+ +0.000455
+ select max=6 rfds=[4] wfds=[5] efds=[] to=14.000000
+ select=1 rfds=[] wfds=[5] efds=[]
+ +0.000135
+ read fd=5 buflen=1
+ read=EAGAIN
+ +0.000062
+ write fd=5
+     003b311f 01000001 00000000 00000574 72756e63 04746573 74036977 6a0a7265
+     6c617469 76697479 08677265 656e656e 64036f72 6702756b 00000c00 01.
+ write=61
+ +0.004082
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.005381
+ select=1 rfds=[5] wfds=[] efds=[]
+ +0.000149
+ read fd=5 buflen=2
+ read=OK
+     0638.
+ +0.000210
+ read fd=5 buflen=1592
+ read=OK
+     311f8580 0001001e 00010001 05747275 6e630474 65737403 69776a0a 72656c61
+     74697669 74790867 7265656e 656e6403 6f726702 756b0000 0c0001c0 0c000c00
+     01000000 3c004704 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275
+     6e636174 696f6e01 30047465 73740369 776a0a72 656c6174 69766974 79086772
+     65656e65 6e64036f 72670275 6b00c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0131 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0132 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0133 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0134 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0135 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0136 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0137 c069c00c
+     000c0001 0000003c 0024046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0138 c069c00c 000c0001 0000003c 0024046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0139 c069c00c
+     000c0001 0000003c 0025046c 6f6e6706 646f6d61 696e0274 6f05666f 7263650a
+     7472756e 63617469 6f6e0231 30c069c0 0c000c00 01000000 3c002504 6c6f6e67
+     06646f6d 61696e02 746f0566 6f726365 0a747275 6e636174 696f6e02 3131c069
+     c00c000c 00010000 003c0025 046c6f6e 6706646f 6d61696e 02746f05 666f7263
+     650a7472 756e6361 74696f6e 023132c0 69c00c00 0c000100 00003c00 25046c6f
+     6e670664 6f6d6169 6e02746f 05666f72 63650a74 72756e63 6174696f 6e023133
+     c069c00c 000c0001 0000003c 0025046c 6f6e6706 646f6d61 696e0274 6f05666f
+     7263650a 7472756e 63617469 6f6e0231 34c069c0 0c000c00 01000000 3c002504
+     6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275 6e636174 696f6e02
+     3135c069 c00c000c 00010000 003c0025 046c6f6e 6706646f 6d61696e 02746f05
+     666f7263 650a7472 756e6361 74696f6e 023136c0 69c00c00 0c000100 00003c00
+     25046c6f 6e670664 6f6d6169 6e02746f 05666f72 63650a74 72756e63 6174696f
+     6e023137 c069c00c 000c0001 0000003c 0025046c 6f6e6706 646f6d61 696e0274
+     6f05666f 7263650a 7472756e 63617469 6f6e0231 38c069c0 0c000c00 01000000
+     3c002504 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275 6e636174
+     696f6e02 3139c069 c00c000c 00010000 003c0025 046c6f6e 6706646f 6d61696e
+     02746f05 666f7263 650a7472 756e6361 74696f6e 023230c0 69c00c00 0c000100
+     00003c00 25046c6f 6e670664 6f6d6169 6e02746f 05666f72 63650a74 72756e63
+     6174696f 6e023231 c069c00c 000c0001 0000003c 0025046c 6f6e6706 646f6d61
+     696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0232 32c069c0 0c000c00
+     01000000 3c002504 6c6f6e67 06646f6d 61696e02 746f0566 6f726365 0a747275
+     6e636174 696f6e02 3233c069 c00c000c 00010000 003c0025 046c6f6e 6706646f
+     6d61696e 02746f05 666f7263 650a7472 756e6361 74696f6e 023234c0 69c00c00
+     0c000100 00003c00 25046c6f 6e670664 6f6d6169 6e02746f 05666f72 63650a74
+     72756e63 6174696f 6e023235 c069c00c 000c0001 0000003c 0025046c 6f6e6706
+     646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0232 36c069c0
+     0c000c00 01000000 3c002504 6c6f6e67 06646f6d 61696e02 746f0566 6f726365
+     0a747275 6e636174 696f6e02 3237c069 c00c000c 00010000 003c0025 046c6f6e
+     6706646f 6d61696e 02746f05 666f7263 650a7472 756e6361 74696f6e 023238c0
+     69c00c00 0c000100 00003c00 25046c6f 6e670664 6f6d6169 6e02746f 05666f72
+     63650a74 72756e63 6174696f 6e023239 c069c069 00020001 0000003c 0006036e
+     7330c072 036e7330 c0720001 00010001 51800004 ac122d06.
+ +0.006071
+ read fd=5 buflen=1594
+ read=EAGAIN
+ +0.005347
+ close fd=4
+ close=OK
+ +0.004675
+ close fd=5
+ close=OK
+ +0.000433

diff --git a/regress/case-manyptrwrongrem.sys b/regress/case-manyptrwrongrem.sys
index 3f07310417a137de173f2ec9abe08d8823ac4fd2..3b90e59f06f6b4ad192bf358a638d037b7a925e8 100644 (file)
--- a/regress/case-manyptrwrongrem.sys
+++ b/regress/case-manyptrwrongrem.sys
@@ -316,7 +316,7 @@ manyptrwrong
  recvfrom fd=4 buflen=512 *addrlen=16
  recvfrom=EAGAIN
  +0.000373
- select max=6 rfds=[4] wfds=[5] efds=[] to=29.539402
+ select max=6 rfds=[4] wfds=[5] efds=[] to=13.539402
  select=1 rfds=[] wfds=[5] efds=[]
  +0.008807
  read fd=5 buflen=1
@@ -332,7 +332,7 @@ manyptrwrong
      64647204 61727061 00000c00 01.
  write=45
  +0.000449
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.998444
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.529039
  select=1 rfds=[5] wfds=[] efds=[]
  +1.-90216
  read fd=5 buflen=2
@@ -391,7 +391,7 @@ manyptrwrong
  read fd=5 buflen=973
  read=EAGAIN
  +0.000255
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.078950
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.609545
  select=1 rfds=[5] wfds=[] efds=[]
  +1.-260444
  read fd=5 buflen=973
@@ -431,7 +431,7 @@ manyptrwrong
  read fd=5 buflen=2433
  read=EAGAIN
  +0.018754
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.314815
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.145272
  select=1 rfds=[5] wfds=[] efds=[]
  +0.355726
  read fd=5 buflen=2433
@@ -486,7 +486,7 @@ manyptrwrong
  read fd=5 buflen=973
  read=EAGAIN
  +0.000242
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=27.950237
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=27.780694
  select=1 rfds=[5] wfds=[] efds=[]
  +1.-129629
  read fd=5 buflen=973

diff --git a/regress/case-manyptrwrongrst.sys b/regress/case-manyptrwrongrst.sys
index 10a5a1780b4f70275a5f54398e11ecc65bf3ab94..227264faa0fd335cb868fb62c168d570cefa0c52 100644 (file)
--- a/regress/case-manyptrwrongrst.sys
+++ b/regress/case-manyptrwrongrst.sys
@@ -446,7 +446,7 @@ default
  recvfrom fd=4 buflen=512 *addrlen=16
  recvfrom=EAGAIN
  +0.000169
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.282776
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.275214
  select=1 rfds=[4] wfds=[] efds=[]
  +1.-921124
  recvfrom fd=4 buflen=512 *addrlen=16
@@ -471,7 +471,7 @@ default
  recvfrom fd=4 buflen=512 *addrlen=16
  recvfrom=EAGAIN
  +0.000483
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.200363
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.192801
  select=1 rfds=[5] wfds=[] efds=[]
  +0.817055
  read fd=5 buflen=2
@@ -563,7 +563,7 @@ default
  read fd=5 buflen=2417
  read=EAGAIN
  +0.019409
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=59.059852
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.059852
  select=1 rfds=[5] wfds=[] efds=[]
  +0.028945
  read fd=5 buflen=2417
@@ -618,7 +618,7 @@ default
  read fd=5 buflen=957
  read=EAGAIN
  +0.000264
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=59.021921
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.021921
  select=1 rfds=[5] wfds=[] efds=[]
  +0.063001
  read fd=5 buflen=957

diff --git a/regress/case-norecurse.out b/regress/case-norecurse.out
index 41accc1c3547550b6826206a995d1b5146d12aaf..f0d2a0f858e8567f53f86dbd6fe839dc200c3649 100644 (file)
--- a/regress/case-norecurse.out
+++ b/regress/case-norecurse.out
@@ -6,7 +6,7 @@ adns debug: using nameserver 172.18.45.6
 4.204.50.158.in-addr.arpa flags 0 type 12 PTR(raw) submitted
 4.204.50.158.in-addr.arpa flags 0 type 13adns debug: TCP connected (NS=172.18.45.6)
  HINFO(-) submitted
-4.204.50.158.in-addr.arpa flags 0 type 15adns warning: TCP connection lost: poll/select: exceptional condition detected (NS=172.18.45.6)
+4.204.50.158.in-addr.arpa flags 0 type 15adns warning: TCP connection failed: poll/select: exceptional condition detected (NS=172.18.45.6)
  MX(raw) submitted
 4.204.50.158.in-addr.arpa flags 0 type 16 TXT(-) submitted
 4.204.50.158.in-addr.arpa flags 0 type 17 RP(raw) submitted
@@ -15,7 +15,7 @@ adns debug: using nameserver 172.18.45.6
 4.204.50.158.in-addr.arpa flags 0 type 65548 PTR(checked) submitted
 4.204.50.158.in-addr.arpa flags 0 type 65551adns debug: TCP connected (NS=172.18.45.6)
  MX(+addr) submitted
-4.204.50.158.in-addr.arpa flags 0 type 131078adns warning: TCP connection lost: poll/select: exceptional condition detected (NS=172.18.45.6)
+4.204.50.158.in-addr.arpa flags 0 type 131078adns warning: TCP connection failed: poll/select: exceptional condition detected (NS=172.18.45.6)
  SOA(822) submitted
 4.204.50.158.in-addr.arpa flags 0 type 131089adns debug: reply not found, id 3141, query owner ns2.afpdoc.com (NS=172.18.45.6)
 adns debug: reply not found, id 3142, query owner ns2.afp-notes.com (NS=172.18.45.6)

diff --git a/regress/case-norecurse2.sys b/regress/case-norecurse2.sys
index 3ace74f1cf27f2cbb7257136b0417300b7de092e..388543f61e0f9b7ab7ef4884580d0aade3447814 100644 (file)
--- a/regress/case-norecurse2.sys
+++ b/regress/case-norecurse2.sys
@@ -523,7 +523,7 @@ default -0x16
  recvfrom fd=4 buflen=512 *addrlen=16
  recvfrom=EAGAIN
  +0.000201
- select max=6 rfds=[4] wfds=[5] efds=[] to=29.987312
+ select max=6 rfds=[4] wfds=[5] efds=[] to=13.987312
  select=1 rfds=[] wfds=[5] efds=[]
  +0.000364
  read fd=5 buflen=1
@@ -539,7 +539,7 @@ default -0x16
      64647204 61727061 00000c00 01.
  write=45
  +0.001275
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.996906
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.983854
  select=1 rfds=[5] wfds=[] efds=[]
  +0.000150
  read fd=5 buflen=2

diff --git a/regress/case-tcpmultipart.sys b/regress/case-tcpmultipart.sys
index 4c1b2c2167560b774f0ed6997e160389fc9da12e..bdc3f785e9de02b84c12b0bbb82ec93c02b295a9 100644 (file)
--- a/regress/case-tcpmultipart.sys
+++ b/regress/case-tcpmultipart.sys
@@ -22,7 +22,7 @@ tunnel
  connect fd=5 addr=172.31.80.9:53
  connect=EINPROGRESS
  +0.000414
- select max=6 rfds=[4] wfds=[5] efds=[] to=29.998324
+ select max=6 rfds=[4] wfds=[5] efds=[] to=13.998324
  select=1 rfds=[] wfds=[5] efds=[]
  +1.-647444
  read fd=5 buflen=1
@@ -43,7 +43,7 @@ tunnel
      2d616464 72046172 70610000 0c0001.
  write=47
  +0.000273
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.998465
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.644233
  select=1 rfds=[5] wfds=[] efds=[]
  +0.538651
  read fd=5 buflen=2
@@ -66,7 +66,7 @@ tunnel
  read fd=5 buflen=297
  read=EAGAIN
  +0.000476
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.457802
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.105246
  select=1 rfds=[5] wfds=[] efds=[]
  +1.-401146
  read fd=5 buflen=297
@@ -109,7 +109,7 @@ tunnel
  read fd=5 buflen=2572
  read=EAGAIN
  +0.000101
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.855360
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.502804
  select=1 rfds=[5] wfds=[] efds=[]
  +0.336462
  read fd=5 buflen=2572
@@ -148,7 +148,7 @@ tunnel
  read fd=5 buflen=1624
  read=EAGAIN
  +0.000124
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.515459
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.162903
  select=1 rfds=[5] wfds=[] efds=[]
  +1.-683589
  read fd=5 buflen=1624
@@ -187,7 +187,7 @@ tunnel
  read fd=5 buflen=676
  read=EAGAIN
  +0.000114
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.195733
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=27.843177
  select=1 rfds=[5] wfds=[] efds=[]
  +0.376863
  read fd=5 buflen=676
@@ -230,7 +230,7 @@ tunnel
  read fd=5 buflen=3248
  read=EAGAIN
  +0.000066
- select max=6 rfds=[4,5] wfds=[] efds=[5] to=27.807002
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=27.454446
  select=1 rfds=[5] wfds=[] efds=[]
  +0.316770
  read fd=5 buflen=3248

diff --git a/regress/init-1stservbroken.text b/regress/init-1stservbroken.text
new file mode 100644 (file)
index 0000000..56cd423
--- /dev/null
+++ b/regress/init-1stservbroken.text
@@ -0,0 +1,3 @@
+nameserver 172.18.45.2
+nameserver 172.18.45.6
+sortlist 127.0.0.1/32 172.18.45.0/28 172.18.45.0/24

diff --git a/regress/init-1stservto.text b/regress/init-1stservto.text
new file mode 100644 (file)
index 0000000..b70e678
--- /dev/null
+++ b/regress/init-1stservto.text
@@ -0,0 +1,3 @@
+nameserver 10.0.0.1
+nameserver 172.18.45.6
+sortlist 127.0.0.1/32 172.18.45.0/28 172.18.45.0/24

diff --git a/regress/init-2ndserver.text b/regress/init-2ndserver.text
new file mode 100644 (file)
index 0000000..88cb0d2
--- /dev/null
+++ b/regress/init-2ndserver.text
@@ -0,0 +1,3 @@
+nameserver 172.18.45.36
+nameserver 172.18.45.6
+sortlist 127.0.0.1/32 172.18.45.0/28 172.18.45.0/24