X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=5f028d0e4debc0b635858fb6dc937f34bdfa23c4;hb=a0a47e4deac74cae8426db35d19b6911ea3d8794;hp=9cab3d149b56ae98fdcb201c4440f014c459f7b5;hpb=36601a5de5f90e16188deadd271b70595b4cc237;p=umurmur.git diff --git a/src/conf.h b/src/conf.h index 9cab3d1..5f028d0 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2013, Martin Johansson - Copyright (C) 2005-2013, Thorvald Natvig +/* Copyright (C) 2009-2014, Martin Johansson + Copyright (C) 2005-2014, Thorvald Natvig 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,6 +57,7 @@ typedef enum param { BANFILE, SYNC_BANFILE, OPUS_THRESHOLD, + SHOW_ADDRESSES, } param_t; typedef struct {