diff options
36 files changed, 112 insertions, 125 deletions
diff --git a/src/clock/s6-clockadd.c b/src/clock/s6-clockadd.c index cd0dcbb..010222f 100644 --- a/src/clock/s6-clockadd.c +++ b/src/clock/s6-clockadd.c @@ -11,12 +11,12 @@ int main (int argc, char const *const *argv) { - tain_t now, adj ; + tain now, adj ; unsigned int emax = 2000 ; int flagforce = 0 ; PROG = "s6-clockadd" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "fe:", &l) ; @@ -39,7 +39,7 @@ int main (int argc, char const *const *argv) tain_from_millisecs(&now, emax) ; if (tain_less(&now, &adj)) { - tain_t tmp = TAIN_ZERO ; + tain tmp = TAIN_ZERO ; tain_sub(&tmp, &tmp, &adj) ; if (tain_less(&now, &tmp)) { diff --git a/src/clock/s6-clockview.c b/src/clock/s6-clockview.c index 3600cce..9b18175 100644 --- a/src/clock/s6-clockview.c +++ b/src/clock/s6-clockview.c @@ -9,8 +9,8 @@ int main (void) { char buf[TAIN_PACK] ; - tain_t now, adj ; - localtmn_t l ; + tain now, adj ; + localtmn l ; char fmt[LOCALTMN_FMT] ; PROG = "s6-clockview" ; diff --git a/src/clock/s6-sntpclock.c b/src/clock/s6-sntpclock.c index a171dc4..bc4edfc 100644 --- a/src/clock/s6-sntpclock.c +++ b/src/clock/s6-sntpclock.c @@ -23,13 +23,13 @@ static unsigned int verbosity = 1 ; -int ntp_exchange (int s, ip46_t const *ip, uint16_t port, tain_t *stamps, tain_t const *deadline) +int ntp_exchange (int s, ip46 const *ip, uint16_t port, tain *stamps, tain const *deadline) { char query[48] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ; char answer[48] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" ; - tain_t starttime ; + tain starttime ; uint64_t ntpstamp ; - ip46_t dummyip ; + ip46 dummyip ; uint16_t dummyport ; ssize_t r ; tain_copynow(&starttime) ; @@ -75,17 +75,17 @@ int ntp_exchange (int s, ip46_t const *ip, uint16_t port, tain_t *stamps, tain_t int main (int argc, char const *const *argv) { - tain_t deltamin = TAIN_ZERO ; - tain_t deltaoffset ; - tain_t deltamax ; - tain_t errmax ; - tain_t timeouttto, throttletto, globaltto ; - tain_t globaldeadline ; + tain deltamin = TAIN_ZERO ; + tain deltaoffset ; + tain deltamax ; + tain errmax ; + tain timeouttto, throttletto, globaltto ; + tain globaldeadline ; unsigned int roundtrips = 10 ; unsigned int i = 0 ; int sock ; int flagforce = 0 ; - ip46_t ipremote ; + ip46 ipremote ; uint16_t portremote = 123 ; PROG = "s6-sntpclock" ; @@ -94,7 +94,7 @@ int main (int argc, char const *const *argv) unsigned int throttle = 0 ; unsigned int bigtimeout = 10000 ; unsigned int emax = 100 ; - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "fv:r:t:h:T:e:p:", &l) ; @@ -135,8 +135,8 @@ int main (int argc, char const *const *argv) for (; i < roundtrips ; i++) { - tain_t stamps[4] ; - tain_t deadline ; + tain stamps[4] ; + tain deadline ; tain_add_g(&deadline, &timeouttto) ; if (tain_less(&globaldeadline, &deadline)) deadline = globaldeadline ; if (verbosity >= 3) @@ -160,14 +160,14 @@ int main (int argc, char const *const *argv) } else { - tain_t cur, min, max ; + tain cur, min, max ; if (verbosity >= 3) { unsigned int j = 0 ; for (; j < 4 ; j++) { uint64_t ntp ; - localtmn_t l ; + localtmn l ; char fmt[UINT_FMT] ; char fmtntp[UINT64_XFMT] ; char fmttaia[TAIN_FMT] ; @@ -210,7 +210,7 @@ int main (int argc, char const *const *argv) { char adj[TAIN_PACK] ; - tain_t delta ; + tain delta ; if (tain_less(&deltamax, &deltamin)) tain_sub(&delta, &deltamin, &deltamax) ; else tain_sub(&delta, &deltamax, &deltamin) ; if (tain_less(&errmax, &delta)) diff --git a/src/clock/s6-taiclock.c b/src/clock/s6-taiclock.c index f36a047..2bc0470 100644 --- a/src/clock/s6-taiclock.c +++ b/src/clock/s6-taiclock.c @@ -25,11 +25,11 @@ static unsigned int verbosity = 1 ; #define N 28 -int tain_exchange (int s, ip46_t const *ip, uint16_t port, tain_t *serversays, tain_t const *deadline) +int tain_exchange (int s, ip46 const *ip, uint16_t port, tain *serversays, tain const *deadline) { char query[N] = "ctai" ; char answer[N] ; - ip46_t dummyip ; + ip46 dummyip ; ssize_t r ; uint16_t dummyport ; tain_pack(query+4, &STAMP) ; @@ -48,15 +48,15 @@ int tain_exchange (int s, ip46_t const *ip, uint16_t port, tain_t *serversays, t int main (int argc, char const *const *argv) { - tain_t deltamin = TAIN_ZERO ; - tain_t deltaoffset ; - tain_t deltamax ; - tain_t errmax ; - tain_t timeouttto, throttletto, globaltto ; - tain_t globaldeadline ; + tain deltamin = TAIN_ZERO ; + tain deltaoffset ; + tain deltamax ; + tain errmax ; + tain timeouttto, throttletto, globaltto ; + tain globaldeadline ; unsigned int roundtrips = 10 ; unsigned int i = 0 ; - ip46_t ipremote ; + ip46 ipremote ; int sock ; int flagforce = 0 ; uint16_t portremote = 4014 ; @@ -67,7 +67,7 @@ int main (int argc, char const *const *argv) unsigned int throttle = 0 ; unsigned int bigtimeout = 10000 ; unsigned int emax = 100 ; - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "fv:r:t:h:T:e:p:", &l) ; @@ -110,7 +110,7 @@ int main (int argc, char const *const *argv) for (; i < roundtrips ; i++) { - tain_t deadline, before, serversays ; + tain deadline, before, serversays ; tain_add_g(&deadline, &timeouttto) ; if (tain_less(&globaldeadline, &deadline)) deadline = globaldeadline ; tain_copynow(&before) ; @@ -127,7 +127,7 @@ int main (int argc, char const *const *argv) } else { - tain_t cur, min, max ; + tain cur, min, max ; tain_add(&cur, &serversays, &deltaoffset) ; tain_add(&min, &before, &deltamin) ; tain_add(&max, &before, &deltamax) ; @@ -155,7 +155,7 @@ int main (int argc, char const *const *argv) { char adj[TAIN_PACK] ; - tain_t delta ; + tain delta ; if (tain_less(&deltamax, &deltamin)) tain_sub(&delta, &deltamin, &deltamax) ; else tain_sub(&delta, &deltamax, &deltamin) ; if (tain_less(&errmax, &delta)) diff --git a/src/clock/s6-taiclockd.c b/src/clock/s6-taiclockd.c index e76a9c5..7b2a725 100644 --- a/src/clock/s6-taiclockd.c +++ b/src/clock/s6-taiclockd.c @@ -16,9 +16,9 @@ int main (int argc, char const *const *argv) { int s ; - ip46_t ip = IP46_ZERO ; + ip46 ip = IP46_ZERO ; uint16_t port = 4014 ; - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; PROG = "s6-taiclockd" ; for (;;) { @@ -44,7 +44,7 @@ int main (int argc, char const *const *argv) ssize_t r = socket_recv46(s, packet, 256, &ip, &port) ; if ((r >= 20) && !memcmp(packet, "ctai", 4)) { - tain_t now ; + tain now ; packet[0] = 's' ; if (!tain_wallclock_read(&now)) strerr_diefu1sys(111, "tain_wallclock_read") ; tain_pack(packet + 4, &now) ; diff --git a/src/conn-tools/s6-ident-client.c b/src/conn-tools/s6-ident-client.c index 9485de3..8cb9ce1 100644 --- a/src/conn-tools/s6-ident-client.c +++ b/src/conn-tools/s6-ident-client.c @@ -17,13 +17,13 @@ int main (int argc, char const *const *argv) { - tain_t deadline ; - ip46_t ra, la ; + tain deadline ; + ip46 ra, la ; uint16_t rp, lp ; PROG = "s6-ident-client" ; { unsigned int t = 0 ; - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "t:", &l) ; diff --git a/src/conn-tools/s6-tcpclient.c b/src/conn-tools/s6-tcpclient.c index c439812..d567d54 100644 --- a/src/conn-tools/s6-tcpclient.c +++ b/src/conn-tools/s6-tcpclient.c @@ -42,7 +42,7 @@ struct tflags_s char const *localname ; unsigned int timeout ; unsigned int timeoutconn[2] ; - ip46_t localip ; + ip46 localip ; uint16_t localport ; unsigned int verbosity : 2 ; #ifdef SKALIBS_IPV6_ENABLED @@ -55,7 +55,7 @@ struct tflags_s unsigned int qualif : 1 ; } ; -static tain_t deadline ; +static tain deadline ; int main (int argc, char const *const *argv) { @@ -65,7 +65,7 @@ int main (int argc, char const *const *argv) uint16_t remoteport ; PROG = "s6-tcpclient" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, OPTSTRING, &l) ; @@ -120,7 +120,7 @@ int main (int argc, char const *const *argv) else tain_add_g(&deadline, &tain_infinite_relative) ; if (!s6dns_init()) strerr_diefu1sys(111, "init DNS") ; { - ip46_t ip[2][MAXIP] ; + ip46 ip[2][MAXIP] ; unsigned int j = 0 ; size_t n[2] = { 0, 0 } ; if (!**argv || ((**argv == '0') && !argv[0][1])) @@ -164,10 +164,10 @@ int main (int argc, char const *const *argv) size_t i = 0 ; if (s6dns_resolve_aaaaa_g(&ips, argv[0], strlen(argv[0]), flags.qualif, &deadline) <= 0) strerr_diefu4x(111, "resolve ", argv[0], ": ", s6dns_constants_error_str(errno)) ; - n[0] = genalloc_len(ip46_t, &ips) ; + n[0] = genalloc_len(ip46, &ips) ; if (n[0] >= MAXIP) n[0] = MAXIP ; - for (; i < n[0] ; i++) ip[0][i] = genalloc_s(ip46_t, &ips)[i] ; - genalloc_free(ip46_t, &ips) ; + for (; i < n[0] ; i++) ip[0][i] = genalloc_s(ip46, &ips)[i] ; + genalloc_free(ip46, &ips) ; } } else if (flags.ip6) @@ -226,7 +226,7 @@ int main (int argc, char const *const *argv) size_t i = 0 ; for (; i < n[j] ; i++) { - tain_t localdeadline ; + tain localdeadline ; #ifdef SKALIBS_IPV6_ENABLED if(!localip) flags.localip.is6 = ip46_is6(&ip[j][i]); #endif @@ -261,7 +261,7 @@ int main (int argc, char const *const *argv) strerr_diefu2sys(111, "get local", " address and port") ; { - ip46_t remoteip ; + ip46 remoteip ; char fmtip[IP46_FMT] ; char fmtport[UINT16_FMT] ; @@ -314,7 +314,7 @@ int main (int argc, char const *const *argv) data[1].rtype = S6DNS_T_PTR ; } { - tain_t infinite = TAIN_INFINITE ; + tain infinite = TAIN_INFINITE ; if (!s6dns_resolven_parse_g(blob + !!flags.localname, !flags.localname + !!flags.remotehost, &infinite)) strerr_diefu2x(111, "resolve IP addresses: ", s6dns_constants_error_str(errno)) ; } diff --git a/src/conn-tools/s6-tcpserver-access.c b/src/conn-tools/s6-tcpserver-access.c index 4dc6a5b..6d4e044 100644 --- a/src/conn-tools/s6-tcpserver-access.c +++ b/src/conn-tools/s6-tcpserver-access.c @@ -39,7 +39,7 @@ #define X() strerr_dief1x(101, "internal inconsistency. Please submit a bug-report.") -static void logit (pid_t pid, ip46_t const *ip, int h) +static void logit (pid_t pid, ip46 const *ip, int h) { char fmtpid[PID_FMT] ; char fmtip[IP46_FMT] ; @@ -49,12 +49,12 @@ static void logit (pid_t pid, ip46_t const *ip, int h) else strerr_warni5sys("deny", " pid ", fmtpid, " ip ", fmtip) ; } -static inline void log_accept (pid_t pid, ip46_t const *ip) +static inline void log_accept (pid_t pid, ip46 const *ip) { logit(pid, ip, 1) ; } -static inline void log_deny (pid_t pid, ip46_t const *ip) +static inline void log_deny (pid_t pid, ip46 const *ip) { logit(pid, ip, 0) ; } @@ -64,25 +64,24 @@ int main (int argc, char const *const *argv) { s6_accessrules_params_t params = S6_ACCESSRULES_PARAMS_ZERO ; stralloc modifs = STRALLOC_ZERO ; - tain_t deadline, tto ; + tain deadline, tto ; char const *rulestypestr[3] = { "no", "fs", "cdb" } ; char const *rules = 0 ; char const *localname = 0 ; char const *proto ; - struct cdb c = CDB_ZERO ; - int cdbfd = -1 ; + cdb c = CDB_ZERO ; unsigned int rulestype = 0 ; unsigned int verbosity = 1 ; size_t protolen ; s6_accessrules_result_t accepted ; - ip46_t remoteip, localip ; + ip46 remoteip, localip ; int flagfatal = 1, flagnodelay = 0, flagdnslookup = 1, flagident = 0, flagparanoid = 0, e = 0 ; uint16_t remoteport, localport ; PROG = "s6-tcpserver-access" ; { unsigned int timeout = 0 ; - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "WwDdHhRrPpv:l:B:t:i:x:", &l) ; @@ -158,15 +157,9 @@ int main (int argc, char const *const *argv) accepted = s6_accessrules_ip46_fs(&remoteip, (void *)rules, ¶ms) ; break ; case 2 : - cdbfd = open_readb(rules) ; - if (cdbfd < 0) strerr_diefu2sys(111, "open_readb ", rules) ; - if (cdb_init(&c, cdbfd) < 0) strerr_diefu2sys(111, "cdb_init ", rules) ; + if (!cdb_init(&c, rules)) strerr_diefu2sys(111, "cdb_init ", rules) ; accepted = s6_accessrules_ip46_cdb(&remoteip, &c, ¶ms) ; - if (accepted == S6_ACCESSRULES_ALLOW) - { - cdb_free(&c) ; - fd_close(cdbfd) ; - } + if (accepted == S6_ACCESSRULES_ALLOW) cdb_free(&c) ; break ; default : X() ; } @@ -238,7 +231,7 @@ int main (int argc, char const *const *argv) } else { - tain_t infinite ; + tain infinite ; s6dns_dpag_t data[2] = { S6DNS_DPAG_ZERO, S6DNS_DPAG_ZERO } ; s6dns_resolve_t blob[2] ; char remotebuf[256] ; @@ -363,11 +356,7 @@ int main (int argc, char const *const *argv) } } - if ((rulestype == 2) && (accepted != S6_ACCESSRULES_ALLOW)) - { - cdb_free(&c) ; - fd_close(cdbfd) ; - } + if ((rulestype == 2) && (accepted != S6_ACCESSRULES_ALLOW)) cdb_free(&c) ; switch (accepted) { diff --git a/src/conn-tools/s6-tcpserver.c b/src/conn-tools/s6-tcpserver.c index ed874b6..077b5ad 100644 --- a/src/conn-tools/s6-tcpserver.c +++ b/src/conn-tools/s6-tcpserver.c @@ -32,7 +32,7 @@ int main (int argc, char const *const *argv) unsigned int what = 0 ; PROG = "s6-tcpserver" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "qQvDd1U46c:C:b:u:g:G:", &l) ; @@ -63,7 +63,7 @@ int main (int argc, char const *const *argv) if (!what) { - ip46_t ip ; + ip46 ip ; if (!ip46_scan(argv[0], &ip)) dieusage() ; what = ip46_is6(&ip) ? 6 : 4 ; } diff --git a/src/conn-tools/s6-tcpserver4-socketbinder.c b/src/conn-tools/s6-tcpserver4-socketbinder.c index c02c3a6..69c5262 100644 --- a/src/conn-tools/s6-tcpserver4-socketbinder.c +++ b/src/conn-tools/s6-tcpserver4-socketbinder.c @@ -26,7 +26,7 @@ int main (int argc, char const *const *argv) uint16_t port ; PROG = "s6-tcpserver4-socketbinder" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "DdMmBb:", &l) ; diff --git a/src/conn-tools/s6-tcpserver4.c b/src/conn-tools/s6-tcpserver4.c index 144e16a..734435c 100644 --- a/src/conn-tools/s6-tcpserver4.c +++ b/src/conn-tools/s6-tcpserver4.c @@ -30,7 +30,7 @@ int main (int argc, char const *const *argv) unsigned int backlog = (unsigned int)-1 ; PROG = "s6-tcpserver4" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "Dd1Uv:c:C:b:u:g:G:", &l) ; diff --git a/src/conn-tools/s6-tcpserver4d.c b/src/conn-tools/s6-tcpserver4d.c index ace550a..e8dbb3a 100644 --- a/src/conn-tools/s6-tcpserver4d.c +++ b/src/conn-tools/s6-tcpserver4d.c @@ -253,7 +253,6 @@ static inline void new_connection (int s, uint32_t ip, uint16_t port, char const else if (!pid) { selfpipe_finish() ; - sig_restore(SIGPIPE) ; run_child(s, ip, port, num+1, argv) ; } @@ -280,7 +279,7 @@ int main (int argc, char const *const *argv) iopause_fd x[2] = { { .events = IOPAUSE_READ }, { .fd = 0, .events = IOPAUSE_READ | IOPAUSE_EXCEPT } } ; PROG = "s6-tcpserver4d" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; int flag1 = 0 ; for (;;) { @@ -315,7 +314,7 @@ int main (int argc, char const *const *argv) x[0].fd = selfpipe_init() ; if (x[0].fd == -1) strerr_diefu1sys(111, "create selfpipe") ; - if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ; + if (!sig_altignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ; { sigset_t set ; sigemptyset(&set) ; @@ -324,7 +323,7 @@ int main (int argc, char const *const *argv) sigaddset(&set, SIGHUP) ; sigaddset(&set, SIGQUIT) ; sigaddset(&set, SIGABRT) ; - if (selfpipe_trapset(&set) < 0) strerr_diefu1sys(111, "trap signals") ; + if (!selfpipe_trapset(&set)) strerr_diefu1sys(111, "trap signals") ; } fmtlocalmaxconn[1+uint_fmt(fmtlocalmaxconn+1, localmaxconn)] = 0 ; if (verbosity >= 2) diff --git a/src/conn-tools/s6-tcpserver6-socketbinder.c b/src/conn-tools/s6-tcpserver6-socketbinder.c index 6890d7e..6ce2c50 100644 --- a/src/conn-tools/s6-tcpserver6-socketbinder.c +++ b/src/conn-tools/s6-tcpserver6-socketbinder.c @@ -26,7 +26,7 @@ int main (int argc, char const *const *argv) uint16_t port ; PROG = "s6-tcpserver6-socketbinder" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "DdMmBb:", &l) ; diff --git a/src/conn-tools/s6-tcpserver6.c b/src/conn-tools/s6-tcpserver6.c index 51ad4a1..b186ee5 100644 --- a/src/conn-tools/s6-tcpserver6.c +++ b/src/conn-tools/s6-tcpserver6.c @@ -30,7 +30,7 @@ int main (int argc, char const *const *argv) unsigned int backlog = (unsigned int)-1 ; PROG = "s6-tcpserver6" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "Dd1Uv:c:C:b:u:g:G:", &l) ; diff --git a/src/conn-tools/s6-tcpserver6d.c b/src/conn-tools/s6-tcpserver6d.c index 7f0135b..455b41c 100644 --- a/src/conn-tools/s6-tcpserver6d.c +++ b/src/conn-tools/s6-tcpserver6d.c @@ -259,7 +259,6 @@ static inline void new_connection (int s, char const *ip, uint16_t port, char co else if (!pid) { selfpipe_finish() ; - sig_restore(SIGPIPE) ; run_child(s, ip, port, num+1, argv) ; } @@ -284,7 +283,7 @@ int main (int argc, char const *const *argv) iopause_fd x[2] = { { .events = IOPAUSE_READ }, { .fd = 0, .events = IOPAUSE_READ | IOPAUSE_EXCEPT } } ; PROG = "s6-tcpserver6d" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; int flag1 = 0 ; for (;;) { @@ -319,7 +318,7 @@ int main (int argc, char const *const *argv) x[0].fd = selfpipe_init() ; if (x[0].fd == -1) strerr_diefu1sys(111, "create selfpipe") ; - if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ; + if (!sig_altignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ; { sigset_t set ; sigemptyset(&set) ; @@ -328,7 +327,7 @@ int main (int argc, char const *const *argv) sigaddset(&set, SIGHUP) ; sigaddset(&set, SIGQUIT) ; sigaddset(&set, SIGABRT) ; - if (selfpipe_trapset(&set) < 0) strerr_diefu1sys(111, "trap signals") ; + if (!selfpipe_trapset(&set)) strerr_diefu1sys(111, "trap signals") ; } if (flag1) { diff --git a/src/include/s6-networking/ident.h b/src/include/s6-networking/ident.h index ec2c93b..be494c7 100644 --- a/src/include/s6-networking/ident.h +++ b/src/include/s6-networking/ident.h @@ -13,14 +13,14 @@ /* High-level */ -extern ssize_t s6net_ident_client (char *, size_t, ip46_t const *, uint16_t, ip46_t const *, uint16_t, tain_t const *, tain_t *) ; +extern ssize_t s6net_ident_client (char *, size_t, ip46 const *, uint16_t, ip46 const *, uint16_t, tain const *, tain *) ; #define s6net_ident_client_g(s, max, ra, rp, la, lp, deadline) s6net_ident_client(s, max, ra, rp, la, lp, (deadline), &STAMP) extern char const *s6net_ident_error_str (int) ; /* Low-level */ -extern ssize_t s6net_ident_reply_get (char *, ip46_t const *, uint16_t, ip46_t const *, uint16_t, tain_t const *, tain_t *) ; +extern ssize_t s6net_ident_reply_get (char *, ip46 const *, uint16_t, ip46 const *, uint16_t, tain const *, tain *) ; #define s6net_ident_reply_get_g(s, ra, rp, la, lp, deadline) s6net_ident_reply_get(s, ra, rp, la, lp, (deadline), &STAMP) extern ssize_t s6net_ident_reply_parse (char const *, uint16_t, uint16_t) ; diff --git a/src/include/s6-networking/sbearssl.h b/src/include/s6-networking/sbearssl.h index 5e7c42a..4e4dca6 100644 --- a/src/include/s6-networking/sbearssl.h +++ b/src/include/s6-networking/sbearssl.h @@ -59,7 +59,7 @@ struct sbearssl_x509_small_context_s char *eehash ; } ; -extern int sbearssl_x509_minimal_set_tai (br_x509_minimal_context *, tai_t const *) ; +extern int sbearssl_x509_minimal_set_tai (br_x509_minimal_context *, tai const *) ; #define sbearssl_x509_minimal_set_tain(ctx, a) sbearssl_x509_minimal_set_tai(ctx, tain_secp(a)) #define sbearssl_x509_small_set_tai(ctx, t) sbearssl_x509_minimal_set_tai(&(ctx)->minimal, t) #define sbearssl_x509_small_set_tain(ctx, a) sbearssl_x509_small_set_tai(ctx, tain_secp(a)) @@ -262,7 +262,7 @@ typedef int sbearssl_handshake_cbfunc (br_ssl_engine_context *, sbearssl_handsha typedef sbearssl_handshake_cbfunc *sbearssl_handshake_cbfunc_ref ; extern int sbearssl_send_environment (br_ssl_engine_context *, sbearssl_handshake_cbarg *) ; -extern void sbearssl_run (br_ssl_engine_context *, int *, tain_t const *, uint32_t, unsigned int, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; +extern void sbearssl_run (br_ssl_engine_context *, int *, tain const *, uint32_t, unsigned int, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; /* Generic server policy class and server-side SNI implementation */ @@ -298,7 +298,7 @@ extern void sbearssl_sctx_set_policy_sni (br_ssl_server_context *, sbearssl_sni_ /* s6-tlsc-io and s6-tlsd-io implementations */ -extern void sbearssl_client_init_and_run (int *, tain_t const *, uint32_t, uint32_t, unsigned int, char const *, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; -extern void sbearssl_server_init_and_run (int *, tain_t const *, uint32_t, uint32_t, unsigned int, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; +extern void sbearssl_client_init_and_run (int *, tain const *, uint32_t, uint32_t, unsigned int, char const *, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; +extern void sbearssl_server_init_and_run (int *, tain const *, uint32_t, uint32_t, unsigned int, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; #endif diff --git a/src/include/s6-networking/stls.h b/src/include/s6-networking/stls.h index 071b96b..e9f6136 100644 --- a/src/include/s6-networking/stls.h +++ b/src/include/s6-networking/stls.h @@ -21,7 +21,7 @@ extern void stls_run (struct tls *, int *, uint32_t, unsigned int) gccattr_noret /* s6-tlsc-io and s6-tlsd-io */ -struct tls *stls_client_init_and_handshake (int const *, tain_t const *, uint32_t, char const *) ; -struct tls *stls_server_init_and_handshake (int const *, tain_t const *, uint32_t) ; +struct tls *stls_client_init_and_handshake (int const *, tain const *, uint32_t, char const *) ; +struct tls *stls_server_init_and_handshake (int const *, tain const *, uint32_t) ; #endif diff --git a/src/libs6net/s6net_ident_client.c b/src/libs6net/s6net_ident_client.c index d09da7a..9a6356f 100644 --- a/src/libs6net/s6net_ident_client.c +++ b/src/libs6net/s6net_ident_client.c @@ -4,7 +4,7 @@ #include <errno.h> #include <s6-networking/ident.h> -ssize_t s6net_ident_client (char *s, size_t max, ip46_t const *remoteip, uint16_t remoteport, ip46_t const *localip, uint16_t localport, tain_t const *deadline, tain_t *stamp) +ssize_t s6net_ident_client (char *s, size_t max, ip46 const *remoteip, uint16_t remoteport, ip46 const *localip, uint16_t localport, tain const *deadline, tain *stamp) { char buf[S6NET_IDENT_REPLY_SIZE] ; size_t len ; diff --git a/src/libs6net/s6net_ident_reply_get.c b/src/libs6net/s6net_ident_reply_get.c index 0dc7130..9093700 100644 --- a/src/libs6net/s6net_ident_reply_get.c +++ b/src/libs6net/s6net_ident_reply_get.c @@ -12,7 +12,7 @@ #include <s6-networking/ident.h> -ssize_t s6net_ident_reply_get (char *s, ip46_t const *remoteip, uint16_t remoteport, ip46_t const *localip, uint16_t localport, tain_t const *deadline, tain_t *stamp) +ssize_t s6net_ident_reply_get (char *s, ip46 const *remoteip, uint16_t remoteport, ip46 const *localip, uint16_t localport, tain const *deadline, tain *stamp) { size_t len ; int fd ; diff --git a/src/sbearssl/sbearssl_client_init_and_run.c b/src/sbearssl/sbearssl_client_init_and_run.c index a15a779..e32f146 100644 --- a/src/sbearssl/sbearssl_client_init_and_run.c +++ b/src/sbearssl/sbearssl_client_init_and_run.c @@ -13,7 +13,7 @@ #include <s6-networking/sbearssl.h> #include "sbearssl-internal.h" -void sbearssl_client_init_and_run (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, sbearssl_handshake_cbfunc_ref cb, sbearssl_handshake_cbarg *cbarg) +void sbearssl_client_init_and_run (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, sbearssl_handshake_cbfunc_ref cb, sbearssl_handshake_cbarg *cbarg) { sbearssl_skey skey ; genalloc certs = GENALLOC_ZERO ; /* sbearssl_cert */ diff --git a/src/sbearssl/sbearssl_run.c b/src/sbearssl/sbearssl_run.c index 93a2c26..91e839a 100644 --- a/src/sbearssl/sbearssl_run.c +++ b/src/sbearssl/sbearssl_run.c @@ -14,7 +14,7 @@ #include <s6-networking/sbearssl.h> #include "sbearssl-internal.h" -void sbearssl_run (br_ssl_engine_context *ctx, int *fds, tain_t const *tto, uint32_t options, unsigned int verbosity, sbearssl_handshake_cbfunc_ref cb, sbearssl_handshake_cbarg *cbarg) +void sbearssl_run (br_ssl_engine_context *ctx, int *fds, tain const *tto, uint32_t options, unsigned int verbosity, sbearssl_handshake_cbfunc_ref cb, sbearssl_handshake_cbarg *cbarg) { iopause_fd x[4] ; unsigned int xindex[4] ; @@ -29,7 +29,7 @@ void sbearssl_run (br_ssl_engine_context *ctx, int *fds, tain_t const *tto, uint for (;;) { - tain_t deadline = TAIN_INFINITE ; + tain deadline = TAIN_INFINITE ; unsigned int j = 0 ; unsigned int state = br_ssl_engine_current_state(ctx) ; int r ; diff --git a/src/sbearssl/sbearssl_server_init_and_run.c b/src/sbearssl/sbearssl_server_init_and_run.c index f8d8b31..1cfb3db 100644 --- a/src/sbearssl/sbearssl_server_init_and_run.c +++ b/src/sbearssl/sbearssl_server_init_and_run.c @@ -15,7 +15,7 @@ #include <s6-networking/sbearssl.h> #include "sbearssl-internal.h" -void sbearssl_server_init_and_run (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, sbearssl_handshake_cbfunc_ref cb, sbearssl_handshake_cbarg *cbarg) +void sbearssl_server_init_and_run (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, sbearssl_handshake_cbfunc_ref cb, sbearssl_handshake_cbarg *cbarg) { sbearssl_sni_policy_context pol ; sbearssl_sni_policy_init(&pol) ; diff --git a/src/sbearssl/sbearssl_x509_minimal_set_tai.c b/src/sbearssl/sbearssl_x509_minimal_set_tai.c index 381e9d3..58a1a4a 100644 --- a/src/sbearssl/sbearssl_x509_minimal_set_tai.c +++ b/src/sbearssl/sbearssl_x509_minimal_set_tai.c @@ -8,7 +8,7 @@ #include <s6-networking/sbearssl.h> -int sbearssl_x509_minimal_set_tai (br_x509_minimal_context *ctx, tai_t const *t) +int sbearssl_x509_minimal_set_tai (br_x509_minimal_context *ctx, tai const *t) { uint64_t u ; if (!utc_from_tai(&u, t)) return 0 ; diff --git a/src/stls/stls-internal.h b/src/stls/stls-internal.h index ef004ea..dcf0f56 100644 --- a/src/stls/stls-internal.h +++ b/src/stls/stls-internal.h @@ -8,6 +8,6 @@ #include <skalibs/tai.h> extern void stls_drop (void) ; -extern void stls_handshake (struct tls *, tain_t const *) ; +extern void stls_handshake (struct tls *, tain const *) ; #endif diff --git a/src/stls/stls_client_init_and_handshake.c b/src/stls/stls_client_init_and_handshake.c index 7e0bc13..c8fc587 100644 --- a/src/stls/stls_client_init_and_handshake.c +++ b/src/stls/stls_client_init_and_handshake.c @@ -12,7 +12,7 @@ #define diecfg(cfg, s) strerr_diefu3x(96, (s), ": ", tls_config_error(cfg)) #define diectx(e, ctx, s) strerr_diefu3x(e, (s), ": ", tls_error(ctx)) -struct tls *stls_client_init_and_handshake (int const *fds, tain_t const *tto, uint32_t preoptions, char const *servername) +struct tls *stls_client_init_and_handshake (int const *fds, tain const *tto, uint32_t preoptions, char const *servername) { struct tls *ctx ; struct tls_config *cfg ; diff --git a/src/stls/stls_handshake.c b/src/stls/stls_handshake.c index 989a167..5e965b1 100644 --- a/src/stls/stls_handshake.c +++ b/src/stls/stls_handshake.c @@ -17,7 +17,7 @@ static void alrm_handler (int sig) strerr_dief1x(98, "handshake timed out") ; } -void stls_handshake (struct tls *ctx, tain_t const *tto) +void stls_handshake (struct tls *ctx, tain const *tto) { struct sigaction saold ; struct sigaction sanew = { .sa_handler = &alrm_handler, .sa_flags = SA_RESTART, .sa_sigaction = 0 } ; diff --git a/src/stls/stls_server_init_and_handshake.c b/src/stls/stls_server_init_and_handshake.c index f2613db..6830801 100644 --- a/src/stls/stls_server_init_and_handshake.c +++ b/src/stls/stls_server_init_and_handshake.c @@ -14,7 +14,7 @@ #define diecfg(cfg, s) strerr_diefu3x(96, (s), ": ", tls_config_error(cfg)) #define diectx(e, ctx, s) strerr_diefu3x(e, (s), ": ", tls_error(ctx)) -struct tls *stls_server_init_and_handshake (int const *fds, tain_t const *tto, uint32_t preoptions) +struct tls *stls_server_init_and_handshake (int const *fds, tain const *tto, uint32_t preoptions) { struct tls *ctx = 0 ; struct tls *sctx ; diff --git a/src/tls/s6-tlsc-io.c b/src/tls/s6-tlsc-io.c index 3c9df58..0070f8e 100644 --- a/src/tls/s6-tlsc-io.c +++ b/src/tls/s6-tlsc-io.c @@ -16,13 +16,13 @@ #define USAGE "s6-tlsc-io [ -v verbosity ] [ -d notif ] [ -S | -s ] [ -Y | -y ] [ -K timeout ] [ -k servername ] fdr fdw" #define dieusage() strerr_dieusage(100, USAGE) -static inline void doit (int *, tain_t const *tto, uint32_t, uint32_t, unsigned int, char const *, unsigned int) gccattr_noreturn ; +static inline void doit (int *, tain const *tto, uint32_t, uint32_t, unsigned int, char const *, unsigned int) gccattr_noreturn ; #ifdef S6_NETWORKING_USE_TLS #include <s6-networking/stls.h> -static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif) +static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif) { struct tls *ctx = stls_client_init_and_handshake(fds + 2, tto, preoptions, servername) ; if (notif) @@ -53,7 +53,7 @@ static int handshake_cb (br_ssl_engine_context *ctx, sbearssl_handshake_cbarg *c return 1 ; } -static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif) +static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif) { sbearssl_handshake_cbarg cbarg = SBEARSSL_HANDSHAKE_CBARG_ZERO ; if (!random_init()) strerr_diefu1sys(111, "initialize random device") ; @@ -71,7 +71,7 @@ static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint3 int main (int argc, char const *const *argv, char const *const *envp) { char const *servername = 0 ; - tain_t tto ; + tain tto ; int fds[4] = { 0, 1, 0, 1 } ; unsigned int verbosity = 1 ; unsigned int notif = 0 ; @@ -80,7 +80,7 @@ int main (int argc, char const *const *argv, char const *const *envp) PROG = "s6-tlsc-io" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; unsigned int t = 0 ; for (;;) { @@ -111,7 +111,7 @@ int main (int argc, char const *const *argv, char const *const *envp) fds[1] = u ; } - if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ; + if (!sig_ignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ; tain_now_set_stopwatch_g() ; doit(fds, &tto, preoptions, options, verbosity, servername, notif) ; } diff --git a/src/tls/s6-tlsc.c b/src/tls/s6-tlsc.c index 08a2ab2..97e0d79 100644 --- a/src/tls/s6-tlsc.c +++ b/src/tls/s6-tlsc.c @@ -41,7 +41,7 @@ int main (int argc, char const *const *argv) PROG = "s6-tlsc" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "SsYyv:K:k:Zz6:7:", &l) ; diff --git a/src/tls/s6-tlsclient.c b/src/tls/s6-tlsclient.c index 06ef4da..aadddfb 100644 --- a/src/tls/s6-tlsclient.c +++ b/src/tls/s6-tlsclient.c @@ -26,7 +26,7 @@ struct options_s unsigned int ximeout ; unsigned int yimeout ; unsigned int kimeout ; - ip46full_t localip ; + ip46full localip ; uint16_t localport ; unsigned int verbosity : 2 ; unsigned int flag4 : 1 ; @@ -69,7 +69,7 @@ int main (int argc, char const *const *argv) options_t o = OPTIONS_ZERO ; PROG = "s6-tlsclient" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "qQv46DdHhRrnNt:l:T:i:p:SsYyK:k:Zz", &l) ; @@ -124,7 +124,7 @@ int main (int argc, char const *const *argv) if (!o.servername && !o.flagH) { - ip46full_t ip ; + ip46full ip ; if (!ip46full_scan(argv[0], &ip)) o.servername = argv[0] ; } diff --git a/src/tls/s6-tlsd-io.c b/src/tls/s6-tlsd-io.c index f4a58ce..c8641b2 100644 --- a/src/tls/s6-tlsd-io.c +++ b/src/tls/s6-tlsd-io.c @@ -16,13 +16,13 @@ #define USAGE "s6-tlsd-io [ -v verbosity ] [ -d notif ] [ -S | -s ] [ -Y | -y ] [ -K timeout ] [ -k snilevel ] fdr fdw" #define dieusage() strerr_dieusage(100, USAGE) -static inline void doit (int *, tain_t const *tto, uint32_t, uint32_t, unsigned int, unsigned int) gccattr_noreturn ; +static inline void doit (int *, tain const *tto, uint32_t, uint32_t, unsigned int, unsigned int) gccattr_noreturn ; #ifdef S6_NETWORKING_USE_TLS #include <s6-networking/stls.h> -static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, unsigned int notif) +static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, unsigned int notif) { struct tls *ctx = stls_server_init_and_handshake(fds + 2, tto, preoptions) ; if (notif) @@ -51,7 +51,7 @@ static int handshake_cb (br_ssl_engine_context *ctx, sbearssl_handshake_cbarg *c return 1 ; } -static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, unsigned int notif) +static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, unsigned int notif) { sbearssl_handshake_cbarg cbarg = SBEARSSL_HANDSHAKE_CBARG_ZERO ; if (!random_init()) strerr_diefu1sys(111, "initialize random device") ; @@ -68,7 +68,7 @@ static inline void doit (int *fds, tain_t const *tto, uint32_t preoptions, uint3 int main (int argc, char const *const *argv) { - tain_t tto ; + tain tto ; int fds[4] = { 0, 1, 0, 1 } ; unsigned int verbosity = 1 ; unsigned int notif = 0 ; @@ -77,7 +77,7 @@ int main (int argc, char const *const *argv) PROG = "s6-tlsd-io" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; unsigned int t = 0 ; for (;;) { @@ -115,7 +115,7 @@ int main (int argc, char const *const *argv) fds[1] = u ; } - if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ; + if (!sig_ignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ; tain_now_set_stopwatch_g() ; doit(fds, &tto, preoptions, options, verbosity, notif) ; } diff --git a/src/tls/s6-tlsd.c b/src/tls/s6-tlsd.c index 9432bd7..b32bedd 100644 --- a/src/tls/s6-tlsd.c +++ b/src/tls/s6-tlsd.c @@ -38,7 +38,7 @@ int main (int argc, char const *const *argv) PROG = "s6-tlsd (parent)" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "SsYyv:K:Zzk:", &l) ; diff --git a/src/tls/s6-tlsserver.c b/src/tls/s6-tlsserver.c index 646ce64..2ee8a5c 100644 --- a/src/tls/s6-tlsserver.c +++ b/src/tls/s6-tlsserver.c @@ -90,7 +90,7 @@ int main (int argc, char const *const *argv) options_t o = OPTIONS_ZERO ; PROG = "s6-tlsserver" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "qQv461c:C:b:G:g:u:UWwDdHhRrPpl:eB:t:i:x:SsYyK:Zzk:", &l) ; diff --git a/src/tls/s6-ucspitlsc.c b/src/tls/s6-ucspitlsc.c index fd5bc86..d2bad3d 100644 --- a/src/tls/s6-ucspitlsc.c +++ b/src/tls/s6-ucspitlsc.c @@ -58,7 +58,7 @@ int main (int argc, char const *const *argv, char const *const *envp) PROG = "s6-ucspitlsc (parent)" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "SsYyv:K:Zzk:6:7:", &l) ; diff --git a/src/tls/s6-ucspitlsd.c b/src/tls/s6-ucspitlsd.c index d24cf99..0539d7e 100644 --- a/src/tls/s6-ucspitlsd.c +++ b/src/tls/s6-ucspitlsd.c @@ -55,7 +55,7 @@ int main (int argc, char const *const *argv) PROG = "s6-ucspitlsd (parent)" ; { - subgetopt_t l = SUBGETOPT_ZERO ; + subgetopt l = SUBGETOPT_ZERO ; for (;;) { int opt = subgetopt_r(argc, argv, "SsYyv:K:Zzk:", &l) ; |