projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A couple missed tevent things.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
e447a1f
..
0c399bb
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-1,7
+1,7
@@
/*
net_setup.c -- Setup.
/*
net_setup.c -- Setup.
- Copyright (C) 1998-2005 Ivo Timmermans
<ivo@tinc-vpn.org>
,
- 2000-200
5
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 1998-2005 Ivo Timmermans,
+ 2000-200
6
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
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
@@
-32,7
+32,7
@@
#include "conf.h"
#include "connection.h"
#include "device.h"
#include "conf.h"
#include "connection.h"
#include "device.h"
-#include "event.h"
+#include "
t
event.h"
#include "graph.h"
#include "logger.h"
#include "net.h"
#include "graph.h"
#include "logger.h"
#include "net.h"
@@
-437,7
+437,6
@@
bool setup_myself(void)
myself->nexthop = myself;
myself->via = myself;
myself->nexthop = myself;
myself->via = myself;
- myself->status.active = true;
myself->status.reachable = true;
node_add(myself);
myself->status.reachable = true;
node_add(myself);
@@
-502,7
+501,7
@@
bool setup_myself(void)
free(hostname);
}
free(hostname);
}
-
listen_socket[listen_sockets].sa.sa = *aip->ai_addr
;
+
memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen)
;
listen_sockets++;
}
listen_sockets++;
}
@@
-527,11
+526,11
@@
bool setup_network_connections(void)
now = time(NULL);
now = time(NULL);
+ init_tevents();
init_connections();
init_subnets();
init_nodes();
init_edges();
init_connections();
init_subnets();
init_nodes();
init_edges();
- init_events();
init_requests();
if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) {
init_requests();
if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) {
@@
-573,8
+572,14
@@
void close_network_connections(void)
next = node->next;
c = node->data;
next = node->next;
c = node->data;
- if(c->outgoing)
- free(c->outgoing->name), free(c->outgoing), c->outgoing = NULL;
+ if(c->outgoing) {
+ if(c->outgoing->ai)
+ freeaddrinfo(c->outgoing->ai);
+ free(c->outgoing->name);
+ free(c->outgoing);
+ c->outgoing = NULL;
+ }
+
terminate_connection(c, false);
}
terminate_connection(c, false);
}
@@
-595,11
+600,11
@@
void close_network_connections(void)
envp[4] = NULL;
exit_requests();
envp[4] = NULL;
exit_requests();
- exit_events();
exit_edges();
exit_subnets();
exit_nodes();
exit_connections();
exit_edges();
exit_subnets();
exit_nodes();
exit_connections();
+ exit_tevents();
execute_script("tinc-down", envp);
execute_script("tinc-down", envp);