X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=9a9591c22f2c3ff553265699506b24a98adfa539;hb=a0e46b6337ab6736bb391703338d2ad3b5ee514f;hp=c9793eb79cde76db9ed95f54c808552f96672ca8;hpb=772cee17b53bb6795a5e98f1ae2acb7e7d6c25c1;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index c9793eb..9a9591c 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,
@@ -62,7 +64,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 {