projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- If necessary, patch po/Makefile.in from po-Makefile.in.in.diff to
[tinc]
/
src
/
conf.h
diff --git
a/src/conf.h
b/src/conf.h
index
39f9053
..
c4c030a
100644
(file)
--- a/
src/conf.h
+++ b/
src/conf.h
@@
-17,25
+17,21
@@
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.1
0 2000/10/11 13:42:52
guus Exp $
+ $Id: conf.h,v 1.6.4.1
5 2000/10/29 00:24:31
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 {
tincname = 1,
connectto,
typedef enum which_t {
tincname = 1,
connectto,
@@
-46,7
+42,6
@@
typedef enum which_t {
resolve_dns,
interface,
interfaceip,
resolve_dns,
interface,
interfaceip,
- configuration
address,
port,
publickey,
address,
port,
publickey,
@@
-63,7
+58,12
@@
typedef struct config_t {
struct config_t *next;
which_t which;
int argtype;
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;
typedef struct internal_config_t {
} config_t;
typedef struct internal_config_t {
@@
-87,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__ */