regress/: Include the protocol family in socket(2) lines.

I updated the test files with this rune:

	grep -lZ "^ socket type=" *.sys | xargs -0r sed -i \
	  's/^ socket type=/ socket domain=PF_INET type=/'

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>

diff --git a/regress/case-1stservbroken.sys b/regress/case-1stservbroken.sys
index d52c7c6..0b9a462 100644 (file)
--- a/regress/case-1stservbroken.sys
+++ b/regress/case-1stservbroken.sys
@@ -1,7 +1,7 @@
 adnstest 1stservbroken
 :12 trunc.test.iwj.relativity.greenend.org.uk
  start 940102940.701451
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000612
  fcntl fd=4 cmd=F_GETFL
@@ -50,7 +50,7 @@ adnstest 1stservbroken
      7472756e 63617469 6f6e0136 c069c00c 000c0001 0000003c 0024046c 6f6e6706
      646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0137 c069.
  +0.004340
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.005126
  fcntl fd=5 cmd=F_GETFL
@@ -89,7 +89,7 @@ adnstest 1stservbroken
  select max=5 rfds=[4] wfds=[] efds=[] to=0.000000
  select=0 rfds=[] wfds=[] efds=[]
  +0.000001
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.004865
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-1stservtotcp.sys b/regress/case-1stservtotcp.sys
index 08caf32..e1671d0 100644 (file)
--- a/regress/case-1stservtotcp.sys
+++ b/regress/case-1stservtotcp.sys
@@ -1,7 +1,7 @@
 adnstest 1stservto
 :12 trunc.test.iwj.relativity.greenend.org.uk
  start 940100259.965940
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000698
  fcntl fd=4 cmd=F_GETFL
@@ -44,7 +44,7 @@ adnstest 1stservto
      7472756e 63617469 6f6e0136 c069c00c 000c0001 0000003c 0024046c 6f6e6706
      646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0137 c069.
  +0.004379
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.009970
  fcntl fd=5 cmd=F_GETFL
@@ -65,7 +65,7 @@ adnstest 1stservto
  close fd=5
  close=OK
  +0.000750
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.004957
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-2ndservok.sys b/regress/case-2ndservok.sys
index 0f79be6..4a8836f 100644 (file)
--- a/regress/case-2ndservok.sys
+++ b/regress/case-2ndservok.sys
@@ -1,7 +1,7 @@
 adnstest 2ndserver
 :1 davenant.relativity.greenend.org.uk
  start 940100095.012145
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000173
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-2ndservtcp.sys b/regress/case-2ndservtcp.sys
index b1c64dd..e6760c4 100644 (file)
--- a/regress/case-2ndservtcp.sys
+++ b/regress/case-2ndservtcp.sys
@@ -1,7 +1,7 @@
 adnstest 2ndserver
 :12 trunc.test.iwj.relativity.greenend.org.uk
  start 940100083.268555
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000169
  fcntl fd=4 cmd=F_GETFL
@@ -47,7 +47,7 @@ adnstest 2ndserver
      7472756e 63617469 6f6e0136 c069c00c 000c0001 0000003c 0024046c 6f6e6706
      646f6d61 696e0274 6f05666f 7263650a 7472756e 63617469 6f6e0137 c069.
  +0.002022
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.000905
  fcntl fd=5 cmd=F_GETFL
