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.
---
NEWS | 7 ++++
doc/index.html | 3 +-
doc/libs6dns/s6dns-resolve.html | 4 +-
doc/s6-dnsip.html | 72 +++++++++++++++++++++++++++++++++++
doc/upgrade.html | 6 +++
package/deps.mak | 3 ++
package/info | 2 +-
package/targets.mak | 1 +
src/clients/deps-exe/s6-dnsip | 4 ++
src/clients/s6-dnsip.c | 67 ++++++++++++++++++++++++++++++++
src/include/s6-dns/s6dns-resolve.h | 2 +-
src/libs6dns/s6dns_resolvenoq_aaaaa.c | 12 +++---
src/libs6dns/s6dns_resolveq_aaaaa.c | 12 ++++--
13 files changed, 181 insertions(+), 14 deletions(-)
create mode 100644 doc/s6-dnsip.html
create mode 100644 src/clients/deps-exe/s6-dnsip
create mode 100644 src/clients/s6-dnsip.c
diff --git a/NEWS b/NEWS
index 14cfebb..ac69396 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
Changelog for s6-dns.
+In 2.3.3.0
+----------
+
+ - Bugfixes.
+ - New binary: s6-dnsip, returning both v4 and v6 addresses.
+
+
In 2.3.2.0
----------
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
diff --git a/package/deps.mak b/package/deps.mak
index b10d4b8..9b58f8b 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -24,6 +24,7 @@ src/caches/shibari_whitelist_add6.o src/caches/shibari_whitelist_add6.lo: src/ca
src/caches/shibari_whitelist_ip4_match.o src/caches/shibari_whitelist_ip4_match.lo: src/caches/shibari_whitelist_ip4_match.c src/caches/shibari-internal.h
src/caches/shibari_whitelist_ip6_match.o src/caches/shibari_whitelist_ip6_match.lo: src/caches/shibari_whitelist_ip6_match.c src/caches/shibari-internal.h
src/caches/shibari_whitelist_read.o src/caches/shibari_whitelist_read.lo: src/caches/shibari_whitelist_read.c src/caches/shibari-internal.h
+src/clients/s6-dnsip.o src/clients/s6-dnsip.lo: src/clients/s6-dnsip.c src/include/s6-dns/s6dns.h
src/clients/s6-dnsip4-filter.o src/clients/s6-dnsip4-filter.lo: src/clients/s6-dnsip4-filter.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h src/clients/s6dns-generic-filter.h
src/clients/s6-dnsip4.o src/clients/s6-dnsip4.lo: src/clients/s6-dnsip4.c src/include/s6-dns/s6dns.h
src/clients/s6-dnsip6-filter.o src/clients/s6-dnsip6-filter.lo: src/clients/s6-dnsip6-filter.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h src/clients/s6dns-generic-filter.h
@@ -163,6 +164,8 @@ libshibari.so.xyzzy: EXTRA_LIBS :=
libshibari.so.xyzzy: src/caches/shibari_whitelist_add6.lo src/caches/shibari_whitelist_ip4_match.lo src/caches/shibari_whitelist_ip6_match.lo src/caches/shibari_whitelist_read.lo
shibari: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
shibari: src/caches/shibari.o libshibari.a.xyzzy ${LIBDCACHE} ${LIBS6DNS}
+s6-dnsip: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-dnsip: src/clients/s6-dnsip.o ${LIBS6DNS}
s6-dnsip4: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
s6-dnsip4: src/clients/s6-dnsip4.o ${LIBS6DNS}
s6-dnsip4-filter: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
diff --git a/package/info b/package/info
index 2e264fb..432358a 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6-dns
-version=2.3.2.0
+version=2.3.3.0
category=web
package_macro_name=S6_DNS
diff --git a/package/targets.mak b/package/targets.mak
index 9d7a60f..ffab27d 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -2,6 +2,7 @@ BIN_TARGETS := \
skadnsd \
s6-randomip \
s6-dnsqualify \
+s6-dnsip \
s6-dnsip4 \
s6-dnsip6 \
s6-dnsmx \
diff --git a/src/clients/deps-exe/s6-dnsip b/src/clients/deps-exe/s6-dnsip
new file mode 100644
index 0000000..9bc872f
--- /dev/null
+++ b/src/clients/deps-exe/s6-dnsip
@@ -0,0 +1,4 @@
+${LIBS6DNS}
+-lskarnet
+${SOCKET_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/clients/s6-dnsip.c b/src/clients/s6-dnsip.c
new file mode 100644
index 0000000..f4c1a58
--- /dev/null
+++ b/src/clients/s6-dnsip.c
@@ -0,0 +1,67 @@
+/* ISC license. */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define USAGE "s6-dnsip [ -q ] [ -r ] [ -t timeout ] domain"
+#define dieusage() strerr_dieusage(100, USAGE)
+
+int main (int argc, char const *const *argv)
+{
+ genalloc ips = GENALLOC_ZERO ; /* ip46full_t */
+ tain_t deadline ;
+ size_t i = 0 ;
+ unsigned int t = 0 ;
+ int flagqualify = 0 ;
+ int flagunsort = 0 ;
+ PROG = "s6-dnsip" ;
+
+ for (;;)
+ {
+ int opt = subgetopt(argc, argv, "qrt:") ;
+ if (opt == -1) break ;
+ switch (opt)
+ {
+ case 'q' : flagqualify = 1 ; break ;
+ case 'r' : flagunsort = 1 ; break ;
+ case 't' : if (!uint0_scan(subgetopt_here.arg, &t)) dieusage() ; break ;
+ default : dieusage() ;
+ }
+ }
+ argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ;
+ if (argc < 1) dieusage() ;
+
+ tain_now_set_stopwatch_g() ;
+ if (t) tain_from_millisecs(&deadline, t) ; else deadline = tain_infinite_relative ;
+ tain_add_g(&deadline, &deadline) ;
+ if (!s6dns_init()) strerr_diefu1sys(111, "s6dns_init") ;
+ {
+ int r = s6dns_resolve_aaaaa_g(&ips, argv[0], strlen(argv[0]), flagqualify, &deadline) ;
+ if (r < 0) strerr_diefu2sys((errno == ETIMEDOUT) ? 99 : 111, "resolve ", argv[0]) ;
+ if (!r) strerr_diefu4x(2, "resolve ", argv[0], ": ", s6dns_constants_error_str(errno)) ;
+ }
+ if (!genalloc_len(ip46full_t, &ips)) return 1 ;
+
+ if (flagunsort) random_unsort(ips.s, genalloc_len(ip46full_t, &ips), sizeof(ip46full_t)) ;
+ for (i = 0 ; i < genalloc_len(ip46full_t, &ips) ; i++)
+ {
+ char fmt[IP6_FMT] ;
+ size_t n = ip46full_fmt(fmt, genalloc_s(ip46full_t, &ips) + i) ;
+ fmt[n++] = '\n' ;
+ if (buffer_put(buffer_1small, fmt, n) < (ssize_t)n)
+ strerr_diefu1sys(111, "write to stdout") ;
+ }
+ if (!buffer_flush(buffer_1small))
+ strerr_diefu1sys(111, "write to stdout") ;
+ return 0 ;
+}
diff --git a/src/include/s6-dns/s6dns-resolve.h b/src/include/s6-dns/s6dns-resolve.h
index a571103..7369ffd 100644
--- a/src/include/s6-dns/s6dns-resolve.h
+++ b/src/include/s6-dns/s6dns-resolve.h
@@ -155,7 +155,7 @@ extern int s6dns_resolve_name6_r (genalloc *, char const *, s6dns_engine_t *, s6
#define s6dns_resolve_name46(ds, i, deadline, stamp) s6dns_resolve_name46_r(ds, i, &s6dns_engine_here, &s6dns_rci_here.servers, &s6dns_debughook_zero, deadline, stamp)
#define s6dns_resolve_name46_g(ds, i, deadline) s6dns_resolve_name46(ds, i, (deadline), &STAMP)
-#define s6dns_resolve_name46_r(ds, i, dt, servers, dbh, deadline, stamp) (ip46_is6(i) ? s6dns_resolve_name6_r(ds, (i)->ip, dt, servers, dbh, deadline, stamp) : s6dns_resolve_name4_r(ds, (i)->ip, dt, servers, dbh, deadline, stamp))
+#define s6dns_resolve_name46_r(ds, i, dt, servers, dbh, deadline, stamp) (ip46full_is6(i) ? s6dns_resolve_name6_r(ds, (i)->ip, dt, servers, dbh, deadline, stamp) : s6dns_resolve_name4_r(ds, (i)->ip, dt, servers, dbh, deadline, stamp))
#define s6dns_resolve_name46_r_g(ds, i, dt, servers, dbh, deadline) s6dns_resolve_name46_r(ds, i, dt, servers, dbh, (deadline), &STAMP)
#define s6dns_resolve_txt(sa, offsets, name, len, qualif, deadline, stamp) s6dns_resolve_txt_r(sa, offsets, name, len, qualif, &s6dns_engine_here, &s6dns_rci_here, &s6dns_debughook_zero, deadline, stamp)
diff --git a/src/libs6dns/s6dns_resolvenoq_aaaaa.c b/src/libs6dns/s6dns_resolvenoq_aaaaa.c
index 734d048..7012594 100644
--- a/src/libs6dns/s6dns_resolvenoq_aaaaa.c
+++ b/src/libs6dns/s6dns_resolvenoq_aaaaa.c
@@ -26,7 +26,7 @@ int s6dns_resolvenoq_aaaaa_r (genalloc *ips, char const *name, size_t len, s6dns
blob[1].data = &sa[1] ;
if (!s6dns_resolven_parse_r(blob, 2, servers, dbh, deadline, stamp)) return -1 ;
if (blob[0].status && blob[1].status) return (errno = blob[1].status, 0) ;
- if (!genalloc_readyplus(ip46_t, ips, (sa[0].len >> 4) + (sa[1].len >> 2)))
+ if (!genalloc_readyplus(ip46full_t, ips, (sa[0].len >> 4) + (sa[1].len >> 2)))
{
stralloc_free(&sa[0]) ;
stralloc_free(&sa[1]) ;
@@ -34,13 +34,15 @@ int s6dns_resolvenoq_aaaaa_r (genalloc *ips, char const *name, size_t len, s6dns
}
{
int e = (!!sa[0].len << 1) | !!sa[1].len ;
- size_t n = genalloc_len(ip46_t, ips) ;
+ size_t n = genalloc_len(ip46full_t, ips) ;
size_t i = 0 ;
for (; i < (sa[0].len >> 4) ; i++)
- ip46_from_ip6(genalloc_s(ip46_t, ips) + n++, sa[0].s + (i << 4)) ;
+ ip46full_from_ip6(genalloc_s(ip46full_t, ips) + n + i, sa[0].s + (i << 4)) ;
+ n += i ;
for (i = 0 ; i < (sa[1].len >> 2) ; i++)
- ip46_from_ip4(genalloc_s(ip46_t, ips) + n++, sa[1].s + (i << 2)) ;
- genalloc_setlen(ip46_t, ips, n) ;
+ ip46full_from_ip4(genalloc_s(ip46full_t, ips) + n + i, sa[1].s + (i << 2)) ;
+ n += i ;
+ genalloc_setlen(ip46full_t, ips, n) ;
stralloc_free(&sa[0]) ;
stralloc_free(&sa[1]) ;
return e ;
diff --git a/src/libs6dns/s6dns_resolveq_aaaaa.c b/src/libs6dns/s6dns_resolveq_aaaaa.c
index 5a0a358..f990a7c 100644
--- a/src/libs6dns/s6dns_resolveq_aaaaa.c
+++ b/src/libs6dns/s6dns_resolveq_aaaaa.c
@@ -1,16 +1,20 @@
/* ISC license. */
#include
+
#include
#include
#include
#include
+
#include
#include
#include
#include
#include
+#define d_ip46full_from_ip(i, s, h) ((h) ? ip46full_from_ip6(i, s) : ip46full_from_ip4(i, s))
+
int s6dns_resolveq_aaaaa_r (genalloc *ips, char const *name, size_t len, s6dns_rci_t const *rci, s6dns_debughook_t const *dbh, tain_t const *deadline, tain_t *stamp)
{
s6dns_engine_t dtl[rci->rulesnum << 1] ;
@@ -75,11 +79,11 @@ int s6dns_resolveq_aaaaa_r (genalloc *ips, char const *name, size_t len, s6dns_r
{
size_t len = data.len >> ((best & 1) ? 2 : 4) ;
size_t i = 0 ;
- size_t base = genalloc_len(ip46_t, ips) ;
- if (!genalloc_readyplus(ip46_t, ips, len)) return -1 ;
+ size_t base = genalloc_len(ip46full_t, ips) ;
+ if (!genalloc_readyplus(ip46full_t, ips, len)) return -1 ;
for (; i < len ; i++)
- ip46_from_ip(genalloc_s(ip46_t, ips) + base + i, data.s + (i << ((best & 1) ? 2 : 4)), !(best & 1)) ;
- genalloc_setlen(ip46_t, ips, base + len) ;
+ d_ip46full_from_ip(genalloc_s(ip46full_t, ips) + base + i, data.s + (i << ((best & 1) ? 2 : 4)), !(best & 1)) ;
+ genalloc_setlen(ip46full_t, ips, base + len) ;
}
stralloc_free(&data) ;
return 1 ;
--
cgit v1.2.3