Import Upstream version 1.0.5
This commit is contained in:
parent
392ff555ea
commit
a18165833b
90 changed files with 7610 additions and 5088 deletions
11
src/conf.c
11
src/conf.c
|
|
@ -1,9 +1,9 @@
|
|||
/*
|
||||
conf.c -- configuration code
|
||||
Copyright (C) 1998 Robert van der Meulen
|
||||
1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
|
||||
2000-2005 Guus Sliepen <guus@tinc-vpn.org>
|
||||
2000 Cris van Pelt <tribbel@arise.dhs.org>
|
||||
1998-2005 Ivo Timmermans
|
||||
2000-2006 Guus Sliepen <guus@tinc-vpn.org>
|
||||
2000 Cris van Pelt
|
||||
|
||||
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
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
$Id: conf.c 1439 2005-05-04 18:09:30Z guus $
|
||||
$Id: conf.c 1452 2006-04-26 13:52:58Z guus $
|
||||
*/
|
||||
|
||||
#include "system.h"
|
||||
|
|
@ -33,7 +33,8 @@
|
|||
|
||||
avl_tree_t *config_tree;
|
||||
|
||||
int pingtimeout = 0; /* seconds before timeout */
|
||||
int pinginterval = 0; /* seconds between pings */
|
||||
int pingtimeout = 0; /* seconds to wait for response */
|
||||
char *confbase = NULL; /* directory in which all config files are */
|
||||
char *netname = NULL; /* name of the vpn network */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue