X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=0f14cd69c53251d0d6e02e3e2fce9b94240eb78e;hp=016fbff7733bb871b2904c55559cbe69fdbadfcc;hb=4a7c2026aec6966f934b60d75bc472d28f8587d8;hpb=3c5655f59e85d312d11fa04489123e604920f95b diff --git a/src/protocol_key.c b/src/protocol_key.c index 016fbff7..0f14cd69 100644 --- a/src/protocol_key.c +++ b/src/protocol_key.c @@ -1,7 +1,7 @@ /* protocol_key.c -- handle the meta-protocol, key exchange - Copyright (C) 1999-2002 Ivo Timmermans , - 2000-2002 Guus Sliepen + Copyright (C) 1999-2002 Ivo Timmermans , + 2000-2002 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: protocol_key.c,v 1.1.4.6 2002/03/22 13:31:18 guus Exp $ + $Id: protocol_key.c,v 1.1.4.9 2002/09/04 08:02:33 guus Exp $ */ #include "config.h" @@ -40,7 +40,6 @@ #include "meta.h" #include "connection.h" #include "node.h" -#include "edge.h" #include "system.h" @@ -48,8 +47,6 @@ int mykeyused = 0; int send_key_changed(connection_t *c, node_t *n) { - connection_t *other; - avl_node_t *node; cp /* Only send this message if some other daemon requested our key previously. This reduces unnecessary key_changed broadcasts. @@ -58,12 +55,7 @@ cp if(n == myself && !mykeyused) return 0; - for(node = connection_tree->head; node; node = node->next) - { - other = (connection_t *)node->data; - if(other->status.active && other != c) - send_request(other, "%d %lx %s", KEY_CHANGED, random(), n->name); - } + send_request(NULL, "%d %lx %s", KEY_CHANGED, random(), n->name); cp return 0; } @@ -96,7 +88,6 @@ cp n->status.validkey = 0; n->status.waitingforkey = 0; - n->sent_seqno = 0; /* Tell the others */ @@ -153,7 +144,7 @@ cp if(to == myself) /* Yes, send our own key back */ { mykeyused = 1; - from->received_seqno = 0; + from->sent_seqno = 0; send_ans_key(c, myself, from); } else @@ -235,7 +226,8 @@ cp from->status.validkey = 1; from->status.waitingforkey = 0; - + from->received_seqno = 0; + /* Check and lookup cipher and digest algorithms */ if(cipher)