Fixed server crash when setting Access token while connected.

[umurmur.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 540928bac58476fc0fa2aa9f07d568b5adf997a9..4d82e2f1b7e6aa16e0bfe03836fc6ac9af6876c6 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -47,7 +47,7 @@ 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 5000
+#define DEFAULT_MAX_BANDWIDTH 48000
 #define DEFAULT_BINDPORT 64738
 
 const char defaultconfig[] = DEFAULT_CONFIG;
@@ -135,7 +135,7 @@ const char *getStrConf(param_t param)
                        return DEFAULT_WELCOME;
                }
                break;
-       case DEAFULT_CHANNEL:
+       case DEFAULT_CHANNEL:
                setting = config_lookup(&configuration, "default_channel");
                if (!setting)
                        return "";
@@ -195,20 +195,48 @@ int Conf_getNextChannel(conf_channel_t *chdesc, int index)
        sprintf(configstr, "channels.[%d].name", index);
        setting = config_lookup(&configuration, configstr);
        if (setting == NULL)
-               return -1;
-       strncpy(chdesc->name, config_setting_get_string(setting), MAX_TEXT);
+               return -1; /* Required */
+       chdesc->name =  config_setting_get_string(setting);
        
        sprintf(configstr, "channels.[%d].parent", index);
        setting = config_lookup(&configuration, configstr);
        if (setting == NULL)
-               return -1;
-       strncpy(chdesc->parent, config_setting_get_string(setting), MAX_TEXT);
+               return -1; /* Required */
+       chdesc->parent = config_setting_get_string(setting);
        
        sprintf(configstr, "channels.[%d].description", index);
        setting = config_lookup(&configuration, configstr);
+       if (setting == NULL) /* Optional */
+               chdesc->description = NULL;
+       else
+               chdesc->description = config_setting_get_string(setting);
+       
+       sprintf(configstr, "channels.[%d].noenter", index);
+       setting = config_lookup(&configuration, configstr);
+       if (setting == NULL) /* Optional */
+               chdesc->noenter = false;
+       else
+               chdesc->noenter = config_setting_get_bool(setting);
+
+       return 0;
+}
+
+int Conf_getNextChannelLink(conf_channel_link_t *chlink, int index)
+{
+       config_setting_t *setting = NULL;
+       char configstr[64];
+       
+       sprintf(configstr, "channel_links.[%d].source", index);
+       setting = config_lookup(&configuration, configstr);
+       if (setting == NULL)
+               return -1;
+       chlink->source = config_setting_get_string(setting);
+
+       sprintf(configstr, "channel_links.[%d].destination", index);
+       setting = config_lookup(&configuration, configstr);
        if (setting == NULL)
                return -1;
-       strncpy(chdesc->description, config_setting_get_string(setting), MAX_TEXT);
+       chlink->destination = config_setting_get_string(setting);
 
        return 0;
 }