From fb76faf56aca9b79648d776896a4a4fae7c978cf Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 21 Nov 2020 11:58:44 +0000 Subject: Move all tls stuff into its own subdir --- src/conn-tools/s6-tlsclient.c | 202 ------------------------------------------ 1 file changed, 202 deletions(-) delete mode 100644 src/conn-tools/s6-tlsclient.c (limited to 'src/conn-tools/s6-tlsclient.c') diff --git a/src/conn-tools/s6-tlsclient.c b/src/conn-tools/s6-tlsclient.c deleted file mode 100644 index 267f457..0000000 --- a/src/conn-tools/s6-tlsclient.c +++ /dev/null @@ -1,202 +0,0 @@ -/* ISC license. */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#define USAGE "s6-tlsclient [ options ] host port prog...\n" \ -"s6-tcpclient options: [ -q | -Q | -v ] [ -4 | -6 ] [ -d | -D ] [ -r | -R ] [ -h | -H ] [ -n | -N ] [ -t timeout ] [ -l localname ] [ -T timeoutconn ] [ -i localip ] [ -p localport ]\n" \ -"s6-tlsc options: [ -S | -s ] [ -Y | -y ] [ -K timeout ] [ -k servername ] [ -Z | -z ]" - -#define dieusage() strerr_dieusage(100, USAGE) - -typedef struct options_s options_t, *options_t_ref ; -struct options_s -{ - char const *localname ; - char const *servername ; - unsigned int timeout ; - unsigned int ximeout ; - unsigned int yimeout ; - unsigned int kimeout ; - uint16_t localport ; - ip46full_t localip ; - unsigned int verbosity : 2 ; - unsigned int flag4 : 1 ; - unsigned int flag6 : 1 ; - unsigned int flagD : 1 ; - unsigned int flagH : 1 ; - unsigned int flagr : 1 ; - unsigned int flagN : 1 ; - unsigned int flagS : 1 ; - unsigned int flagy : 1 ; - unsigned int flagZ : 1 ; - unsigned int doxy : 1 ; -} ; - -#define OPTIONS_ZERO \ -{ \ - .localname = 0, \ - .servername = 0, \ - .timeout = 0, \ - .ximeout = 2, \ - .yimeout = 58, \ - .kimeout = 0, \ - .localport = 0, \ - .localip = IP46FULL_ZERO, \ - .verbosity = 1, \ - .flag4 = 0, \ - .flag6 = 0, \ - .flagD = 0, \ - .flagH = 0, \ - .flagr = 0, \ - .flagN = 0, \ - .flagS = 0, \ - .flagy = 0, \ - .flagZ = 0, \ - .doxy = 0 \ -} - -int main (int argc, char const *const *argv, char const *const *envp) -{ - options_t o = OPTIONS_ZERO ; - PROG = "s6-tlsclient" ; - { - subgetopt_t l = SUBGETOPT_ZERO ; - for (;;) - { - int opt = subgetopt_r(argc, argv, "qQv46DdHhRrnNt:l:T:i:p:SsYyK:k:Zz", &l) ; - if (opt == -1) break ; - switch (opt) - { - case 'q' : o.verbosity = 0 ; break ; - case 'Q' : o.verbosity = 1 ; break ; - case 'v' : o.verbosity = 2 ; break ; - case '4' : o.flag4 = 1 ; break ; - case '6' : o.flag6 = 1 ; break ; - case 'D' : o.flagD = 1 ; break ; - case 'd' : o.flagD = 0 ; break ; - case 'H' : o.flagH = 1 ; break ; - case 'h' : o.flagH = 0 ; break ; - case 'R' : o.flagr = 0 ; break ; - case 'r' : o.flagr = 1 ; break ; - case 'n' : o.flagN = 0 ; break ; - case 'N' : o.flagN = 1 ; break ; - case 't' : if (!uint0_scan(l.arg, &o.timeout)) dieusage() ; break ; - case 'l' : o.localname = l.arg ; break ; - case 'T' : - { - size_t n = uint_scan(l.arg, &o.ximeout) ; - if (!n) dieusage() ; - o.doxy = 1 ; - if (!l.arg[n]) - { - o.yimeout = 0 ; - break ; - } - if (l.arg[n] != '+') dieusage() ; - if (!uint0_scan(l.arg + n + 1, &o.yimeout)) dieusage() ; - break ; - } - case 'i' : if (!ip46full_scan(l.arg, &o.localip)) dieusage() ; break ; - case 'p' : if (!uint160_scan(l.arg, &o.localport)) dieusage() ; break ; - case 'S' : o.flagS = 1 ; break ; - case 's' : o.flagS = 0 ; break ; - case 'Y' : o.flagy = 0 ; break ; - case 'y' : o.flagy = 1 ; break ; - case 'K' : if (!uint0_scan(l.arg, &o.kimeout)) dieusage() ; break ; - case 'k' : o.servername = l.arg ; break ; - case 'Z' : o.flagZ = 1 ; break ; - case 'z' : o.flagZ = 0 ; break ; - default : dieusage() ; - } - } - argc -= l.ind ; argv += l.ind ; - if (argc < 3) dieusage() ; - } - - if (!o.servername && !o.flagH) - { - ip46full_t ip ; - if (!ip46full_scan(argv[0], &ip)) - o.servername = argv[0] ; - } - - { - size_t pos = 0 ; - unsigned int m = 0 ; - char fmt[UINT_FMT * 4 + UINT16_FMT + IP46_FMT] ; - char const *newargv[29 + argc] ; - newargv[m++] = S6_NETWORKING_BINPREFIX "s6-tcpclient" ; - if (o.verbosity != 1) newargv[m++] = o.verbosity ? "-v" : "-q" ; - if (o.flag4) newargv[m++] = "-4" ; - if (o.flag6) newargv[m++] = "-6" ; - if (o.flagD) newargv[m++] = "-D" ; - if (o.flagH) newargv[m++] = "-H" ; - if (o.flagr) newargv[m++] = "-r" ; - if (o.flagN) newargv[m++] = "-N" ; - if (o.timeout) - { - newargv[m++] = "-t" ; - newargv[m++] = fmt + pos ; - pos += uint_fmt(fmt + pos, o.timeout) ; - fmt[pos++] = 0 ; - } - if (o.localname) - { - newargv[m++] = "-l" ; - newargv[m++] = o.localname ; - } - if (o.doxy) - { - newargv[m++] = "-T" ; - newargv[m++] = fmt + pos ; - pos += uint_fmt(fmt + pos, o.ximeout) ; - fmt[pos++] = '+' ; - pos += uint_fmt(fmt + pos, o.yimeout) ; - fmt[pos++] = 0 ; - } - if (memcmp(o.localip.ip, IP6_ANY, 16)) - { - newargv[m++] = "-i" ; - newargv[m++] = fmt + pos ; - pos += ip46full_fmt(fmt + pos, &o.localip) ; - fmt[pos++] = 0 ; - } - if (o.localport) - { - newargv[m++] = "-p" ; - newargv[m++] = fmt + pos ; - pos += uint16_fmt(fmt + pos, o.localport) ; - fmt[pos++] = 0 ; - } - newargv[m++] = "--" ; - newargv[m++] = *argv++ ; - newargv[m++] = *argv++ ; - newargv[m++] = S6_NETWORKING_BINPREFIX "s6-tlsc" ; - if (o.flagS) newargv[m++] = "-S" ; - if (o.flagy) newargv[m++] = "-y" ; - if (o.kimeout) - { - newargv[m++] = "-K" ; - newargv[m++] = fmt + pos ; - pos += uint_fmt(fmt + pos, o.kimeout) ; - fmt[pos++] = 0 ; - } - if (o.servername) - { - newargv[m++] = "-k" ; - newargv[m++] = o.servername ; - } - if (o.flagZ) newargv[m++] = "-Z" ; - newargv[m++] = "--" ; - while (*argv) newargv[m++] = *argv++ ; - newargv[m++] = 0 ; - xpathexec_run(newargv[0], newargv, envp) ; - } -} -- cgit v1.2.3