From 91e808f1db0b76f3625f516ec73a95b4e32decb2 Mon Sep 17 00:00:00 2001
From: Laurent Bercot
Date: Sun, 17 May 2020 18:07:58 +0000
Subject: Add s6-dnsip, prepare for 2.3.3.0, fix resolvenoq_aaaaa
TODO: resolveq_aaaaa returns the best (1 answer) whereas we
want both ip6 and ip4 when available. It works with noq, it
should work with q too.
---
doc/index.html | 3 +-
doc/libs6dns/s6dns-resolve.html | 4 +--
doc/s6-dnsip.html | 72 +++++++++++++++++++++++++++++++++++++++++
doc/upgrade.html | 6 ++++
4 files changed, 82 insertions(+), 3 deletions(-)
create mode 100644 doc/s6-dnsip.html
(limited to 'doc')
diff --git a/doc/index.html b/doc/index.html
index 036dca0..4bd7ca3 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -60,7 +60,7 @@ requirement if you link against the shared version of the skalibs library.
Download
- - The current released version of s6-dns is 2.3.2.0.
+ - The current released version of s6-dns is 2.3.3.0.
- Alternatively, you can checkout a copy of the
s6-dns
git repository:
@@ -100,6 +100,7 @@ relevant page.
Command-line DNS clients programs
+- The s6-dnsip program
- The s6-dnsip4 program
- The s6-dnsip6 program
- The s6-dnsname program
diff --git a/doc/libs6dns/s6dns-resolve.html b/doc/libs6dns/s6dns-resolve.html
index 69596f8..5d021aa 100644
--- a/doc/libs6dns/s6dns-resolve.html
+++ b/doc/libs6dns/s6dns-resolve.html
@@ -191,7 +191,7 @@ Returns -1 if an error occurs, or 0 if no answer
can be obtained from servers, or a positive number if it succeeds: 1 if IPv4 addresses
were found, 2 if IPv6 addresses were found, and 3 if both were found.
The IPs are appended to the genalloc *ips, which contains an array of
-ip46_t, the skalibs structure used to store IPv4 and IPv6 addresses
+ip46full_t, the skalibs structure used to store IPv4 and IPv6 addresses
indiscriminately.
@@ -222,7 +222,7 @@ appended to the genalloc *ds, which contains an array of s6dns_doma
- int s6dns_resolve_name46_g (genalloc *ds, ip46_t const *ip, tain_t const *deadline)
+ int s6dns_resolve_name46_g (genalloc *ds, ip46full_t const *ip, tain_t const *deadline)
Calls s6dns_resolve_name6_g() or s6dns_resolve_name4_g()
depending on which ip is an IPv6 or IPv4 address.
diff --git a/doc/s6-dnsip.html b/doc/s6-dnsip.html
new file mode 100644
index 0000000..47c4970
--- /dev/null
+++ b/doc/s6-dnsip.html
@@ -0,0 +1,72 @@
+
+
+
+
+
+ s6-dns: the s6-dnsip program
+
+
+
+
+
+
+
+s6-dns
+Software
+skarnet.org
+
+
+ The s6-dnsip program
+
+
+ s6-dnsip finds both the IPv6 and IPv4 addresses associated to a domain name.
+
+
+ Interface
+
+
+ s6-dnsip [ -q ] [ -r ] [ -t timeout ] domain
+
+
+
+ - s6-dnsip makes both an A and an AAAA query for the name domain,
+in parallel. It waits for the results and prints the obtained addresses,
+one per line, then exits 0.
+ - If the domain exists but no relevant field has been found, it exits 1.
+ - If the DNS answered but no answer is available, it prints a relevant
+error message and exits 2.
+ - By default, s6-dnsip looks for DNS cache addresses in the
+/etc/resolv.conf file. If the DNSCACHEIP environment variable is set
+and contains a list of IP (v4 or v6) addresses, separated by commas,
+semicolons, spaces, tabs, newlines or carriage returns, then this list
+is used instead.
+
+
+ Options
+
+
+ - -q : qualify. Qualifies domain before resolution,
+according to suffixes found in /etc/resolv.conf. If the DNSQUALIFY
+environment variable is set and contains a list of suffixes separated by spaces,
+tabs, newlines or carriage returns, then this list is used instead. By
+default, no qualification is used: if domain is not a FQDN, a dot
+is just appended to it.
+ - -r : random. By default, the program does not sort the
+result, but prints them in the order received from the DNS. With this
+option, it performs a random permutation on the results before printing
+them.
+ - -t timeout : if the resolution takes more
+than timeout milliseconds, then it exits 99 right away with an error
+message. By default, timeout is 0, which means no timeout.
+
+
+ Notes
+
+
+Even if the underlying skalibs has been compiled without IPv6 support,
+or IPv6 DNS transport is unavailable for any reason, s6-dnsip will still
+return IPv6 addresses if the AAAA query has a positive result.
+
+
+
+
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 3bf4b67..97dde72 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
What has changed in s6-dns
+ in 2.3.3.0
+
+
+
in 2.3.2.0