X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=5f028d0e4debc0b635858fb6dc937f34bdfa23c4;hb=a0a47e4deac74cae8426db35d19b6911ea3d8794;hp=32531f8653ed2874322a36802fc09f826aae0d9f;hpb=23a4fcd5944b793bba2cc4cc70c87cd68c3c051c;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index 32531f8..5f028d0 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2011, 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,15 +32,17 @@
 #define CONF_H_24564356
 
 #include "messages.h"
-
-#define DEFAULT_CONFIG "/etc/umurmur.conf"
+#include "config.h"
 
 typedef enum param {
 	CERTIFICATE,
 	KEY,
 	PASSPHRASE,
+	CAPATH,
 	BINDPORT,
+	BINDPORT6,
 	BINDADDR,
+	BINDADDR6,
 	WELCOMETEXT,
 	MAX_BANDWIDTH,
 	MAX_CLIENTS,
@@ -48,13 +50,23 @@ typedef enum param {
 	USERNAME,
 	GROUPNAME,
 	LOGFILE,
+	ADMIN_PASSPHRASE,
+	BAN_LENGTH,
+	ALLOW_TEXTMESSAGE,
+	ENABLE_BAN,
+	BANFILE,
+	SYNC_BANFILE,
+	OPUS_THRESHOLD,
+	SHOW_ADDRESSES,
 } param_t;
 
 typedef struct {
 	const char *parent;
 	const char *name;
 	const char *description;
-	bool_t noenter;
+	const char *password;
+	bool_t noenter, silent;
+	int position;
 } conf_channel_t;
 
 typedef struct {
@@ -64,9 +76,11 @@ typedef struct {
 
 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);