X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=20141dcca468d06a8f3d242d591130c1fc6fb912;hb=60aae12f64796bca7e8aed516f2b294120245957;hp=3a469b27e6e41f2ee9d6b40c8932232dd9510b1c;hpb=e86df9764efd8caa27aa0a2dec0092889aa87c91;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index 3a469b2..20141dc 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2011, 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,
@@ -42,22 +44,28 @@ typedef enum param {
 	WELCOMETEXT,
 	MAX_BANDWIDTH,
 	MAX_CLIENTS,
-	DEAFULT_CHANNEL,
+	DEFAULT_CHANNEL,
+	USERNAME,
+	GROUPNAME,
+	LOGFILE,
 } 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;
 } 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);