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
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
f0bf180
..
d0dd9f7
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.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: protocol.c,v 1.28.4.10
0 2001/07/19 12:29:4
0 guus Exp $
+ $Id: protocol.c,v 1.28.4.10
2 2001/07/20 20:25:1
0 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-249,10
+249,6
@@
cp
return 0;
}
return 0;
}
- /* Now we can add the name to the id tree */
-
- id_add(cl);
-
/* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
old = avl_search(active_tree, cl);
/* Also check if no other tinc daemon uses the same IP and port for UDP traffic */
old = avl_search(active_tree, cl);
@@
-266,7
+262,6
@@
cp
/* Activate this connection */
cl->allow_request = ALL;
/* Activate this connection */
cl->allow_request = ALL;
- cl->status.active = 1;
cl->nexthop = cl;
cl->cipher_pkttype = EVP_bf_cbc();
cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cl->nexthop = cl;
cl->cipher_pkttype = EVP_bf_cbc();
cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
@@
-307,7
+302,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
+685,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_add_subnet(p, subnet);
}
cp
send_add_subnet(p, subnet);
}
cp
@@
-774,7
+769,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_subnet(p, subnet);
}
cp
send_del_subnet(p, subnet);
}
cp
@@
-856,21
+851,19
@@
cp
new->name = xstrdup(name);
active_add(new);
new->name = xstrdup(name);
active_add(new);
- id_add(new);
/* Tell the rest about the new host */
for(node = connection_tree->head; node; node = node->next)
{
p = (connection_t *)node->data;
/* Tell the rest about the new host */
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_add_host(p, new);
}
/* Fill in rest of connection structure */
new->nexthop = cl;
send_add_host(p, new);
}
/* Fill in rest of connection structure */
new->nexthop = cl;
- new->status.active = 1;
new->cipher_pkttype = EVP_bf_cbc();
new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cp
new->cipher_pkttype = EVP_bf_cbc();
new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cp
@@
-921,7
+914,7
@@
cp
return 0;
}
return 0;
}
- /* Check if the
new
host already exists in the connnection list */
+ /* Check if the
deleted
host already exists in the connnection list */
if(!(old = lookup_id(name)))
{
if(!(old = lookup_id(name)))
{
@@
-940,15
+933,14
@@
cp
/* Ok, since EVERYTHING seems to check out all right, delete it */
/* Ok, since EVERYTHING seems to check out all right, delete it */
- old->status.active = 0;
terminate_connection(old);
terminate_connection(old);
- /* Tell the rest about the
new
host */
+ /* Tell the rest about the
deleted
host */
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, old);
}
cp
send_del_host(p, old);
}
cp
@@
-1088,7
+1080,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 != cl && p->status.
meta && p->status.
active)
+ if(p != cl && p->status.active)
if(!(p->options & OPTION_INDIRECT) || from == myself)
send_request(p, "%d %s", KEY_CHANGED, from->name);
}
if(!(p->options & OPTION_INDIRECT) || from == myself)
send_request(p, "%d %s", KEY_CHANGED, from->name);
}