summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-09-06 10:51:27 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-09-06 10:51:27 +0000
commitbe796e67efda6fbcc6ac07c3b213e3e276b8d7f0 (patch)
treeb4aabd39f8a657159fc4d0f3061fd8c3bbc5ecc8 /src
parent5bee815f7f9045db667bf9a1b0d5fddd94c704e4 (diff)
downloads6-dns-be796e67efda6fbcc6ac07c3b213e3e276b8d7f0.tar.xz
Adapt to new stopwatch API
Diffstat (limited to 'src')
-rw-r--r--src/clients/s6-dnsip4.c3
-rw-r--r--src/clients/s6-dnsip6.c3
-rw-r--r--src/clients/s6-dnsmx.c3
-rw-r--r--src/clients/s6-dnsname.c3
-rw-r--r--src/clients/s6-dnsns.c3
-rw-r--r--src/clients/s6-dnsq.c3
-rw-r--r--src/clients/s6-dnsqr.c3
-rw-r--r--src/clients/s6-dnssoa.c3
-rw-r--r--src/clients/s6-dnssrv.c3
-rw-r--r--src/clients/s6-dnstxt.c11
-rw-r--r--src/clients/s6dns_generic_filter_main.c3
-rw-r--r--src/skadns/skadnsd.c3
12 files changed, 16 insertions, 28 deletions
diff --git a/src/clients/s6-dnsip4.c b/src/clients/s6-dnsip4.c
index 8458099..b46f229 100644
--- a/src/clients/s6-dnsip4.c
+++ b/src/clients/s6-dnsip4.c
@@ -39,8 +39,7 @@ int main (int argc, char const *const *argv)
argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ;
if (argc < 1) dieusage() ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ 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") ;
diff --git a/src/clients/s6-dnsip6.c b/src/clients/s6-dnsip6.c
index 7e59f80..dd4e87e 100644
--- a/src/clients/s6-dnsip6.c
+++ b/src/clients/s6-dnsip6.c
@@ -39,8 +39,7 @@ int main (int argc, char const *const *argv)
argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ;
if (argc < 1) dieusage() ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ 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") ;
diff --git a/src/clients/s6-dnsmx.c b/src/clients/s6-dnsmx.c
index c28894e..c91cb44 100644
--- a/src/clients/s6-dnsmx.c
+++ b/src/clients/s6-dnsmx.c
@@ -38,8 +38,7 @@ int main (int argc, char const *const *argv)
argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ;
if (argc < 1) dieusage() ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ 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") ;
diff --git a/src/clients/s6-dnsname.c b/src/clients/s6-dnsname.c
index ab1fd4b..04e293f 100644
--- a/src/clients/s6-dnsname.c
+++ b/src/clients/s6-dnsname.c
@@ -53,8 +53,7 @@ int main (int argc, char const *const *argv)
}
else if (!ip4_scan(argv[0], ip.ip)) dieusage() ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ 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") ;
diff --git a/src/clients/s6-dnsns.c b/src/clients/s6-dnsns.c
index a1a6b09..2e343ca 100644
--- a/src/clients/s6-dnsns.c
+++ b/src/clients/s6-dnsns.c
@@ -38,8 +38,7 @@ int main (int argc, char const *const *argv)
argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ;
if (argc < 1) dieusage() ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ 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") ;
diff --git a/src/clients/s6-dnsq.c b/src/clients/s6-dnsq.c
index 3113025..207c58f 100644
--- a/src/clients/s6-dnsq.c
+++ b/src/clients/s6-dnsq.c
@@ -75,8 +75,7 @@ int main (int argc, char const *const *argv)
}
if (debuglevel & 1) dbh.post_recv = &s6dns_debug_dumpdt_post_recv ;
if (debuglevel & 2) { dbh.pre_send = &s6dns_debug_dumpdt_pre_send ; dbh.post_send = &s6dns_debug_dumpdt_post_send ; }
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
tain_add_g(&deadline, &deadline) ;
if (!s6dns_engine_init_r_g(&s6dns_engine_here, &servers, 0, d.s, d.len, qtype, &dbh, &deadline))
strerr_diefu1sys(111, "initialize query") ;
diff --git a/src/clients/s6-dnsqr.c b/src/clients/s6-dnsqr.c
index 186ae75..d32f3b6 100644
--- a/src/clients/s6-dnsqr.c
+++ b/src/clients/s6-dnsqr.c
@@ -52,8 +52,7 @@ int main (int argc, char const *const *argv)
dbh.external = where ;
if (debuglevel & 1) dbh.post_recv = &s6dns_debug_dumpdt_post_recv ;
if (debuglevel & 2) { dbh.pre_send = &s6dns_debug_dumpdt_pre_send ; dbh.post_send = &s6dns_debug_dumpdt_post_send ; }
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
tain_add_g(&deadline, &deadline) ;
if (!s6dns_init()) strerr_diefu1sys(111, "s6dns_init") ;
if (!s6dns_resolve_core_r_g(&d, qtype, &s6dns_engine_here, &s6dns_rci_here.servers, &dbh, &deadline))
diff --git a/src/clients/s6-dnssoa.c b/src/clients/s6-dnssoa.c
index 9d42d8f..cb8dc55 100644
--- a/src/clients/s6-dnssoa.c
+++ b/src/clients/s6-dnssoa.c
@@ -39,8 +39,7 @@ int main (int argc, char const *const *argv)
argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ;
if (argc < 1) dieusage() ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ 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") ;
diff --git a/src/clients/s6-dnssrv.c b/src/clients/s6-dnssrv.c
index 0845ffb..e7d58f9 100644
--- a/src/clients/s6-dnssrv.c
+++ b/src/clients/s6-dnssrv.c
@@ -39,8 +39,7 @@ int main (int argc, char const *const *argv)
argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ;
if (argc < 3) dieusage() ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ 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") ;
diff --git a/src/clients/s6-dnstxt.c b/src/clients/s6-dnstxt.c
index 622f9bb..22e9776 100644
--- a/src/clients/s6-dnstxt.c
+++ b/src/clients/s6-dnstxt.c
@@ -21,7 +21,7 @@ int main (int argc, char const *const *argv)
stralloc quoted = STRALLOC_ZERO ;
stralloc sa = STRALLOC_ZERO ;
genalloc offsets = GENALLOC_ZERO ; /* array of size_t */
- tain_t deadline, stamp ;
+ tain_t deadline ;
size_t n ;
size_t i = 0 ;
unsigned int t = 0 ;
@@ -42,14 +42,13 @@ int main (int argc, char const *const *argv)
}
argc -= subgetopt_here.ind ; argv += subgetopt_here.ind ;
if (argc < 1) dieusage() ;
-
- tain_now_set_stopwatch() ;
- tain_now(&stamp) ;
if (t) tain_from_millisecs(&deadline, t) ; else deadline = tain_infinite_relative ;
- tain_add(&deadline, &deadline, &stamp) ;
+
+ tain_now_set_stopwatch_g() ;
+ tain_add_g(&deadline, &deadline) ;
if (!s6dns_init()) strerr_diefu1sys(111, "s6dns_init") ;
{
- int r = s6dns_resolve_txt(&sa, &offsets, argv[0], strlen(argv[0]), flagqualify, &deadline, &stamp) ;
+ int r = s6dns_resolve_txt_g(&sa, &offsets, 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)) ;
}
diff --git a/src/clients/s6dns_generic_filter_main.c b/src/clients/s6dns_generic_filter_main.c
index c7373b2..8d97780 100644
--- a/src/clients/s6dns_generic_filter_main.c
+++ b/src/clients/s6dns_generic_filter_main.c
@@ -78,8 +78,7 @@ int s6dns_generic_filter_main (int argc, char const *const *argv, char const *co
if (maxconn > SKADNS_MAXCONCURRENCY) maxconn = SKADNS_MAXCONCURRENCY ;
if (maxlines < maxconn) maxlines = maxconn ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
tain_addsec_g(&deadline, 2) ;
if (!skadns_startf_g(&a, &deadline))
strerr_diefu1sys(111, "establish skadns connection") ;
diff --git a/src/skadns/skadnsd.c b/src/skadns/skadnsd.c
index bbbcefd..7711bc1 100644
--- a/src/skadns/skadnsd.c
+++ b/src/skadns/skadnsd.c
@@ -112,8 +112,7 @@ int main (void)
if (ndelay_on(0) < 0) strerr_diefu2sys(111, "ndelay_on ", "0") ;
if (ndelay_on(1) < 0) strerr_diefu2sys(111, "ndelay_on ", "1") ;
if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
if (!s6dns_init()) strerr_diefu1sys(111, "s6dns_init") ;
{