projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed URL from kernelnotes.org to linuxdoc.org.
[tinc]
/
src
/
conf.h
diff --git
a/src/conf.h
b/src/conf.h
index
297dc42
..
d1fb609
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
,1999,2000
Ivo Timmermans <itimmermans@bigfoot.com>
-
2000
Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1998
-2001
Ivo Timmermans <itimmermans@bigfoot.com>
+
2000,2001
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.
17 2000/11/29 14:24:40 zarq
Exp $
+ $Id: conf.h,v 1.6.4.
23 2001/02/27 16:37:24 guus
Exp $
*/
#ifndef __TINC_CONF_H__
*/
#ifndef __TINC_CONF_H__
@@
-33,11
+33,13
@@
typedef struct ip_mask_t {
} ip_mask_t;
typedef enum which_t {
} ip_mask_t;
typedef enum which_t {
+ config_dummy = 0,
config_name = 1,
config_connectto,
config_pingtimeout,
config_tapdevice,
config_privatekey,
config_name = 1,
config_connectto,
config_pingtimeout,
config_tapdevice,
config_privatekey,
+ config_privatekeyfile,
config_keyexpire,
config_hostnames,
config_interface,
config_keyexpire,
config_hostnames,
config_interface,
@@
-45,6
+47,7
@@
typedef enum which_t {
config_address,
config_port,
config_publickey,
config_address,
config_port,
config_publickey,
+ config_publickeyfile,
config_subnet,
config_restricthosts,
config_restrictsubnets,
config_subnet,
config_restricthosts,
config_restrictsubnets,
@@
-60,7
+63,7
@@
typedef struct config_t {
int argtype;
union data {
unsigned long val;
int argtype;
union data {
unsigned long val;
-
void
*ptr;
+
char
*ptr;
ip_mask_t *ip;
struct config_t *next; /* For nested configs! */
} data;
ip_mask_t *ip;
struct config_t *next; /* For nested configs! */
} data;
@@
-96,6
+99,7
@@
extern int read_config_file(config_t **, const char *);
extern const config_t *get_config_val(config_t *, which_t type);
extern void clear_config();
extern int read_server_config(void);
extern const config_t *get_config_val(config_t *, which_t type);
extern void clear_config();
extern int read_server_config(void);
-extern FILE *ask_and_safe_open(const char*, const char*);
+extern FILE *ask_and_safe_open(const char*, const char*, const char *);
+extern int is_safe_path(const char *);
#endif /* __TINC_CONF_H__ */
#endif /* __TINC_CONF_H__ */