@@ -74,7 +74,7 @@ adnstest 2ndserver
  select max=5 rfds=[4] wfds=[] efds=[] to=0.000000
  select=0 rfds=[] wfds=[] efds=[]
  +0.000001
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.000678
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-aaaa-simple.sys b/regress/case-aaaa-simple.sys
index d7b904e..9f6aea3 100644 (file)
--- a/regress/case-aaaa-simple.sys
+++ b/regress/case-aaaa-simple.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted
 :28 stratocaster.distorted.org.uk
  start 1401870460.843715
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000022
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-aaaa-sort.sys b/regress/case-aaaa-sort.sys
index cb59cb3..4273b8a 100644 (file)
--- a/regress/case-aaaa-sort.sys
+++ b/regress/case-aaaa-sort.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted
 :28 maddr.dnserr.distorted.org.uk
  start 1401871954.600653
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000061
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-abbrev.sys b/regress/case-abbrev.sys
index e5e03bc..e1f2b4f 100644 (file)
--- a/regress/case-abbrev.sys
+++ b/regress/case-abbrev.sys
@@ -1,7 +1,7 @@
 adnstest default
 ,a/greenend.org.uk
  start 929580078.542974
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000202
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-abbrevto.sys b/regress/case-abbrevto.sys
index 503570b..507c94a 100644 (file)
--- a/regress/case-abbrevto.sys
+++ b/regress/case-abbrevto.sys
@@ -1,7 +1,7 @@
 adnstest noserver
 ,a/greenend.org.uk
  start 929580082.699581
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000192
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-adh-cancel.sys b/regress/case-adh-cancel.sys
index d0ced6a..a34d2ad 100644 (file)
--- a/regress/case-adh-cancel.sys
+++ b/regress/case-adh-cancel.sys
@@ -1,7 +1,7 @@
 ./adnshost default -f
 
  start 969124425.922896
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000162
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-adh-cancel2.sys b/regress/case-adh-cancel2.sys
index d089fa6..379119a 100644 (file)
--- a/regress/case-adh-cancel2.sys
+++ b/regress/case-adh-cancel2.sys
@@ -1,7 +1,7 @@
 ./adnshost default -f
 
  start 969124594.885114
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000160
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-adh-cancel3.sys b/regress/case-adh-cancel3.sys
index d7785a5..fcbc5d5 100644 (file)
--- a/regress/case-adh-cancel3.sys
+++ b/regress/case-adh-cancel3.sys
@@ -1,7 +1,7 @@
 ./adnshost default -f
 
  start 969129578.690081
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000809
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-adh-norm.sys b/regress/case-adh-norm.sys
index ca9a7a7..36537db 100644 (file)
--- a/regress/case-adh-norm.sys
+++ b/regress/case-adh-norm.sys
@@ -1,7 +1,7 @@
 ./adnshost default
 chiark.greenend.org.uk
  start 969122933.609498
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000155
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-adh-pipe.sys b/regress/case-adh-pipe.sys
index d956beb..7b2c4f6 100644 (file)
--- a/regress/case-adh-pipe.sys
+++ b/regress/case-adh-pipe.sys
@@ -1,7 +1,7 @@
 ./adnshost default -f
 
  start 969123801.904882
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000156
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-alr-norm.sys b/regress/case-alr-norm.sys
index adce885..fcbb560 100644 (file)
--- a/regress/case-alr-norm.sys
+++ b/regress/case-alr-norm.sys
@@ -1,7 +1,7 @@
 ./adnslogres default
 
  start 969140608.116717
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000127
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-alr-slow.sys b/regress/case-alr-slow.sys
index e4d14b0..09f5987 100644 (file)
--- a/regress/case-alr-slow.sys
+++ b/regress/case-alr-slow.sys
@@ -1,7 +1,7 @@
 ./adnslogres default
 -c4
  start 969140728.042464
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000132
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-arf-norm.sys b/regress/case-arf-norm.sys
index 31aabe8..b9afe1f 100644 (file)
--- a/regress/case-arf-norm.sys
+++ b/regress/case-arf-norm.sys
@@ -13,7 +13,7 @@
  fcntl fd=1 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000034
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.004723
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-arf-text.sys b/regress/case-arf-text.sys
index 0250444..9750504 100644 (file)
--- a/regress/case-arf-text.sys
+++ b/regress/case-arf-text.sys
@@ -13,7 +13,7 @@
  fcntl fd=1 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000033
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.004099
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-brokenmail.sys b/regress/case-brokenmail.sys
index 706fa65..3268143 100644 (file)
--- a/regress/case-brokenmail.sys
+++ b/regress/case-brokenmail.sys
@@ -1,7 +1,7 @@
 adnstest default
 :15,16842767 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 domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000425
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-child.sys b/regress/case-child.sys
index 062a950..df1f477 100644 (file)
--- a/regress/case-child.sys
+++ b/regress/case-child.sys
@@ -1,7 +1,7 @@
 adnstest default
 :65548 134.76.224.195.in-addr.arpa
  start 929574747.401802
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000189
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-cnametocname.sys b/regress/case-cnametocname.sys
index 8fb1143..4d8f2a8 100644 (file)
--- a/regress/case-cnametocname.sys
+++ b/regress/case-cnametocname.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 intel.ugcs.caltech.edu.
  start 938369896.279735
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000179
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-comprinf.sys b/regress/case-comprinf.sys
index 5e29f44..b3fbbb1 100644 (file)
--- a/regress/case-comprinf.sys
+++ b/regress/case-comprinf.sys
@@ -1,7 +1,7 @@
 adnstest default
 :12 37.45.18.172.in-addr.arpa.
  start 951961094.184850
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000134
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-connfail.sys b/regress/case-connfail.sys
index b62923b..af062a3 100644 (file)
--- a/regress/case-connfail.sys
+++ b/regress/case-connfail.sys
@@ -1,7 +1,7 @@
 ./adnstest 2ndserver
 :1 2/davenant.greenend.org.uk
  start 1056289303.784817
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000031
  fcntl fd=6 cmd=F_GETFL
@@ -10,7 +10,7 @@
  fcntl fd=6 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000007
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=7
  +0.000059
  fcntl fd=7 cmd=F_GETFL
@@ -25,7 +25,7 @@
  close fd=7
  close=OK
  +0.000031
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=7
  +0.000035
  fcntl fd=7 cmd=F_GETFL
@@ -43,7 +43,7 @@
  select max=7 rfds=[6] wfds=[] efds=[] to=0.000000
  select=0 rfds=[] wfds=[] efds=[]
  +0.000036
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=7
  +0.000036
  fcntl fd=7 cmd=F_GETFL
@@ -58,7 +58,7 @@
  close fd=7
  close=OK
  +0.000013
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=7
  +0.000036
  fcntl fd=7 cmd=F_GETFL

