projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added purge_tree for connection_t's which are no longer in the connection,
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
9048d50
..
00fbdc5
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-17,7
+17,7
@@
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: net.c,v 1.35.4.12
1 2001/07/19 12:29:4
0 guus Exp $
+ $Id: net.c,v 1.35.4.12
3 2001/07/20 20:25:1
0 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-253,7
+253,7
@@
cp
send_udppacket(cl, packet);
}
send_udppacket(cl, packet);
}
-/* Broadcast a packet to all active connections */
+/* Broadcast a packet to all active
direct
connections */
void broadcast_packet(connection_t *from, vpn_packet_t *packet)
{
void broadcast_packet(connection_t *from, vpn_packet_t *packet)
{
@@
-267,7
+267,7
@@
cp
for(node = connection_tree->head; node; node = node->next)
{
cl = (connection_t *)node->data;
for(node = connection_tree->head; node; node = node->next)
{
cl = (connection_t *)node->data;
- if(cl->status.
meta
&& cl != from)
+ if(cl->status.
active
&& cl != from)
send_packet(cl, packet);
}
cp
send_packet(cl, packet);
}
cp
@@
-885,10
+885,10
@@
cp
keyexpires = time(NULL) + keylifetime;
cp
keyexpires = time(NULL) + keylifetime;
cp
-
- /* Activate ourselves */
+ /* Done */
myself->status.active = 1;
myself->status.active = 1;
+ id_add(myself);
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
cp
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
cp
@@
-1001,30
+1001,24
@@
cp
*/
void close_network_connections(void)
{
*/
void close_network_connections(void)
{
- avl_node_t *node;
+ avl_node_t *node
, *next
;
connection_t *p;
cp
connection_t *p;
cp
- for(node = connection_tree->head; node; node = n
ode->n
ext)
+ for(node = connection_tree->head; node; node = next)
{
{
+ next = node->next;
p = (connection_t *)node->data;
p->status.outgoing = 0;
p = (connection_t *)node->data;
p->status.outgoing = 0;
- p->status.active = 0;
terminate_connection(p);
}
terminate_connection(p);
}
- if(myself)
- if(myself->status.active)
- {
- close(myself->meta_socket);
- free_connection(myself);
- myself = NULL;
- }
+ terminate_connection(myself);
+
+ destroy_trees();
execute_script("tinc-down");
close(tap_fd);
execute_script("tinc-down");
close(tap_fd);
-
- destroy_connection_tree();
cp
return;
}
cp
return;
}
@@
-1083,8
+1077,7
@@
cp
for(node = connection_tree->head; node; node = node->next)
{
p = (connection_t *)node->data;
for(node = connection_tree->head; node; node = node->next)
{
p = (connection_t *)node->data;
- if(p->status.meta)
- FD_SET(p->meta_socket, fs);
+ FD_SET(p->meta_socket, fs);
}
FD_SET(myself->meta_socket, fs);
}
FD_SET(myself->meta_socket, fs);
@@
-1138,8
+1131,11
@@
cp
}
/*
}
/*
- terminate a connection and notify the other
- end before closing the sockets
+ Terminate a connection:
+ - Close the sockets
+ - Remove associated hosts and subnets
+ - Deactivate the host
+ - Since it might still be referenced, put it on the prune list.
*/
void terminate_connection(connection_t *cl)
{
*/
void terminate_connection(connection_t *cl)
{
@@
-1149,26
+1145,26
@@
void terminate_connection(connection_t *cl)
cp
if(cl->status.remove)
return;
cp
if(cl->status.remove)
return;
-
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
- cl->name, cl->hostname);
-
- cl->status.remove = 1;
+ else
+ cl->status.remove = 1;
if(cl->socket)
close(cl->socket);
if(cl->socket)
close(cl->socket);
- if(cl->status.meta)
- close(cl->meta_socket);
if(cl->status.meta)
{
if(cl->status.meta)
{
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+ cl->name, cl->hostname);
+
+ close(cl->meta_socket);
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
- for(node =
connection_tree->head; node; node = node->
next)
+ for(node =
active_tree->head; node; node =
next)
{
{
+ next = node->next;
p = (connection_t *)node->data;
if(p->nexthop == cl && p != cl)
terminate_connection(p);
p = (connection_t *)node->data;
if(p->nexthop == cl && p != cl)
terminate_connection(p);
@@
-1180,7
+1176,7
@@
cp
for(node = connection_tree->head; node; node = node->next)
{
p = (connection_t *)node->data;
for(node = connection_tree->head; node; node = node->next)
{
p = (connection_t *)node->data;
- if(p->status.
meta && p->status.
active && p != cl)
+ if(p->status.active && p != cl)
send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
}
}
send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
}
}
@@
-1203,11
+1199,11
@@
cp
alarm(seconds_till_retry);
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
}
alarm(seconds_till_retry);
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
}
-
- /* Deactivate */
-
- cl->status.active = 0;
cp
cp
+ /* Schedule it for pruning */
+
+ prune_add(cl);
+ connection_del(cl);
}
/*
}
/*
@@
-1229,7
+1225,7
@@
cp
for(node = connection_tree->head; node; node = node->next)
{
cl = (connection_t *)node->data;
for(node = connection_tree->head; node; node = node->next)
{
cl = (connection_t *)node->data;
- if(cl->status.active
&& cl->status.meta
)
+ if(cl->status.active)
{
if(cl->last_ping_time + timeout < now)
{
{
if(cl->last_ping_time + timeout < now)
{
@@
-1301,13
+1297,12
@@
cp
if(p->status.remove)
return;
if(p->status.remove)
return;
- if(p->status.meta)
- if(FD_ISSET(p->meta_socket, f))
- if(receive_meta(p) < 0)
- {
- terminate_connection(p);
- return;
- }
+ if(FD_ISSET(p->meta_socket, f))
+ if(receive_meta(p) < 0)
+ {
+ terminate_connection(p);
+ return;
+ }
}
if(FD_ISSET(myself->meta_socket, f))
}
if(FD_ISSET(myself->meta_socket, f))
@@
-1379,7
+1374,7
@@
cp
tv.tv_sec = timeout;
tv.tv_usec = 0;
tv.tv_sec = timeout;
tv.tv_usec = 0;
- prune_
connection_tree
();
+ prune_
flush
();
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)