X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.c;h=2c6f56f9ffa5fd404fd2f10618a241cf42488d6c;hb=8299f488088878d38ccf7ba9bbccc4743e48bd13;hp=f2baa3106de0d943126bb20fdf5fa1fa8c32b7e3;hpb=8a7572e8271d7f146299ac63de0e9982b46652e0;p=umurmur.git

diff --git a/src/conf.c b/src/conf.c
index f2baa31..2c6f56f 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -45,6 +45,7 @@ static config_t configuration;
 #define DEFAULT_MAX_BANDWIDTH 48000
 #define DEFAULT_BINDPORT 64738
 #define DEFAULT_BAN_LENGTH (60*60)
+#define DEFAULT_OPUS_THRESHOLD 100
 
 const char defaultconfig[] = DEFAULT_CONFIG;
 
@@ -83,7 +84,7 @@ const char *getStrConf(param_t param)
 {
 	config_setting_t *setting = NULL;
 	const char *strsetting = NULL;
-	
+
 	switch (param) {
 	case CERTIFICATE:
 		setting = config_lookup(&configuration, "certificate");
@@ -107,6 +108,17 @@ const char *getStrConf(param_t param)
 				return "/etc/umurmur/private_key.key";
 		}
 		break;
+	case CAPATH:
+		setting = config_lookup(&configuration, "ca_path");
+		if (!setting)
+		  return NULL;
+		else {
+			if ((strsetting = config_setting_get_string(setting)) != NULL)
+				return strsetting;
+			else
+				return NULL;
+		}
+		break;
 	case PASSPHRASE:
 		setting = config_lookup(&configuration, "password");
 		if (!setting)
@@ -195,6 +207,17 @@ const char *getStrConf(param_t param)
 			return NULL;
 		}
 		break;
+	case BANFILE:
+		setting = config_lookup(&configuration, "banfile");
+		if (!setting)
+			return NULL;
+		else {
+			if ((strsetting = config_setting_get_string(setting)) != NULL)
+				return strsetting;
+			else
+			return NULL;
+		}
+		break;
 	default:
 		doAssert(false);
 		break;
@@ -205,7 +228,7 @@ const char *getStrConf(param_t param)
 int getIntConf(param_t param)
 {
 	config_setting_t *setting = NULL;
-	
+
 	switch (param) {
 	case BINDPORT:
 		setting = config_lookup(&configuration, "bindport");
@@ -239,6 +262,14 @@ int getIntConf(param_t param)
 			return config_setting_get_int(setting);
 		}
 		break;
+	case OPUS_THRESHOLD:
+		setting = config_lookup(&configuration, "opus_threshold");
+		if (!setting)
+			return DEFAULT_OPUS_THRESHOLD;
+		else {
+			return config_setting_get_int(setting);
+		}
+		break;
 	default:
 		doAssert(false);
 	}
@@ -247,7 +278,7 @@ int getIntConf(param_t param)
 bool_t getBoolConf(param_t param)
 {
 	config_setting_t *setting = NULL;
-	
+
 	switch (param) {
 	case ALLOW_TEXTMESSAGE:
 		setting = config_lookup(&configuration, "allow_textmessage");
@@ -263,6 +294,13 @@ bool_t getBoolConf(param_t param)
 		else
 			return config_setting_get_bool(setting);
 		break;
+	case SYNC_BANFILE:
+		setting = config_lookup(&configuration, "sync_banfile");
+		if (!setting)
+			return false;
+		else
+			return config_setting_get_bool(setting);
+		break;
 	default:
 		doAssert(false);
 	}
@@ -273,33 +311,33 @@ int Conf_getNextChannel(conf_channel_t *chdesc, int index)
 	config_setting_t *setting = NULL;
 	int maxconfig = 64, ret = 0;
 	char configstr[maxconfig];
-	
+
 	ret = snprintf(configstr, maxconfig, "channels.[%d].name", index);
 	setting = config_lookup(&configuration, configstr);
 	if (ret >= maxconfig || ret < 0 || setting == NULL)
 		return -1; /* Required */
 	chdesc->name =  config_setting_get_string(setting);
-	
+
 	ret = snprintf(configstr, maxconfig, "channels.[%d].parent", index);
 	setting = config_lookup(&configuration, configstr);
 	if (ret >= maxconfig || ret < 0 || setting == NULL)
 		return -1; /* Required */
 	chdesc->parent = config_setting_get_string(setting);
-	
+
 	ret = snprintf(configstr, maxconfig, "channels.[%d].description", index);
 	setting = config_lookup(&configuration, configstr);
 	if (ret >= maxconfig || ret < 0 || setting == NULL) /* Optional */
 		chdesc->description = NULL;
 	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 */
@@ -307,6 +345,20 @@ int Conf_getNextChannel(conf_channel_t *chdesc, int index)
 	else
 		chdesc->noenter = config_setting_get_bool(setting);
 
+	ret = snprintf(configstr, maxconfig, "channels.[%d].silent", index);
+	setting = config_lookup(&configuration, configstr);
+	if (ret >= maxconfig || ret < 0 || setting == NULL) /* Optional */
+		chdesc->silent = false;
+	else
+		chdesc->silent = config_setting_get_bool(setting);
+
+	ret = snprintf(configstr, maxconfig, "channels.[%d].position", index);
+	setting = config_lookup(&configuration, configstr);
+	if (ret >= maxconfig || ret < 0 || setting == NULL) /* Optional */
+		chdesc->position = 0;
+	else
+		chdesc->position = config_setting_get_int(setting);
+
 	return 0;
 }
 
@@ -315,7 +367,7 @@ int Conf_getNextChannelLink(conf_channel_link_t *chlink, int index)
 	config_setting_t *setting = NULL;
 	int maxconfig = 64, ret = 0;
 	char configstr[maxconfig];
-	
+
 	ret = snprintf(configstr, maxconfig, "channel_links.[%d].source", index);
 	setting = config_lookup(&configuration, configstr);
 	if (ret >= maxconfig || ret < 0 || setting == NULL)