diff --git a/regress/case-datapluscname.sys b/regress/case-datapluscname.sys
index 855f689..67fb9aa 100644 (file)
--- a/regress/case-datapluscname.sys
+++ b/regress/case-datapluscname.sys
@@ -1,7 +1,7 @@
 adnstest default
 292/170.99.219.194.in-addr.arpa
  start 933809668.543946
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000199
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-datapluscnamewait.sys b/regress/case-datapluscnamewait.sys
index ecfafb5..f94a7b2 100644 (file)
--- a/regress/case-datapluscnamewait.sys
+++ b/regress/case-datapluscnamewait.sys
@@ -1,7 +1,7 @@
 adnstest default
 292/170.99.219.194.in-addr.arpa
  start 933809632.795174
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000201
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-dh-ptr-aaaa.sys b/regress/case-dh-ptr-aaaa.sys
index 5b9f983..eee96b6 100644 (file)
--- a/regress/case-dh-ptr-aaaa.sys
+++ b/regress/case-dh-ptr-aaaa.sys
@@ -1,7 +1,7 @@
 ./adnshost distorted
 -i2001:ba8:1d9:2::4
  start 1401919808.588362
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000058
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-flags10.sys b/regress/case-flags10.sys
index fe0b341..146cf24 100644 (file)
--- a/regress/case-flags10.sys
+++ b/regress/case-flags10.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 ,aaaaaaaaaa/chiark.greenend.org.uk
  start 929580072.670441
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000191
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-flags9.sys b/regress/case-flags9.sys
index e8935ba..ff54112 100644 (file)
--- a/regress/case-flags9.sys
+++ b/regress/case-flags9.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 ,aaaaaaaaa/chiark.greenend.org.uk
  start 929580075.263215
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000212
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-formerr.sys b/regress/case-formerr.sys
index c0e1802..d2ed5d6 100644 (file)
--- a/regress/case-formerr.sys
+++ b/regress/case-formerr.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 1/h.rndrobwlxxxxxxxxxxlllantysiliogogllanfairpwllgwyngyllgogerychw.relativity.greenend.org.uk.
  start 951956380.814815
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000130
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-lockup.sys b/regress/case-lockup.sys
index a14c5ac..5e4ad6b 100644 (file)
--- a/regress/case-lockup.sys
+++ b/regress/case-lockup.sys
@@ -1,7 +1,7 @@
 adnstest noserver
 :1 chiark.greenend.org.uk
  start 912889153.349504
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000193
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-longdom0.sys b/regress/case-longdom0.sys
index ff9a018..6ec88f7 100644 (file)
--- a/regress/case-longdom0.sys
+++ b/regress/case-longdom0.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 1/0rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk.
  start 951955651.857473
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000126
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-longdom1.sys b/regress/case-longdom1.sys
index a54e14d..c0abc4e 100644 (file)
--- a/regress/case-longdom1.sys
+++ b/regress/case-longdom1.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 1/10rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk.
  start 951955690.505811
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000126
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-longdomsrch0.sys b/regress/case-longdomsrch0.sys
index 298bec8..8ebee41 100644 (file)
--- a/regress/case-longdomsrch0.sys
+++ b/regress/case-longdomsrch0.sys
@@ -1,7 +1,7 @@
 adnstest ndots100
 :1 1/10rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
  start 951956073.321566
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000131
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-longdomsrch1.sys b/regress/case-longdomsrch1.sys
index 8e905f5..7643c6f 100644 (file)
--- a/regress/case-longdomsrch1.sys
+++ b/regress/case-longdomsrch1.sys
@@ -1,7 +1,7 @@
 adnstest ndots100
 :1 1/0rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
  start 951956087.269350
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000132
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-longdomsrch1b.sys b/regress/case-longdomsrch1b.sys
index d2f936a..8126b12 100644 (file)
--- a/regress/case-longdomsrch1b.sys
+++ b/regress/case-longdomsrch1b.sys
@@ -1,7 +1,7 @@
 adnstest ndots100
 :1 1/1xxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
  start 951956136.566877
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000137
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-longdomsrch2.sys b/regress/case-longdomsrch2.sys
index 196bb5c..87d2e37 100644 (file)
--- a/regress/case-longdomsrch2.sys
+++ b/regress/case-longdomsrch2.sys
@@ -1,7 +1,7 @@
 adnstest ndots100
 :1 1/xxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
  start 951956143.624786
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000137
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-longlab0.sys b/regress/case-longlab0.sys
index 8bd65ee..eee8899 100644 (file)
--- a/regress/case-longlab0.sys
+++ b/regress/case-longlab0.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 1/yrndrobwlxxxxxxxxxxlllantysiliogogllanfairpwllgwyngyllgogerychw.relativity.greenend.org.uk.
  start 951955250.786132
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000123
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-longlab1.sys b/regress/case-longlab1.sys
index 5b0e46a..7540c06 100644 (file)
--- a/regress/case-longlab1.sys
+++ b/regress/case-longlab1.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 1/hyrndrobwlxxxxxxxxxxlllantysiliogogllanfairpwllgwyngyllgogerychw.relativity.greenend.org.uk.
  start 951955261.286712
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000128
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-mailboxes.sys b/regress/case-mailboxes.sys
index 701f8cc..22a4ff2 100644 (file)
--- a/regress/case-mailboxes.sys
+++ b/regress/case-mailboxes.sys
@@ -1,7 +1,7 @@
 adnstest default
 :131089 silly-rp.test.iwj.relativity.greenend.org.uk
  start 923859567.899146
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000411
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-manya.sys b/regress/case-manya.sys
index 4fad517..503ceb8 100644 (file)
--- a/regress/case-manya.sys
+++ b/regress/case-manya.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 manyaddrs.test.iwj.relativity.greenend.org.uk
  start 912888920.123769
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000245
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-manyptrwrong.sys b/regress/case-manyptrwrong.sys
index b8c638c..264fa83 100644 (file)
--- a/regress/case-manyptrwrong.sys
+++ b/regress/case-manyptrwrong.sys
@@ -1,7 +1,7 @@
 adnstest ncipher
 254.0.99.203.in-addr.arpa
  start 933269010.293417
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000166
  fcntl fd=4 cmd=F_GETFL
@@ -107,7 +107,7 @@ adnstest ncipher
      000c0001 00013b96 000f026e 7309756e 64657268 6f7572c0 43c00c00 0c000100
      013b9600 06036263 63c043.
  +0.001498
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.000954
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-manyptrwrongrem.sys b/regress/case-manyptrwrongrem.sys
index 8590c10..90512d1 100644 (file)
--- a/regress/case-manyptrwrongrem.sys
+++ b/regress/case-manyptrwrongrem.sys
@@ -1,7 +1,7 @@
 adnstest manyptrwrong
 292/254.0.99.203.in-addr.arpa
  start 933286859.476326
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000271
  fcntl fd=4 cmd=F_GETFL
@@ -172,7 +172,7 @@ adnstest manyptrwrong
      000c0001 00015180 000f026e 7309756e 64657268 6f7572c0 43c00c00 0c000100
      01518000 06036263 63c043.
  +0.003324
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.001351
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-manyptrwrongrst.sys b/regress/case-manyptrwrongrst.sys
index 5872e70..07a1cc5 100644 (file)
--- a/regress/case-manyptrwrongrst.sys
+++ b/regress/case-manyptrwrongrst.sys
@@ -1,7 +1,7 @@
 adnstest default
 292/254.0.99.203.in-addr.arpa
  start 933289772.727140
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000265
  fcntl fd=4 cmd=F_GETFL
