projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops.
[tinc]
/
src
/
conf.h
diff --git
a/src/conf.h
b/src/conf.h
index
77ec5c9
..
32bb909
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
2
Ivo Timmermans <ivo@o2w.nl>
- 2000-200
2
Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-200
3
Ivo Timmermans <ivo@o2w.nl>
+ 2000-200
3
Guus Sliepen <guus@sliepen.eu.org>
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,18
+17,13
@@
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.3
5 2002/09/15 12:26:24
guus Exp $
+ $Id: conf.h,v 1.6.4.3
9 2003/07/17 15:06:26
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 "subnet.h"
typedef struct config_t {
#include "subnet.h"
typedef struct config_t {
@@
-40,7
+35,6
@@
typedef struct config_t {
extern avl_tree_t *config_tree;
extern avl_tree_t *config_tree;
-extern int debug_lvl;
extern int pingtimeout;
extern int maxtimeout;
extern int bypass_security;
extern int pingtimeout;
extern int maxtimeout;
extern int bypass_security;
@@
-49,7
+43,7
@@
extern char *netname;
extern void init_configuration(avl_tree_t **);
extern void exit_configuration(avl_tree_t **);
extern void init_configuration(avl_tree_t **);
extern void exit_configuration(avl_tree_t **);
-extern config_t *new_config(void);
+extern config_t *new_config(void)
__attribute__ ((malloc))
;
extern void free_config(config_t *);
extern void config_add(avl_tree_t *, config_t *);
extern config_t *lookup_config(avl_tree_t *, char *);
extern void free_config(config_t *);
extern void config_add(avl_tree_t *, config_t *);
extern config_t *lookup_config(avl_tree_t *, char *);
@@
-58,7
+52,6
@@
extern int get_config_bool(config_t *, int *);
extern int get_config_int(config_t *, int *);
extern int get_config_string(config_t *, char **);
extern int get_config_address(config_t *, struct addrinfo **);
extern int get_config_int(config_t *, int *);
extern int get_config_string(config_t *, char **);
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 get_config_subnet(config_t *, struct subnet_t **);
extern int read_config_file(avl_tree_t *, const char *);