summaryrefslogtreecommitdiff
path: root/src/tls/s6-ucspitlsc.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-09-08 08:38:06 +0000
committerLaurent Bercot <ska@appnovation.com>2023-09-08 08:38:06 +0000
commit7113c4cf792ec44ec04a54e9723fa31a97bee5a7 (patch)
treecb13b4316f0a164e83ffba5ca603dcf11c26045c /src/tls/s6-ucspitlsc.c
parent9efa646c7fb520747804acdc829b3cccea0dce63 (diff)
downloads6-networking-7113c4cf792ec44ec04a54e9723fa31a97bee5a7.tar.xz
Refactor s6-tls[cd] so they're ready to port to posix_spawn
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/tls/s6-ucspitlsc.c')
-rw-r--r--src/tls/s6-ucspitlsc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/tls/s6-ucspitlsc.c b/src/tls/s6-ucspitlsc.c
index 521bb4d..2d728b5 100644
--- a/src/tls/s6-ucspitlsc.c
+++ b/src/tls/s6-ucspitlsc.c
@@ -10,6 +10,7 @@
#include <skalibs/strerr.h>
#include <skalibs/djbunix.h>
#include <skalibs/socket.h>
+#include <skalibs/exec.h>
#include <s6-networking/config.h>
#include "s6tls-internal.h"
@@ -20,15 +21,17 @@
static inline void child (int [4][2], uint32_t, unsigned int, unsigned int, char const *, pid_t) gccattr_noreturn ;
static inline void child (int p[4][2], uint32_t options, unsigned int verbosity, unsigned int kimeout, char const *servername, pid_t pid)
{
- int fds[3] = { p[0][0], p[1][1], p[2][1] } ;
+ char const *newargv[S6TLS_PREP_IO_ARGC] ;
+ char buf[S6TLS_PREP_IO_BUFLEN] ;
ssize_t r ;
char c ;
PROG = "s6-ucspitlsc" ;
close(p[2][0]) ;
close(p[0][1]) ;
close(p[1][0]) ;
- if (fd_move(0, p[3][0]) < 0 || fd_move(1, p[3][1]) < 0)
+ if (fd_move(0, p[3][0]) == -1 || fd_move(1, p[3][1]) == -1)
strerr_diefu1sys(111, "move network fds to stdin/stdout") ;
+ s6tls_prep_tlscio(newargv, buf, p[0][0], p[1][1], p[2][1], options, verbosity, kimeout, servername) ;
r = read(p[2][1], &c, 1) ;
if (r < 0) strerr_diefu1sys(111, "read from control socket") ;
if (!r)
@@ -59,7 +62,7 @@ static inline void child (int p[4][2], uint32_t options, unsigned int verbosity,
fmt[pid_fmt(fmt, pid)] = 0 ;
strerr_warni4x("pid ", fmt, " accepted", " opportunistic TLS") ;
}
- s6tls_exec_tlscio(fds, options, verbosity, kimeout, servername) ;
+ xexec(newargv) ;
}
int main (int argc, char const *const *argv, char const *const *envp)