@@ -385,7 +385,7 @@ adnstest default
      000c0001 00004ecb 000f026e 7309756e 64657268 6f7572c0 43c00c00 0c000100
      004ecb00 06036263 63c043.
  +0.003463
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.001488
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-manyptrwrongrty.sys b/regress/case-manyptrwrongrty.sys
index 9058af3..1c0d425 100644 (file)
--- a/regress/case-manyptrwrongrty.sys
+++ b/regress/case-manyptrwrongrty.sys
@@ -1,7 +1,7 @@
 adnstest default
 292/254.0.99.203.in-addr.arpa
  start 933286845.072950
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000253
  fcntl fd=4 cmd=F_GETFL
@@ -146,7 +146,7 @@ adnstest default
      000c0001 0001514f 000f026e 7309756e 64657268 6f7572c0 43c00c00 0c000100
      01514f00 06036263 63c043.
  +0.003330
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.001365
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-ndots-as.sys b/regress/case-ndots-as.sys
index 169f46b..970f38d 100644 (file)
--- a/regress/case-ndots-as.sys
+++ b/regress/case-ndots-as.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 5/newsx.davenant 5/news.davenant 5/news.davenant.greenend.org.uk 5/trunc.test.iwj.relativity 5/trunx.test.iwj.relativity 5/test.iwj.relativity
  start 931992163.221752
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000186
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-ndots.sys b/regress/case-ndots.sys
index 9fc0135..2ce3e97 100644 (file)
--- a/regress/case-ndots.sys
+++ b/regress/case-ndots.sys
@@ -1,7 +1,7 @@
 adnstest ndots -,s
 :1 5/newsx.davenant 5/news.davenant 5/news.davenant.greenend.org.uk 5/trunc.test.iwj.relativity 5/trunx.test.iwj.relativity 5/test.iwj.relativity
  start 924365863.351594
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000212
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-noinfto.sys b/regress/case-noinfto.sys
index ceeb290..0e938dd 100644 (file)
--- a/regress/case-noinfto.sys
+++ b/regress/case-noinfto.sys
@@ -1,7 +1,7 @@
 adnstest noserver -,p
 :1 a.b.c.d
  start 940011574.766962
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000158
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-norecurse.sys b/regress/case-norecurse.sys
index 8a49558..acc867e 100644 (file)
--- a/regress/case-norecurse.sys
+++ b/regress/case-norecurse.sys
@@ -1,7 +1,7 @@
 adnstest default -0x16
 4.204.50.158.in-addr.arpa
  start 939764098.821612
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000163
  fcntl fd=4 cmd=F_GETFL
@@ -81,7 +81,7 @@ adnstest default -0x16
      0014036e 73320a69 6d616765 666f7275 6d02746d c07cc00c 000c0001 0001307c
      0007046e 657773c1 c6.
  +0.002263
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.000942
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-norecurse2.sys b/regress/case-norecurse2.sys
index 4836c33..a181503 100644 (file)
--- a/regress/case-norecurse2.sys
+++ b/regress/case-norecurse2.sys
@@ -1,7 +1,7 @@
 adnstest default -0x16
 4.204.50.158.in-addr.arpa
  start 939764277.018636
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000162
  fcntl fd=4 cmd=F_GETFL
