projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle neighbor solicitation requests without link layer addresses.
[tinc]
/
src
/
conf.h
diff --git
a/src/conf.h
b/src/conf.h
index
8ceb111
..
eb2e0dd
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
3 Ivo Timmermans <ivo@o2w.nl>
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1998-200
5 Ivo Timmermans
+ 2000-200
6 Guus Sliepen <guus@tinc-vpn
.org>
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.41 2003/07/24 12:08:15 guus Exp
$
+ $Id$
*/
#ifndef __TINC_CONF_H__
*/
#ifndef __TINC_CONF_H__
@@
-36,6
+36,7
@@
typedef struct config_t {
extern avl_tree_t *config_tree;
extern avl_tree_t *config_tree;
+extern int pinginterval;
extern int pingtimeout;
extern int maxtimeout;
extern bool bypass_security;
extern int pingtimeout;
extern int maxtimeout;
extern bool bypass_security;
@@
-44,11
+45,11
@@
extern char *netname;
extern void init_configuration(avl_tree_t **);
extern void exit_configuration(avl_tree_t **);
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 void free_config(config_t *);
extern void config_add(avl_tree_t *, config_t *);
-extern config_t *lookup_config(
const
avl_tree_t *, char *);
-extern config_t *lookup_config_next(
const
avl_tree_t *, const config_t *);
+extern config_t *lookup_config(avl_tree_t *, char *);
+extern config_t *lookup_config_next(avl_tree_t *, const config_t *);
extern bool get_config_bool(const config_t *, bool *);
extern bool get_config_int(const config_t *, int *);
extern bool get_config_string(const config_t *, char **);
extern bool get_config_bool(const config_t *, bool *);
extern bool get_config_int(const config_t *, int *);
extern bool get_config_string(const config_t *, char **);
@@
-57,7
+58,8
@@
extern bool get_config_subnet(const config_t *, struct subnet_t **);
extern int read_config_file(avl_tree_t *, const char *);
extern bool read_server_config(void);
extern int read_config_file(avl_tree_t *, const char *);
extern bool read_server_config(void);
-extern FILE *ask_and_
safe_open(const char *, const char *, bool
, const char *);
+extern FILE *ask_and_
open(const char *
, const char *);
extern bool is_safe_path(const char *);
extern bool is_safe_path(const char *);
+extern bool disable_old_keys(FILE *);
#endif /* __TINC_CONF_H__ */
#endif /* __TINC_CONF_H__ */