-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
static config_t configuration;
-#define DEFAULT_CONFIG "/etc/umurmur.conf"
#define DEFAULT_WELCOME "Welcome to uMurmur!"
#define DEFAULT_MAX_CLIENTS 10
#define DEFAULT_MAX_BANDWIDTH 48000
}
}
+void Conf_test(const char *conffile)
+{
+ config_init(&configuration);
+ if (conffile == NULL)
+ conffile = defaultconfig;
+ if (config_read_file(&configuration, conffile) != CONFIG_TRUE) {
+ fprintf(stderr, "Error in config file %s line %d: %s", conffile,
+ config_error_line(&configuration), config_error_text(&configuration));
+ exit(1);
+ }
+}
+
void Conf_deinit()
{
config_destroy(&configuration);
return "";
}
break;
+ case USERNAME:
+ setting = config_lookup(&configuration, "username");
+ if (!setting)
+ return "";
+ else {
+ if ((strsetting = config_setting_get_string(setting)) != NULL)
+ return strsetting;
+ else
+ return "";
+ }
+ break;
+ case GROUPNAME:
+ setting = config_lookup(&configuration, "groupname");
+ if (!setting)
+ return "";
+ else {
+ if ((strsetting = config_setting_get_string(setting)) != NULL)
+ return strsetting;
+ else
+ return "";
+ }
+ break;
+ case LOGFILE:
+ setting = config_lookup(&configuration, "logfile");
+ if (!setting)
+ return NULL;
+ else {
+ if ((strsetting = config_setting_get_string(setting)) != NULL)
+ return strsetting;
+ else
+ return NULL;
+ }
+ break;
default:
doAssert(false);
break;
else
chdesc->description = config_setting_get_string(setting);
+ ret = snprintf(configstr, maxconfig, "channels.[%d].password", index);
+ setting = config_lookup(&configuration, configstr);
+ if (ret >= maxconfig || ret < 0 || setting == NULL) /* Optional */
+ chdesc->password = NULL;
+ else
+ chdesc->password = config_setting_get_string(setting);
+
ret = snprintf(configstr, maxconfig, "channels.[%d].noenter", index);
setting = config_lookup(&configuration, configstr);
if (ret >= maxconfig || ret < 0 || setting == NULL) /* Optional */