@@ -477,7 +477,7 @@ adnstest default -0x16
      0014036e 73320a69 6d616765 666f7275 6d02746d c07cc00c 000c0001 00000000
      0007046e 657773c1 c6.
  +0.003281
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.002885
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-norecurse3.sys b/regress/case-norecurse3.sys
index 7d62f2e..df9816f 100644 (file)
--- a/regress/case-norecurse3.sys
+++ b/regress/case-norecurse3.sys
@@ -1,7 +1,7 @@
 adnstest default -0x16
 2.203.156.195.in-addr.arpa1
  start 939764258.086555
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000189
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-norm.sys b/regress/case-norm.sys
index 2593661..89f55e9 100644 (file)
--- a/regress/case-norm.sys
+++ b/regress/case-norm.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 chiark.greenend.org.uk
  start 912888966.802483
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000204
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-owner.sys b/regress/case-owner.sys
index 80224dd..c43f4d9 100644 (file)
--- a/regress/case-owner.sys
+++ b/regress/case-owner.sys
@@ -1,7 +1,7 @@
 adnstest default
 4/chiark.greenend.org.uk
  start 933206012.504679
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000275
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-poll.sys b/regress/case-poll.sys
index c16cfb5..cfbee0b 100644 (file)
--- a/regress/case-poll.sys
+++ b/regress/case-poll.sys
@@ -1,7 +1,7 @@
 adnstest default -,p
 :1 chiark.greenend.org.uk
  start 931719947.391142
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000208
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-polltimeout.sys b/regress/case-polltimeout.sys
index 3da57c0..eb1e995 100644 (file)
--- a/regress/case-polltimeout.sys
+++ b/regress/case-polltimeout.sys
@@ -1,7 +1,7 @@
 adnstest noserver -,p
 :1 chiark.greenend.org.uk
  start 931719968.733439
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000199
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-ptr-aaaa-check.sys b/regress/case-ptr-aaaa-check.sys
index c536b5f..fe640f4 100644 (file)
--- a/regress/case-ptr-aaaa-check.sys
+++ b/regress/case-ptr-aaaa-check.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted
 :65548 4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.d.1.0.8.a.b.0.1.0.0.2.ip6.arpa
  start 1401919115.064959
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000064
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-ptr-aaaa-mismatch.sys b/regress/case-ptr-aaaa-mismatch.sys
index 057f06c..c4edcd6 100644 (file)
--- a/regress/case-ptr-aaaa-mismatch.sys
+++ b/regress/case-ptr-aaaa-mismatch.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted
 :65548 4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.d.1.0.8.b.d.0.1.0.0.2.ip6.arpa
  start 1401919322.902230
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000061
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-ptr-aaaa-plain.sys b/regress/case-ptr-aaaa-plain.sys
index d09ce17..a2e6b83 100644 (file)
--- a/regress/case-ptr-aaaa-plain.sys
+++ b/regress/case-ptr-aaaa-plain.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted
 :12 4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.d.1.0.8.a.b.0.1.0.0.2.ip6.arpa
  start 1401918956.635299
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000060
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-ptr-aaaa.sys b/regress/case-ptr-aaaa.sys
index 60fa010..da99b6c 100644 (file)
--- a/regress/case-ptr-aaaa.sys
+++ b/regress/case-ptr-aaaa.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted
 :65548 4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.9.d.1.0.8.a.b.0.1.0.0.2.ip6.arpa
  start 1401919090.054985
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000061
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-ptrbaddom.sys b/regress/case-ptrbaddom.sys
index 37b682f..c4594a3 100644 (file)
--- a/regress/case-ptrbaddom.sys
+++ b/regress/case-ptrbaddom.sys
@@ -1,7 +1,7 @@
 adnstest default
 :12,65548 37.45.18.172.in-addr.arpa.test.iwj.relativity.greenend.org.uk.
  start 951960654.608219
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000194
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-quote.sys b/regress/case-quote.sys
index ecf07ae..2392c4a 100644 (file)
--- a/regress/case-quote.sys
+++ b/regress/case-quote.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 hyphen.cname.test.iwj.relativity.greenend.org.uk dot.cname.test.iwj.relativity.greenend.org.uk plus.cname.test.iwj.relativity.greenend.org.uk slash.cname.test.iwj.relativity.greenend.org.uk underscore.cname.test.iwj.relativity.greenend.org.uk quote.cname.test.iwj.relativity.greenend.org.uk backslash.cname.test.iwj.relativity.greenend.org.uk null.cname.test.iwj.relativity.greenend.org.uk space.cname.test.iwj.relativity.greenend.org.uk hash.cname.test.iwj.relativity.greenend.org.uk del.cname.test.iwj.relativity.greenend.org.uk meta-null.cname.test.iwj.relativity.greenend.org.uk meta-del.cname.test.iwj.relativity.greenend.org.uk
  start 951958420.936685
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000229
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-rootquery.sys b/regress/case-rootquery.sys
index 42e114a..f4e00c7 100644 (file)
--- a/regress/case-rootquery.sys
+++ b/regress/case-rootquery.sys
@@ -1,7 +1,7 @@
 adnstest default
 :131078 . 1/.
  start 924364442.672925
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000222
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-rootqueryall-as.sys b/regress/case-rootqueryall-as.sys
index 9fa9d43..7ae7a77 100644 (file)
--- a/regress/case-rootqueryall-as.sys
+++ b/regress/case-rootqueryall-as.sys
@@ -1,7 +1,7 @@
 adnstest default
 . 1/.
  start 931992019.753022
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000216
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-rootqueryall.sys b/regress/case-rootqueryall.sys
index f1c7d99..41ce7db 100644 (file)
--- a/regress/case-rootqueryall.sys
+++ b/regress/case-rootqueryall.sys
@@ -1,7 +1,7 @@
 adnstest default -,s
 . 1/.
  start 924364450.165424
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000220
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-rr_addr-binary-compat.sys b/regress/case-rr_addr-binary-compat.sys
index 9fe95c8..d58230a 100644 (file)
--- a/regress/case-rr_addr-binary-compat.sys
+++ b/regress/case-rr_addr-binary-compat.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted
 :16842753,65537 maddr.dnserr.distorted.org.uk
  start 1402443258.469312
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000064
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-search-as.sys b/regress/case-search-as.sys
index 482cac3..0433914 100644 (file)
--- a/regress/case-search-as.sys
+++ b/regress/case-search-as.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 0x5/news 0x5/chiark 1/news 1/chiark
  start 931992052.232208
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000202
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-search.sys b/regress/case-search.sys
index a852de6..c2e700c 100644 (file)
--- a/regress/case-search.sys
+++ b/regress/case-search.sys
@@ -1,7 +1,7 @@
 adnstest default -,s
 :1 0x5/news 0x5/chiark 1/news 1/chiark
  start 924360470.478357
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000200
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-searchabs.sys b/regress/case-searchabs.sys
index 2606e4a..35c8052 100644 (file)
--- a/regress/case-searchabs.sys
+++ b/regress/case-searchabs.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 1/news.davenant
  start 924363451.882765
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000207
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-sillyrp.sys b/regress/case-sillyrp.sys
index f45cf19..e8a880f 100644 (file)
--- a/regress/case-sillyrp.sys
+++ b/regress/case-sillyrp.sys
@@ -1,7 +1,7 @@
 adnstest default
 :17,131089 0x70/silly-rp-dm.test.iwj.relativity.greenend.org.uk 0x70/silly-rp-lp.test.iwj.relativity.greenend.org.uk silly-rp-lp.test.iwj.relativity.greenend.org.uk silly-rp-dm.test.iwj.relativity.greenend.org.uk
  start 929580348.131048
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000207
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-srvbaddom.sys b/regress/case-srvbaddom.sys
index ca48c3c..d06d7ce 100644 (file)
--- a/regress/case-srvbaddom.sys
+++ b/regress/case-srvbaddom.sys
@@ -1,7 +1,7 @@
 ./adnshost default
 -t srv- srv.tcp.test.iwj.relativity.greenend.org.uk. spong. _foo._bar. _s*a._tcp.ucam.org. _s*a._tcp.pi&ckle.ucam.org
  start 1144349027.926430
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000082
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-srvha.sys b/regress/case-srvha.sys
index f64b702..1c2499b 100644 (file)
--- a/regress/case-srvha.sys
+++ b/regress/case-srvha.sys
@@ -1,7 +1,7 @@
 ./adnshost default
 -t srv _srv._tcp.test.iwj.relativity.greenend.org.uk. _jabber._tcp.jabber.org _sip._udp.voip.net.cam.ac.uk.
  start 1144348939.753711
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000080
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-srvok.sys b/regress/case-srvok.sys
index 1521ed0..2121146 100644 (file)
--- a/regress/case-srvok.sys
+++ b/regress/case-srvok.sys
@@ -1,7 +1,7 @@
 ./adnshost default
 -t srv- _srv._tcp.test.iwj.relativity.greenend.org.uk. _jabber._tcp.jabber.org _sip._udp.voip.net.cam.ac.uk.
  start 1144348873.125491
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000077
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-srvqudom.sys b/regress/case-srvqudom.sys
index 8c14352..35119df 100644 (file)
--- a/regress/case-srvqudom.sys
+++ b/regress/case-srvqudom.sys
@@ -1,7 +1,7 @@
 ./adnshost default
 -Qq -t srv- srv.tcp.test.iwj.relativity.greenend.org.uk. spong. _foo._bar. _s*a._tcp.ucam.org. _s*a._tcp.pi&ckle.ucam.org
  start 1144349124.698466
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000082
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-srvsort.sys b/regress/case-srvsort.sys
index de97620..ac8816b 100644 (file)
--- a/regress/case-srvsort.sys
+++ b/regress/case-srvsort.sys
@@ -1,7 +1,7 @@
 ./adnshost default
 -t srv- _srv._tcp.test.iwj.relativity.greenend.org.uk. _srv._tcp.test.iwj.relativity.greenend.org.uk. _srv._tcp.test.iwj.relativity.greenend.org.uk. _srv._tcp.test.iwj.relativity.greenend.org.uk. _srv._tcp.test.iwj.relativity.greenend.org.uk. _srv._tcp.test.iwj.relativity.greenend.org.uk. _srv._tcp.test.iwj.relativity.greenend.org.uk.
  start 1144348887.924234
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000083
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-tcpallfail.sys b/regress/case-tcpallfail.sys
index f17346b..53a0d8b 100644 (file)
--- a/regress/case-tcpallfail.sys
+++ b/regress/case-tcpallfail.sys
@@ -1,7 +1,7 @@
 adnstest anarres
 2/test.iwj.relativity.greenend.org.uk.
  start 962142174.403028
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000120
  fcntl fd=4 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest anarres
  fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000034
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.000479
  fcntl fd=5 cmd=F_GETFL
