X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=cef5d77b72a97e17092d66c594cfcd8ed9aef495;hp=46a42b1d455b8ff7b048cfe8c151a9bfc15312f5;hb=3fae14fae5a347823679ef694ab630b4991a201d;hpb=5b0f5ad958d6db4e73aebc5ee6c608cdae81b7b5 diff --git a/src/conf.h b/src/conf.h index 46a42b1d..cef5d77b 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,7 +1,10 @@ +#ifndef TINC_CONF_H +#define TINC_CONF_H + /* conf.h -- header for conf.c Copyright (C) 1998-2005 Ivo Timmermans - 2000-2009 Guus Sliepen + 2000-2012 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +21,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_CONF_H__ -#define __TINC_CONF_H__ - #include "avl_tree.h" #include "list.h" @@ -38,6 +38,7 @@ extern avl_tree_t *config_tree; extern int pinginterval; extern int pingtimeout; extern int maxtimeout; +extern int mintimeout; extern bool bypass_security; extern char *confbase; extern char *netname; @@ -45,7 +46,7 @@ extern list_t *cmdline_conf; extern void init_configuration(avl_tree_t **); extern void exit_configuration(avl_tree_t **); -extern config_t *new_config(void) __attribute__ ((__malloc__)); +extern config_t *new_config(void) __attribute__((__malloc__)); extern void free_config(config_t *); extern void config_add(avl_tree_t *, config_t *); extern config_t *lookup_config(const avl_tree_t *, char *); @@ -64,4 +65,4 @@ extern bool read_connection_config(struct connection_t *); extern FILE *ask_and_open(const char *, const char *); extern bool is_safe_path(const char *); -#endif /* __TINC_CONF_H__ */ +#endif