projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Description of protocol and authentication updated.
[tinc]
/
src
/
conf.h
diff --git
a/src/conf.h
b/src/conf.h
index
c1db544
..
00fbcb1
100644
(file)
--- a/
src/conf.h
+++ b/
src/conf.h
@@
-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.
14 2000/10/24 15:46:16
guus Exp $
+ $Id: conf.h,v 1.6.4.
20 2001/01/05 23:53:49
guus Exp $
*/
#ifndef __TINC_CONF_H__
*/
#ifndef __TINC_CONF_H__
@@
-33,26
+33,28
@@
typedef struct ip_mask_t {
} ip_mask_t;
typedef enum which_t {
} ip_mask_t;
typedef enum which_t {
- tincname = 1,
- connectto,
- pingtimeout,
- tapdevice,
- tapsubnet,
- privatekey,
- keyexpire,
- resolve_dns,
- interface,
- interfaceip,
- address,
- port,
- publickey,
- subnet,
- restricthosts,
- restrictsubnets,
- restrictaddress,
- restrictport,
- indirectdata,
- tcponly,
+ config_dummy = 0,
+ config_name = 1,
+ config_connectto,
+ config_pingtimeout,
+ config_tapdevice,
+ config_privatekey,
+ config_privatekeyfile,
+ config_keyexpire,
+ config_hostnames,
+ config_interface,
+ config_interfaceip,
+ config_address,
+ config_port,
+ config_publickey,
+ config_publickeyfile,
+ config_subnet,
+ config_restricthosts,
+ config_restrictsubnets,
+ config_restrictaddress,
+ config_restrictport,
+ config_indirectdata,
+ config_tcponly,
} which_t;
typedef struct config_t {
} which_t;
typedef struct config_t {
@@
-61,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;
@@
-97,5
+99,6
@@
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*);
#endif /* __TINC_CONF_H__ */
#endif /* __TINC_CONF_H__ */