@@ -34,7 +34,7 @@ adnstest anarres
  select max=5 rfds=[4] wfds=[] efds=[] to=0.000000
  select=0 rfds=[] wfds=[] efds=[]
  +0.000103
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.000392
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-tcpblock.sys b/regress/case-tcpblock.sys
index 6fbcf0b..9a130bb 100644 (file)
--- a/regress/case-tcpblock.sys
+++ b/regress/case-tcpblock.sys
@@ -1,7 +1,7 @@
 adnstest anarres
 2/test.iwj.relativity.greenend.org.uk.
  start 962142246.340485
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000126
  fcntl fd=4 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest anarres
  fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000035
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.000459
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-tcpblockbrk.sys b/regress/case-tcpblockbrk.sys
index b2aedd7..ae497ae 100644 (file)
--- a/regress/case-tcpblockbrk.sys
+++ b/regress/case-tcpblockbrk.sys
@@ -1,7 +1,7 @@
 adnstest anarres -0x300
 2/test.iwj.relativity.greenend.org.uk.
  start 962143388.709150
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=5
  +0.000434
  fcntl fd=5 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest anarres -0x300
  fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000439
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=6
  +0.001725
  fcntl fd=6 cmd=F_GETFL
@@ -110,7 +110,7 @@ adnstest anarres -0x300
  select max=6 rfds=[5] wfds=[] efds=[] to=0.000000
  select=0 rfds=[] wfds=[] efds=[]
  +0.000702
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=6
  +0.001734
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-tcpblockwr.sys b/regress/case-tcpblockwr.sys
index 69e224b..6ccc54e 100644 (file)
--- a/regress/case-tcpblockwr.sys
+++ b/regress/case-tcpblockwr.sys
@@ -1,7 +1,7 @@
 adnstest anarres -0x300
 2/test.iwj.relativity.greenend.org.uk. 2/test.iwj.relativity.greenend.org.uk. 2/test.iwj.relativity.greenend.org.uk.
  start 962143438.172669
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=5
  +0.000433
  fcntl fd=5 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest anarres -0x300
  fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000409
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=6
  +0.001762
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-tcpbreakin.sys b/regress/case-tcpbreakin.sys
index 9e8e75b..85fe3a6 100644 (file)
--- a/regress/case-tcpbreakin.sys
+++ b/regress/case-tcpbreakin.sys
@@ -1,7 +1,7 @@
 adnstest default
 :65548 2/6.45.18.172.in-addr.arpa
  start 957718868.938329
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000161
  fcntl fd=4 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest default
  fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000038
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.001056
  fcntl fd=5 cmd=F_GETFL
@@ -66,7 +66,7 @@ adnstest default
  select max=5 rfds=[4] wfds=[] efds=[] to=0.000000
  select=1 rfds=[] wfds=[] efds=[]
  +0.000118
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.001056
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-tcpmultipart.sys b/regress/case-tcpmultipart.sys
index d26ded2..f8cf435 100644 (file)
--- a/regress/case-tcpmultipart.sys
+++ b/regress/case-tcpmultipart.sys
@@ -1,7 +1,7 @@
 adnstest 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 domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000164
  fcntl fd=4 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest tunnel
  fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000043
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.001177
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-tcpptr.sys b/regress/case-tcpptr.sys
index 387dc87..a2da436 100644 (file)
--- a/regress/case-tcpptr.sys
+++ b/regress/case-tcpptr.sys
@@ -1,7 +1,7 @@
 adnstest default
 :65548 2/6.45.18.172.in-addr.arpa
  start 957718868.938329
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000161
  fcntl fd=4 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest default
  fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000038
- socket type=SOCK_STREAM
+ socket domain=PF_INET type=SOCK_STREAM
  socket=5
  +0.001056
  fcntl fd=5 cmd=F_GETFL

