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 08928570f83024f918908da91f16f408598cf8c9..fe4363ce41cda6995263d68209f3cdcc0d64623f 100644 (file)
--- 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 f5d4f4c5735702a30388b12c72bae45cd8e3564c..e6ef382abc754a0851ef7b96f7141c0d13135d43 100644 (file)
--- 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 31777c9142cef7489fc8243d51e254e1fd6b10ab..6765361c1a1bbaffec61807dbba803b952724f25 100644 (file)
--- 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 cc702bf0c0779f20020defabf0f71c33f52ab953..fa9e9941c39c1b4022435edf811de7a558e4c7b2 100644 (file)
--- 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 aecfafe33e29fdc31dbf1f758805a213697472e8..25873edc75aa357d600d29c1f0058c267828ac71 100644 (file)
--- 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 5f9f3b56bf65e73b31700f72ee63a37ead6c3df8..4860661a304bbbd4599f8bbf6f6e6f17df8e8ceb 100644 (file)
--- 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 ef40368b3bb98d8850cd7a5025b9e007b7312506..1edce47cbfacbdea4b9b927ce04f0195213b44a7 100644 (file)
--- 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 bc39fa8fdd775e78ee8c12bf3e6701b4ec09378c..4cb4b264fdfb27b4fc42c4def4e389b096952714 100644 (file)
--- 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 6846e7a7220c7181a2ded0c7e91ca215f4959c39..c9ead487874302b62e6463025ecbf49a3e3e5e2f 100644 (file)
--- 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 c35fe9b876e1691918e0f4b63bdd5f56be24eb3c..49829c0ec95d6e1543804f7e31310712b9451f87 100644 (file)
--- 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 de83e032975ac7f24e12b326407385e740969304..33cbd7d4ab5374b9a9300b783fac8d137ddf1d83 100644 (file)
--- 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 b9705a1797a9533dc7300aa07816db529bacc804..01411baf4c5bea0db284033c80e692e7c3d6e45f 100644 (file)
--- 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 85bb21c3e55883af1bcf4a6de280e76495fc1b9e..f84f99daeb8ed4eef8dc50cadaca9a7cd184c40f 100644 (file)
--- 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 6c50b73efd7f64eb6fcada9bacffeb6796efde3c..24431ed44441a8aca44c2a058c20588ccae41b8b 100644 (file)
--- 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 e5b5cebe0b4da65f2ce52c1d59c651457c517d76..4b01b3738109e8d5db85b35db4b1ee874f66b8bd 100644 (file)
--- 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 1f026d9ac320bda3fdc432b8b2705152031452cc..79c4c4e72090e77a0447286f4748bdfbe5eb678a 100644 (file)
--- 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 59efb4e3bb0eba50563cbd10a476b1e408357537..486632a5e1f067dd70cc538fbfd2cf58aea8d7bb 100644 (file)
--- 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 696399313d10869e955635541f6180bcf4f6896a..f6d3a56c3136d14ff413c252b1381304095acd75 100644 (file)
--- 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 15a96050fa47a4dc1af0c8c6feda6d7c4ddd5345..718aaed53ff6b377c198ad8e5f605711718891d5 100644 (file)
--- 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 66ed75528734e82398617d32badc2669285b3dc0..ff0a22d268cbfb34b542b3572a97cd0409ae05f1 100644 (file)
--- 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 e706c5813a9267bdc1810d5beb84c209296a3cb3..c3deb1b83cc30472e1aa14a2c698ed431a142c17 100644 (file)
--- 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 cd780da5b57d83b18fc394d25e10d52afa8b9ddc..3ef9468ab52347e437f0c191cbc2110f3da87925 100644 (file)
--- 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 65e23e88f5c32781f79a09c69e81ba335dd59707..683c44bb9069f7bb6b9d3cf3b9f461c09fb9ad99 100644 (file)
--- 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 6e39ee6db6b02d6afe6aea668093bdd12b4ddd1f..bea6488450c358137157ade7b28caad08e587e04 100644 (file)
--- 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 b73482f33574435f44796d5143d3612550b491a2..bc8d0f0a18dc0eba46549c2c7c84bab02b1824fa 100644 (file)
--- 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 81457da05f59adc8ae781af67240f6da8d9bb66f..5889227612978d86304ea4a7610808ef467d031a 100644 (file)
--- 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 492c620a8d8936b5acb7b8adb0aadac63e1a64c5..4eb03864769f0c42bc1fe7f0a09e88becf94002e 100644 (file)
--- 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 b9afa754a4cfe6c0fe407e2203b9f082b0abfd73..0f0db4417512043a94d5f7fb7d14939a751f004d 100644 (file)
--- 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 7934cc928bb854ca0074644c8dd21193cf64db64..8fd6be9c8585bbd7d26b325606f607114284f13c 100644 (file)
--- 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 eaf457d3979e5ab1a643e22b21957a68aa570a13..b5ebfb4a0a310377cef6e4161a3a379e25063b37 100644 (file)
--- 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 96d7fe178bafa8e7f778cd3e35d2156ad18cb333..63d2fd0b8b20435877bf97154300dac6771fc27d 100644 (file)
--- 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 9059105742d6d964f4e0f47aa1ef09e2f2c238c1..8c874303fe6ef9d784ab78a1303ef18187c1efda 100644 (file)
--- 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 51a276dbf1acf15f5f45571d5af4c47940a106f9..1c0e8afae706048d24931ec6b03a10ce8658dded 100644 (file)
--- 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 ee87357494ff6e7bc51a3951707ac02cd8d188e2..ca5ce0340942fc9ca9ad66c21b005eeb899c89e4 100644 (file)
--- 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 4637e7c84a38af009393e4f6db3dccb305504cdb..8ff0db90d3ed96c53f12a6ea819762f1f656916e 100644 (file)
--- 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 5b538fe66ddd167288617e1905937f66b8b82269..68e453d91801be7114f2a9316b3730485ad3ef25 100644 (file)
--- 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 84655c44f26df440e724e7048ac833525fac4655..360509f0c113e9bc6f575f97f24a2959a7dc8df7 100644 (file)
--- 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 085dcd012dedc614c0be3fc3010fafc6e95960b2..343cffc1398b0f6ffd3f74e4f064ca408cb6ccec 100644 (file)
--- 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 8b7a6148a19a6294a9ff8e43b15dcbdb98b64a49..d2e21dff4e96b6740bf1603c55d8547f14ccfc28 100644 (file)
--- 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 5c571a71ef24d03a635316b40be4475ee2dd9a98..f53995ae4e2c91dabdf35571303ea7e7b18090a0 100644 (file)
--- 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 71f86a2c3b4cbd08f11d9475026934533a7d66d1..cdd266a8b56fdd10577eab5c57bc33bbe0b1c3b8 100644 (file)
--- 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 e54f90fbd244e524bee32d973578a333f7ef5739..475aeb76b271cc4ac559ea486ca17759604d48b4 100644 (file)
--- 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 f23340cbac0beddfb70d7ee7f06407b90013b777..b2907631d9547b8a58933bd9964864daecf1565d 100644 (file)
--- 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 a75ebf8a56372c67dc74c13f684f48c0c0c06b3d..c1ae7bb3da85bf97f2bf6e6e397b0553bc3835b8 100644 (file)
--- 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 267e1b0a3c11e4e4be8a08cee1dc269c92d3cc24..442a0a5f365a9b370dcb40363493c49f6a85382a 100644 (file)
--- 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 e74a52de8e1249775ec663e4f13863c8e5c56a93..4c6675c4914fccce2229b5e319ba1930557620ce 100644 (file)
--- 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 97d99b564662125dd0a9c3aed5cc547991183ee3..ee547baa1cebea03598fb238a9e40ca69575029a 100644 (file)
--- 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 f746d7281efb28d97221ca4005a4e0b43494df27..f5d8e5181335ae63af4a7f41b2e4ac14532ffcc6 100644 (file)
--- 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 f2d5fe36facd8c1bf6b1c3640e5dd874cdf67dd7..d20b0d9f5b0150799d574e6490e57c6cc6ffed9a 100644 (file)
--- 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 bcb8ad49837d9db681af630162fea3ddcd7038cc..8f59ea9e409ed26ed645873eca8249d3a3831ae8 100644 (file)
--- 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 61da1675f30d63f6bf2a31219d74a6d4e3a14888..662689ca622e1f4a691a80b08a0782c549b724b7 100644 (file)
--- 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 4ce68f9f690fce7d4fb39b680fd5f7636c3b9403..3fb78d305e86df5cd92617a31f0822a3622ed2be 100644 (file)
--- 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 af088adb68f03928e3a88a6d03e11bc0870349fa..d57547db253882ac807c7cb7ba858bdc40284fe6 100644 (file)
--- 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 bb73c130b4aea3d48803fe5b5054da02dc007b9d..60e6d2d403865c84dd24efc7991e682ca4e35674 100644 (file)
--- 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 3f69f2c7980573c27bf4e9df90560bb997946fcf..3e92dce852e91172199a8bf68e0d7c5c2a25d769 100644 (file)
--- 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