GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 00:37:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmp-share-vars' into 'master'

Browse Source 
worker.h: share OCSERV_ENV_WORKER_STARTUP_MSG between main and worker

See merge request openconnect/ocserv!250
This commit is contained in:
Nikos Mavrogiannopoulos
2020-12-14 23:10:08 +00:00
parent 8b9cc3a5c5 8d4a5924e4
commit 1657781caf
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.c
View File

@@ -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;

4
src/worker.c
View File

@@ -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;

4
src/worker.h
View File

@@ -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,