X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.c;h=efacd56e6bae6ed10ee773efdcd7922eb41adcda;hb=720f08b81dda944f5d0f79bd1cf040244fd09365;hp=0ac0bc40841856b126800d92216771732fb6407d;hpb=4c431fe65269e9b1d452855b9df8cfe80683b691;p=umurmur.git

diff --git a/src/conf.c b/src/conf.c
index 0ac0bc4..efacd56 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -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;
 
@@ -195,6 +196,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;
@@ -239,6 +251,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);
 	}
@@ -256,6 +276,20 @@ bool_t getBoolConf(param_t param)
 		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);
 	}