/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2017 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2021 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2011 Loïc Grenié <loic.grenie@gmail.com>
#include "system.h"
#include "autoconnect.h"
+#include "conf_net.h"
#include "conf.h"
#include "connection.h"
-#include "device.h"
#include "graph.h"
#include "logger.h"
#include "meta.h"
#include "names.h"
#include "net.h"
-#include "netutl.h"
#include "protocol.h"
#include "subnet.h"
#include "utils.h"
-#include "xalloc.h"
int contradicting_add_edge = 0;
int contradicting_del_edge = 0;
exit_configuration(&config_tree);
init_configuration(&config_tree);
- if(!read_server_config()) {
+ if(!read_server_config(config_tree)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file.");
return EINVAL;
}