projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small updates.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
621bb1b
..
029b41a
100644
(file)
--- a/
src/protocol_key.c
+++ b/
src/protocol_key.c
@@
-1,7
+1,7
@@
/*
protocol_key.c -- handle the meta-protocol, key exchange
/*
protocol_key.c -- handle the meta-protocol, key exchange
- Copyright (C) 1999-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>,
- 2000-2002 Guus Sliepen <guus@sliepen.
warande.net
>
+ Copyright (C) 1999-2002 Ivo Timmermans <i
vo@o2w.nl
>,
+ 2000-2002 Guus Sliepen <guus@sliepen.
eu.org
>
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
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.
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.
2 2002/02/11 15:59:18
guus Exp $
+ $Id: protocol_key.c,v 1.1.4.
10 2002/09/04 16:26:45
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-40,16
+40,13
@@
#include "meta.h"
#include "connection.h"
#include "node.h"
#include "meta.h"
#include "connection.h"
#include "node.h"
-#include "edge.h"
-\
+
#include "system.h"
int mykeyused = 0;
int send_key_changed(connection_t *c, node_t *n)
{
#include "system.h"
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.
cp
/* Only send this message if some other daemon requested our key previously.
This reduces unnecessary key_changed broadcasts.
@@
-57,15
+54,8
@@
cp
if(n == myself && !mykeyused)
return 0;
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->status.mst && other != c)
- send_request(other, "%d %s", KEY_CHANGED, n->name);
- }
cp
cp
- return
0
;
+ return
send_request(c, "%d %lx %s", KEY_CHANGED, random(), n->name)
;
}
int key_changed_h(connection_t *c)
}
int key_changed_h(connection_t *c)
@@
-73,13
+63,16
@@
int key_changed_h(connection_t *c)
char name[MAX_STRING_SIZE];
node_t *n;
cp
char name[MAX_STRING_SIZE];
node_t *n;
cp
- if(sscanf(c->buffer, "%*d "MAX_STRING, name) != 1)
+ if(sscanf(c->buffer, "%*d
%*x
"MAX_STRING, name) != 1)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
c->name, c->hostname);
return -1;
}
{
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
c->name, c->hostname);
return -1;
}
+ if(seen_request(c->buffer))
+ return 0;
+
n = lookup_node(name);
if(!n)
n = lookup_node(name);
if(!n)
@@
-91,9
+84,10
@@
cp
n->status.validkey = 0;
n->status.waitingforkey = 0;
n->status.validkey = 0;
n->status.waitingforkey = 0;
- n->sent_seqno = 0;
- send_key_changed(c, n);
+ /* Tell the others */
+
+ forward_request(c);
cp
return 0;
}
cp
return 0;
}
@@
-141,7
+135,7
@@
cp
if(to == myself) /* Yes, send our own key back */
{
mykeyused = 1;
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
send_ans_key(c, myself, from);
}
else
@@
-208,7
+202,7
@@
cp
if(to != myself)
{
if(to != myself)
{
- return send_request(to->nexthop->connection, c->buffer);
+ return send_request(to->nexthop->connection,
"%s",
c->buffer);
}
/* Update our copy of the origin's packet key */
}
/* Update our copy of the origin's packet key */
@@
-223,7
+217,8
@@
cp
from->status.validkey = 1;
from->status.waitingforkey = 0;
from->status.validkey = 1;
from->status.waitingforkey = 0;
-
+ from->received_seqno = 0;
+
/* Check and lookup cipher and digest algorithms */
if(cipher)
/* Check and lookup cipher and digest algorithms */
if(cipher)
@@
-245,6
+240,8
@@
cp
from->cipher = NULL;
}
from->cipher = NULL;
}
+ from->maclength = maclength;
+
if(digest)
{
from->digest = EVP_get_digestbynid(digest);
if(digest)
{
from->digest = EVP_get_digestbynid(digest);
@@
-253,7
+250,6
@@
cp
syslog(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name, from->hostname);
return -1;
}
syslog(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name, from->hostname);
return -1;
}
- from->maclength = maclength;
if(from->maclength > from->digest->md_size || from->maclength < 0)
{
syslog(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
if(from->maclength > from->digest->md_size || from->maclength < 0)
{
syslog(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
@@
-263,7
+259,6
@@
cp
else
{
from->digest = NULL;
else
{
from->digest = NULL;
- from->maclength = maclength;
}
from->compression = compression;
}
from->compression = compression;