X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=5f028d0e4debc0b635858fb6dc937f34bdfa23c4;hb=21ed5998124647e79de379c35b75acaf7323677a;hp=c0a0825c47702c0e4bd68c5f3c08cd610f6346a2;hpb=46d18f60766f997d0ca37c5937f58c0c06477932;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index c0a0825..5f028d0 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-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -32,35 +32,55 @@
 #define CONF_H_24564356
 
 #include "messages.h"
+#include "config.h"
 
 typedef enum param {
 	CERTIFICATE,
 	KEY,
 	PASSPHRASE,
+	CAPATH,
 	BINDPORT,
+	BINDPORT6,
 	BINDADDR,
+	BINDADDR6,
 	WELCOMETEXT,
 	MAX_BANDWIDTH,
 	MAX_CLIENTS,
-	DEAFULT_CHANNEL,
+	DEFAULT_CHANNEL,
+	USERNAME,
+	GROUPNAME,
+	LOGFILE,
+	ADMIN_PASSPHRASE,
+	BAN_LENGTH,
+	ALLOW_TEXTMESSAGE,
+	ENABLE_BAN,
+	BANFILE,
+	SYNC_BANFILE,
+	OPUS_THRESHOLD,
+	SHOW_ADDRESSES,
 } param_t;
 
 typedef struct {
-	char parent[MAX_TEXT];
-	char name[MAX_TEXT];
-	char description[MAX_TEXT];
+	const char *parent;
+	const char *name;
+	const char *description;
+	const char *password;
+	bool_t noenter, silent;
+	int position;
 } conf_channel_t;
 
 typedef struct {
-	char source[MAX_TEXT];
-	char destination[MAX_TEXT];
+	const char *source;
+	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);