Big header file cleanup: everything that has to do with standard system

[tinc] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index e9fb2ae..32bb909 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
+                  2000-2003 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
@@ -17,18 +17,13 @@
     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.34 2002/09/09 21:24:31 guus Exp $
+    $Id: conf.h,v 1.6.4.39 2003/07/17 15:06:26 guus Exp $
 */
 
 #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 {
@@ -40,7 +35,6 @@ typedef struct config_t {
 
 extern avl_tree_t *config_tree;
 
-extern int debug_lvl;
 extern int pingtimeout;
 extern int maxtimeout;
 extern int bypass_security;
@@ -49,17 +43,15 @@ extern char *netname;
 
 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 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_port(config_t *, port_t *);
 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 *);