diff --git a/regress/case-timeout.sys b/regress/case-timeout.sys
index f810c3b..ca377a7 100644 (file)
--- a/regress/case-timeout.sys
+++ b/regress/case-timeout.sys
@@ -1,7 +1,7 @@
 adnstest noserver
 :1 chiark.greenend.org.uk
  start 912889153.349504
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000193
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-trunc.sys b/regress/case-trunc.sys
index 39ae631..0258517 100644 (file)
--- a/regress/case-trunc.sys
+++ b/regress/case-trunc.sys
@@ -1,7 +1,7 @@
 adnstest default
 :1 trunc.test.iwj.relativity.greenend.org.uk
  start 912888921.274801
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000207
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-unknown2.sys b/regress/case-unknown2.sys
index 6e3b315..b5dfb10 100644 (file)
--- a/regress/case-unknown2.sys
+++ b/regress/case-unknown2.sys
@@ -1,7 +1,7 @@
 ./adnshost default
 -t type2 -Qq ucam.org.
  start 1144369677.011111
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000083
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-unknown33.sys b/regress/case-unknown33.sys
index b34db25..f509a15 100644 (file)
--- a/regress/case-unknown33.sys
+++ b/regress/case-unknown33.sys
@@ -1,7 +1,7 @@
 ./adnshost default
 -t type33 -Qq _jabber._tcp.jabber.org
  start 1144369693.043661
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000080
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-unknown5.sys b/regress/case-unknown5.sys
index ed9ee88..11ba985 100644 (file)
--- a/regress/case-unknown5.sys
+++ b/regress/case-unknown5.sys
@@ -1,7 +1,7 @@
 ./adnshost default
 -t type5 pop.chiark.greenend.org.uk
  start 1144369700.944069
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=6
  +0.000074
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-unknownq.sys b/regress/case-unknownq.sys
index 736210d..1245a8a 100644 (file)
--- a/regress/case-unknownq.sys
+++ b/regress/case-unknownq.sys
@@ -1,7 +1,7 @@
 adnstest default
 :32767 davenant.relativity.greenend.org.uk.
  start 933811310.565828
