From 8d4a5924e48d9679ca78518a3ed8514af9cf17a3 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 14 Dec 2020 23:26:05 +0100 Subject: [PATCH] worker.h: share OCSERV_ENV_WORKER_STARTUP_MSG between main and worker Signed-off-by: Nikos Mavrogiannopoulos --- src/main.c | 5 ----- src/worker.c | 4 ---- src/worker.h | 4 ++++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main.c b/src/main.c index f05ad1c3..a703f73f 100644 --- a/src/main.c +++ b/src/main.c @@ -76,13 +76,8 @@ extern const ASN1_ARRAY_TYPE kkdcp_asn1_tab[]; ASN1_TYPE _kkdcp_pkix1_asn = ASN1_TYPE_EMPTY; #endif -// Name of environment variable used to pass worker_startup_msg -// between ocserv-main and ocserv-worker. -#define OCSERV_ENV_WORKER_STARTUP_MSG "OCSERV_WORKER_STARTUP_MSG" - extern struct snapshot_t * config_snapshot; - int worker_argc = 0; char **worker_argv = NULL; diff --git a/src/worker.c b/src/worker.c index 1e915c3e..9589a040 100644 --- a/src/worker.c +++ b/src/worker.c @@ -42,10 +42,6 @@ extern const ASN1_ARRAY_TYPE kkdcp_asn1_tab[]; ASN1_TYPE _kkdcp_pkix1_asn = ASN1_TYPE_EMPTY; #endif -// Name of environment variable used to pass worker_startup_msg -// between ocserv-main and ocserv-worker. -#define OCSERV_ENV_WORKER_STARTUP_MSG "OCSERV_WORKER_STARTUP_MSG" - extern struct snapshot_t *config_snapshot; int syslog_open = 0; diff --git a/src/worker.h b/src/worker.h index b61b46c3..cf9443ff 100644 --- a/src/worker.h +++ b/src/worker.h @@ -40,6 +40,10 @@ #include "vhost.h" #include "ev.h" +// Name of environment variable used to pass worker_startup_msg +// between ocserv-main and ocserv-worker. +#define OCSERV_ENV_WORKER_STARTUP_MSG "OCSERV_WORKER_STARTUP_MSG" + typedef enum { UP_DISABLED, UP_WAIT_FD,