diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-06-04 17:06:28 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-06-04 17:06:28 +0000 |
| commit | 5ed44b2a0448d2ac2e76ce68cb342665257a0126 (patch) | |
| tree | 6d5f3bb1837d6257d1628ed31b68ce8fd5a7c29f | |
| parent | bffe71501a9be468cb0e31d8e607bd02ace3cc81 (diff) | |
| download | s6-networking-5ed44b2a0448d2ac2e76ce68cb342665257a0126.tar.gz | |
Delay addition of pid in name until after trivial permanent errors
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | src/conn-tools/proxy-server.c | 8 | ||||
| -rw-r--r-- | src/conn-tools/s6-tcpserver-access.c | 13 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/conn-tools/proxy-server.c b/src/conn-tools/proxy-server.c index 5a578f8..e5c5820 100644 --- a/src/conn-tools/proxy-server.c +++ b/src/conn-tools/proxy-server.c @@ -329,9 +329,7 @@ int main (int argc, char const *const *argv) } ; uint64_t golb = 0 ; - char prog_storage[PROG_pid_len(NAME)] ; - PROG_pid_fill(prog_storage, NAME) ; - PROG = prog_storage ; + PROG = NAME ; { char const *gola[MAIN_GOLA_N] = { 0 } ; @@ -350,6 +348,10 @@ int main (int argc, char const *const *argv) tain_add_g(&deadline, &tto) ; } + char prog_storage[PROG_pid_len(NAME)] ; + PROG_pid_fill(prog_storage, NAME) ; + PROG = prog_storage ; + if ((golb & (1 << MAIN_GOLB_V1 | 1 << MAIN_GOLB_V2)) == 0) golb |= 1 << MAIN_GOLB_V2 ; if ((golb & (1 << MAIN_GOLB_V1 | 1 << MAIN_GOLB_V2)) == 1 << MAIN_GOLB_V2) v2() ; else if ((golb & (1 << MAIN_GOLB_V1 | 1 << MAIN_GOLB_V2)) == 1 << MAIN_GOLB_V1) v1() ; diff --git a/src/conn-tools/s6-tcpserver-access.c b/src/conn-tools/s6-tcpserver-access.c index 5922f51..04eabac 100644 --- a/src/conn-tools/s6-tcpserver-access.c +++ b/src/conn-tools/s6-tcpserver-access.c @@ -8,6 +8,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/types.h> +#include <skalibs/prog.h> #include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/buffer.h> @@ -35,7 +36,8 @@ /* XXX: this file is super ugly and full of tech debt */ -#define USAGE "s6-tcpserver-access [ -v verbosity ] [ -W | -w ] [ -D | -d ] [ -H ] [ -h ] [ -R | -r ] [ -P | -p ] [ -l localname ] [ -B banner ] [ -t timeout ] [ -i rulesdir | -x rulesfile ] prog..." +#define NAME "s6-tcpserver-access" +#define USAGE NAME " [ -v verbosity ] [ -W | -w ] [ -D | -d ] [ -H ] [ -h ] [ -R | -r ] [ -P | -p ] [ -l localname ] [ -B banner ] [ -t timeout ] [ -i rulesdir | -x rulesfile ] prog..." #define dieusage() strerr_dieusage(100, USAGE) #define dienomem() strerr_diefu1sys(111, "update environment") #define X() strerr_dief1x(101, "internal inconsistency. Please submit a bug-report.") @@ -80,9 +82,7 @@ int main (int argc, char const *const *argv) int flagfatal = 0, flagnodelay = 0, flagdnslookup = 1, flaghosts = 0, flagident = 0, flagparanoid = 0, e = 0 ; uint16_t remoteport, localport ; - char progbuf[sizeof(PROGNAME) + sizeof(": pid ") + PID_FMT] = PROGNAME ": pid " ; - progbuf[sizeof(PROGNAME ": pid ") - 1 + pid_fmt(progbuf + sizeof(PROGNAME ": pid ") - 1, getpid())] = 0 ; - PROG = PROGNAME ; + PROG = NAME ; { unsigned int timeout = 0 ; subgetopt l = SUBGETOPT_ZERO ; @@ -149,7 +149,10 @@ int main (int argc, char const *const *argv) if (!uint160_scan(x, &remoteport)) strerr_dieinvalid(100, tmp) ; } - PROG = progbuf ; + char prog_storage[PROG_pid_len(NAME)] ; + PROG_pid_fill(prog_storage, NAME) ; + PROG = prog_storage ; + if (flagnodelay) { if (socket_tcpnodelay(1) < 0) |