X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.h;h=17dcc5955538df01095aa40b6f851c2c28da5118;hb=bde0d73919778e0c31f79a6c14efad7e9378b633;hp=20a78a917b8304c0d1d17297fd7b67afd3c1d229;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;p=meshlink

diff --git a/src/conf.h b/src/conf.h
index 20a78a91..17dcc595 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.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
@@ -31,16 +31,12 @@ typedef struct config_t {
 	int line;
 } config_t;
 
-#include "subnet.h"
-
 extern splay_tree_t *config_tree;
 
 extern int pinginterval;
 extern int pingtimeout;
 extern int maxtimeout;
 extern bool bypass_security;
-extern char *confbase;
-extern char *netname;
 extern list_t *cmdline_conf;
 
 extern void init_configuration(splay_tree_t **);
@@ -54,7 +50,6 @@ extern bool get_config_bool(const config_t *, bool *);
 extern bool get_config_int(const config_t *, int *);
 extern bool get_config_string(const config_t *, char **);
 extern bool get_config_address(const config_t *, struct addrinfo **);
-extern bool get_config_subnet(const config_t *, struct subnet_t **);
 
 extern config_t *parse_config_line(char *, const char *, int);
 extern bool read_config_file(splay_tree_t *, const char *);