X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=d30ed416b1667741b4bd74cc036312acfd199f98;hb=bb58415037ceff0a0668d4b8bd789ec947170b54;hp=7967716fa04a65a22f43d5493a3a171a77487464;hpb=90a18c3aebe9e2478bc9b24bd2d1680e1487cf8f;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index 7967716..d30ed41 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -33,6 +33,8 @@
 
 #include "messages.h"
 
+#define DEFAULT_CONFIG "/etc/umurmur.conf"
+
 typedef enum param {
 	CERTIFICATE,
 	KEY,
@@ -43,13 +45,25 @@ typedef enum param {
 	MAX_BANDWIDTH,
 	MAX_CLIENTS,
 	DEFAULT_CHANNEL,
+	USERNAME,
+	GROUPNAME,
+	LOGFILE,
+	ADMIN_PASSPHRASE,
+	BAN_LENGTH,
+	ALLOW_TEXTMESSAGE,
+	ENABLE_BAN,
+	BANFILE,
+	SYNC_BANFILE,
+	OPUS_THRESHOLD,
+	SILENT_CHANNEL,
 } param_t;
 
 typedef struct {
 	const char *parent;
 	const char *name;
 	const char *description;
-	bool_t noenter;
+	const char *password;
+	bool_t noenter, silent;
 } conf_channel_t;
 
 typedef struct {
@@ -57,11 +71,13 @@ typedef struct {
 	const char *destination;
 } conf_channel_link_t;
 
-int Conf_init(const char *conffile);
+void Conf_init(const char *conffile);
 void Conf_deinit();
+bool_t Conf_ok(const char *conffile);
 
 const char *getStrConf(param_t param);
 int getIntConf(param_t param);
+bool_t getBoolConf(param_t param);
 int Conf_getNextChannel(conf_channel_t *chdesc, int index);
 int Conf_getNextChannelLink(conf_channel_link_t *chlink, int index);