X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=24115563f8c937dd4894c80b68a516b56432d057;hp=90df50f2093151d5d8013df85998a841a380b7c7;hb=66741978e16cc407e5c760621c34d1aabb753cd2;hpb=d134c4542d4e890e1c1007f32b866742319853c5 diff --git a/src/protocol_key.c b/src/protocol_key.c index 90df50f2..24115563 100644 --- a/src/protocol_key.c +++ b/src/protocol_key.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. - $Id: protocol_key.c,v 1.1.4.8 2002/09/03 20:43:25 guus Exp $ + $Id: protocol_key.c,v 1.1.4.11 2002/09/06 14:31:12 guus Exp $ */ #include "config.h" @@ -47,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. @@ -56,22 +54,13 @@ 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); - } cp - return 0; + return send_request(c, "%d %lx %s", KEY_CHANGED, random(), n->name); } int key_changed_h(connection_t *c) { char name[MAX_STRING_SIZE]; - avl_node_t *node; - connection_t *other; node_t *n; cp if(sscanf(c->buffer, "%*d %*x "MAX_STRING, name) != 1) @@ -98,12 +87,7 @@ cp /* Tell the others */ - for(node = connection_tree->head; node; node = node->next) - { - other = (connection_t *)node->data; - if(other->status.active && other != c) - send_request(other, "%s", c->buffer); - } + forward_request(c); cp return 0; } @@ -151,7 +135,7 @@ cp if(to == myself) /* Yes, send our own key back */ { mykeyused = 1; - from->sent_seqno = 0; + from->received_seqno = 0; send_ans_key(c, myself, from); } else @@ -233,7 +217,7 @@ cp from->status.validkey = 1; from->status.waitingforkey = 0; - from->received_seqno = 0; + from->sent_seqno = 0; /* Check and lookup cipher and digest algorithms */