Add test for TCP responses which end up in several packets.

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

diff --git a/regress/case-tcpmultipart.out b/regress/case-tcpmultipart.out
new file mode 100644 (file)
index 0000000..3a7a124
--- /dev/null
+++ b/regress/case-tcpmultipart.out
@@ -0,0 +1,71 @@
+adns debug: using nameserver 172.31.80.9
+132.76.224.195.in-addr.arpa flags 2 type 12 PTR(raw) submitted
+manymorerrs.test.culture.dotat.at. flags 2 type 12 PTR(raw) submitted
+132.76.224.195.in-addr.arpa flags 2 type 12 PTR(raw) submitted
+adns debug: TCP connected (NS=172.31.80.9)
+132.76.224.195.in-addr.arpa flags 2 type PTR(raw): OK; nrrs=1; cname=$; owner=$; ttl=86400
+ chiark.greenend.org.uk
+manymorerrs.test.culture.dotat.at. flags 2 type PTR(raw): OK; nrrs=60; cname=$; owner=$; ttl=86400
+ very-long-domain.to-ensure-truncation.00.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.01.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.02.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.03.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.04.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.05.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.06.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.07.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.08.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.09.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.10.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.11.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.12.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.13.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.14.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.15.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.16.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.17.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.18.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.19.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.20.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.21.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.22.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.23.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.24.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.25.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.26.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.27.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.28.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.29.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.30.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.31.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.32.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.33.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.34.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.35.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.36.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.37.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.38.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.39.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.40.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.41.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.42.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.43.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.44.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.45.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.46.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.47.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.48.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.49.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.50.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.51.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.52.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.53.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.54.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.55.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.56.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.57.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.58.test.culture.dotat.at
+ very-long-domain.to-ensure-truncation.59.test.culture.dotat.at
+132.76.224.195.in-addr.arpa flags 2 type PTR(raw): OK; nrrs=1; cname=$; owner=$; ttl=86400
+ chiark.greenend.org.uk
+rc=0

