From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 24 Oct 2014 17:53:02 +0000 (+0100)
Subject: regress: Use new combined hex syntax for adnstest types
X-Git-Tag: adns-1.5.0-rc1~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=5307773088c9b322501533291f3fbc3b7b84b377

regress: Use new combined hex syntax for adnstest types

This makes the tests clearer to read.  No functional change.

Change was made with

  for f in regress/*.sys; do perl -i~ -p ../t.pl $f; done

where t.pl is this script

  if ($.==1) { $at=m{^(?:\./)?adnstest\b}; }
  if ($at && $.==2 && m/^:/) {
      m/^:(\S+)/ or die;
      $r=$'; #';
      $_=$1;
      s{\b(\d+)\b}{
	  sprintf "0x%x|%d", ($1 & ~0xffff), ($1 & 0xffff)
      }ge;
      $_=":$_$r";
  }

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

diff --git a/regress/case-1stservbroken.sys b/regress/case-1stservbroken.sys
index 0892857..fe4363c 100644
--- a/regress/case-1stservbroken.sys
+++ b/regress/case-1stservbroken.sys
@@ -1,5 +1,5 @@
 adnstest 1stservbroken
-:12 trunc.test.iwj.relativity.greenend.org.uk
+:0x0|12 trunc.test.iwj.relativity.greenend.org.uk
  start 940102940.701451
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-1stservtotcp.sys b/regress/case-1stservtotcp.sys
index f5d4f4c..e6ef382 100644
--- a/regress/case-1stservtotcp.sys
+++ b/regress/case-1stservtotcp.sys
@@ -1,5 +1,5 @@
 adnstest 1stservto
-:12 trunc.test.iwj.relativity.greenend.org.uk
+:0x0|12 trunc.test.iwj.relativity.greenend.org.uk
  start 940100259.965940
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-2ndservok.sys b/regress/case-2ndservok.sys
index 31777c9..6765361 100644
--- a/regress/case-2ndservok.sys
+++ b/regress/case-2ndservok.sys
@@ -1,5 +1,5 @@
 adnstest 2ndserver
-:1 davenant.relativity.greenend.org.uk
+:0x0|1 davenant.relativity.greenend.org.uk
  start 940100095.012145
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-2ndservtcp.sys b/regress/case-2ndservtcp.sys
index cc702bf..fa9e994 100644
--- a/regress/case-2ndservtcp.sys
+++ b/regress/case-2ndservtcp.sys
@@ -1,5 +1,5 @@
 adnstest 2ndserver
-:12 trunc.test.iwj.relativity.greenend.org.uk
+:0x0|12 trunc.test.iwj.relativity.greenend.org.uk
  start 940100083.268555
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-aaaa-simple.sys b/regress/case-aaaa-simple.sys
index aecfafe..25873ed 100644
--- a/regress/case-aaaa-simple.sys
+++ b/regress/case-aaaa-simple.sys
@@ -1,5 +1,5 @@
 ./adnstest distorted
-:28 stratocaster.distorted.org.uk
+:0x0|28 stratocaster.distorted.org.uk
  start 1401870460.843715
  socket domain=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-aaaa-sort.sys b/regress/case-aaaa-sort.sys
index 5f9f3b5..4860661 100644
--- a/regress/case-aaaa-sort.sys
+++ b/regress/case-aaaa-sort.sys
@@ -1,5 +1,5 @@
 ./adnstest distorted
-:28 maddr.dnserr.distorted.org.uk
+:0x0|28 maddr.dnserr.distorted.org.uk
  start 1401871954.600653
  socket domain=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-addr-multi-af.sys b/regress/case-addr-multi-af.sys
index ef40368..1edce47 100644
--- a/regress/case-addr-multi-af.sys
+++ b/regress/case-addr-multi-af.sys
@@ -1,5 +1,5 @@
 ./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
+:0x1010000|1,0x1010000|15,0x3010000|1,0x3010000|15 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=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-bogus-sortlist.sys b/regress/case-bogus-sortlist.sys
index bc39fa8..4cb4b26 100644
--- a/regress/case-bogus-sortlist.sys
+++ b/regress/case-bogus-sortlist.sys
@@ -1,2 +1,2 @@
 ./adnstest bogus-sortlist
-:1 chiark.greenend.org.uk
+:0x0|1 chiark.greenend.org.uk
diff --git a/regress/case-brokenmail.sys b/regress/case-brokenmail.sys
index 6846e7a..c9ead48 100644
--- a/regress/case-brokenmail.sys
+++ b/regress/case-brokenmail.sys
@@ -1,5 +1,5 @@
 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.
+:0x0|15,0x1010000|15 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=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-child.sys b/regress/case-child.sys
index c35fe9b..49829c0 100644
--- a/regress/case-child.sys
+++ b/regress/case-child.sys
@@ -1,5 +1,5 @@
 adnstest default
-:65548 134.76.224.195.in-addr.arpa
+:0x10000|12 134.76.224.195.in-addr.arpa
  start 929574747.401802
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-cnametocname.sys b/regress/case-cnametocname.sys
index de83e03..33cbd7d 100644
--- a/regress/case-cnametocname.sys
+++ b/regress/case-cnametocname.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 intel.ugcs.caltech.edu.
+:0x0|1 intel.ugcs.caltech.edu.
  start 938369896.279735
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-comprinf.sys b/regress/case-comprinf.sys
index b9705a1..01411ba 100644
--- a/regress/case-comprinf.sys
+++ b/regress/case-comprinf.sys
@@ -1,5 +1,5 @@
 adnstest default
-:12 37.45.18.172.in-addr.arpa.
+:0x0|12 37.45.18.172.in-addr.arpa.
  start 951961094.184850
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-connfail.sys b/regress/case-connfail.sys
index 85bb21c..f84f99d 100644
--- a/regress/case-connfail.sys
+++ b/regress/case-connfail.sys
@@ -1,5 +1,5 @@
 ./adnstest 2ndserver
-:1 2/davenant.greenend.org.uk
+:0x0|1 2/davenant.greenend.org.uk
  start 1056289303.784817
  socket domain=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-flags10.sys b/regress/case-flags10.sys
index 6c50b73..24431ed 100644
--- a/regress/case-flags10.sys
+++ b/regress/case-flags10.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 ,aaaaaaaaaa/chiark.greenend.org.uk
+:0x0|1 ,aaaaaaaaaa/chiark.greenend.org.uk
  start 929580072.670441
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-flags9.sys b/regress/case-flags9.sys
index e5b5ceb..4b01b37 100644
--- a/regress/case-flags9.sys
+++ b/regress/case-flags9.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 ,aaaaaaaaa/chiark.greenend.org.uk
+:0x0|1 ,aaaaaaaaa/chiark.greenend.org.uk
  start 929580075.263215
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-formerr.sys b/regress/case-formerr.sys
index 1f026d9..79c4c4e 100644
--- a/regress/case-formerr.sys
+++ b/regress/case-formerr.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 1/h.rndrobwlxxxxxxxxxxlllantysiliogogllanfairpwllgwyngyllgogerychw.relativity.greenend.org.uk.
+:0x0|1 1/h.rndrobwlxxxxxxxxxxlllantysiliogogllanfairpwllgwyngyllgogerychw.relativity.greenend.org.uk.
  start 951956380.814815
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-lockup.sys b/regress/case-lockup.sys
index 59efb4e..486632a 100644
--- a/regress/case-lockup.sys
+++ b/regress/case-lockup.sys
@@ -1,5 +1,5 @@
 adnstest noserver
-:1 chiark.greenend.org.uk
+:0x0|1 chiark.greenend.org.uk
  start 912889153.349504
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-longdom0.sys b/regress/case-longdom0.sys
index 6963993..f6d3a56 100644
--- a/regress/case-longdom0.sys
+++ b/regress/case-longdom0.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 1/0rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk.
+:0x0|1 1/0rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk.
  start 951955651.857473
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-longdom1.sys b/regress/case-longdom1.sys
index 15a9605..718aaed 100644
--- a/regress/case-longdom1.sys
+++ b/regress/case-longdom1.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 1/10rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk.
+:0x0|1 1/10rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk.
  start 951955690.505811
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-longdomsrch0.sys b/regress/case-longdomsrch0.sys
index 66ed755..ff0a22d 100644
--- a/regress/case-longdomsrch0.sys
+++ b/regress/case-longdomsrch0.sys
@@ -1,5 +1,5 @@
 adnstest ndots100
-:1 1/10rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
+:0x0|1 1/10rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
  start 951956073.321566
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-longdomsrch1.sys b/regress/case-longdomsrch1.sys
index e706c58..c3deb1b 100644
--- a/regress/case-longdomsrch1.sys
+++ b/regress/case-longdomsrch1.sys
@@ -1,5 +1,5 @@
 adnstest ndots100
-:1 1/0rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
+:0x0|1 1/0rndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
  start 951956087.269350
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-longdomsrch1b.sys b/regress/case-longdomsrch1b.sys
index cd780da..3ef9468 100644
--- a/regress/case-longdomsrch1b.sys
+++ b/regress/case-longdomsrch1b.sys
@@ -1,5 +1,5 @@
 adnstest ndots100
-:1 1/1xxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
+:0x0|1 1/1xxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
  start 951956136.566877
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-longdomsrch2.sys b/regress/case-longdomsrch2.sys
index 65e23e8..683c44b 100644
--- a/regress/case-longdomsrch2.sys
+++ b/regress/case-longdomsrch2.sys
@@ -1,5 +1,5 @@
 adnstest ndots100
-:1 1/xxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
+:0x0|1 1/xxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.llanfairpwllgwyngyllgogerychwyrndrobwlxxxxxxxxxxlllantysiliogog.relativity.greenend.org.uk
  start 951956143.624786
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-longlab0.sys b/regress/case-longlab0.sys
index 6e39ee6..bea6488 100644
--- a/regress/case-longlab0.sys
+++ b/regress/case-longlab0.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 1/yrndrobwlxxxxxxxxxxlllantysiliogogllanfairpwllgwyngyllgogerychw.relativity.greenend.org.uk.
+:0x0|1 1/yrndrobwlxxxxxxxxxxlllantysiliogogllanfairpwllgwyngyllgogerychw.relativity.greenend.org.uk.
  start 951955250.786132
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-longlab1.sys b/regress/case-longlab1.sys
index b73482f..bc8d0f0 100644
--- a/regress/case-longlab1.sys
+++ b/regress/case-longlab1.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 1/hyrndrobwlxxxxxxxxxxlllantysiliogogllanfairpwllgwyngyllgogerychw.relativity.greenend.org.uk.
+:0x0|1 1/hyrndrobwlxxxxxxxxxxlllantysiliogogllanfairpwllgwyngyllgogerychw.relativity.greenend.org.uk.
  start 951955261.286712
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-mailboxes.sys b/regress/case-mailboxes.sys
index 81457da..5889227 100644
--- a/regress/case-mailboxes.sys
+++ b/regress/case-mailboxes.sys
@@ -1,5 +1,5 @@
 adnstest default
-:131089 silly-rp.test.iwj.relativity.greenend.org.uk
+:0x20000|17 silly-rp.test.iwj.relativity.greenend.org.uk
  start 923859567.899146
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-manya.sys b/regress/case-manya.sys
index 492c620..4eb0386 100644
--- a/regress/case-manya.sys
+++ b/regress/case-manya.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 manyaddrs.test.iwj.relativity.greenend.org.uk
+:0x0|1 manyaddrs.test.iwj.relativity.greenend.org.uk
  start 912888920.123769
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-ndots-as.sys b/regress/case-ndots-as.sys
index b9afa75..0f0db44 100644
--- a/regress/case-ndots-as.sys
+++ b/regress/case-ndots-as.sys
@@ -1,5 +1,5 @@
 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
+:0x0|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=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-ndots.sys b/regress/case-ndots.sys
index 7934cc9..8fd6be9 100644
--- a/regress/case-ndots.sys
+++ b/regress/case-ndots.sys
@@ -1,5 +1,5 @@
 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
+:0x0|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=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-ndotsbad.sys b/regress/case-ndotsbad.sys
index eaf457d..b5ebfb4 100644
--- a/regress/case-ndotsbad.sys
+++ b/regress/case-ndotsbad.sys
@@ -1,2 +1,2 @@
 adnstest ndotsbad
-:1 5/news.davenant.greenend.org.uk
+:0x0|1 5/news.davenant.greenend.org.uk
diff --git a/regress/case-noinfto.sys b/regress/case-noinfto.sys
index 96d7fe1..63d2fd0 100644
--- a/regress/case-noinfto.sys
+++ b/regress/case-noinfto.sys
@@ -1,5 +1,5 @@
 adnstest noserver -,p
-:1 a.b.c.d
+:0x0|1 a.b.c.d
  start 940011574.766962
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-norm.sys b/regress/case-norm.sys
index 9059105..8c87430 100644
--- a/regress/case-norm.sys
+++ b/regress/case-norm.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 chiark.greenend.org.uk
+:0x0|1 chiark.greenend.org.uk
  start 912888966.802483
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-poll.sys b/regress/case-poll.sys
index 51a276d..1c0e8af 100644
--- a/regress/case-poll.sys
+++ b/regress/case-poll.sys
@@ -1,5 +1,5 @@
 adnstest default -,p
-:1 chiark.greenend.org.uk
+:0x0|1 chiark.greenend.org.uk
  start 931719947.391142
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-polltimeout.sys b/regress/case-polltimeout.sys
index ee87357..ca5ce03 100644
--- a/regress/case-polltimeout.sys
+++ b/regress/case-polltimeout.sys
@@ -1,5 +1,5 @@
 adnstest noserver -,p
-:1 chiark.greenend.org.uk
+:0x0|1 chiark.greenend.org.uk
  start 931719968.733439
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-ptr-aaaa-caps.sys b/regress/case-ptr-aaaa-caps.sys
index 4637e7c..8ff0db9 100644
--- a/regress/case-ptr-aaaa-caps.sys
+++ b/regress/case-ptr-aaaa-caps.sys
@@ -1,5 +1,5 @@
 ./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
+:0x10000|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 1406162686.218685
  socket domain=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-ptr-aaaa-check.sys b/regress/case-ptr-aaaa-check.sys
index 5b538fe..68e453d 100644
--- a/regress/case-ptr-aaaa-check.sys
+++ b/regress/case-ptr-aaaa-check.sys
@@ -1,5 +1,5 @@
 ./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
+:0x10000|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 1401919115.064959
  socket domain=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-ptr-aaaa-mismatch.sys b/regress/case-ptr-aaaa-mismatch.sys
index 84655c4..360509f 100644
--- a/regress/case-ptr-aaaa-mismatch.sys
+++ b/regress/case-ptr-aaaa-mismatch.sys
@@ -1,5 +1,5 @@
 ./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
+:0x10000|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.b.d.0.1.0.0.2.ip6.arpa
  start 1401919322.902230
  socket domain=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-ptr-aaaa-plain.sys b/regress/case-ptr-aaaa-plain.sys
index 085dcd0..343cffc 100644
--- a/regress/case-ptr-aaaa-plain.sys
+++ b/regress/case-ptr-aaaa-plain.sys
@@ -1,5 +1,5 @@
 ./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
+:0x0|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=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-ptr-aaaa.sys b/regress/case-ptr-aaaa.sys
index 8b7a614..d2e21df 100644
--- a/regress/case-ptr-aaaa.sys
+++ b/regress/case-ptr-aaaa.sys
@@ -1,5 +1,5 @@
 ./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
+:0x10000|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 1401919090.054985
  socket domain=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-ptrbaddom.sys b/regress/case-ptrbaddom.sys
index 5c571a7..f53995a 100644
--- a/regress/case-ptrbaddom.sys
+++ b/regress/case-ptrbaddom.sys
@@ -1,5 +1,5 @@
 adnstest default
-:12,65548 37.45.18.172.in-addr.arpa.test.iwj.relativity.greenend.org.uk.
+:0x0|12,0x10000|12 37.45.18.172.in-addr.arpa.test.iwj.relativity.greenend.org.uk.
  start 951960654.608219
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-ptrbaddom2.sys b/regress/case-ptrbaddom2.sys
index 71f86a2..cdd266a 100644
--- a/regress/case-ptrbaddom2.sys
+++ b/regress/case-ptrbaddom2.sys
@@ -1,5 +1,5 @@
 ./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
+:0x10000|12 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=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-quote.sys b/regress/case-quote.sys
index e54f90f..475aeb7 100644
--- a/regress/case-quote.sys
+++ b/regress/case-quote.sys
@@ -1,5 +1,5 @@
 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
+:0x0|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=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-rootquery.sys b/regress/case-rootquery.sys
index f23340c..b290763 100644
--- a/regress/case-rootquery.sys
+++ b/regress/case-rootquery.sys
@@ -1,5 +1,5 @@
 adnstest default
-:131078 . 1/.
+:0x20000|6 . 1/.
  start 924364442.672925
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-rr_addr-binary-compat.sys b/regress/case-rr_addr-binary-compat.sys
index a75ebf8..c1ae7bb 100644
--- a/regress/case-rr_addr-binary-compat.sys
+++ b/regress/case-rr_addr-binary-compat.sys
@@ -1,5 +1,5 @@
 ./adnstest distorted
-:16842753,65537 maddr.dnserr.distorted.org.uk
+:0x1010000|1,0x10000|1 maddr.dnserr.distorted.org.uk
  start 1402443258.469312
  socket domain=AF_INET type=SOCK_DGRAM
  socket=6
diff --git a/regress/case-search-as.sys b/regress/case-search-as.sys
index 267e1b0..442a0a5 100644
--- a/regress/case-search-as.sys
+++ b/regress/case-search-as.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 0x5/news 0x5/chiark 1/news 1/chiark
+:0x0|1 0x5/news 0x5/chiark 1/news 1/chiark
  start 931992052.232208
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-search.sys b/regress/case-search.sys
index e74a52d..4c6675c 100644
--- a/regress/case-search.sys
+++ b/regress/case-search.sys
@@ -1,5 +1,5 @@
 adnstest default -,s
-:1 0x5/news 0x5/chiark 1/news 1/chiark
+:0x0|1 0x5/news 0x5/chiark 1/news 1/chiark
  start 924360470.478357
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-searchabs.sys b/regress/case-searchabs.sys
index 97d99b5..ee547ba 100644
--- a/regress/case-searchabs.sys
+++ b/regress/case-searchabs.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 1/news.davenant
+:0x0|1 1/news.davenant
  start 924363451.882765
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-sillyrp.sys b/regress/case-sillyrp.sys
index f746d72..f5d8e51 100644
--- a/regress/case-sillyrp.sys
+++ b/regress/case-sillyrp.sys
@@ -1,5 +1,5 @@
 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
+:0x0|17,0x20000|17 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=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-tcpbreakin.sys b/regress/case-tcpbreakin.sys
index f2d5fe3..d20b0d9 100644
--- a/regress/case-tcpbreakin.sys
+++ b/regress/case-tcpbreakin.sys
@@ -1,5 +1,5 @@
 adnstest default
-:65548 2/6.45.18.172.in-addr.arpa
+:0x10000|12 2/6.45.18.172.in-addr.arpa
  start 957718868.938329
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-tcpmultipart.sys b/regress/case-tcpmultipart.sys
index bcb8ad4..8f59ea9 100644
--- a/regress/case-tcpmultipart.sys
+++ b/regress/case-tcpmultipart.sys
@@ -1,5 +1,5 @@
 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
+:0x0|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=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-tcpptr.sys b/regress/case-tcpptr.sys
index 61da167..662689c 100644
--- a/regress/case-tcpptr.sys
+++ b/regress/case-tcpptr.sys
@@ -1,5 +1,5 @@
 adnstest default
-:65548 2/6.45.18.172.in-addr.arpa
+:0x10000|12 2/6.45.18.172.in-addr.arpa
  start 957718868.938329
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-timeout.sys b/regress/case-timeout.sys
index 4ce68f9..3fb78d3 100644
--- a/regress/case-timeout.sys
+++ b/regress/case-timeout.sys
@@ -1,5 +1,5 @@
 adnstest noserver
-:1 chiark.greenend.org.uk
+:0x0|1 chiark.greenend.org.uk
  start 912889153.349504
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-trunc.sys b/regress/case-trunc.sys
index af088ad..d57547d 100644
--- a/regress/case-trunc.sys
+++ b/regress/case-trunc.sys
@@ -1,5 +1,5 @@
 adnstest default
-:1 trunc.test.iwj.relativity.greenend.org.uk
+:0x0|1 trunc.test.iwj.relativity.greenend.org.uk
  start 912888921.274801
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-unknownq.sys b/regress/case-unknownq.sys
index bb73c13..60e6d2d 100644
--- a/regress/case-unknownq.sys
+++ b/regress/case-unknownq.sys
@@ -1,5 +1,5 @@
 adnstest default
-:32767 davenant.relativity.greenend.org.uk.
+:0x0|32767 davenant.relativity.greenend.org.uk.
  start 933811310.565828
  socket domain=AF_INET type=SOCK_DGRAM
  socket=4
diff --git a/regress/case-v6-map.sys b/regress/case-v6-map.sys
index 3f69f2c..3e92dce 100644
--- a/regress/case-v6-map.sys
+++ b/regress/case-v6-map.sys
@@ -1,5 +1,5 @@
 ./adnstest distorted
-:16842753,16842767,65537 0x1000/distorted.org.uk
+:0x1010000|1,0x1010000|15,0x10000|1 0x1000/distorted.org.uk
  start 1402443121.225484
  socket domain=AF_INET type=SOCK_DGRAM
  socket=6