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.119 2001/07/15 14:21:12 guus Exp $
+ $Id: net.c,v 1.35.4.125 2001/07/21 15:46:34 guus Exp $
*/
#include "config.h"
if((cl->options | myself->options) & OPTION_TCPONLY)
{
if(send_tcppacket(cl, packet))
- terminate_connection(cl);
+ terminate_connection(cl, 1);
}
else
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)
{
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
*/
int setup_outgoing_connection(char *name)
{
- connection_t *ncn;
+ connection_t *ncn, *old;
struct hostent *h;
config_t const *cfg;
cp
return -1;
}
+ /* Make sure we don't make an outgoing connection to a host that is already in our connection list */
+
+ if((old = lookup_id(name)))
+ {
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("We are already connected to %s."), name);
+ old->status.outgoing = 1;
+ return 0;
+ }
+
ncn = new_connection();
asprintf(&ncn->name, "%s", name);
keyexpires = time(NULL) + keylifetime;
cp
-
- /* Activate ourselves */
+ /* Done */
myself->status.active = 1;
+ id_add(myself);
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
cp
*/
void close_network_connections(void)
{
- avl_node_t *node;
+ avl_node_t *node, *next;
connection_t *p;
cp
- for(node = connection_tree->head; node; node = node->next)
+ for(node = connection_tree->head; node; node = next)
{
+ next = node->next;
p = (connection_t *)node->data;
p->status.outgoing = 0;
- p->status.active = 0;
- terminate_connection(p);
+ terminate_connection(p, 0);
}
- if(myself)
- if(myself->status.active)
- {
- close(myself->meta_socket);
- free_connection(myself);
- myself = NULL;
- }
+ terminate_connection(myself, 0);
+
+ destroy_trees();
execute_script("tinc-down");
close(tap_fd);
-
- destroy_connection_tree();
cp
return;
}
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);
return;
}
- cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+ cl = lookup_active(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
if(!cl)
{
}
/*
- 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.
+ - If report == 1, then send DEL_HOST messages to the other tinc daemons.
*/
-void terminate_connection(connection_t *cl)
+void terminate_connection(connection_t *cl, int report)
{
connection_t *p;
subnet_t *subnet;
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->status.meta)
+ if(cl->meta_socket)
close(cl->meta_socket);
+ connection_del(cl);
+
if(cl->status.meta)
{
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+ cl->name, cl->hostname);
- /* Find all connections that were lost because they were behind cl
- (the connection that was dropped). */
+ if(cl->status.active)
+ {
+ /* 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)
- {
- p = (connection_t *)node->data;
- if(p->nexthop == cl && p != cl)
- terminate_connection(p);
- }
+ for(node = active_tree->head; node; node = next)
+ {
+ next = node->next;
+ p = (connection_t *)node->data;
+ if(p->nexthop == cl)
+ terminate_connection(p, report);
+ }
+ }
+ }
- /* Inform others of termination if it was still active */
+ /* Inform others of termination if needed */
- if(cl->status.active)
- for(node = connection_tree->head; node; node = node->next)
- {
- p = (connection_t *)node->data;
- if(p->status.meta && p->status.active && p != cl)
- send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
- }
- }
+ if(report)
+ for(node = connection_tree->head; node; node = node->next)
+ {
+ p = (connection_t *)node->data;
+ if(p->status.active)
+ send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
+ }
/* Remove the associated subnets */
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
+ /* Schedule it for pruning */
+
+ prune_add(cl);
}
/*
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)
{
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
cl->name, cl->hostname);
cl->status.timeout = 1;
- terminate_connection(cl);
+ terminate_connection(cl, 1);
}
else
{
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, 1);
+ return;
+ }
}
if(FD_ISSET(myself->meta_socket, f))
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)
projects / tinc / blobdiff