X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=32bb90910fb9bfc4670d254ca20f62d6515385e8;hp=64c87753cc1d8c9384e923512d1a1a8a9849ade7;hb=bad82522ecfc1f3c72c600cbca6e8fa7e950c3bf;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad diff --git a/src/conf.h b/src/conf.h index 64c87753..32bb9091 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,7 +1,7 @@ /* conf.h -- header for conf.c - Copyright (C) 1998-2002 Ivo Timmermans - 2000-2002 Guus Sliepen + Copyright (C) 1998-2003 Ivo Timmermans + 2000-2003 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 @@ -17,18 +17,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: conf.h,v 1.6.4.36 2003/07/06 22:11:31 guus Exp $ + $Id: conf.h,v 1.6.4.39 2003/07/17 15:06:26 guus Exp $ */ #ifndef __TINC_CONF_H__ #define __TINC_CONF_H__ -#include -#include -#include - -#include -#include "net.h" +#include "avl_tree.h" #include "subnet.h" typedef struct config_t { @@ -48,7 +43,7 @@ extern char *netname; extern void init_configuration(avl_tree_t **); extern void exit_configuration(avl_tree_t **); -extern config_t *new_config(void); +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(avl_tree_t *, char *); @@ -57,7 +52,6 @@ extern int get_config_bool(config_t *, int *); extern int get_config_int(config_t *, int *); extern int get_config_string(config_t *, char **); extern int get_config_address(config_t *, struct addrinfo **); -struct subnet_t; /* Needed for next line. */ extern int get_config_subnet(config_t *, struct subnet_t **); extern int read_config_file(avl_tree_t *, const char *);