/*
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
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.13 2000/10/15 00:59:34 guus Exp $
+ $Id: conf.h,v 1.6.4.23 2001/02/27 16:37:24 guus Exp $
*/
#ifndef __TINC_CONF_H__
#define __TINC_CONF_H__
+#include "net.h"
+
#define MAXTIMEOUT 900 /* Maximum timeout value for retries. Should this be a configuration option? */
typedef struct ip_mask_t {
- unsigned long ip;
- unsigned long mask;
+ ipv4_t address;
+ ipv4_t mask;
} 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 {
int argtype;
union data {
unsigned long val;
- void *ptr;
+ char *ptr;
ip_mask_t *ip;
struct config_t *next; /* For nested configs! */
} data;
extern config_t *config;
extern int debug_lvl;
extern int timeout;
-extern int upstreamindex;
extern int sighup;
extern char *confbase;
extern char *netname;
extern config_t *add_config_val(config_t **, int, char *);
extern int read_config_file(config_t **, const char *);
extern const config_t *get_config_val(config_t *, which_t type);
-extern const config_t *get_next_config_val(config_t *, which_t type, int);
extern void clear_config();
extern int read_server_config(void);
+extern FILE *ask_and_safe_open(const char*, const char*, const char *);
+extern int is_safe_path(const char *);
#endif /* __TINC_CONF_H__ */