- socket type=SOCK_DGRAM
+ socket domain=PF_INET type=SOCK_DGRAM
  socket=4
  +0.000264
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/harness.h b/regress/harness.h
index 3bcccf9..eae4206 100644 (file)
--- a/regress/harness.h
+++ b/regress/harness.h
@@ -10,7 +10,7 @@ void Qselect( int max , const fd_set *rfds , const fd_set *wfds , const fd_set *
 #ifdef HAVE_POLL
 void Qpoll(    const struct pollfd *fds , int nfds , int timeout       );
 #endif
-void Qsocket(   int type       );
+void Qsocket(  int domain , int type   );
 void Qfcntl(   int fd , int cmd , long arg     );
 void Qconnect( int fd , const struct sockaddr *addr , int addrlen      );
 void Qbind(    int fd , const struct sockaddr *addr , int addrlen      );

diff --git a/regress/hcommon.c b/regress/hcommon.c
index 7aada14..3c2daa3 100644 (file)
--- a/regress/hcommon.c
+++ b/regress/hcommon.c
@@ -67,9 +67,12 @@ void Qpoll(  const struct pollfd *fds , int nfds , int timeout       ) {
   Q_vb();
 }
 #endif
-void Qsocket(   int type       ) {
+void Qsocket(  int domain , int type   ) {
  vb.used= 0;
  Tvba("socket");
+  Tvbf(domain==PF_INET ? " domain=PF_INET" :
+         domain==PF_INET6 ? " domain=PF_INET6" :
+         " domain=AF_???"); 
   Tvbf(type==SOCK_STREAM ? " type=SOCK_STREAM" : " type=SOCK_DGRAM"); 
   Q_vb();
 }

diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4
index d8b9821..dfd0f28 100644 (file)
--- a/regress/hcommon.c.m4
+++ b/regress/hcommon.c.m4
@@ -100,6 +100,10 @@ void Q$1(hm_args_massage($3,void)) {
  m4_define(`hm_arg_must', `')
  m4_define(`hm_arg_socktype', `
   Tvbf($'`1==SOCK_STREAM ? " $'`1=SOCK_STREAM" : " $'`1=SOCK_DGRAM");')
+ m4_define(`hm_arg_addrfam', `
+  Tvbf($'`1==PF_INET ? " $'`1=PF_INET" :
+         $'`1==PF_INET6 ? " $'`1=PF_INET6" :
+         " $'`1=AF_???");')
  m4_define(`hm_arg_ign', `')
  m4_define(`hm_arg_fd', `Tvbf(" $'`1=%d",$'`1);')
  m4_define(`hm_arg_fcntl_cmd_arg', `

diff --git a/regress/hmacros.i4 b/regress/hmacros.i4
index b6c2d8b..ff8620e 100644 (file)
--- a/regress/hmacros.i4
+++ b/regress/hmacros.i4
@@ -46,6 +46,7 @@ m4_define(`hm_create_nothing', `
  m4_define(`hm_arg_timeval_in_rel_null',`')
  m4_define(`hm_arg_must', `')
  m4_define(`hm_arg_socktype',`')
+ m4_define(`hm_arg_addrfam',`')
  m4_define(`hm_arg_ign', `')
  m4_define(`hm_arg_fd', `')
  m4_define(`hm_arg_fcntl_cmd_arg',`')
@@ -64,6 +65,7 @@ m4_define(`hm_create_proto_h',`
  m4_define(`hm_arg_timeval_in_rel_null', `struct timeval *$'`1')
  m4_define(`hm_arg_must', `$'`1 $'`2')
  m4_define(`hm_arg_socktype', `int $'`1')
+ m4_define(`hm_arg_addrfam', `int $'`1')
  m4_define(`hm_arg_ign', `$'`1 $'`2')
  m4_define(`hm_arg_fd', `int $'`1')
  m4_define(`hm_arg_fcntl_cmd_arg', `int $'`1 hm_comma ...')
@@ -96,6 +98,8 @@ m4_define(`hm_create_hqcall_init',`
  m4_define(`hm_arg_must', `Tmust("$1","$'`2",$'`2==$'`3);')
  m4_define(`hm_arg_socktype',`
   Tmust("$1","$'`1",$'`1==SOCK_STREAM || $'`1==SOCK_DGRAM);')
+ m4_define(`hm_arg_addrfam',`
+  Tmust("$1","$'`1",$'`1==PF_INET || $'`1==PF_INET6);')
  m4_define(`hm_arg_fcntl_cmd_arg',`
   Tmust("$1","$'`1",$'`1==F_SETFL || $'`1==F_GETFL);
   if ($'`1 == F_SETFL) {
@@ -115,6 +119,7 @@ m4_define(`hm_create_realcall_args',`
  m4_define(`hm_arg_timeval_in_rel_null', `$'`1')
  m4_define(`hm_arg_must', `$'`2')
  m4_define(`hm_arg_socktype', `$'`1')
+ m4_define(`hm_arg_addrfam', `$'`1')
  m4_define(`hm_arg_ign', `$'`2')
  m4_define(`hm_arg_fd', `$'`1')
  m4_define(`hm_arg_fcntl_cmd_arg', `$'`1 hm_comma $'`2')

diff --git a/regress/hplayback.c b/regress/hplayback.c
index c14426c..9b88ef4 100644 (file)
--- a/regress/hplayback.c
+++ b/regress/hplayback.c
@@ -7,7 +7,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <netdb.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include "harness.h"
@@ -154,9 +153,10 @@ static void Ppollfds(struct pollfd *fds, int nfds) {
 }
 #endif
 static void Paddr(struct sockaddr *addr, int *lenr) {
-  struct addrinfo *ai, hint = { 0 };
+  adns_rr_addr a;
   char *p, *q, *ep;
   int err;
+  unsigned long ul;
   p= vb2.buf+vb2.used;
   if (*p!='[') {
     q= strchr(p,':');
@@ -170,18 +170,15 @@ static void Paddr(struct sockaddr *addr, int *lenr) {
     if (*q!=':') Psyntax("expected : after ]");
     q++;
   }
-  for (ep=q; ctype_digit(*ep); ep++);
-  if (ep==q || (*ep && *ep!=' ')) Psyntax("invalid port number");
-  *ep= 0;
-  hint.ai_socktype= SOCK_DGRAM;
-  hint.ai_family= AF_UNSPEC;
-  hint.ai_flags= AI_NUMERICHOST | AI_NUMERICSERV;
-  err= getaddrinfo(p, q, &hint, &ai);
+  ul= strtoul(q,&ep,10);
+  if (*ep && *ep != ' ') Psyntax("invalid port (bad syntax)");
+  if (ul >= 65536) Psyntax("port too large");
+  a.len= sizeof(a.addr);
+  err= adns_text2addr(p, (int)ul, 0, &a.addr.sa,&a.len);
   if (err) Psyntax("invalid address");
-  assert(*lenr >= ai->ai_addrlen);
-  memcpy(addr, ai->ai_addr, ai->ai_addrlen);
-  *lenr= ai->ai_addrlen;
-  freeaddrinfo(ai);
+  assert(*lenr >= a.len);
+  memcpy(addr, &a.addr, a.len);
+  *lenr= a.len;
   vb2.used= ep - (char*)vb2.buf;
 }
 static int Pbytes(byte *buf, int maxlen) {
@@ -296,9 +293,9 @@ int Hpoll(  struct pollfd *fds , int nfds , int timeout     ) {
 int Hsocket(   int domain , int type , int protocol    ) {
  int r, amtread;
  char *ep;
-       Tmust("socket","domain",domain==AF_INET); 
+  Tmust("socket","domain",domain==PF_INET || domain==PF_INET6); 
   Tmust("socket","type",type==SOCK_STREAM || type==SOCK_DGRAM); 
- Qsocket(       type   );
+ Qsocket(      domain , type   );
  if (!adns__vbuf_ensure(&vb2,1000)) Tnomem();
  fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
  Tensurereportfile();

diff --git a/regress/hrecord.c b/regress/hrecord.c
index 88e24a4..c059434 100644 (file)
--- a/regress/hrecord.c
+++ b/regress/hrecord.c
@@ -81,9 +81,9 @@ int Hpoll(    struct pollfd *fds , int nfds , int timeout     ) {
 #endif
 int Hsocket(   int domain , int type , int protocol    ) {
  int r, e;
-       Tmust("socket","domain",domain==AF_INET); 
+  Tmust("socket","domain",domain==PF_INET || domain==PF_INET6); 
   Tmust("socket","type",type==SOCK_STREAM || type==SOCK_DGRAM); 
- Qsocket(       type   );
+ Qsocket(      domain , type   );
  r= socket(    domain , type , protocol        );
  e= errno;
  vb.used= 0;

diff --git a/regress/hsyscalls.i4 b/regress/hsyscalls.i4
index ad90104..35684c8 100644 (file)
--- a/regress/hsyscalls.i4
+++ b/regress/hsyscalls.i4
@@ -38,6 +38,7 @@ m4_dnl  hm_arg_fdset_io(<arg>,<max>)    fd_set, max bit set is in max
 m4_dnl  hm_arg_timeval_in_rel_null(<t>) struct timeval*, pass in, relative, may be null
 m4_dnl  hm_arg_must(<type>,<arg>,<val>) must have correct value, or abort test
 m4_dnl  hm_arg_socktype(<arg>)          SOCK_STREAM or SOCK_DGRAM (an int)
+m4_dnl  hm_arg_addrfam(<arg>)           a supported address family
 m4_dnl  hm_arg_ign(<type>,<arg>)        input parameter ignored
 m4_dnl  hm_arg_fd(<arg>)                fd
 m4_dnl  hm_arg_fcntl_cmd_arg(<ca>,<aa>) syscall is fcntl, do special processing
@@ -70,7 +71,7 @@ hm_syscall(
 
 hm_syscall(
        socket, `hm_rv_fd', `
-       hm_arg_must(int,domain,AF_INET) hm_na
+       hm_arg_addrfam(domain) hm_na
        hm_arg_socktype(type) hm_na
        hm_arg_ign(int,protocol) hm_na
 ')