summaryrefslogtreecommitdiff
path: root/src/conn-tools
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-09-06 12:31:32 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-09-06 12:31:32 +0000
commitfd151339c157d8df21f44fd12a42adc2700cce2a (patch)
treeb4c86e15f826f29baa8d5ecb6488302f85ac26fe /src/conn-tools
parent9c5b811d182f77b67a0bb5cd5f4a33774304e1d4 (diff)
downloads6-networking-fd151339c157d8df21f44fd12a42adc2700cce2a.tar.xz
Adapt to new stopwatch API
Diffstat (limited to 'src/conn-tools')
-rw-r--r--src/conn-tools/s6-ident-client.c3
-rw-r--r--src/conn-tools/s6-tcpclient.c3
-rw-r--r--src/conn-tools/s6-tcpserver-access.c3
-rw-r--r--src/conn-tools/s6-tlsc.c2
-rw-r--r--src/conn-tools/s6-tlsd.c2
5 files changed, 5 insertions, 8 deletions
diff --git a/src/conn-tools/s6-ident-client.c b/src/conn-tools/s6-ident-client.c
index fb88830..9485de3 100644
--- a/src/conn-tools/s6-ident-client.c
+++ b/src/conn-tools/s6-ident-client.c
@@ -50,8 +50,7 @@ int main (int argc, char const *const *argv)
if (ip46_is6(&ra) != ip46_is6(&la))
strerr_dief1x(100, "address family mismatch") ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
tain_add_g(&deadline, &deadline) ;
{
diff --git a/src/conn-tools/s6-tcpclient.c b/src/conn-tools/s6-tcpclient.c
index 3e42fd0..e2ba32b 100644
--- a/src/conn-tools/s6-tcpclient.c
+++ b/src/conn-tools/s6-tcpclient.c
@@ -111,8 +111,7 @@ int main (int argc, char const *const *argv)
#endif
if (!uint160_scan(argv[1], &remoteport))
strerr_dief2x(100, "invalid port number: ", argv[1]) ;
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
if (flags.timeout) tain_addsec_g(&deadline, flags.timeout) ;
else tain_add_g(&deadline, &tain_infinite_relative) ;
if (!s6dns_init()) strerr_diefu1sys(111, "init DNS") ;
diff --git a/src/conn-tools/s6-tcpserver-access.c b/src/conn-tools/s6-tcpserver-access.c
index 9b58b69..b09a2b8 100644
--- a/src/conn-tools/s6-tcpserver-access.c
+++ b/src/conn-tools/s6-tcpserver-access.c
@@ -133,8 +133,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
if (socket_tcpnodelay(1) < 0)
if (verbosity) strerr_warnwu1sys("socket_tcpnodelay") ;
}
- tain_now_set_stopwatch() ;
- tain_now_g() ;
+ tain_now_set_stopwatch_g() ;
tain_add_g(&deadline, &tto) ;
if (!buffer_timed_flush_g(buffer_1small, &deadline))
strerr_diefu1sys(111, "write banner") ;
diff --git a/src/conn-tools/s6-tlsc.c b/src/conn-tools/s6-tlsc.c
index 805cc7f..d9df81c 100644
--- a/src/conn-tools/s6-tlsc.c
+++ b/src/conn-tools/s6-tlsc.c
@@ -93,6 +93,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
if (x && !gid0_scan(x, &gid)) strerr_dieinvalid(100, "TLS_GID") ;
}
- tain_now_set_stopwatch() ;
+ tain_now_set_stopwatch_g() ;
return s6tlsc(argv, envp, &tto, preoptions, options, uid, gid, verbosity, servername, fds) ;
}
diff --git a/src/conn-tools/s6-tlsd.c b/src/conn-tools/s6-tlsd.c
index d70d2c7..923ac47 100644
--- a/src/conn-tools/s6-tlsd.c
+++ b/src/conn-tools/s6-tlsd.c
@@ -75,6 +75,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
if (x && !gid0_scan(x, &gid)) strerr_dieinvalid(100, "TLS_GID") ;
}
- tain_now_set_stopwatch() ;
+ tain_now_set_stopwatch_g() ;
return s6tlsd(argv, envp, &tto, preoptions, options, uid, gid, verbosity) ;
}