Add show-addresses option, to optionally hide user's IP addresses

[umurmur.git] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 100c73fd85f350f8daa6555d1d0cc932affa88d6..5f028d0e4debc0b635858fb6dc937f34bdfa23c4 100644 (file)
--- 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,
@@ -50,6 +52,12 @@ typedef enum param {
        LOGFILE,
        ADMIN_PASSPHRASE,
        BAN_LENGTH,
+       ALLOW_TEXTMESSAGE,
+       ENABLE_BAN,
+       BANFILE,
+       SYNC_BANFILE,
+       OPUS_THRESHOLD,
+       SHOW_ADDRESSES,
 } param_t;
 
 typedef struct {
@@ -57,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 {
@@ -71,6 +80,7 @@ bool_t Conf_ok(const char *conffile);
 
 const char *getStrConf(param_t param);
 int getIntConf(param_t param);
+bool_t getBoolConf(param_t param);
 int Conf_getNextChannel(conf_channel_t *chdesc, int index);
 int Conf_getNextChannelLink(conf_channel_link_t *chlink, int index);