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

diff --git a/src/conf.h b/src/conf.h
index ea43e38..5f028d0 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,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,
@@ -54,6 +56,8 @@ typedef enum param {
 	ENABLE_BAN,
 	BANFILE,
 	SYNC_BANFILE,
+	OPUS_THRESHOLD,
+	SHOW_ADDRESSES,
 } param_t;
 
 typedef struct {
@@ -61,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 {