diff --git a/regress/case-tcpmultipart.sys b/regress/case-tcpmultipart.sys
new file mode 100644 (file)
index 0000000..4c1b2c2
--- /dev/null
+++ b/regress/case-tcpmultipart.sys
@@ -0,0 +1,248 @@
+tunnel
+:12 2/132.76.224.195.in-addr.arpa 2/manymorerrs.test.culture.dotat.at. 2/132.76.224.195.in-addr.arpa
+ start 938365454.994875
+ socket type=SOCK_DGRAM
+ socket=4
+ +0.000164
+ fcntl fd=4 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000055
+ fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000043
+ socket type=SOCK_STREAM
+ socket=5
+ +0.001177
+ fcntl fd=5 cmd=F_GETFL
+ fcntl=~O_NONBLOCK&...
+ +0.000044
+ fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
+ fcntl=OK
+ +0.000041
+ 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=1 rfds=[] wfds=[5] efds=[]
+ +1.-647444
+ read fd=5 buflen=1
+ read=EAGAIN
+ +0.000176
+ write fd=5
+     002d311f 01000001 00000000 00000331 33320237 36033232 34033139 3507696e
+     2d616464 72046172 70610000 0c0001.
+ write=47
+ +0.000727
+ write fd=5
+     00333120 01000001 00000000 00000b6d 616e796d 6f726572 72730474 65737407
+     63756c74 75726505 646f7461 74026174 00000c00 01.
+ write=53
+ +0.000359
+ write fd=5
+     002d3121 01000001 00000000 00000331 33320237 36033232 34033139 3507696e
+     2d616464 72046172 70610000 0c0001.
+ write=47
+ +0.000273
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.998465
+ select=1 rfds=[5] wfds=[] efds=[]
+ +0.538651
+ read fd=5 buflen=2
+ read=OK
+     0127.
+ +0.000289
+ read fd=5 buflen=295
+ read=OK
+     311f8580 00010001 00050005 03313332 02373603 32323403 31393507 696e2d61
+     64647204 61727061 00000c00 01c00c00 0c000100 01518000 18066368 6961726b
+     08677265 656e656e 64036f72 6702756b 00023736 03323234 03313935 07696e2d
+     61646472 04617270 61000002 00010001 51800011 04646e73 3006656c 6d61696c
+     02636fc0 4dc05100 02000100 01518000 0704646e 7331c079 c0510002 00010001
+     51800007 04646e73 32c079c0 51000200 01000151 80000e03 6e733204 78617261
+     036e6574 00c05100 02000100 01518000 06036e73 33c0bbc0 74000100 01000055
+     c80004c1 7ae911c0 91000100 0100004f 650004c1 7ae901c0 a4000100 0100004f
+     650004c3 e04cc1c0 b7000100 0100014c 4b0004c2 8fa16bc0 d1000100 0100014c
+     4b0004c2 8fa319.
+ +0.001247
+ read fd=5 buflen=297
+ read=EAGAIN
+ +0.000476
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=29.457802
+ select=1 rfds=[5] wfds=[] efds=[]
+ +1.-401146
+ read fd=5 buflen=297
+ read=OK
+     0dbe3120 85800001 003c0002 00020b6d 616e796d 6f726572 72730474 65737407
+     63756c74 75726505 646f7461 74026174 00000c00 01c00c00 0c000100 01518000
+     40107665 72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265 2d747275
+     6e636174 696f6e02 30300474 65737407 63756c74 75726505 646f7461 74026174
+     00c00c00 0c000100 01518000 2b107665 72792d6c 6f6e672d 646f6d61 696e1474
+     6f2d656e 73757265 2d747275 6e636174 696f6e02 3031c068 c00c000c 00010001
+     5180002b 10766572 792d6c6f 6e672d64 6f6d6169 6e14746f 2d656e73 7572652d
+     7472756e 63617469 6f6e0230 32c068c0 0c000c00 01000151 80002b10 76657279
+     2d6c6f6e 672d646f 6d61696e 14746f2d 656e7375 72652d74 72756e63 6174696f
+     6e023033 c068c00c 00.
+ +0.001076
+ read fd=5 buflen=3223
+ read=OK
+     0c000100 01518000 2b107665 72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e
+     73757265 2d747275 6e636174 696f6e02 3034c068 c00c000c 00010001 5180002b
+     10766572 792d6c6f 6e672d64 6f6d6169 6e14746f 2d656e73 7572652d 7472756e
+     63617469 6f6e0230 35c068c0 0c000c00 01000151 80002b10 76657279 2d6c6f6e
+     672d646f 6d61696e 14746f2d 656e7375 72652d74 72756e63 6174696f 6e023036
+     c068c00c 000c0001 00015180 002b1076 6572792d 6c6f6e67 2d646f6d 61696e14
+     746f2d65 6e737572 652d7472 756e6361 74696f6e 023037c0 68c00c00 0c000100
+     01518000 2b107665 72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265
+     2d747275 6e636174 696f6e02 3038c068 c00c000c 00010001 5180002b 10766572
+     792d6c6f 6e672d64 6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469
+     6f6e0230 39c068c0 0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f
+     6d61696e 14746f2d 656e7375 72652d74 72756e63 6174696f 6e023130 c068c00c
+     000c0001 00015180 002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65
+     6e737572 652d7472 756e6361 74696f6e 023131c0 68c00c00 0c000100 01518000
+     2b107665 72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265 2d747275
+     6e636174 696f6e02 3132c068 c00c000c 00010001 5180002b 10766572 792d6c6f
+     6e672d64 6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469 6f6e0231
+     33c068c0 0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f 6d61696e
+     14746f2d 656e7375 72652d74 72756e63 6174696f 6e023134 c068c00c 000c0001
+     00015180 002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65 6e737572
+     652d7472 756e6361 74696f.
+ +0.002411
+ read fd=5 buflen=2572
+ read=EAGAIN
+ +0.000101
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.855360
+ select=1 rfds=[5] wfds=[] efds=[]
+ +0.336462
+ read fd=5 buflen=2572
+ read=OK
+     6e023135 c068c00c 000c0001 00015180 002b1076 6572792d 6c6f6e67 2d646f6d
+     61696e14 746f2d65 6e737572 652d7472 756e6361 74696f6e 023136c0 68c00c00
+     0c000100 01518000 2b107665 72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e
+     73757265 2d747275 6e636174 696f6e02 3137c068 c00c000c 00010001 5180002b
+     10766572 792d6c6f 6e672d64 6f6d6169 6e14746f 2d656e73 7572652d 7472756e
+     63617469 6f6e0231 38c068c0 0c000c00 01000151 80002b10 76657279 2d6c6f6e
+     672d646f 6d61696e 14746f2d 656e7375 72652d74 72756e63 6174696f 6e023139
+     c068c00c 000c0001 00015180 002b1076 6572792d 6c6f6e67 2d646f6d 61696e14
+     746f2d65 6e737572 652d7472 756e6361 74696f6e 023230c0 68c00c00 0c000100
+     01518000 2b107665 72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265
+     2d747275 6e636174 696f6e02 3231c068 c00c000c 00010001 5180002b 10766572
+     792d6c6f 6e672d64 6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469
+     6f6e0232 32c068c0 0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f
+     6d61696e 14746f2d 656e7375 72652d74 72756e63 6174696f 6e023233 c068c00c
+     000c0001 00015180 002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65
+     6e737572 652d7472 756e6361 74696f6e 023234c0 68c00c00 0c000100 01518000
+     2b107665 72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265 2d747275
+     6e636174 696f6e02 3235c068 c00c000c 00010001 5180002b 10766572 792d6c6f
+     6e672d64 6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469 6f6e0232
+     36c068c0 0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f 6d61696e
+     14746f2d 656e7375 72652d74 72756e63 6174696f 6e023237 c068c00c 000c0001
+     00015180 002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65 6e737572
+     652d7472 756e6361 74696f6e 023238c0 68c00c00 0c000100 01518000 2b107665
+     72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265 2d747275 6e636174
+     696f6e02 3239c068 c00c000c 00010001 5180002b 10766572 792d6c6f 6e672d64
+     6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469 6f6e0233 30c068c0
+     0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f 6d61696e 14746f2d
+     656e7375 72652d74 72756e63 6174696f 6e023331 c068c00c 000c0001 00015180
+     002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65 6e737572 652d7472
+     756e6361 74696f6e 023332c0 68c00c00 0c000100.
+ +0.003315
+ read fd=5 buflen=1624
+ read=EAGAIN
+ +0.000124
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.515459
+ select=1 rfds=[5] wfds=[] efds=[]
+ +1.-683589
+ read fd=5 buflen=1624
+ read=OK
+     01518000 2b107665 72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265
+     2d747275 6e636174 696f6e02 3333c068 c00c000c 00010001 5180002b 10766572
+     792d6c6f 6e672d64 6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469
+     6f6e0233 34c068c0 0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f
+     6d61696e 14746f2d 656e7375 72652d74 72756e63 6174696f 6e023335 c068c00c
+     000c0001 00015180 002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65
+     6e737572 652d7472 756e6361 74696f6e 023336c0 68c00c00 0c000100 01518000
+     2b107665 72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265 2d747275
+     6e636174 696f6e02 3337c068 c00c000c 00010001 5180002b 10766572 792d6c6f
+     6e672d64 6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469 6f6e0233
+     38c068c0 0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f 6d61696e
+     14746f2d 656e7375 72652d74 72756e63 6174696f 6e023339 c068c00c 000c0001
+     00015180 002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65 6e737572
+     652d7472 756e6361 74696f6e 023430c0 68c00c00 0c000100 01518000 2b107665
+     72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265 2d747275 6e636174
+     696f6e02 3431c068 c00c000c 00010001 5180002b 10766572 792d6c6f 6e672d64
+     6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469 6f6e0234 32c068c0
+     0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f 6d61696e 14746f2d
+     656e7375 72652d74 72756e63 6174696f 6e023433 c068c00c 000c0001 00015180
+     002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65 6e737572 652d7472
+     756e6361 74696f6e 023434c0 68c00c00 0c000100 01518000 2b107665 72792d6c
+     6f6e672d 646f6d61 696e1474 6f2d656e 73757265 2d747275 6e636174 696f6e02
+     3435c068 c00c000c 00010001 5180002b 10766572 792d6c6f 6e672d64 6f6d6169
+     6e14746f 2d656e73 7572652d 7472756e 63617469 6f6e0234 36c068c0 0c000c00
+     01000151 80002b10 76657279 2d6c6f6e 672d646f 6d61696e 14746f2d 656e7375
+     72652d74 72756e63 6174696f 6e023437 c068c00c 000c0001 00015180 002b1076
+     6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65 6e737572 652d7472 756e6361
+     74696f6e 023438c0 68c00c00 0c000100 01518000 2b107665 72792d6c 6f6e672d
+     646f6d61 696e1474 6f2d656e 73757265 2d747275 6e636174 696f6e02 3439c068
+     c00c000c 00010001 5180002b 10766572 792d6c6f.
+ +0.003201
+ read fd=5 buflen=676
+ read=EAGAIN
+ +0.000114
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=28.195733
+ select=1 rfds=[5] wfds=[] efds=[]
+ +0.376863
+ read fd=5 buflen=676
+ read=OK
+     6e672d64 6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469 6f6e0235
+     30c068c0 0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f 6d61696e
+     14746f2d 656e7375 72652d74 72756e63 6174696f 6e023531 c068c00c 000c0001
+     00015180 002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65 6e737572
+     652d7472 756e6361 74696f6e 023532c0 68c00c00 0c000100 01518000 2b107665
+     72792d6c 6f6e672d 646f6d61 696e1474 6f2d656e 73757265 2d747275 6e636174
+     696f6e02 3533c068 c00c000c 00010001 5180002b 10766572 792d6c6f 6e672d64
+     6f6d6169 6e14746f 2d656e73 7572652d 7472756e 63617469 6f6e0235 34c068c0
+     0c000c00 01000151 80002b10 76657279 2d6c6f6e 672d646f 6d61696e 14746f2d
+     656e7375 72652d74 72756e63 6174696f 6e023535 c068c00c 000c0001 00015180
+     002b1076 6572792d 6c6f6e67 2d646f6d 61696e14 746f2d65 6e737572 652d7472
+     756e6361 74696f6e 023536c0 68c00c00 0c000100 01518000 2b107665 72792d6c
+     6f6e672d 646f6d61 696e1474 6f2d656e 73757265 2d747275 6e636174 696f6e02
+     3537c068 c00c000c 00010001 5180002b 10766572 792d6c6f 6e672d64 6f6d6169
+     6e14746f 2d656e73 7572652d 7472756e 63617469 6f6e0235 38c068c0 0c000c00
+     01000151 80002b10 76657279 2d6c6f6e 672d646f 6d61696e 14746f2d 656e7375
+     72652d74 72756e63 6174696f 6e023539 c068c06d 00020001 00054600 0014076c
+     69627261 7279066c 73706163 65036f72 6700c06d 00020001 00054600 001b026e
+     73066368 6961726b 08677265 656e656e 64036f72 6702756b 00076c69 62726172
+     79066c73 70616365 036f7267 00000100 01000161 890004c3 c8013a02 6e730663
+     68696172 6b086772 65656e65 6e64036f 72670275 6b000001 00010001 51800004
+     c3e04c84.
+ +0.002355
+ read fd=5 buflen=3520
+ read=OK
+     01273121 85800001 00010005 00050331 33320237 36033232 34033139 3507696e
+     2d616464 72046172 70610000 0c0001c0 0c000c00 01000151 80001806 63686961
+     726b0867 7265656e 656e6403 6f726702 756b0002 37360332 32340331 39350769
+     6e2d6164 64720461 72706100 00020001 00015180 00110464 6e733006 656c6d61
+     696c0263 6fc04dc0 51000200 01000151 80000704 646e7331 c079c051 00020001
+     00015180 00070464 6e7332c0 79c05100 02000100 01518000 0e036e73 32047861
+     7261036e 657400c0 51000200 01000151 80000603 6e7333c0 bbc07400 01000100
+     0055c800 04c17ae9 11c09100 01000100 004f6500 04c17ae9 01c0a400 01000100
+     004f6500 04c3e04c c1c0b700 01000100.
+ +0.009447
+ read fd=5 buflen=3248
+ read=EAGAIN
+ +0.000066
+ select max=6 rfds=[4,5] wfds=[] efds=[5] to=27.807002
+ select=1 rfds=[5] wfds=[] efds=[]
+ +0.316770
+ read fd=5 buflen=3248
+ read=OK
+     014c4b00 04c28fa1 6bc0d100 01000100 014c4b00 04c28fa3 19.
+ +0.000195
+ read fd=5 buflen=3520
+ read=EAGAIN
+ +0.000429
+ close fd=4
+ close=OK
+ +0.000375
+ close fd=5
+ close=OK
+ +0.000226

diff --git a/regress/init-tunnel.text b/regress/init-tunnel.text
new file mode 100644 (file)
index 0000000..29c789e
--- /dev/null
+++ b/regress/init-tunnel.text
@@ -0,0 +1,3 @@
+nameserver 172.31.80.9
+sortlist 127.0.0.1/32 172.18.45.0/24 172.31.80.0/28
+search davenant.greenend.org.uk greenend.org.uk