X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.c;h=47504527158775e56f495cb239f39236a9e471b8;hb=673cad207cccf829038ab1a4399ca302bb0cf078;hp=2a83e53e0712025f072a3587f4d29d3bb8ff86a1;hpb=00d6addea82c3c75ac784f9c7877ef61a382492b;p=umurmur.git

diff --git a/src/conf.c b/src/conf.c
index 2a83e53..4750452 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2011, 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.
 
@@ -44,6 +44,8 @@ static config_t configuration;
 #define DEFAULT_MAX_CLIENTS 10
 #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;
 
@@ -106,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)
@@ -117,6 +130,17 @@ const char *getStrConf(param_t param)
 				return "";
 		}
 		break;
+	case ADMIN_PASSPHRASE:
+		setting = config_lookup(&configuration, "admin_password");
+		if (!setting)
+			return "";
+		else {
+			if ((strsetting = config_setting_get_string(setting)) != NULL)
+				return strsetting;
+			else
+				return "";
+		}
+		break;
 	case BINDADDR:
 		setting = config_lookup(&configuration, "bindaddr");
 		if (!setting)
@@ -183,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;
@@ -203,6 +238,14 @@ int getIntConf(param_t param)
 			return config_setting_get_int(setting);
 		}
 		break;
+	case BAN_LENGTH:
+		setting = config_lookup(&configuration, "ban_length");
+		if (!setting)
+			return DEFAULT_BAN_LENGTH;
+		else {
+			return config_setting_get_int(setting);
+		}
+		break;
 	case MAX_BANDWIDTH:
 		setting = config_lookup(&configuration, "max_bandwidth");
 		if (!setting)
@@ -219,6 +262,45 @@ 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);
+	}
+}
+
+bool_t getBoolConf(param_t param)
+{
+	config_setting_t *setting = NULL;
+	
+	switch (param) {
+	case ALLOW_TEXTMESSAGE:
+		setting = config_lookup(&configuration, "allow_textmessage");
+		if (!setting)
+			return true;
+		else
+			return config_setting_get_bool(setting);
+		break;
+	case ENABLE_BAN:
+		setting = config_lookup(&configuration, "enable_ban");
+		if (!setting)
+			return false;
+		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);
 	}
@@ -262,6 +344,20 @@ int Conf_getNextChannel(conf_channel_t *chdesc, int index)
 		chdesc->noenter = false;
 	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;
 }