projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better checks for OpenSSL. I think it can now detect almost all conceivable installa...
[tinc]
/
src
/
conf.h
diff --git
a/src/conf.h
b/src/conf.h
index
a63821c
..
9ab0add
100644
(file)
--- a/
src/conf.h
+++ b/
src/conf.h
@@
-17,51
+17,61
@@
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.
9 2000/09/14 14:34:38 zarq
Exp $
+ $Id: conf.h,v 1.6.4.
16 2000/11/04 22:57:30 guus
Exp $
*/
#ifndef __TINC_CONF_H__
#define __TINC_CONF_H__
*/
#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 {
#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;
} ip_mask_t;
-typedef union data_t {
- unsigned long val;
- void *ptr;
- ip_mask_t *ip;
-} data_t;
-
typedef enum which_t {
typedef enum which_t {
- passphrasesdir = 1,
- upstreamip,
- upstreamport,
- listenport,
- myvpnip,
- tapdevice,
- allowconnect,
- pingtimeout,
- keyexpire,
- vpnmask,
- resolve_dns,
- indirectdata,
- tcponly,
- interface,
- interfaceip,
- tincname,
+ config_name = 1,
+ config_connectto,
+ config_pingtimeout,
+ config_tapdevice,
+ config_privatekey,
+ config_keyexpire,
+ config_hostnames,
+ config_interface,
+ config_interfaceip,
+ config_address,
+ config_port,
+ config_publickey,
+ config_subnet,
+ config_restricthosts,
+ config_restrictsubnets,
+ config_restrictaddress,
+ config_restrictport,
+ config_indirectdata,
+ config_tcponly,
} which_t;
typedef struct config_t {
struct config_t *next;
which_t which;
int argtype;
} which_t;
typedef struct config_t {
struct config_t *next;
which_t which;
int argtype;
- data_t data;
+ union data {
+ unsigned long val;
+ void *ptr;
+ ip_mask_t *ip;
+ struct config_t *next; /* For nested configs! */
+ } data;
} config_t;
} config_t;
+typedef struct internal_config_t {
+ char *name;
+ enum which_t which;
+ int argtype;
+} internal_config_t;
+
enum {
stupid_false = 1,
stupid_true
enum {
stupid_false = 1,
stupid_true
@@
-77,14
+87,14
@@
enum {
extern config_t *config;
extern int debug_lvl;
extern int timeout;
extern config_t *config;
extern int debug_lvl;
extern int timeout;
-extern int upstreamindex;
extern int sighup;
extern int sighup;
-extern char *configfilename;
+extern char *confbase;
+extern char *netname;
extern config_t *add_config_val(config_t **, int, char *);
extern config_t *add_config_val(config_t **, int, char *);
-extern int read_config_file(const char *);
-extern const config_t *get_config_val(which_t type);
-extern const config_t *get_next_config_val(which_t type, int);
+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 void clear_config();
+extern int read_server_config(void);
#endif /* __TINC_CONF_H__ */
#endif /* __TINC_CONF_H__ */