X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconf.c;h=2873a9e40e7d5bd6da75a2ee9137b6d1f34b5919;hb=ddc0e8af6bbcb1f7635ea78297c5158611821aec;hp=d85ff7c0eb20aef5613d3fc1661e8ed016fd264a;hpb=9bf7a133fd2e6500976bdd7c8a8bc830f54c5c13;p=umurmur.git

diff --git a/src/conf.c b/src/conf.c
index d85ff7c..2873a9e 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
-/* 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.
 
@@ -40,7 +40,6 @@
 
 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
@@ -48,21 +47,27 @@ static config_t configuration;
 
 const char defaultconfig[] = DEFAULT_CONFIG;
 
-int Conf_init(const char *conffile)
+void Conf_init(const char *conffile)
 {
-	const char *conf;
-	
 	config_init(&configuration);
 	if (conffile == NULL)
-		conf = defaultconfig;
-	else
-		conf = conffile;
-	if (config_read_file(&configuration, conf) != CONFIG_TRUE) {
-		fprintf(stderr, "Error in config file %s: %s at line %d\n", conffile,
-				config_error_text(&configuration), config_error_line(&configuration));
+		conffile = defaultconfig;
+	if (config_read_file(&configuration, conffile) != CONFIG_TRUE) {
+		Log_fatal("Error in config file %s line %d: %s", conffile,
+				  config_error_line(&configuration), config_error_text(&configuration));
+	}
+}
+
+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);
 	}
-	return 0;
 }
 
 void Conf_deinit()
@@ -142,6 +147,39 @@ const char *getStrConf(param_t param)
 			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;
@@ -208,6 +246,13 @@ int Conf_getNextChannel(conf_channel_t *chdesc, int index)
 	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 */