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 d52c7c6cc60210c71bd82a01d3dae74344437129..0b9a46220e73f506a453d1beff307dc3cac4c12b 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 08caf3223d7b473de4468d0b974e082f409d171f..e1671d0efdbe06600b01ea74cc1a3e73a553431f 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 0f79be6e7c621a5fe3df4e79bee2c91560f07c3b..4a8836f3ddddd6ca47099a56de257bcbddbe78c3 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 b1c64dd9bca35f2bb9ccc481d9782f129138f45d..e6760c480f8bbaf304639bd2c3ba6c69051c6e3d 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 d7b904e7c50ce486d1161f3f6053d012dbf88963..9f6aea31d16c8c8aa63e7936bd8cd0334e331e38 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 cb59cb357a9f082604a3de746dd9c3fef1517f89..4273b8a409079c5b4ef5f849372102364ae5e8d7 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 e5e03bc1abab57fdb131d7388d2aece13aafc955..e1f2b4f3fa822248771312a069b8104231c945db 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 503570b9a867895efcfa21aa243bac5f3bff929c..507c94a6480df523f68cc94fb88cd6e0e5608640 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 d0ced6ae28198e5ab28f7e16f1de2967ff302520..a34d2adc3814f0648e7fcbe13f532b19ae581c09 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 d089fa68719d85ffe0fdcd8c50001d8ce017bc1d..379119ae28686785af346a1244f3f50e300e2cb4 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 d7785a57b49f8c36590deba45beaa9095a894f67..fcbc5d56800b2a0a0aa59ab16f53e128ccd55bfe 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 ca9a7a7508d28dd95333bb0c82c82866a1ae26e6..36537db5b3d55b98333529df9c9d59b4f35aaf94 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 d956beb04e011f227710da7c80a584ceda8e507b..7b2c4f69db3dcf499d38159bbbaf0d86aeb41ccc 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 adce8851281ca474a10792e85d24d4c20b1debb8..fcbb560ed66032636079c82b610fa723871df311 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 e4d14b06d5d1759ac3ec459ae6405f2e1debc2fc..09f5987cacb5482543cf373f989afbd29c15ac9e 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 31aabe8bf72e0a3d92b5dfdfbcd3d8e7c8a3c488..b9afe1f5b50dbe4fa50d2b036b7e035e43cc7fc3 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 0250444980e78694c2d20a8e7993e272a6cd9e64..9750504e153499601f34db029f46d2c35745ff28 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 706fa658e9e49b986abb2c27d4eb6eaa46c6d8f7..326814373cc2f8c7bbc50bd85d3d4e8fac5c97f7 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 062a950028359c5d7edbc31e883ef19b7403370c..df1f4771476eeff749b36a27c09cd4c8d20f4e2d 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 8fb114319a3ff841d11e9e32f8f19a731372e518..4d8f2a8fbea3307605caaff7f1521ef799c6f883 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 5e29f442b55c4c904d05b14f39466782490044d7..b3fbbb1d746482879abd73ccfed710db8cf061a8 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 b62923bcc2d2b53f0c225e8e0bff7b690308701a..af062a3aabee415d2f982c5129cf2108b34f8267 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 855f689f048bc18ae2efea889a6b8a428f9866c3..67fb9aa95dbdafdd9e477b9663b9ce9eeb3743f1 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 ecfafb5f6c50fa9cfa3ba37fc465f46c18386b17..f94a7b20eaeb7153ea91ccd10c2d53858d1b565e 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 5b9f983c3f26859054a51e46937e788bd8fc76b9..eee96b64e81aba4686e5aca8d2eea692a776544a 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 fe0b3413a1e7975cba4847c594e8448c1191e901..146cf2465194ace33eefab0077c597593f22a5f8 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 e8935ba3cd01006c8e68019cc14d8fd9f2c8f1bd..ff5411298d21ab9ed1972ff4959f8e589b085791 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 c0e1802607d4abafcfbf4a6be736dc9a7ee22883..d2ed5d6d4e3a6384b5751f8044ebae059cff55d1 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 a14c5ac0ad9894ddc9d873c4c2783c2b84b30102..5e4ad6be58bfcf1f9bce07b45e017ad502445011 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 ff9a0188905404f5f549ac32dfb0ae84172c7c8a..6ec88f7dfde18f36540da34d6a9051781e57d955 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 a54e14d17ac55823029b467e776ba0c0ff7f8664..c0abc4eb921523b7a85c4f4fbf41c6eb69bc09b5 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 298bec809f66171e9b9f2992d9e9a961f9e5e567..8ebee41443fc4abc5a25cc0623a9b0ad4f1cc128 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 8e905f51ff1239c7803ed1ea1364a1815b049f25..7643c6fa90b1d83250bca675b2b77adb182ea4b8 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 d2f936aff94021f3bc5714883c8cfbbee7eee771..8126b12769b7d4592591dab7a1727a3ae8443157 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 196bb5cb344124bd58cc4d09a4be96d215e3a39d..87d2e37e3d924b36c927208589444561e09237aa 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 8bd65ee777f0d2f4035cd66c79c34b4ee2d951f2..eee88993c2859a4ee558f1d592e10bcfb45fc30a 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 5b0e46adc66bcd802c94e03a89203b1210d57fc7..7540c06a4cc7a30cccdbbe748e2b39636af9556d 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 701f8cc0a240dd59b869a13962a503fb33257a89..22a4ff2229e6aa26d0732a6e793c392bdf42f5f9 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 4fad517ce1c54f8b2d4cdb2a0b2e9456b30244d3..503ceb83eb13a080e05df1e746c0c3d1db604f29 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 b8c638c9311064f8f8cbf699f08e4770f6baa22e..264fa832e2976bd4263fdf63fde16b4e8bf7d43d 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 8590c102ca8a5f698d68218945ab5fe728c6693d..90512d138d770871b409e8ac7e3a639be4ac1511 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 5872e705af933613766b3592bc33a8b2e73e3bb6..07a1cc5f2c4df1e0228eabab381e7cf6fb842b4b 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 9058af33a6fe856a747900c0f238ef97441eee8f..1c0d4256ab9ee5634ab7040d5b0e55a1d7ef5d99 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 169f46b75d57cf640f0a90c65df4c32be57fda27..970f38da5324ea34e7ea948f7561532af0928a7c 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 9fc01357b08a4049ccc8eb9ac657b7bc647d761f..2ce3e97327c50a7d950ac99d3517788e64d2c9ce 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 ceeb2905d7e0e5c50bbeb892728668941e1fbfbb..0e938dd600fc1e04ababcd24d3d869256022ae9f 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 8a49558a19eae2e7c24371931039300efd173941..acc867eb7f0dccffc8f9c4f7122c1305726772c6 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 4836c33551b8ae6ce8978385129077ab378c8010..a181503c64d8095f871611bac0c2a958932bd0b3 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 7d62f2e746338cb0d10ad5acc03b9e3c5b1a33df..df9816fab09e16569ad822c52704359516abf9aa 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 25936619ae2a007356a653a7f568bde995e5fda6..89f55e9024004cd630fcab7e4d08d511ceef1db2 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 80224dd8755939bdcc307d441e260b57df0bc381..c43f4d9bd3e60884fbb07a198166b6db910bb130 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 c16cfb5cac7aa2740327df5d0c39f57bdf21ce09..cfbee0b3e915a05f87370be1d522f32518a0c573 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 3da57c08b1b00245235505714227dea52a1fc0a6..eb1e99559cc0e6dd86e2c8044e1a1a9c1655ea46 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 c536b5f9fdb2f47dcacdb414d351f26fdddc008b..fe640f4ad12a0ec4d43408a2c193bbc3147e4a22 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 057f06c8a3bdabcc72c9d1c3aee33bbd0c9a7f4d..c4edcd649478591494814c38bc465205568353c2 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 d09ce176f38d0e4deee0087521a5ddd8f9022b48..a2e6b83a509dda01cf389bd8705a6b6845f8cf5f 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 60fa01061da12da2c2757fec45a46858d1feb773..da99b6cb92cffdb033a4cdaca1d8e89f0bc49170 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 37b682fd723e740a4a8ff2e171c773b730a60f4d..c4594a3a6e751aa9cb4075817bc4f7345a6a903f 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 ecf07aeed9a3355f106839fbe3af1662e8cbf572..2392c4a258e35ccc4a3f801120df41a05b11375e 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 42e114a85612bff8f460bf36a139941686c6da93..f4e00c7d4b60a5dfcfab54dd1d2ff7c156ff6880 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 9fa9d43eaa0439b331ad8dc98b03d0a252b61660..7ae7a7738f19f31285a98fc4f251808c22dfb1d0 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 f1c7d9912a2f094e695fdbee1202dcb6d933c34e..41ce7dbf45999495bb3eb490f446ad41599cd996 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 9fe95c8c5f16c4f2eec62288312299ba51fc9336..d58230a79884893e4335093bd99efb2b7b486691 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 482cac33271ec062e7fa07e6a8578b213a6b4d2f..0433914837ce01d9d95c7349427d0bd2edfbf1b7 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 a852de6870fdc0f918ccdbfedceefde0addd436e..c2e700c9e14c31964af6f18cf39016125dece9ee 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 2606e4aa40ff54aae2e1f8d8931eac472a411251..35c805290667954b2cbc48bf3b4401c598b73983 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 f45cf19cd83ad4489c6a6fcd26c001ac429a26b3..e8a880fed6f9d494f973adf4c7bca87a2e378821 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 ca48c3c9456accbf66106338ea0ee8fb54a03ca8..d06d7ce4519f26ae3d45a39f8b68eabaf61abd3e 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 f64b70271266e1c63144493015fdf534a43315a1..1c2499bc1ecf2e6bf8c68ebda77f3901b250f0c1 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 1521ed0b074cbfb3eab33daa4232a380e0d8432c..212114674192989020e81adcddc3cea02625dd8c 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 8c143521ff0a2ae2a591c3f88a30f37474003d56..35119df9077adc8ca45189d8966b9e8ce89257db 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 de976207b05a7d720ef8e77a2344e9deb9f41ae6..ac8816baebcff5d9738194783de9a5c80b8d1a7f 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 f17346be32b4e06750142322360afe8aad4114b6..53a0d8bc7a55c7e3385634f22e85e5878b8cbb7d 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 6fbcf0b19642ff746dc9856cabd0d0570dcbe56a..9a130bb160debc220ffbe6ba247e8521187d39fc 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 b2aedd792c18f2198d2a909dd2639184c284680b..ae497aefa4363bacd7c074fa18b197059f35a482 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 69e224b14feb55efb60d7aafacad11204c1b9ddc..6ccc54ead85b74159cfeeb01fc5afc7b1da3fe2c 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 9e8e75babe31ba02fffd437a51c1783528fb81b6..85fe3a630e7b61c85ed701070857df9c6248e82f 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 d26ded29659c91f5278b09080e24c9d8fa2c1c6c..f8cf43517e1189cbddd7481f6c993dd393d1db12 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 387dc87a2d5e22860f06c26d637b3f0e6a8ede0b..a2da4366076dff554e56ab0bb685dc809d8ce741 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 f810c3b55496b7c0e01d50191cb80d0561bfd761..ca377a7a921ba912207a1b804d524dcd7de0a17b 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 39ae63147d0ea3ed07b264e7de196d4caf5b9f99..0258517f11f6d82400354364ef1ef6ef2dea02b7 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 6e3b315057647b6971cd36db0275cc939c54b607..b5dfb10546c1b22892a65115d3c7db44ea0566da 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 b34db254344a4e5fac755969b86fb1529e2230bb..f509a15d0efb574535599245497105aef6aa7e42 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 ed9ee88101997e7f09b0efdfd6ede756e6e9c96a..11ba985789a4918860cd8c15a23e00af36851242 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 736210d0b4c3bbdceacf2e37f623759694a3d542..1245a8a1d9a45740e9707d4ad61a6a7ef4e016e9 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 3bcccf9b30af366b3507524ae1015bf375e8d708..eae42068f4a477dfa97b1ef18f2762b732c04a8d 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 7aada144aed629c37d49df95de3da19cf666f141..3c2daa300bf1989ec27744b8ba9620697da63600 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 d8b9821c94e86b470a03118a3e5494f5cf2b2d5c..dfd0f280a55c431722fcb03e307aee43ecadc234 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 b6c2d8be597ce6a45ee9631c0266dba6878619ee..ff8620ec214eed253812a37b717b4ac7e110242b 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 c14426c5588f8c6d36abf1fb53621f5b776d73d5..9b88ef480a5238857e7a01d3abb70cb99acc99dc 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 88e24a41f48925918a5601747e178098fd2df027..c059434e7ac522e951a40535da38a99095921fff 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 ad90104c7e6f4b1eae75376aa66259f9dce40159..35684c895c6a2d333c5d7da7ba2835b24b5b4170 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
 ')