j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Remove all unnecessary status.meta and status.active checks.

Browse source
This commit is contained in:
Guus Sliepen 2001-07-20 13:54:19 +00:00
parent 5e2ded68bf
commit 37ed4265fa
5 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/meta.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: meta.c,v 1.1.2.19 2001/07/04 08:41:36 guus Exp $ $Id: meta.c,v 1.1.2.20 2001/07/20 13:54:19 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -75,7 +75,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
p = (connection_t *)node->data; p = (connection_t *)node->data;
if(p != cl && p->status.meta && p->status.active) if(p != cl && p->status.active)
send_meta(p, buffer, length); send_meta(p, buffer, length);
} }
cp cp

29
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.121 2001/07/19 12:29:40 guus Exp $ $Id: net.c,v 1.35.4.122 2001/07/20 13:54:19 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) for(node = connection_tree->head; node; node = node->next)
{ {
cl = (connection_t *)node->data; cl = (connection_t *)node->data;
if(cl->status.meta && cl != from) if(cl->status.active && cl != from)
send_packet(cl, packet); send_packet(cl, packet);
} }
cp cp
@ -1083,8 +1083,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
p = (connection_t *)node->data; 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);
@ -1163,11 +1162,10 @@ cp
if(cl->status.meta) if(cl->status.meta)
{ {
/* Find all connections that were lost because they were behind cl /* Find all connections that were lost because they were behind cl
(the connection that was dropped). */ (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; p = (connection_t *)node->data;
if(p->nexthop == cl && p != cl) if(p->nexthop == cl && p != cl)
@ -1180,7 +1178,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
p = (connection_t *)node->data; 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 :) */
} }
} }
@ -1229,7 +1227,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
cl = (connection_t *)node->data; 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 +1299,12 @@ cp
if(p->status.remove) if(p->status.remove)
return; return;
if(p->status.meta) if(FD_ISSET(p->meta_socket, f))
if(FD_ISSET(p->meta_socket, f)) if(receive_meta(p) < 0)
if(receive_meta(p) < 0) {
{ terminate_connection(p);
terminate_connection(p); return;
return; }
}
} }
if(FD_ISSET(myself->meta_socket, f)) if(FD_ISSET(myself->meta_socket, f))

14
src/protocol.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: protocol.c,v 1.28.4.100 2001/07/19 12:29:40 guus Exp $ $Id: protocol.c,v 1.28.4.101 2001/07/20 13:54:19 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -307,7 +307,7 @@ cp
{ {
p = (connection_t *)node->data; p = (connection_t *)node->data;
if(p != cl && p->status.active) if(p != cl)
{ {
/* Notify others of this connection */ /* Notify others of this connection */
@ -690,7 +690,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
p = (connection_t *)node->data; p = (connection_t *)node->data;
if(p->status.meta && p->status.active && p!= cl) if(p->status.active && p!= cl)
send_add_subnet(p, subnet); send_add_subnet(p, subnet);
} }
cp cp
@ -774,7 +774,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
p = (connection_t *)node->data; p = (connection_t *)node->data;
if(p->status.meta && p->status.active && p!= cl) if(p->status.active && p!= cl)
send_del_subnet(p, subnet); send_del_subnet(p, subnet);
} }
cp cp
@ -863,7 +863,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
p = (connection_t *)node->data; p = (connection_t *)node->data;
if(p->status.meta && p->status.active && p!=cl) if(p->status.active && p!=cl)
send_add_host(p, new); send_add_host(p, new);
} }
@ -948,7 +948,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
p = (connection_t *)node->data; p = (connection_t *)node->data;
if(p->status.meta && p->status.active && p!=cl) if(p->status.active && p!=cl)
send_del_host(p, old); send_del_host(p, old);
} }
cp cp
@ -1088,7 +1088,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
p = (connection_t *)node->data; p = (connection_t *)node->data;
if(p != cl && p->status.meta && p->status.active) if(p != cl && p->status.active)
if(!(p->options & OPTION_INDIRECT) || from == myself) if(!(p->options & OPTION_INDIRECT) || from == myself)
send_request(p, "%d %s", KEY_CHANGED, from->name); send_request(p, "%d %s", KEY_CHANGED, from->name);
} }

4
src/route.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: route.c,v 1.1.2.15 2001/07/01 09:21:14 guus Exp $ $Id: route.c,v 1.1.2.16 2001/07/20 13:54:19 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -78,7 +78,7 @@ cp
for(node = connection_tree->head; node; node = node->next) for(node = connection_tree->head; node; node = node->next)
{ {
p = (connection_t *)node->data; p = (connection_t *)node->data;
if(p->status.meta && p->status.active && p!= myself) if(p->status.active && p!= myself)
send_add_subnet(p, subnet); send_add_subnet(p, subnet);
} }
} }

4
src/tincd.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: tincd.c,v 1.10.4.49 2001/07/04 08:43:32 guus Exp $ $Id: tincd.c,v 1.10.4.50 2001/07/20 13:54:19 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -212,7 +212,7 @@ int keygen(int bits)
if(!rsa_key) if(!rsa_key)
{ {
fprintf(stderr, _("Error during key generation!")); fprintf(stderr, _("Error during key generation!\n"));
return -1; return -1;
} }
else else