Add Opus threshold config variable

[umurmur.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index e3d417c262b6c5004720d5c66ac5a4b18d1b2e4a..efacd56e6bae6ed10ee773efdcd7922eb41adcda 100644 (file)
--- 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-2012, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -40,11 +40,12 @@
 
 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
 #define DEFAULT_BINDPORT 64738
+#define DEFAULT_BAN_LENGTH (60*60)
+#define DEFAULT_OPUS_THRESHOLD 100
 
 const char defaultconfig[] = DEFAULT_CONFIG;
 
@@ -59,6 +60,21 @@ void Conf_init(const char *conffile)
        }
 }
 
+bool_t Conf_ok(const char *conffile)
+{
+       bool_t rc = true;
+       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\n", conffile,
+                       config_error_line(&configuration), config_error_text(&configuration));
+               rc = false;
+       }
+       config_destroy(&configuration);
+       return rc;
+}
+
 void Conf_deinit()
 {
        config_destroy(&configuration);
@@ -103,6 +119,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)
@@ -169,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;
@@ -189,6 +227,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)
@@ -205,6 +251,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);
        }
@@ -235,6 +320,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 */