regress/: Replace PF_ with AF_

I don't much like PF_.  None of the modern specs or docs talk about PF
any more.

Entirely formulaic patch:
  perl -i~ -pe 's/\bPF_INET\b/AF_INET/g' regress/*
  perl -i~ -pe 's/\bPF_INET6\b/AF_INET6/g' regress/*

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/regress/case-1stservbroken.sys b/regress/case-1stservbroken.sys
index 0b9a46220e73f506a453d1beff307dc3cac4c12b..08928570f83024f918908da91f16f408598cf8c9 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 e1671d0efdbe06600b01ea74cc1a3e73a553431f..f5d4f4c5735702a30388b12c72bae45cd8e3564c 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 4a8836f3ddddd6ca47099a56de257bcbddbe78c3..31777c9142cef7489fc8243d51e254e1fd6b10ab 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 e6760c480f8bbaf304639bd2c3ba6c69051c6e3d..cc702bf0c0779f20020defabf0f71c33f52ab953 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 9f6aea31d16c8c8aa63e7936bd8cd0334e331e38..aecfafe33e29fdc31dbf1f758805a213697472e8 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 4273b8a409079c5b4ef5f849372102364ae5e8d7..5f9f3b56bf65e73b31700f72ee63a37ead6c3df8 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 1b924338cb1dccaba58baf6e847b63ba09eae15f..1d49978465809d73ca01f5d9df681abd1cd799ba 100644 (file)
--- a/regress/case-abbrev.sys
+++ b/regress/case-abbrev.sys
@@ -1,7 +1,7 @@
 adnstest default -0x400
 ,a/greenend.org.uk
  start 929580078.542974
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 a1faf9a6f54a264136d1670dbb2de4667efd2f8d..b26be7b0217e6a2508e37fd38c6e2400c02abe00 100644 (file)
--- a/regress/case-abbrevto.sys
+++ b/regress/case-abbrevto.sys
@@ -1,7 +1,7 @@
 adnstest noserver -0x400
 ,a/greenend.org.uk
  start 929580082.699581
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000192
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-addr-multi-af.sys b/regress/case-addr-multi-af.sys
index 14b1661a463a4c1c20fe384b80110e86f18fbdcb..ef40368b3bb98d8850cd7a5025b9e007b7312506 100644 (file)
--- a/regress/case-addr-multi-af.sys
+++ b/regress/case-addr-multi-af.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted
 :16842753,16842767,50397185,50397199 maddr.dnserr.distorted.org.uk mx.dnserr.distorted.org.uk 0x400/maddr.dnserr.distorted.org.uk 0x400/mx.dnserr.distorted.org.uk 0x800/maddr.dnserr.distorted.org.uk 0x800/mx.dnserr.distorted.org.uk 0xc00/maddr.dnserr.distorted.org.uk 0xc00/mx.dnserr.distorted.org.uk
  start 1402445458.222480
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=6
  +0.000026
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-adh-cancel.sys b/regress/case-adh-cancel.sys
index bd1f8cf83350f0b3d31d0d0a2568d3f76f1a686b..a7889c9a7ac6fd43b906ff3189a575a856c2eaf0 100644 (file)
--- a/regress/case-adh-cancel.sys
+++ b/regress/case-adh-cancel.sys
@@ -1,7 +1,7 @@
 ./adnshost default -f -A4
 
  start 969124425.922896
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 a2facecb0227bd262b472f7b742d8833a834d239..90f114f6c5aa9b2060ada2e6d2852eae9bffcb95 100644 (file)
--- a/regress/case-adh-cancel2.sys
+++ b/regress/case-adh-cancel2.sys
@@ -1,7 +1,7 @@
 ./adnshost default -f -A4
 
  start 969124594.885114
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 fcbc5d56800b2a0a0aa59ab16f53e128ccd55bfe..3e99426abda877f4647c476af8fc89295d60b81b 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 54fe6672214f4cae5abe7eaa28b98decb9bb83a3..fa6cd4be216cc25acf9c5fb60bd951a08ec20ab2 100644 (file)
--- a/regress/case-adh-norm.sys
+++ b/regress/case-adh-norm.sys
@@ -1,7 +1,7 @@
 ./adnshost default -A4
 chiark.greenend.org.uk
  start 969122933.609498
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 625ea18780e064011117bbe2e70b045cb70b427b..6e9ec3c976d1e8fe956db047b84396ff9100c702 100644 (file)
--- a/regress/case-adh-pipe.sys
+++ b/regress/case-adh-pipe.sys
@@ -1,7 +1,7 @@
 ./adnshost default -f -A4
 
  start 969123801.904882
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 fcbb560ed66032636079c82b610fa723871df311..ca076c144f8aaaa6ddd189c66979ebc3ab38c34f 100644 (file)
--- a/regress/case-alr-norm.sys
+++ b/regress/case-alr-norm.sys
@@ -1,7 +1,7 @@
 ./adnslogres default
 
  start 969140608.116717
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 09f5987cacb5482543cf373f989afbd29c15ac9e..ba5d4c307165c6251ce5521be37fd12892e0dc39 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 b9afe1f5b50dbe4fa50d2b036b7e035e43cc7fc3..a9beaf32c2483b1f79a77e9c18ec848922dc4f3c 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 9750504e153499601f34db029f46d2c35745ff28..4a2ca5749ee8861bcea502b1d0ce601c1d3e21d6 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 0322e147f4caf5e146674f80af2b314c9eeb1d3c..6846e7a7220c7181a2ded0c7e91ca215f4959c39 100644 (file)
--- a/regress/case-brokenmail.sys
+++ b/regress/case-brokenmail.sys
@@ -1,7 +1,7 @@
 adnstest default -0x400
 :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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 df1f4771476eeff749b36a27c09cd4c8d20f4e2d..c35fe9b876e1691918e0f4b63bdd5f56be24eb3c 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 4d8f2a8fbea3307605caaff7f1521ef799c6f883..de83e032975ac7f24e12b326407385e740969304 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 b3fbbb1d746482879abd73ccfed710db8cf061a8..b9705a1797a9533dc7300aa07816db529bacc804 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 af062a3aabee415d2f982c5129cf2108b34f8267..85bb21c3e55883af1bcf4a6de280e76495fc1b9e 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 b33043f1b5f7729b5f295fda232846e23a0a2b8b..fd5d83f24583a6e5f637bea785a4268141d9849f 100644 (file)
--- a/regress/case-datapluscname.sys
+++ b/regress/case-datapluscname.sys
@@ -1,7 +1,7 @@
 adnstest default -0x400
 292/170.99.219.194.in-addr.arpa
  start 933809668.543946
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 c58be33fd8cee6c87519cea01757b1b0ecdc0a65..07e55e85ffebec76aebbbdfdbdb70910f452b8a0 100644 (file)
--- a/regress/case-datapluscnamewait.sys
+++ b/regress/case-datapluscnamewait.sys
@@ -1,7 +1,7 @@
 adnstest default -0x400
 292/170.99.219.194.in-addr.arpa
  start 933809632.795174
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 eee96b64e81aba4686e5aca8d2eea692a776544a..dcd7136e1a12811aa6e204ab7adf09f0715926c9 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 146cf2465194ace33eefab0077c597593f22a5f8..6c50b73efd7f64eb6fcada9bacffeb6796efde3c 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 ff5411298d21ab9ed1972ff4959f8e589b085791..e5b5cebe0b4da65f2ce52c1d59c651457c517d76 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 d2ed5d6d4e3a6384b5751f8044ebae059cff55d1..1f026d9ac320bda3fdc432b8b2705152031452cc 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 5e4ad6be58bfcf1f9bce07b45e017ad502445011..59efb4e3bb0eba50563cbd10a476b1e408357537 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 6ec88f7dfde18f36540da34d6a9051781e57d955..696399313d10869e955635541f6180bcf4f6896a 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 c0abc4eb921523b7a85c4f4fbf41c6eb69bc09b5..15a96050fa47a4dc1af0c8c6feda6d7c4ddd5345 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 8ebee41443fc4abc5a25cc0623a9b0ad4f1cc128..66ed75528734e82398617d32badc2669285b3dc0 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 7643c6fa90b1d83250bca675b2b77adb182ea4b8..e706c5813a9267bdc1810d5beb84c209296a3cb3 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 8126b12769b7d4592591dab7a1727a3ae8443157..cd780da5b57d83b18fc394d25e10d52afa8b9ddc 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 87d2e37e3d924b36c927208589444561e09237aa..65e23e88f5c32781f79a09c69e81ba335dd59707 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 eee88993c2859a4ee558f1d592e10bcfb45fc30a..6e39ee6db6b02d6afe6aea668093bdd12b4ddd1f 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 7540c06a4cc7a30cccdbbe748e2b39636af9556d..b73482f33574435f44796d5143d3612550b491a2 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 22a4ff2229e6aa26d0732a6e793c392bdf42f5f9..81457da05f59adc8ae781af67240f6da8d9bb66f 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 503ceb83eb13a080e05df1e746c0c3d1db604f29..492c620a8d8936b5acb7b8adb0aadac63e1a64c5 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 79e2ce4e11af674da52b2eaa8de8c0bbf09389a3..27c8cacec1d3494d0df7fa94cc27e40788da18d2 100644 (file)
--- a/regress/case-manyptrwrong.sys
+++ b/regress/case-manyptrwrong.sys
@@ -1,7 +1,7 @@
 adnstest ncipher -0x400
 254.0.99.203.in-addr.arpa
  start 933269010.293417
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000166
  fcntl fd=4 cmd=F_GETFL
@@ -107,7 +107,7 @@ adnstest ncipher -0x400
      000c0001 00013b96 000f026e 7309756e 64657268 6f7572c0 43c00c00 0c000100
      013b9600 06036263 63c043.
  +0.001498
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 4acb741ec15d26f795b667ce2859033e721d9bc0..ccb353068e61448b72fb2f4f3d911d5671896fd7 100644 (file)
--- a/regress/case-manyptrwrongrem.sys
+++ b/regress/case-manyptrwrongrem.sys
@@ -1,7 +1,7 @@
 adnstest manyptrwrong -0x400
 292/254.0.99.203.in-addr.arpa
  start 933286859.476326
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000271
  fcntl fd=4 cmd=F_GETFL
@@ -172,7 +172,7 @@ adnstest manyptrwrong -0x400
      000c0001 00015180 000f026e 7309756e 64657268 6f7572c0 43c00c00 0c000100
      01518000 06036263 63c043.
  +0.003324
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 df52b44e7bfd1a7ac5d598dde22f93600baeabd1..80e8381e984a80abf58444ca0434fb247250cfa9 100644 (file)
--- a/regress/case-manyptrwrongrst.sys
+++ b/regress/case-manyptrwrongrst.sys
@@ -1,7 +1,7 @@
 adnstest default -0x400
 292/254.0.99.203.in-addr.arpa
  start 933289772.727140
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000265
  fcntl fd=4 cmd=F_GETFL
@@ -385,7 +385,7 @@ adnstest default -0x400
      000c0001 00004ecb 000f026e 7309756e 64657268 6f7572c0 43c00c00 0c000100
      004ecb00 06036263 63c043.
  +0.003463
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 0d5f3dd99237b53bb1e32ad24fdd7e57ce222d44..92be042ab75ba657621d6baf6532d5b006c0f0c1 100644 (file)
--- a/regress/case-manyptrwrongrty.sys
+++ b/regress/case-manyptrwrongrty.sys
@@ -1,7 +1,7 @@
 adnstest default -0x400
 292/254.0.99.203.in-addr.arpa
  start 933286845.072950
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000253
  fcntl fd=4 cmd=F_GETFL
@@ -146,7 +146,7 @@ adnstest default -0x400
      000c0001 0001514f 000f026e 7309756e 64657268 6f7572c0 43c00c00 0c000100
      01514f00 06036263 63c043.
  +0.003330
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 970f38da5324ea34e7ea948f7561532af0928a7c..b9afa754a4cfe6c0fe407e2203b9f082b0abfd73 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 2ce3e97327c50a7d950ac99d3517788e64d2c9ce..7934cc928bb854ca0074644c8dd21193cf64db64 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 0e938dd600fc1e04ababcd24d3d869256022ae9f..96d7fe178bafa8e7f778cd3e35d2156ad18cb333 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 3365feca87a5fcc58d243daafd27e4510ce8e0c9..f9509d7647c61416c7d6c7d31849a425b1ea544e 100644 (file)
--- a/regress/case-norecurse.sys
+++ b/regress/case-norecurse.sys
@@ -1,7 +1,7 @@
 adnstest default -0x416
 4.204.50.158.in-addr.arpa
  start 939764098.821612
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000163
  fcntl fd=4 cmd=F_GETFL
@@ -81,7 +81,7 @@ adnstest default -0x416
      0014036e 73320a69 6d616765 666f7275 6d02746d c07cc00c 000c0001 0001307c
      0007046e 657773c1 c6.
  +0.002263
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 a8424ebb6099d616fbaa63df4c7da51fe4d0b121..2e2b8e5ac2fed47c985a54c020984d6eb95ee146 100644 (file)
--- a/regress/case-norecurse2.sys
+++ b/regress/case-norecurse2.sys
@@ -1,7 +1,7 @@
 adnstest default -0x416
 4.204.50.158.in-addr.arpa
  start 939764277.018636
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000162
  fcntl fd=4 cmd=F_GETFL
@@ -477,7 +477,7 @@ adnstest default -0x416
      0014036e 73320a69 6d616765 666f7275 6d02746d c07cc00c 000c0001 00000000
      0007046e 657773c1 c6.
  +0.003281
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 0d3ce7ee73d57f70faa5a78354313aa378a00578..3c666ac36c9eff89234b0b7c966f733641da10bb 100644 (file)
--- a/regress/case-norecurse3.sys
+++ b/regress/case-norecurse3.sys
@@ -1,7 +1,7 @@
 adnstest default -0x416
 2.203.156.195.in-addr.arpa1
  start 939764258.086555
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 89f55e9024004cd630fcab7e4d08d511ceef1db2..9059105742d6d964f4e0f47aa1ef09e2f2c238c1 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 ed310bdde94bbe7cdd6dba0455dea1dcb839733c..f0432b762587f80be67b012ed640d8f934b9c1c8 100644 (file)
--- a/regress/case-owner.sys
+++ b/regress/case-owner.sys
@@ -1,7 +1,7 @@
 adnstest default -0x400
 4/chiark.greenend.org.uk
  start 933206012.504679
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 cfbee0b3e915a05f87370be1d522f32518a0c573..51a276dbf1acf15f5f45571d5af4c47940a106f9 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 eb1e99559cc0e6dd86e2c8044e1a1a9c1655ea46..ee87357494ff6e7bc51a3951707ac02cd8d188e2 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000199
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-ptr-aaaa-caps.sys b/regress/case-ptr-aaaa-caps.sys
index 20fad760a905e166a32de2f556ece9bcdaaf71f6..4637e7c84a38af009393e4f6db3dccb305504cdb 100644 (file)
--- a/regress/case-ptr-aaaa-caps.sys
+++ b/regress/case-ptr-aaaa-caps.sys
@@ -1,7 +1,7 @@
 ./adnstest default
 :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 1406162686.218685
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=6
  +0.000153
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-ptr-aaaa-check.sys b/regress/case-ptr-aaaa-check.sys
index fe640f4ad12a0ec4d43408a2c193bbc3147e4a22..5b538fe66ddd167288617e1905937f66b8b82269 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 c4edcd649478591494814c38bc465205568353c2..84655c44f26df440e724e7048ac833525fac4655 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 a2e6b83a509dda01cf389bd8705a6b6845f8cf5f..085dcd012dedc614c0be3fc3010fafc6e95960b2 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 da99b6cb92cffdb033a4cdaca1d8e89f0bc49170..8b7a6148a19a6294a9ff8e43b15dcbdb98b64a49 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 c4594a3a6e751aa9cb4075817bc4f7345a6a903f..5c571a71ef24d03a635316b40be4475ee2dd9a98 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000194
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-ptrbaddom2.sys b/regress/case-ptrbaddom2.sys
index 4d99cb57101782f604941555c209bdf1266f82db..71f86a2c3b4cbd08f11d9475026934533a7d66d1 100644 (file)
--- a/regress/case-ptrbaddom2.sys
+++ b/regress/case-ptrbaddom2.sys
@@ -1,7 +1,7 @@
 ./adnstest default
 :65548 00.45.18.172.in-addr.arpa 6.945.18.172.in-addr.arpa 4.0.0.0.g.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 1406163217.059538
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=6
  +0.000157
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-quote.sys b/regress/case-quote.sys
index 2392c4a258e35ccc4a3f801120df41a05b11375e..e54f90fbd244e524bee32d973578a333f7ef5739 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 f4e00c7d4b60a5dfcfab54dd1d2ff7c156ff6880..f23340cbac0beddfb70d7ee7f06407b90013b777 100644 (file)
--- a/regress/case-rootquery.sys
+++ b/regress/case-rootquery.sys
@@ -1,7 +1,7 @@
 adnstest default
 :131078 . 1/.
  start 924364442.672925
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 c001282229a59c2a2fbdebd7c132cdf808616144..6d1da7a752f1baf61fd0d5508452e81691bedf94 100644 (file)
--- a/regress/case-rootqueryall-as.sys
+++ b/regress/case-rootqueryall-as.sys
@@ -1,7 +1,7 @@
 adnstest default -0x400
 . 1/.
  start 931992019.753022
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 184c83f91faa22341e90b0138e7d544a979b4328..cf2efe34658b7a8c3e6ecbcfc623ce6a0853ecce 100644 (file)
--- a/regress/case-rootqueryall.sys
+++ b/regress/case-rootqueryall.sys
@@ -1,7 +1,7 @@
 adnstest default -0x400,s
 . 1/.
  start 924364450.165424
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 d58230a79884893e4335093bd99efb2b7b486691..a75ebf8a56372c67dc74c13f684f48c0c0c06b3d 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 0433914837ce01d9d95c7349427d0bd2edfbf1b7..267e1b0a3c11e4e4be8a08cee1dc269c92d3cc24 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 c2e700c9e14c31964af6f18cf39016125dece9ee..e74a52de8e1249775ec663e4f13863c8e5c56a93 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 35c805290667954b2cbc48bf3b4401c598b73983..97d99b564662125dd0a9c3aed5cc547991183ee3 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 e8a880fed6f9d494f973adf4c7bca87a2e378821..f746d7281efb28d97221ca4005a4e0b43494df27 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 d06d7ce4519f26ae3d45a39f8b68eabaf61abd3e..5e03602fa51d4a65d8c259e6d5884f46e17f9343 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 1bb2de5f11972b67abcc22da7a114ad074f6e960..231c29b79f6f35d35c132273e4e8794ca08b3244 100644 (file)
--- a/regress/case-srvha.sys
+++ b/regress/case-srvha.sys
@@ -1,7 +1,7 @@
 ./adnshost default -A4
 -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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 212114674192989020e81adcddc3cea02625dd8c..b7b4120e11b8f648d56b9c1f0d46d3c55d77fead 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 35119df9077adc8ca45189d8966b9e8ce89257db..a54c484539f0a39de1ac2063351a001c6dc995be 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 ac8816baebcff5d9738194783de9a5c80b8d1a7f..d44fba5ffe7d3b80d290f2d47e7a58b171b90858 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 c0e014038fde4292d02cf52fde1fb97ebd8f4888..a49b1b9f236b7a7dcefcd4d97b3d10b458fd5ba1 100644 (file)
--- a/regress/case-tcpallfail.sys
+++ b/regress/case-tcpallfail.sys
@@ -1,7 +1,7 @@
 adnstest anarres -0x400
 2/test.iwj.relativity.greenend.org.uk.
  start 962142174.403028
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000120
  fcntl fd=4 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest anarres -0x400
  fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000034
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_INET type=SOCK_STREAM
  socket=5
  +0.000479
  fcntl fd=5 cmd=F_GETFL
@@ -34,7 +34,7 @@ adnstest anarres -0x400
  select max=5 rfds=[4] wfds=[] efds=[] to=0.000000
  select=0 rfds=[] wfds=[] efds=[]
  +0.000103
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 e211840323d0a966f7127f4263d402d4459a006e..027df17bbb3295fb168a16b28791916bd07ded85 100644 (file)
--- a/regress/case-tcpblock.sys
+++ b/regress/case-tcpblock.sys
@@ -1,7 +1,7 @@
 adnstest anarres -0x400
 2/test.iwj.relativity.greenend.org.uk.
  start 962142246.340485
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000126
  fcntl fd=4 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest anarres -0x400
  fcntl fd=4 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000035
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 ecc388f9c5b60c1cd871433a67bc1e9f4773064a..679d0d490abdc4fbe40ec13968ae5f9039eef26d 100644 (file)
--- a/regress/case-tcpblockbrk.sys
+++ b/regress/case-tcpblockbrk.sys
@@ -1,7 +1,7 @@
 adnstest anarres -0x700
 2/test.iwj.relativity.greenend.org.uk.
  start 962143388.709150
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=5
  +0.000434
  fcntl fd=5 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest anarres -0x700
  fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000439
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_INET type=SOCK_STREAM
  socket=6
  +0.001725
  fcntl fd=6 cmd=F_GETFL
@@ -110,7 +110,7 @@ adnstest anarres -0x700
  select max=6 rfds=[5] wfds=[] efds=[] to=0.000000
  select=0 rfds=[] wfds=[] efds=[]
  +0.000702
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 5453b227594658b7eb3cb417bce7fe6fb2e0a2d2..e232d2832137123a248c2d3e1dfda6c92e885613 100644 (file)
--- a/regress/case-tcpblockwr.sys
+++ b/regress/case-tcpblockwr.sys
@@ -1,7 +1,7 @@
 adnstest anarres -0x700
 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=5
  +0.000433
  fcntl fd=5 cmd=F_GETFL
@@ -10,7 +10,7 @@ adnstest anarres -0x700
  fcntl fd=5 cmd=F_SETFL O_NONBLOCK|...
  fcntl=OK
  +0.000409
- socket domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 85fe3a630e7b61c85ed701070857df9c6248e82f..f2d5fe36facd8c1bf6b1c3640e5dd874cdf67dd7 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 f8cf43517e1189cbddd7481f6c993dd393d1db12..bcb8ad49837d9db681af630162fea3ddcd7038cc 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 a2da4366076dff554e56ab0bb685dc809d8ce741..61da1675f30d63f6bf2a31219d74a6d4e3a14888 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 domain=PF_INET type=SOCK_STREAM
+ socket domain=AF_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 ca377a7a921ba912207a1b804d524dcd7de0a17b..4ce68f9f690fce7d4fb39b680fd5f7636c3b9403 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 0258517f11f6d82400354364ef1ef6ef2dea02b7..af088adb68f03928e3a88a6d03e11bc0870349fa 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 b5dfb10546c1b22892a65115d3c7db44ea0566da..0a1f5934c4479c56b79d6e6abe6dcdd26f538aa2 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 f509a15d0efb574535599245497105aef6aa7e42..7a6c122fcbf65bb6df0d860f8d2114af7fc1960c 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 11ba985789a4918860cd8c15a23e00af36851242..4a436c49393f6ff6029519f24eeaa9abf8aa7b01 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_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 1245a8a1d9a45740e9707d4ad61a6a7ef4e016e9..bb73c130b4aea3d48803fe5b5054da02dc007b9d 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 domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=4
  +0.000264
  fcntl fd=4 cmd=F_GETFL

diff --git a/regress/case-v6-map.sys b/regress/case-v6-map.sys
index 97a1eb3d7d4b0facf0f392689e39bc45ca25b2cd..3f69f2c7980573c27bf4e9df90560bb997946fcf 100644 (file)
--- a/regress/case-v6-map.sys
+++ b/regress/case-v6-map.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted
 :16842753,16842767,65537 0x1000/distorted.org.uk
  start 1402443121.225484
- socket domain=PF_INET type=SOCK_DGRAM
+ socket domain=AF_INET type=SOCK_DGRAM
  socket=6
  +0.000067
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/case-v6-transport-simple.sys b/regress/case-v6-transport-simple.sys
index 29fe47b8850dd326a29eee9b5b8c6caac0067832..e6ad68e10f37ccfe9e111a0a4ec4b4530678a504 100644 (file)
--- a/regress/case-v6-transport-simple.sys
+++ b/regress/case-v6-transport-simple.sys
@@ -1,7 +1,7 @@
 ./adnstest distorted-v6 -0x400
 www.distorted.org.uk
  start 1402047441.083542
- socket domain=PF_INET6 type=SOCK_DGRAM
+ socket domain=AF_INET6 type=SOCK_DGRAM
  socket=6
  +0.000065
  fcntl fd=6 cmd=F_GETFL

diff --git a/regress/hcommon.c b/regress/hcommon.c
index 3c2daa300bf1989ec27744b8ba9620697da63600..ebbef9400e4d361dc96c24cbabe2dcec6d54fd33 100644 (file)
--- a/regress/hcommon.c
+++ b/regress/hcommon.c
@@ -70,8 +70,8 @@ void Qpoll(   const struct pollfd *fds , int nfds , int timeout       ) {
 void Qsocket(  int domain , int type   ) {
  vb.used= 0;
  Tvba("socket");
-  Tvbf(domain==PF_INET ? " domain=PF_INET" :
-         domain==PF_INET6 ? " domain=PF_INET6" :
+  Tvbf(domain==AF_INET ? " domain=AF_INET" :
+         domain==AF_INET6 ? " domain=AF_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 dfd0f280a55c431722fcb03e307aee43ecadc234..89015749be38f8aa2f7527227ce1304fa2162358 100644 (file)
--- a/regress/hcommon.c.m4
+++ b/regress/hcommon.c.m4
@@ -101,8 +101,8 @@ void Q$1(hm_args_massage($3,void)) {
  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" :
+  Tvbf($'`1==AF_INET ? " $'`1=AF_INET" :
+         $'`1==AF_INET6 ? " $'`1=AF_INET6" :
          " $'`1=AF_???");')
  m4_define(`hm_arg_ign', `')
  m4_define(`hm_arg_fd', `Tvbf(" $'`1=%d",$'`1);')

diff --git a/regress/hmacros.i4 b/regress/hmacros.i4
index ff8620ec214eed253812a37b717b4ac7e110242b..43e5e6706b3e0ac039efcc31c977347d79ea18c1 100644 (file)
--- a/regress/hmacros.i4
+++ b/regress/hmacros.i4
@@ -99,7 +99,7 @@ m4_define(`hm_create_hqcall_init',`
  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);')
+  Tmust("$1","$'`1",$'`1==AF_INET || $'`1==AF_INET6);')
  m4_define(`hm_arg_fcntl_cmd_arg',`
   Tmust("$1","$'`1",$'`1==F_SETFL || $'`1==F_GETFL);
   if ($'`1 == F_SETFL) {

diff --git a/regress/hplayback.c b/regress/hplayback.c
index 9b88ef480a5238857e7a01d3abb70cb99acc99dc..279934c63e05c9319bb9bef64b8fff39946b04e4 100644 (file)
--- a/regress/hplayback.c
+++ b/regress/hplayback.c
@@ -293,7 +293,7 @@ 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==PF_INET || domain==PF_INET6); 
+  Tmust("socket","domain",domain==AF_INET || domain==AF_INET6); 
   Tmust("socket","type",type==SOCK_STREAM || type==SOCK_DGRAM); 
  Qsocket(      domain , type   );
  if (!adns__vbuf_ensure(&vb2,1000)) Tnomem();

diff --git a/regress/hrecord.c b/regress/hrecord.c
index c059434e7ac522e951a40535da38a99095921fff..dec099b247dabaccb08da05771eeed40c05b4a17 100644 (file)
--- a/regress/hrecord.c
+++ b/regress/hrecord.c
@@ -81,7 +81,7 @@ 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==PF_INET || domain==PF_INET6); 
+  Tmust("socket","domain",domain==AF_INET || domain==AF_INET6); 
   Tmust("socket","type",type==SOCK_STREAM || type==SOCK_DGRAM); 
  Qsocket(      domain , type   );
  r= socket(    domain , type , protocol        );