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

Only send key_changed if it was previously requested.

Browse source
This commit is contained in:
Guus Sliepen 2001-05-24 21:52:26 +00:00
parent 1a248fd5bd
commit bfc5d6014e
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
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.88 2001/05/24 21:29:09 guus Exp $ $Id: protocol.c,v 1.28.4.89 2001/05/24 21:52:26 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -68,6 +68,8 @@
#include "system.h" #include "system.h"
int mykeyused = 0;
int check_id(char *id) int check_id(char *id)
{ {
int i; int i;
@ -1101,13 +1103,21 @@ int send_key_changed(connection_t *from, connection_t *cl)
connection_t *p; connection_t *p;
avl_node_t *node; avl_node_t *node;
cp cp
for(node = connection_tree->head; node; node = node->next) /* Only send this message if some other daemon requested our key previously.
This reduces unnecessary key_changed broadcasts.
*/
if(mykeyused)
{ {
p = (connection_t *)node->data; for(node = connection_tree->head; node; node = node->next)
if(p != cl && p->status.meta && p->status.active) {
if(!(p->options & OPTION_INDIRECT) || from == myself) p = (connection_t *)node->data;
send_request(p, "%d %s", KEY_CHANGED, from->name); if(p != cl && p->status.meta && p->status.active)
} if(!(p->options & OPTION_INDIRECT) || from == myself)
send_request(p, "%d %s", KEY_CHANGED, from->name);
}
mykeyused = 0;
}
cp cp
return 0; return 0;
} }
@ -1170,11 +1180,12 @@ cp
/* Check if this key request is for us */ /* Check if this key request is for us */
if(!strcmp(to_id, myself->name)) if(!strcmp(to_id, myself->name)) /* Yes, send our own key back */
{ {
bin2hex(myself->cipher_pktkey, pktkey, myself->cipher_pktkeylength); bin2hex(myself->cipher_pktkey, pktkey, myself->cipher_pktkeylength);
pktkey[myself->cipher_pktkeylength*2] = '\0'; pktkey[myself->cipher_pktkeylength*2] = '\0';
send_ans_key(myself, from, pktkey); send_ans_key(myself, from, pktkey);
mykeyused = 1;
} }
else else
{ {