X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=9a9591c22f2c3ff553265699506b24a98adfa539;hb=97729daab63f49323ca6bee7859260653e5090a1;hp=d30ed416b1667741b4bd74cc036312acfd199f98;hpb=c7a24ac8471652b8443453d8f02acd7b85a68d60;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index d30ed41..9a9591c 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2013, 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,
@@ -55,7 +57,6 @@ typedef enum param {
 	BANFILE,
 	SYNC_BANFILE,
 	OPUS_THRESHOLD,
-	SILENT_CHANNEL,
 } param_t;
 
 typedef struct {
@@ -64,6 +65,7 @@ typedef struct {
 	const char *description;
 	const char *password;
 	bool_t noenter, silent;
+	int position;
 } conf_channel_t;
 
 typedef struct {