projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Non-blocking connect()s.
[tinc]
/
src
/
conf.h
diff --git
a/src/conf.h
b/src/conf.h
index
ca32a48
..
bf399dd
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-200
1
Ivo Timmermans <itimmermans@bigfoot.com>
- 2000
,2001
Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1998-200
2
Ivo Timmermans <itimmermans@bigfoot.com>
+ 2000
-2002
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,14
+17,19
@@
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.
27 2001/10/10 20:34:27
guus Exp $
+ $Id: conf.h,v 1.6.4.
32 2002/02/18 16:25:16
guus Exp $
*/
#ifndef __TINC_CONF_H__
#define __TINC_CONF_H__
*/
#ifndef __TINC_CONF_H__
#define __TINC_CONF_H__
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
#include <avl_tree.h>
#include "net.h"
#include <avl_tree.h>
#include "net.h"
+#include "subnet.h"
typedef struct config_t {
char *variable;
typedef struct config_t {
char *variable;
@@
-36,9
+41,9
@@
typedef struct config_t {
extern avl_tree_t *config_tree;
extern int debug_lvl;
extern avl_tree_t *config_tree;
extern int debug_lvl;
-extern int timeout;
+extern int
ping
timeout;
extern int maxtimeout;
extern int maxtimeout;
-extern int
sighup
;
+extern int
bypass_security
;
extern char *confbase;
extern char *netname;
extern char *confbase;
extern char *netname;
@@
-47,12
+52,15
@@
extern void exit_configuration(avl_tree_t **);
extern config_t *new_config(void);
extern void free_config(config_t *);
extern void config_add(avl_tree_t *, config_t *);
extern config_t *new_config(void);
extern void free_config(config_t *);
extern void config_add(avl_tree_t *, config_t *);
-extern config_t *
config_lookup
(avl_tree_t *, char *);
-extern config_t *
config_lookup
_next(avl_tree_t *, config_t *);
+extern config_t *
lookup_config
(avl_tree_t *, char *);
+extern config_t *
lookup_config
_next(avl_tree_t *, config_t *);
extern int get_config_bool(config_t *, int *);
extern int get_config_int(config_t *, int *);
extern int get_config_bool(config_t *, int *);
extern int get_config_int(config_t *, int *);
+extern int get_config_port(config_t *, port_t *);
extern int get_config_string(config_t *, char **);
extern int get_config_string(config_t *, char **);
-extern int get_config_ip(config_t *, ip_mask_t **);
+extern int get_config_address(config_t *, struct addrinfo **);
+struct subnet_t; /* Needed for next line. */
+extern int get_config_subnet(config_t *, struct subnet_t **);
extern int read_config_file(avl_tree_t *, const char *);
extern int read_server_config(void);
extern int read_config_file(avl_tree_t *, const char *);
extern int read_server_config(void);