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.122 2001/07/20 13:54:19 guus Exp $
*/
#include "config.h"
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);
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)
{
if(cl->status.meta)
{
-
/* 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 = node->next)
{
p = (connection_t *)node->data;
if(p->nexthop == cl && p != cl)
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 :) */
}
}
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(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))