From d3c3ba92c75cb735c3924162943f5761ed99e0f7 Mon Sep 17 00:00:00 2001 From: Iwan Timmer Date: Mon, 3 Aug 2015 19:42:42 +0200 Subject: [PATCH] Load host specific settings from configuration file --- src/config.c | 2 +- src/main.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/config.c b/src/config.c index f972156..e0c316e 100644 --- a/src/config.c +++ b/src/config.c @@ -266,7 +266,7 @@ void config_parse(int argc, char* argv[], PCONFIGURATION config) { char* config_file = get_path("moonlight.conf", "/etc"); if (config_file) config_file_parse(config_file, config); - + if (argc == 2 && access(argv[1], F_OK) == 0) { config->action = "stream"; config_file_parse(argv[1], config); diff --git a/src/main.c b/src/main.c index e3f2dc9..7ba3bfc 100644 --- a/src/main.c +++ b/src/main.c @@ -177,6 +177,10 @@ int main(int argc, char* argv[]) { exit(-1); } } + + char host_config_file[128]; + sprintf(host_config_file, "hosts/%s.conf", config.address); + config_file_parse(host_config_file, &config); PSERVER_DATA server; if (gs_init(server, config.address, config.key_dir) != GS_OK) {