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>
author: Ian Jackson <ijackson@chiark.greenend.org.uk> 2014-10-12 17:16:32 +0100
committer: Ian Jackson <ijackson@chiark.greenend.org.uk> 2014-10-19 21:14:57 +0100
commit: 9ec928894e16fe538a4764ac493d939cd08e0079 (patch)
tree: b41e970feabbf538c45bfc3d777191fbfd66809a
parent: c5d8f7dd72223bede87be4ea525bfe7814b275f3 (diff)
95 files changed, 123 insertions, 123 deletions
diff --git a/regress/case-1stservbroken.sys b/regress/case-1stservbroken.sys
index 0b9a462..0892857 100644
--- 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 e1671d0..f5d4f4c 100644
--- 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 4a8836f..31777c9 100644
--- 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 e6760c4..cc702bf 100644
--- 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 9f6aea3..aecfafe 100644
--- 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 4273b8a..5f9f3b5 100644
--- 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 1b92433..1d49978 100644
--- 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 a1faf9a..b26be7b 100644
--- 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 14b1661..ef40368 100644
--- 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 bd1f8cf..a7889c9 100644
--- 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 a2facec..90f114f 100644
--- 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 fcbc5d5..3e99426 100644
--- 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 54fe667..fa6cd4b 100644
--- 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 625ea18..6e9ec3c 100644
--- 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 fcbb560..ca076c1 100644
--- 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 09f5987..ba5d4c3 100644
--- 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 b9afe1f..a9beaf3 100644
--- 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 9750504..4a2ca57 100644
--- 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 0322e14..6846e7a 100644
--- 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 df1f477..c35fe9b 100644
--- 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 4d8f2a8..de83e03 100644
--- 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 b3fbbb1..b9705a1 100644
--- 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 af062a3..85bb21c 100644
--- 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 b33043f..fd5d83f 100644
--- 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 c58be33..07e55e8 100644
--- 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 eee96b6..dcd7136 100644
--- 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 146cf24..6c50b73 100644
--- 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 ff54112..e5b5ceb 100644
--- 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 d2ed5d6..1f026d9 100644
--- 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 5e4ad6b..59efb4e 100644
--- 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 6ec88f7..6963993 100644
--- 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 c0abc4e..15a9605 100644
--- 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 8ebee41..66ed755 100644
--- 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 7643c6f..e706c58 100644
--- 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 8126b12..cd780da 100644
--- 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 87d2e37..65e23e8 100644
--- 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 eee8899..6e39ee6 100644
--- 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 7540c06..b73482f 100644
--- 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 22a4ff2..81457da 100644
--- 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 503ceb8..492c620 100644
--- 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 79e2ce4..27c8cac 100644
--- 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 4acb741..ccb3530 100644
--- 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 df52b44..80e8381 100644
--- 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 0d5f3dd..92be042 100644
--- 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 970f38d..b9afa75 100644
--- 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 2ce3e97..7934cc9 100644
--- 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 0e938dd..96d7fe1 100644
--- 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 3365fec..f9509d7 100644
--- 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 a8424eb..2e2b8e5 100644
--- 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 0d3ce7e..3c666ac 100644
--- 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 89f55e9..9059105 100644
--- 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 ed310bd..f0432b7 100644
--- 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 cfbee0b..51a276d 100644
--- 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 eb1e995..ee87357 100644
--- 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 20fad76..4637e7c 100644
--- 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 fe640f4..5b538fe 100644
--- 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 c4edcd6..84655c4 100644
--- 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 a2e6b83..085dcd0 100644
--- 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 da99b6c..8b7a614 100644
--- 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 c4594a3..5c571a7 100644
--- 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 4d99cb5..71f86a2 100644
--- 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 2392c4a..e54f90f 100644
--- 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 f4e00c7..f23340c 100644
--- 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 c001282..6d1da7a 100644
--- 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 184c83f..cf2efe3 100644
--- 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 d58230a..a75ebf8 100644
--- 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 0433914..267e1b0 100644
--- 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 c2e700c..e74a52d 100644
--- 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 35c8052..97d99b5 100644
--- 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 e8a880f..f746d72 100644
--- 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 d06d7ce..5e03602 100644
--- 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 1bb2de5..231c29b 100644
--- 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 2121146..b7b4120 100644
--- 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 35119df..a54c484 100644
--- 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 ac8816b..d44fba5 100644
--- 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 c0e0140..a49b1b9 100644
--- 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 e211840..027df17 100644
--- 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 ecc388f..679d0d4 100644
--- 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 5453b22..e232d28 100644
--- 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 85fe3a6..f2d5fe3 100644
--- 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 f8cf435..bcb8ad4 100644
--- 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 a2da436..61da167 100644
--- 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 ca377a7..4ce68f9 100644
--- 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 0258517..af088ad 100644
--- 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 b5dfb10..0a1f593 100644
--- 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 f509a15..7a6c122 100644
--- 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 11ba985..4a436c4 100644
--- 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 1245a8a..bb73c13 100644
--- 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 97a1eb3..3f69f2c 100644
--- 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 29fe47b..e6ad68e 100644
--- 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 3c2daa3..ebbef94 100644
--- 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 dfd0f28..8901574 100644
--- 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 ff8620e..43e5e67 100644
--- 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 9b88ef4..279934c 100644
--- 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 c059434..dec099b 100644
--- 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 	);
author	Ian Jackson <ijackson@chiark.greenend.org.uk>	2014-10-12 17:16:32 +0100
committer	Ian Jackson <ijackson@chiark.greenend.org.uk>	2014-10-19 21:14:57 +0100
commit	9ec928894e16fe538a4764ac493d939cd08e0079 (patch)
tree	b41e970feabbf538c45bfc3d777191fbfd66809a
parent	c5d8f7dd72223bede87be4ea525bfe7814b275f3 (diff)