X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=5f028d0e4debc0b635858fb6dc937f34bdfa23c4;hb=HEAD;hp=8eb84e2e569ba5714a82158744cac38d5112407d;hpb=25b7d7ee7e1979bf244fa663b56f68c8b00f51b1;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index 8eb84e2..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,
@@ -51,6 +53,11 @@ typedef enum param {
 	ADMIN_PASSPHRASE,
 	BAN_LENGTH,
 	ALLOW_TEXTMESSAGE,
+	ENABLE_BAN,
+	BANFILE,
+	SYNC_BANFILE,
+	OPUS_THRESHOLD,
+	SHOW_ADDRESSES,
 } param_t;
 
 typedef struct {
@@ -58,7 +65,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 {