summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJavier Sánchez Parra <jsanchez@soleta.eu>2020-09-21 10:53:15 +0200
committerOpenGnSys Support Team <soporte-og@soleta.eu>2020-09-29 12:42:53 +0200
commitf068a79c1a39f7f796e045628693241b0f3bc15a (patch)
treed23809cd288bf49aa22b9a54a4d0338a0aa2a5d2 /src
parent65a14e56d396a09a5fc7eca5bbdb7209269cfb40 (diff)
#988 Add global config variable
This commit makes configuration variable global. To use this variable you have to #import "cfg.h".
Diffstat (limited to 'src')
-rw-r--r--src/cfg.h2
-rw-r--r--src/main.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/cfg.h b/src/cfg.h
index 6c7d221..c88a406 100644
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -23,4 +23,6 @@ struct og_server_cfg {
int parse_json_config(const char *filename, struct og_server_cfg *cfg);
void from_json_to_legacy(struct og_server_cfg *cfg);
+extern struct og_server_cfg cfg;
+
#endif
diff --git a/src/main.c b/src/main.c
index 48f0c00..1f23296 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,10 +20,11 @@
#define OG_SERVER_CFG_JSON "/opt/opengnsys/cfg/ogserver.json"
+struct og_server_cfg cfg;
+
int main(int argc, char *argv[])
{
struct ev_io ev_io_server_rest, ev_io_agent_rest;
- struct og_server_cfg cfg = {};
og_loop = ev_default_loop(0);