X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=8253fb330ba3c190f0d6331e2b07671c83bdd81f;hb=381d2562857640505719ed896b0952fc625ccf1e;hp=36115b0f108922fbc4ef46153e1dca908cab9950;hpb=8a7572e8271d7f146299ac63de0e9982b46652e0;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index 36115b0..8253fb3 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2012, 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,13 +32,13 @@
 #define CONF_H_24564356
 
 #include "messages.h"
-
-#define DEFAULT_CONFIG "/etc/umurmur.conf"
+#include "config.h"
 
 typedef enum param {
 	CERTIFICATE,
 	KEY,
 	PASSPHRASE,
+	CAPATH,
 	BINDPORT,
 	BINDADDR,
 	WELCOMETEXT,
@@ -52,6 +52,9 @@ typedef enum param {
 	BAN_LENGTH,
 	ALLOW_TEXTMESSAGE,
 	ENABLE_BAN,
+	BANFILE,
+	SYNC_BANFILE,
+	OPUS_THRESHOLD,
 } param_t;
 
 typedef struct {
@@ -59,7 +62,8 @@ typedef struct {
 	const char *name;
 	const char *description;
 	const char *password;
-	bool_t noenter;
+	bool_t noenter, silent;
+	int position;
 } conf_channel_t;
 
 typedef struct {