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.114 2001/10/30 16:34:32 guus Exp $
+ $Id: protocol.c,v 1.28.4.120 2001/11/04 23:48:27 guus Exp $
*/
#include "config.h"
syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), c->hostname, c->name);
return -1;
}
+ }
- if(read_rsa_public_key(c))
- {
- return -1;
- }
+ if(read_rsa_public_key(c))
+ {
+ return -1;
}
c->allow_request = METAKEY;
int send_metakey(connection_t *c)
{
- char *buffer;
+ char buffer[MAX_STRING_SIZE];
int len, x;
cp
len = RSA_size(c->rsa_key);
/* Allocate buffers for the meta key */
- buffer = xmalloc(len*2+1);
-
if(!c->outkey)
c->outkey = xmalloc(len);
This is allowed, because we encrypt a totally random string
with a length equal to that of the modulus of the RSA key.
*/
-
+
if(RSA_public_encrypt(len, c->outkey, buffer, c->rsa_key, RSA_NO_PADDING) != len)
{
syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), c->name, c->hostname);
- free(buffer);
return -1;
}
cp
/* Send the meta key */
x = send_request(c, "%d %s", METAKEY, buffer);
- free(buffer);
/* Further outgoing requests are encrypted with the key we just generated */
syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name, c->hostname);
return -1;
}
-
+cp
len = RSA_size(myself->connection->rsa_key);
/* Check if the length of the meta key is all right */
}
/* Allocate buffers for the meta key */
-
+cp
if(!c->inkey)
c->inkey = xmalloc(len);
c->inctx = xmalloc(sizeof(*c->inctx));
/* Convert the challenge from hexadecimal back to binary */
-
+cp
hex2bin(buffer,buffer,len);
/* Decrypt the meta key */
-
+cp
if(RSA_private_decrypt(len, buffer, c->inkey, myself->connection->rsa_key, RSA_NO_PADDING) != len) /* See challenge() */
{
syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), c->name, c->hostname);
}
/* All incoming requests will now be encrypted. */
-
+cp
EVP_DecryptInit(c->inctx, EVP_bf_cfb(),
c->inkey + len - EVP_bf_cfb()->key_len,
c->inkey + len - EVP_bf_cfb()->key_len - EVP_bf_cfb()->iv_len);
int send_challenge(connection_t *c)
{
- char *buffer;
+ char buffer[MAX_STRING_SIZE];
int len, x;
cp
/* CHECKME: what is most reasonable value for len? */
/* Allocate buffers for the challenge */
- buffer = xmalloc(len*2+1);
-
- if(c->hischallenge)
- free(c->hischallenge);
-
- c->hischallenge = xmalloc(len);
+ if(!c->hischallenge)
+ c->hischallenge = xmalloc(len);
cp
/* Copy random data to the buffer */
/* Send the challenge */
x = send_request(c, "%d %s", CHALLENGE, buffer);
- free(buffer);
cp
return x;
}
{
other = (connection_t *)node->data;
- if(other == c)
- continue;
-
- send_add_node(other, c->node);
- send_add_edge(other, c->edge);
+ if(other->status.active && other != c)
+ {
+ send_add_node(other, c->node);
+ send_add_edge(other, c->edge);
+ }
}
/* Run MST and SSSP algorithms */
mst_kruskal();
- sssp_bfs();
+ sssp_bfs(0);
cp
return 0;
}
/* Check if the owner of the new subnet is in the connection list */
- if(!(owner = lookup_node(name)))
+ owner = lookup_node(name);
+
+ if(!owner)
{
syslog(LOG_ERR, _("Got ADD_SUBNET from %s (%s) for %s which is not in our connection list"),
- name, c->name, c->hostname);
+ c->name, c->hostname, name);
return -1;
}
+ /* Check if we already know this subnet */
+
+ if(lookup_subnet(owner, s))
+ {
+ free_subnet(s);
+ return 0;
+ }
+
/* If everything is correct, add the subnet to the list of the owner */
subnet_add(owner, s);
return -1;
}
- /* Check if subnet string is valid */
+ /* Check if the owner of the new subnet is in the connection list */
- if(!(s = str2net(subnetstr)))
+ if(!(owner = lookup_node(name)))
{
- syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string"));
+ syslog(LOG_ERR, _("Got %s from %s (%s) for %s which is not in our connection list"),
+ "DEL_SUBNET", c->name, c->hostname, name);
return -1;
}
- /* Check if the owner of the new subnet is in the connection list */
+ /* Check if subnet string is valid */
- if(!(owner = lookup_node(name)))
+ if(!(s = str2net(subnetstr)))
{
- syslog(LOG_ERR, _("Got %s from %s (%s) for %s which is not in our connection list"),
- "DEL_SUBNET", c->name, c->hostname, name);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string"));
return -1;
}
find = lookup_subnet(owner, s);
+ free_subnet(s);
+
if(!find)
{
syslog(LOG_ERR, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
return -1;
}
- subnet_del(owner, s);
+ subnet_del(owner, find);
/* Tell the rest */
int del_node_h(connection_t *c)
{
node_t *n;
- edge_t *e;
char name[MAX_STRING_SIZE];
ipv4_t address;
port_t port;
connection_t *other;
- avl_node_t *node, *next;
+ avl_node_t *node;
cp
if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3)
{
send_del_node(other, n);
}
- /* Delete all edges associated with the node */
-
- for(node = n->edge_tree->head; node; node = next)
- {
- next = node->next;
- e = (edge_t *)node->data;
- edge_del(e);
- }
-
/* Delete the node */
node_del(n);
mst_kruskal();
- sssp_bfs();
+ sssp_bfs(0);
cp
return 0;
}
int send_add_edge(connection_t *c, edge_t *e)
{
cp
- return send_request(c, "%d %s %s %lx %d", ADD_NODE,
+ return send_request(c, "%d %s %s %lx %d", ADD_EDGE,
e->from->name, e->to->name, e->options, e->weight);
}
/* Run MST before or after we tell the rest? */
mst_kruskal();
- sssp_bfs();
+ sssp_bfs(0);
cp
return 0;
}
if(!from)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
- return -1;
+ return 0;
}
to = lookup_node(to_name);
if(!to)
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
- return -1;
+ return 0;
}
/* Check if edge exists */
else
{
syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown edge"));
- return -1;
+ return 0;
}
/* Tell the rest about the deleted edge */
/* Run MST before or after we tell the rest? */
mst_kruskal();
- sssp_bfs();
+ sssp_bfs(1);
cp
return 0;
}
for(node = connection_tree->head; node; node = node->next)
{
other = (connection_t *)node->data;
- if(other != c && other->status.active)
+ if(other->status.active && other != c)
send_request(other, "%d %s", KEY_CHANGED, n->name);
}
cp
projects / tinc / blobdiff