projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Last bits of the merger.
[tinc]
/
src
/
conf.h
diff --git
a/src/conf.h
b/src/conf.h
index
bf3df70
..
a04d668
100644
(file)
--- a/
src/conf.h
+++ b/
src/conf.h
@@
-1,7
+1,7
@@
/*
conf.h -- header for conf.c
/*
conf.h -- header for conf.c
- Copyright (C) 1998-200
1
Ivo Timmermans <itimmermans@bigfoot.com>
- 2000
,2001
Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1998-200
2
Ivo Timmermans <itimmermans@bigfoot.com>
+ 2000
-2002
Guus Sliepen <guus@sliepen.warande.net>
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
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,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.
29 2001/10/28 08:41:19
guus Exp $
+ $Id: conf.h,v 1.6.4.
31 2002/02/10 21:57:53
guus Exp $
*/
#ifndef __TINC_CONF_H__
*/
#ifndef __TINC_CONF_H__
@@
-37,9
+37,8
@@
typedef struct config_t {
extern avl_tree_t *config_tree;
extern int debug_lvl;
extern avl_tree_t *config_tree;
extern int debug_lvl;
-extern int timeout;
+extern int
ping
timeout;
extern int maxtimeout;
extern int maxtimeout;
-extern int sighup;
extern int bypass_security;
extern char *confbase;
extern char *netname;
extern int bypass_security;
extern char *confbase;
extern char *netname;
@@
-55,7
+54,7
@@
extern int get_config_bool(config_t *, int *);
extern int get_config_int(config_t *, int *);
extern int get_config_port(config_t *, port_t *);
extern int get_config_string(config_t *, char **);
extern int get_config_int(config_t *, int *);
extern int get_config_port(config_t *, port_t *);
extern int get_config_string(config_t *, char **);
-extern int get_config_
ip(config_t *, struct ip_mask
_t **);
+extern int get_config_
address(config_t *, ipv4
_t **);
struct subnet_t; /* Needed for next line. */
extern int get_config_subnet(config_t *, struct subnet_t **);
struct subnet_t; /* Needed for next line. */
extern int get_config_subnet(config_t *, struct subnet_t **);