-/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
#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;
return DEFAULT_WELCOME;
}
break;
- case DEAFULT_CHANNEL:
+ case DEFAULT_CHANNEL:
setting = config_lookup(&configuration, "default_channel");
if (!setting)
return "";
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)
- return -1;
- strncpy(chdesc->description, config_setting_get_string(setting), MAX_TEXT);
+ 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;
}
setting = config_lookup(&configuration, configstr);
if (setting == NULL)
return -1;
- strncpy(chlink->source, config_setting_get_string(setting), MAX_TEXT);
+ 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(chlink->destination, config_setting_get_string(setting), MAX_TEXT);
+ chlink->destination = config_setting_get_string(setting);
return 0;
}