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.92 2001/06/05 16:09:55 guus Exp $
+ $Id: protocol.c,v 1.28.4.116 2001/10/31 20:02:06 guus Exp $
*/
#include "config.h"
#include <netinet/in.h>
-#ifdef HAVE_OPENSSL_SHA_H
-# include <openssl/sha.h>
-#else
-# include <sha.h>
-#endif
-
-#ifdef HAVE_OPENSSL_RAND_H
-# include <openssl/rand.h>
-#else
-# include <rand.h>
-#endif
+#include <openssl/sha.h>
+#include <openssl/rand.h>
+#include <openssl/evp.h>
-#ifdef HAVE_OPENSSL_EVP_H
-# include <openssl/evp.h>
-#else
-# include <evp.h>
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
#endif
-
#include "conf.h"
#include "net.h"
#include "netutl.h"
#include "protocol.h"
#include "meta.h"
#include "connection.h"
+#include "node.h"
+#include "edge.h"
+#include "graph.h"
#include "system.h"
/* Generic request routines - takes care of logging and error
detection as well */
-int send_request(connection_t *cl, const char *format, ...)
+int send_request(connection_t *c, const char *format, ...)
{
va_list args;
char buffer[MAXBUFSIZE];
if(len < 0 || len > MAXBUFSIZE-1)
{
- syslog(LOG_ERR, _("Output buffer overflow while sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Output buffer overflow while sending %s to %s (%s)"), request_name[request], c->name, c->hostname);
return -1;
}
if(debug_lvl >= DEBUG_PROTOCOL)
{
if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request], cl->name, cl->hostname, buffer);
+ syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request], c->name, c->hostname, buffer);
else
- syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
+ syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], c->name, c->hostname);
}
buffer[len++] = '\n';
cp
- return send_meta(cl, buffer, len);
+ return send_meta(c, buffer, len);
}
-int receive_request(connection_t *cl)
+int receive_request(connection_t *c)
{
int request;
cp
- if(sscanf(cl->buffer, "%d", &request) == 1)
+ if(sscanf(c->buffer, "%d", &request) == 1)
{
if((request < 0) || (request >= LAST) || (request_handlers[request] == NULL))
{
if(debug_lvl >= DEBUG_META)
syslog(LOG_DEBUG, _("Unknown request from %s (%s): %s"),
- cl->name, cl->hostname, cl->buffer);
+ c->name, c->hostname, c->buffer);
else
syslog(LOG_ERR, _("Unknown request from %s (%s)"),
- cl->name, cl->hostname);
+ c->name, c->hostname);
return -1;
}
{
if(debug_lvl >= DEBUG_META)
syslog(LOG_DEBUG, _("Got %s from %s (%s): %s"),
- request_name[request], cl->name, cl->hostname, cl->buffer);
+ request_name[request], c->name, c->hostname, c->buffer);
else
syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
- request_name[request], cl->name, cl->hostname);
+ request_name[request], c->name, c->hostname);
}
}
- if((cl->allow_request != ALL) && (cl->allow_request != request))
+ if((c->allow_request != ALL) && (c->allow_request != request))
{
- syslog(LOG_ERR, _("Unauthorized request from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Unauthorized request from %s (%s)"), c->name, c->hostname);
return -1;
}
- if(request_handlers[request](cl))
+ if(request_handlers[request](c))
/* Something went wrong. Probably scriptkiddies. Terminate. */
{
syslog(LOG_ERR, _("Error while processing %s from %s (%s)"),
- request_name[request], cl->name, cl->hostname);
+ request_name[request], c->name, c->hostname);
return -1;
}
}
else
{
syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
- cl->name, cl->hostname);
+ c->name, c->hostname);
return -1;
}
cp
/* The authentication protocol is described in detail in doc/SECURITY2,
the rest will be described in doc/PROTOCOL. */
-int send_id(connection_t *cl)
+int send_id(connection_t *c)
{
cp
- return send_request(cl, "%d %s %d %lx %hd", ID, myself->name, myself->protocol_version, myself->options, myself->port);
+ return send_request(c, "%d %s %d", ID, myself->connection->name, myself->connection->protocol_version);
}
-int id_h(connection_t *cl)
+int id_h(connection_t *c)
{
- connection_t *old;
- unsigned short int port;
char name[MAX_STRING_SIZE];
- avl_node_t *node;
+int bla;
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING" %d %lx %hd", name, &cl->protocol_version, &cl->options, &port) != 4)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" %d", name, &c->protocol_version) != 2)
{
- syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ID", c->name, c->hostname);
return -1;
}
- /* Check if version matches */
-
- if(cl->protocol_version != myself->protocol_version)
- {
- syslog(LOG_ERR, _("Peer %s (%s) uses incompatible version %d"),
- cl->name, cl->hostname, cl->protocol_version);
- return -1;
- }
-
/* Check if identity is a valid name */
if(check_id(name))
{
- syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ID", c->name, c->hostname, "invalid name");
return -1;
}
+
+ /* If we set c->name in advance, make sure we are connected to the right host */
- /* Copy string to cl */
-
- if(cl->name)
- free(cl->name);
-
- cl->name = xstrdup(name);
+ if(c->name)
+ {
+ if(strcmp(c->name, name))
+ {
+ syslog(LOG_ERR, _("Peer %s is %s instead of %s"), c->hostname, name, c->name);
+ return -1;
+ }
+ }
+ else
+ c->name = xstrdup(name);
- /* Load information about peer */
+ /* Check if version matches */
- if(read_host_config(cl))
+ if(c->protocol_version != myself->connection->protocol_version)
{
- syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
+ syslog(LOG_ERR, _("Peer %s (%s) uses incompatible version %d"),
+ c->name, c->hostname, c->protocol_version);
return -1;
}
+
+ if(bypass_security)
+ {
+ if(!c->config_tree)
+ init_configuration(&c->config_tree);
+ c->allow_request = ACK;
+ return send_ack(c);
+ }
- /* First check if the host we connected to is already in our
- connection list. If so, we are probably making a loop, which
- is not desirable.
- */
-
- if(cl->status.outgoing)
+ if(!c->config_tree)
{
- if((old = lookup_id(cl->name)))
+ init_configuration(&c->config_tree);
+
+ if((bla = read_connection_config(c)))
{
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"), cl->name, cl->hostname);
- cl->status.outgoing = 0;
- old->status.outgoing = 1;
- terminate_connection(cl);
- return 0;
+ syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), c->hostname, c->name);
+ return -1;
}
}
-
- /* Now we can add the name to the id tree */
-
- id_add(cl);
-
- /* And uhr... cl->port just changed so we have to unlink it from the connection tree and re-insert... */
-
- node = avl_unlink(connection_tree, cl);
- cl->port = port;
- avl_insert_node(connection_tree, node);
- /* Read in the public key, so that we can send a metakey */
-
- if(read_rsa_public_key(cl))
- return -1;
+ if(read_rsa_public_key(c))
+ {
+ return -1;
+ }
- cl->allow_request = METAKEY;
+ c->allow_request = METAKEY;
cp
- return send_metakey(cl);
+ return send_metakey(c);
}
-int ack_h(connection_t *cl)
+int send_metakey(connection_t *c)
{
- config_t const *cfg;
- connection_t *old, *p;
- subnet_t *subnet;
- avl_node_t *node, *node2;
+ char *buffer;
+ int len, x;
cp
- /* Okay, before we active the connection, we check if there is another entry
- in the connection list with the same name. If so, it presumably is an
- old connection that has timed out but we don't know it yet.
- */
+ len = RSA_size(c->rsa_key);
+
+ /* Allocate buffers for the meta key */
- while((old = lookup_id(cl->name)))
+ buffer = xmalloc(len*2+1);
+
+ if(!c->outkey)
+ c->outkey = xmalloc(len);
+
+ if(!c->outctx)
+ c->outctx = xmalloc(sizeof(*c->outctx));
+cp
+ /* Copy random data to the buffer */
+
+ RAND_bytes(c->outkey, len);
+
+ /* The message we send must be smaller than the modulus of the RSA key.
+ By definition, for a key of k bits, the following formula holds:
+
+ 2^(k-1) <= modulus < 2^(k)
+
+ Where ^ means "to the power of", not "xor".
+ This means that to be sure, we must choose our message < 2^(k-1).
+ This can be done by setting the most significant bit to zero.
+ */
+
+ c->outkey[0] &= 0x7F;
+
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
{
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
- cl->name, old->hostname, cl->hostname);
+ bin2hex(c->outkey, buffer, len);
+ buffer[len*2] = '\0';
+ syslog(LOG_DEBUG, _("Generated random meta key (unencrypted): %s"), buffer);
+ }
- terminate_connection(old);
+ /* Encrypt the random data
+
+ We do not use one of the PKCS padding schemes here.
+ 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
+ /* Convert the encrypted random data to a hexadecimal formatted string */
- /* Activate this connection */
+ bin2hex(buffer, buffer, len);
+ buffer[len*2] = '\0';
- cl->allow_request = ALL;
- cl->status.active = 1;
- cl->nexthop = cl;
- cl->cipher_pkttype = EVP_bf_cbc();
- cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
+ /* Send the meta key */
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname);
+ x = send_request(c, "%d %s", METAKEY, buffer);
+ free(buffer);
+ /* Further outgoing requests are encrypted with the key we just generated */
+
+ EVP_EncryptInit(c->outctx, EVP_bf_cfb(),
+ c->outkey + len - EVP_bf_cfb()->key_len,
+ c->outkey + len - EVP_bf_cfb()->key_len - EVP_bf_cfb()->iv_len);
+
+ c->status.encryptout = 1;
cp
- /* Check some options */
-
- if((cfg = get_config_val(cl->config, config_indirectdata)))
+ return x;
+}
+
+int metakey_h(connection_t *c)
+{
+ char buffer[MAX_STRING_SIZE];
+ int len;
+cp
+ if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1)
{
- if(cfg->data.val == stupid_true)
- cl->options |= OPTION_INDIRECT;
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name, c->hostname);
+ return -1;
}
- if((cfg = get_config_val(cl->config, config_tcponly)))
+ len = RSA_size(myself->connection->rsa_key);
+
+ /* Check if the length of the meta key is all right */
+
+ if(strlen(buffer) != len*2)
{
- if(cfg->data.val == stupid_true)
- cl->options |= OPTION_TCPONLY;
+ syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong keylength");
+ return -1;
}
- /* Send him our subnets */
+ /* Allocate buffers for the meta key */
+
+ if(!c->inkey)
+ c->inkey = xmalloc(len);
+
+ if(!c->inctx)
+ c->inctx = xmalloc(sizeof(*c->inctx));
+
+ /* Convert the challenge from hexadecimal back to binary */
+
+ hex2bin(buffer,buffer,len);
+
+ /* Decrypt the meta key */
- for(node = myself->subnet_tree->head; node; node = node->next)
+ if(RSA_private_decrypt(len, buffer, c->inkey, myself->connection->rsa_key, RSA_NO_PADDING) != len) /* See challenge() */
{
- subnet = (subnet_t *)node->data;
- send_add_subnet(cl, subnet);
+ syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), c->name, c->hostname);
+ return -1;
}
- /* And send him all the hosts and their subnets we know... */
-
- for(node = connection_tree->head; node; node = node->next)
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
{
- p = (connection_t *)node->data;
-
- if(p != cl && p->status.active)
- {
- /* Notify others of this connection */
-
- if(p->status.meta)
- send_add_host(p, cl);
+ bin2hex(c->inkey, buffer, len);
+ buffer[len*2] = '\0';
+ syslog(LOG_DEBUG, _("Received random meta key (unencrypted): %s"), buffer);
+ }
- /* Notify new connection of everything we know */
+ /* All incoming requests will now be encrypted. */
- send_add_host(cl, p);
+ 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);
+
+ c->status.decryptin = 1;
- for(node2 = p->subnet_tree->head; node2; node2 = node2->next)
- {
- subnet = (subnet_t *)node2->data;
- send_add_subnet(cl, subnet);
- }
- }
- }
+ c->allow_request = CHALLENGE;
cp
- return 0;
+ return send_challenge(c);
}
-int send_challenge(connection_t *cl)
+int send_challenge(connection_t *c)
{
char *buffer;
int len, x;
cp
/* CHECKME: what is most reasonable value for len? */
- len = RSA_size(cl->rsa_key);
+ len = RSA_size(c->rsa_key);
/* Allocate buffers for the challenge */
buffer = xmalloc(len*2+1);
- if(cl->hischallenge)
- free(cl->hischallenge);
+ if(c->hischallenge)
+ free(c->hischallenge);
- cl->hischallenge = xmalloc(len);
+ c->hischallenge = xmalloc(len);
cp
/* Copy random data to the buffer */
- RAND_bytes(cl->hischallenge, len);
+ RAND_bytes(c->hischallenge, len);
cp
/* Convert to hex */
- bin2hex(cl->hischallenge, buffer, len);
+ bin2hex(c->hischallenge, buffer, len);
buffer[len*2] = '\0';
cp
/* Send the challenge */
- x = send_request(cl, "%d %s", CHALLENGE, buffer);
+ x = send_request(c, "%d %s", CHALLENGE, buffer);
free(buffer);
cp
return x;
}
-int challenge_h(connection_t *cl)
+int challenge_h(connection_t *c)
{
char buffer[MAX_STRING_SIZE];
int len;
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING, buffer) != 1)
+ if(sscanf(c->buffer, "%*d "MAX_STRING, buffer) != 1)
{
- syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHALLENGE", c->name, c->hostname);
return -1;
}
- len = RSA_size(myself->rsa_key);
+ len = RSA_size(myself->connection->rsa_key);
/* Check if the length of the challenge is all right */
if(strlen(buffer) != len*2)
{
- syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, "wrong challenge length");
return -1;
}
/* Allocate buffers for the challenge */
- if(!cl->mychallenge)
- cl->mychallenge = xmalloc(len);
+ if(!c->mychallenge)
+ c->mychallenge = xmalloc(len);
/* Convert the challenge from hexadecimal back to binary */
- hex2bin(buffer,cl->mychallenge,len);
+ hex2bin(buffer,c->mychallenge,len);
- cl->allow_request = CHAL_REPLY;
+ c->allow_request = CHAL_REPLY;
/* Rest is done by send_chal_reply() */
cp
- return send_chal_reply(cl);
+ return send_chal_reply(c);
}
-int send_chal_reply(connection_t *cl)
+int send_chal_reply(connection_t *c)
{
char hash[SHA_DIGEST_LENGTH*2+1];
cp
- if(!cl->mychallenge)
- {
- syslog(LOG_ERR, _("Trying to send CHAL_REPLY to %s (%s) without a valid CHALLENGE"), cl->name, cl->hostname);
- return -1;
- }
-
/* Calculate the hash from the challenge we received */
- SHA1(cl->mychallenge, RSA_size(myself->rsa_key), hash);
+ SHA1(c->mychallenge, RSA_size(myself->connection->rsa_key), hash);
/* Convert the hash to a hexadecimal formatted string */
/* Send the reply */
cp
- return send_request(cl, "%d %s", CHAL_REPLY, hash);
+ return send_request(c, "%d %s", CHAL_REPLY, hash);
}
-int chal_reply_h(connection_t *cl)
+int chal_reply_h(connection_t *c)
{
char hishash[MAX_STRING_SIZE];
char myhash[SHA_DIGEST_LENGTH];
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING, hishash) != 1)
+ if(sscanf(c->buffer, "%*d "MAX_STRING, hishash) != 1)
{
- syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "CHAL_REPLY", c->name, c->hostname);
return -1;
}
if(strlen(hishash) != SHA_DIGEST_LENGTH*2)
{
- syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply length"));
return -1;
}
/* Calculate the hash from the challenge we sent */
- SHA1(cl->hischallenge, RSA_size(cl->rsa_key), myhash);
+ SHA1(c->hischallenge, RSA_size(c->rsa_key), myhash);
/* Verify the incoming hash with the calculated hash */
if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
{
- syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Possible intruder %s (%s): %s"), c->name, c->hostname, _("wrong challenge reply"));
if(debug_lvl >= DEBUG_SCARY_THINGS)
{
bin2hex(myhash, hishash, SHA_DIGEST_LENGTH);
}
/* Identity has now been positively verified.
- ack_h() handles the rest from now on.
+ Send an acknowledgement with the rest of the information needed.
*/
+
+ c->allow_request = ACK;
cp
- return ack_h(cl);
+ return send_ack(c);
}
-int send_metakey(connection_t *cl)
+int send_ack(connection_t *c)
{
- char *buffer;
- int len, x;
-cp
- len = RSA_size(cl->rsa_key);
+ /* ACK message contains rest of the information the other end needs
+ to create node_t and edge_t structures. */
- /* Allocate buffers for the meta key */
+ struct timeval now;
- buffer = xmalloc(len*2+1);
+ /* Estimate weight */
+
+ gettimeofday(&now, NULL);
+ c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
+cp
+ return send_request(c, "%d %hd %d", ACK, myself->port, c->estimated_weight);
+}
- if(!cl->cipher_outkey)
- cl->cipher_outkey = xmalloc(len);
-
- if(!cl->cipher_outctx)
- cl->cipher_outctx = xmalloc(sizeof(*cl->cipher_outctx));
+int ack_h(connection_t *c)
+{
+ port_t port;
+ int weight;
+ node_t *n;
+ subnet_t *s;
+ edge_t *e;
+ connection_t *other;
+ avl_node_t *node, *node2;
cp
- /* Copy random data to the buffer */
+ if(sscanf(c->buffer, "%*d %hd %d", &port, &weight) != 2)
+ {
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name, c->hostname);
+ return -1;
+ }
- RAND_bytes(cl->cipher_outkey, len);
+ /* Check if we already have a node_t for him */
- /* The message we send must be smaller than the modulus of the RSA key.
- By definition, for a key of k bits, the following formula holds:
-
- 2^(k-1) <= modulus < 2^(k)
-
- Where ^ means "to the power of", not "xor".
- This means that to be sure, we must choose our message < 2^(k-1).
- This can be done by setting the most significant bit to zero.
- */
-
- cl->cipher_outkey[0] &= 0x7F;
+ n = lookup_node(c->name);
- if(debug_lvl >= DEBUG_SCARY_THINGS)
+ if(!n)
{
- bin2hex(cl->cipher_outkey, buffer, len);
- buffer[len*2] = '\0';
- syslog(LOG_DEBUG, _("Generated random meta key (unencrypted): %s"), buffer);
- }
+ n = new_node();
+ n->name = xstrdup(c->name);
+ n->address = c->address;
+ n->hostname = xstrdup(c->hostname);
+ n->port = port;
- /* Encrypt the random data
+ /* FIXME: Also check if no other tinc daemon uses the same IP and port for UDP traffic */
+
+ node_add(n);
+ }
+ else
+ {
+ if(n->connection)
+ {
+ /* Oh dear, we already have a connection to this node. */
+ syslog(LOG_DEBUG, _("Established a second connection with %s (%s), closing old connection"), n->name, n->hostname);
+ terminate_connection(n->connection, 0);
+ }
+
+ /* FIXME: check if information in existing node matches that of the other end of this connection */
+ }
- We do not use one of the PKCS padding schemes here.
- This is allowed, because we encrypt a totally random string
- with a length equal to that of the modulus of the RSA key.
- */
+ n->connection = c;
+ c->node = n;
+
+ /* Check some options
- if(RSA_public_encrypt(len, cl->cipher_outkey, buffer, cl->rsa_key, RSA_NO_PADDING) != len)
+ if((cfg = get_config_val(c->config, config_indirectdata)))
{
- syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), cl->name, cl->hostname);
- free(buffer);
- return -1;
+ if(cfg->data.val == stupid_true)
+ c->options |= OPTION_INDIRECT;
}
-cp
- /* Convert the encrypted random data to a hexadecimal formatted string */
- bin2hex(buffer, buffer, len);
- buffer[len*2] = '\0';
+ if((cfg = get_config_val(c->config, config_tcponly)))
+ {
+ if(cfg->data.val == stupid_true)
+ c->options |= OPTION_TCPONLY;
+ }
- /* Send the meta key */
+ if((myself->options | c->options) & OPTION_INDIRECT)
+ c->via = myself;
+ else
+ c->via = c;
- x = send_request(cl, "%d %s", METAKEY, buffer);
- free(buffer);
+ */
- /* Further outgoing requests are encrypted with the key we just generated */
+ /* Create an edge_t for this connection */
- EVP_EncryptInit(cl->cipher_outctx, EVP_bf_cfb(),
- cl->cipher_outkey + len - EVP_bf_cfb()->key_len,
- cl->cipher_outkey + len - EVP_bf_cfb()->key_len - EVP_bf_cfb()->iv_len);
+ c->edge = new_edge();
+
+ c->edge->from = myself;
+ c->edge->to = n;
+ c->edge->weight = (weight + c->estimated_weight) / 2;
+ c->edge->connection = c;
- cl->status.encryptout = 1;
-cp
- return x;
-}
+ edge_add(c->edge);
-int metakey_h(connection_t *cl)
-{
- char buffer[MAX_STRING_SIZE];
- int len;
-cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING, buffer) != 1)
- {
- syslog(LOG_ERR, _("Got bad METAKEY from %s (%s)"), cl->name, cl->hostname);
- return -1;
- }
+ /* Activate this connection */
- len = RSA_size(myself->rsa_key);
+ c->allow_request = ALL;
+ c->status.active = 1;
+ c->node->cipher = EVP_bf_cbc();
+ c->node->keylength = c->node->cipher->key_len + c->node->cipher->iv_len;
- /* Check if the length of the meta key is all right */
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), c->name, c->hostname);
- if(strlen(buffer) != len*2)
+cp
+ /* Send him our subnets */
+
+ for(node = myself->subnet_tree->head; node; node = node->next)
{
- syslog(LOG_ERR, _("Intruder: wrong meta key length from %s (%s)"), cl->name, cl->hostname);
- return -1;
+ s = (subnet_t *)node->data;
+ send_add_subnet(c, s);
}
- /* Allocate buffers for the meta key */
+ /* And send him all known nodes and their subnets */
+
+ for(node = node_tree->head; node; node = node->next)
+ {
+ n = (node_t *)node->data;
- if(!cl->cipher_inkey)
- cl->cipher_inkey = xmalloc(len);
+ if(n == c->node || n == myself)
+ continue;
- if(!cl->cipher_inctx)
- cl->cipher_inctx = xmalloc(sizeof(*cl->cipher_inctx));
+ send_add_node(c, n);
- /* Convert the challenge from hexadecimal back to binary */
+ for(node2 = c->node->subnet_tree->head; node2; node2 = node2->next)
+ {
+ s = (subnet_t *)node2->data;
+ send_add_subnet(c, s);
+ }
+ }
- hex2bin(buffer,buffer,len);
+ /* Send all known edges */
- /* Decrypt the meta key */
-
- if(RSA_private_decrypt(len, buffer, cl->cipher_inkey, myself->rsa_key, RSA_NO_PADDING) != len) /* See challenge() */
+ for(node = edge_tree->head; node; node = node->next)
{
- syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), cl->name, cl->hostname);
- return -1;
+ e = (edge_t *)node->data;
+
+ if(e == c->edge)
+ continue;
+
+ send_add_edge(c, e);
}
- if(debug_lvl >= DEBUG_SCARY_THINGS)
+ /* Notify others of this connection */
+
+ for(node = connection_tree->head; node; node = node->next)
{
- bin2hex(cl->cipher_inkey, buffer, len);
- buffer[len*2] = '\0';
- syslog(LOG_DEBUG, _("Received random meta key (unencrypted): %s"), buffer);
- }
+ other = (connection_t *)node->data;
- /* All incoming requests will now be encrypted. */
+ if(other == c)
+ continue;
+
+ send_add_node(other, c->node);
+ send_add_edge(other, c->edge);
+ }
- EVP_DecryptInit(cl->cipher_inctx, EVP_bf_cfb(),
- cl->cipher_inkey + len - EVP_bf_cfb()->key_len,
- cl->cipher_inkey + len - EVP_bf_cfb()->key_len - EVP_bf_cfb()->iv_len);
+ /* Run MST and SSSP algorithms */
- cl->status.decryptin = 1;
-
- cl->allow_request = CHALLENGE;
+ mst_kruskal();
+ sssp_bfs(0);
cp
- return send_challenge(cl);
+ return 0;
}
+
+
/* Address and subnet information exchange */
-int send_add_subnet(connection_t *cl, subnet_t *subnet)
+int send_add_subnet(connection_t *c, subnet_t *subnet)
{
int x;
char *netstr;
- char *owner;
cp
- if((cl->options | myself->options | subnet->owner->options) & OPTION_INDIRECT)
- owner = myself->name;
- else
- owner = subnet->owner->name;
-
- x = send_request(cl, "%d %s %s", ADD_SUBNET,
- owner, netstr = net2str(subnet));
+ x = send_request(c, "%d %s %s", ADD_SUBNET,
+ subnet->owner->name, netstr = net2str(subnet));
free(netstr);
cp
return x;
}
-int add_subnet_h(connection_t *cl)
+int add_subnet_h(connection_t *c)
{
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
- connection_t *owner, *p;
- subnet_t *subnet;
+ node_t *owner;
+ connection_t *other;
+ subnet_t *s;
avl_node_t *node;
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
{
- syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name, c->hostname);
return -1;
}
if(check_id(name))
{
- syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid name"));
return -1;
}
/* Check if subnet string is valid */
- if(!(subnet = str2net(subnetstr)))
+ if(!(s = str2net(subnetstr)))
{
- syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid subnet string"));
return -1;
}
- /* Check if somebody tries to add a subnet of ourself */
-
- if(!strcmp(name, myself->name))
- {
- syslog(LOG_ERR, _("Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"),
- cl->name, cl->hostname);
- sighup = 1;
- return 0;
- }
-
/* Check if the owner of the new subnet is in the connection list */
- if(!(owner = lookup_id(name)))
+ if(!(owner = lookup_node(name)))
{
- syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
- name, cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got ADD_SUBNET from %s (%s) for %s which is not in our connection list"),
+ name, c->name, c->hostname);
return -1;
}
/* If everything is correct, add the subnet to the list of the owner */
- subnet_add(owner, subnet);
+ subnet_add(owner, s);
/* Tell the rest */
for(node = connection_tree->head; node; node = node->next)
{
- p = (connection_t *)node->data;
- if(p->status.meta && p->status.active && p!= cl)
- send_add_subnet(p, subnet);
+ other = (connection_t *)node->data;
+ if(other->status.active && other != c)
+ send_add_subnet(other, s);
}
cp
return 0;
}
-int send_del_subnet(connection_t *cl, subnet_t *subnet)
+int send_del_subnet(connection_t *c, subnet_t *s)
{
int x;
char *netstr;
- char *owner;
cp
- if(cl->options & OPTION_INDIRECT)
- owner = myself->name;
- else
- owner = subnet->owner->name;
-
- x = send_request(cl, "%d %s %s", DEL_SUBNET, owner, netstr = net2str(subnet));
+ x = send_request(c, "%d %s %s", DEL_SUBNET, s->owner->name, netstr = net2str(s));
free(netstr);
cp
return x;
}
-int del_subnet_h(connection_t *cl)
+int del_subnet_h(connection_t *c)
{
char subnetstr[MAX_STRING_SIZE];
char name[MAX_STRING_SIZE];
- connection_t *owner, *p;
- subnet_t *subnet;
+ node_t *owner;
+ connection_t *other;
+ subnet_t *s, *find;
avl_node_t *node;
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 3)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 3)
{
- syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name, c->hostname);
return -1;
}
if(check_id(name))
{
- syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid name"));
return -1;
}
/* Check if subnet string is valid */
- if(!(subnet = str2net(subnetstr)))
+ if(!(s = str2net(subnetstr)))
{
- syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string"));
return -1;
}
- free(subnetstr);
-
- /* Check if somebody tries to add a subnet of ourself */
-
- if(!strcmp(name, myself->name))
- {
- syslog(LOG_ERR, _("Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"),
- cl->name, cl->hostname);
- sighup = 1;
- return 0;
- }
-
/* Check if the owner of the new subnet is in the connection list */
- if(!(owner = lookup_id(name)))
+ if(!(owner = lookup_node(name)))
{
- syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
- name, cl->name, cl->hostname);
+ 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;
}
/* If everything is correct, delete the subnet from the list of the owner */
- subnet_del(subnet);
+ find = lookup_subnet(owner, s);
+
+ if(!find)
+ {
+ syslog(LOG_ERR, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
+ "DEL_SUBNET", c->name, c->hostname, name);
+ return -1;
+ }
+
+ subnet_del(owner, s);
/* Tell the rest */
for(node = connection_tree->head; node; node = node->next)
{
- p = (connection_t *)node->data;
- if(p->status.meta && p->status.active && p!= cl)
- send_del_subnet(p, subnet);
+ other = (connection_t *)node->data;
+ if(other->status.active && other != c)
+ send_del_subnet(other, s);
}
cp
return 0;
/* New and closed connections notification */
-int send_add_host(connection_t *cl, connection_t *other)
+int send_add_node(connection_t *c, node_t *n)
{
cp
- if(!((cl->options | myself->options | other->options) & OPTION_INDIRECT))
- return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
- other->name, other->address, other->port, other->options);
- else
- return 0;
+ return send_request(c, "%d %s %lx:%d", ADD_NODE,
+ n->name, n->address, n->port);
}
-int add_host_h(connection_t *cl)
+int add_node_h(connection_t *c)
{
- connection_t *old, *new, *p;
+ connection_t *other;
+ node_t *n;
char name[MAX_STRING_SIZE];
+ ipv4_t address;
+ port_t port;
avl_node_t *node;
cp
- new = new_connection();
-
- if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx", name, &new->address, &new->port, &new->options) != 4)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3)
{
- syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_NODE", c->name, c->hostname);
return -1;
}
if(check_id(name))
{
- syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
- free_connection(new);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_NODE", c->name, c->hostname, _("invalid name"));
return -1;
}
- /* Check if somebody tries to add ourself */
-
- if(!strcmp(name, myself->name))
+ /* Check if node already exists */
+
+ n = lookup_node(name);
+
+ if(n)
{
- syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname);
- sighup = 1;
- free_connection(new);
- return 0;
- }
-
- /* Fill in more of the new connection structure */
-
- new->hostname = hostlookup(htonl(new->address));
+ /* Check if it matches */
- /* Check if the new host already exists in the connnection list */
+ if(n->address != address || n->port != port)
+ syslog(LOG_DEBUG, _("Got %s from %s (%s) for %s which does not match existing entry"), "ADD_NODE", c->name, c->hostname, n->name);
- if((old = lookup_id(name)))
+ return 0;
+ }
+ else
{
- if((new->address == old->address) && (new->port == old->port))
- {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
- old->name, old->hostname, name, new->hostname);
- free_connection(new);
- return 0;
- }
- else
- {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Removing old entry for %s (%s) in favour of new connection"),
- old->name, old->hostname);
-
- terminate_connection(old);
- }
+ n = new_node();
+ n->name = xstrdup(name);
+ n->address = address;
+ n->port = port;
+ node_add(n);
}
- /* Hook it up into the connection */
-
- new->name = xstrdup(name);
- connection_add(new);
- id_add(new);
-
- /* Tell the rest about the new host */
+ /* Tell the rest about the new node */
for(node = connection_tree->head; node; node = node->next)
{
- p = (connection_t *)node->data;
- if(p->status.meta && p->status.active && p!=cl)
- send_add_host(p, new);
+ other = (connection_t *)node->data;
+ if(other->status.active && other !=c)
+ send_add_node(other, n);
}
- /* Fill in rest of connection structure */
-
- new->nexthop = cl;
- new->status.active = 1;
- new->cipher_pkttype = EVP_bf_cbc();
- new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
cp
return 0;
}
-int send_del_host(connection_t *cl, connection_t *other)
+int send_del_node(connection_t *c, node_t *n)
{
cp
- if(!((cl->options | myself->options) & OPTION_INDIRECT))
- return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
- other->name, other->address, other->port, other->options);
- else
- return 0;
+ return send_request(c, "%d %s %lx:%d", DEL_NODE,
+ n->name, n->address, n->port);
}
-int del_host_h(connection_t *cl)
+int del_node_h(connection_t *c)
{
+ node_t *n;
char name[MAX_STRING_SIZE];
ipv4_t address;
port_t port;
- long int options;
- connection_t *old, *p;
+ connection_t *other;
avl_node_t *node;
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx", name, &address, &port, &options) != 4)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" %lx:%hd", name, &address, &port) != 3)
{
- syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
- cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_NODE",
+ c->name, c->hostname);
return -1;
}
if(check_id(name))
{
- syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_NODE", c->name, c->hostname, _("invalid name"));
return -1;
}
if(!strcmp(name, myself->name))
{
- syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
- cl->name, cl->hostname);
- sighup = 1;
+ syslog(LOG_ERR, _("Got %s from %s (%s) for ourself!"), "DEL_NODE",
+ c->name, c->hostname);
+ return -1;
+ }
+
+ /* Check if the deleted host exists */
+
+ n = lookup_node(name);
+
+ if(!n)
+ {
+ syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which does not exist"), "DEL_NODE", c->name, c->hostname, n->name);
return 0;
}
+
+ /* Check if the rest matches */
+
+ if(address != n->address || port != n->port)
+ {
+ syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which does not match existing entry"), "DEL_NODE", c->name, c->hostname, n->name);
+ }
+
+ /* Tell the rest about the deleted node */
+
+ for(node = connection_tree->head; node; node = node->next)
+ {
+ other = (connection_t *)node->data;
+ if(other->status.active && other != c)
+ send_del_node(other, n);
+ }
+
+ /* Delete the node */
+
+ node_del(n);
+
+ mst_kruskal();
+ sssp_bfs(0);
+cp
+ return 0;
+}
+
+/* Edges */
+
+int send_add_edge(connection_t *c, edge_t *e)
+{
+cp
+ return send_request(c, "%d %s %s %lx %d", ADD_NODE,
+ e->from->name, e->to->name, e->options, e->weight);
+}
+
+int add_edge_h(connection_t *c)
+{
+ connection_t *other;
+ edge_t *e;
+ node_t *from, *to;
+ char from_name[MAX_STRING_SIZE];
+ char to_name[MAX_STRING_SIZE];
+ long int options;
+ int weight;
+ avl_node_t *node;
+cp
+ if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %lx %d", from_name, to_name, &options, &weight) != 4)
+ {
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, c->hostname);
+ return -1;
+ }
- /* Check if the new host already exists in the connnection list */
+ /* Check if names are valid */
- if(!(old = lookup_id(name)))
+ if(check_id(from_name))
{
- syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for %s which is not in our connection list"),
- name, cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
return -1;
}
+
+ if(check_id(to_name))
+ {
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
+ return -1;
+ }
+
+ /* Lookup nodes */
+
+ from = lookup_node(from_name);
- /* Check if the rest matches */
+ if(!from)
+ {
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("unknown node"));
+ return -1;
+ }
+
+ to = lookup_node(to_name);
- if(address!=old->address || port!=old->port || options!=old->options || cl!=old->nexthop)
+ if(!to)
{
- syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("unknown node"));
+ return -1;
+ }
+
+ /* Check if edge already exists */
+
+ e = lookup_edge(from, to);
+
+ if(e)
+ {
+ if(e->weight != weight || e->options != options)
+ {
+ syslog(LOG_ERR, _("Got %s from %s (%s) which does not match existing entry"), "ADD_EDGE", c->name, c->hostname);
+ return -1;
+ }
+
return 0;
}
+ else
+ {
+ e = new_edge();
+ e->from = from;
+ e->to = to;
+ e->options = options;
+ e->weight = weight;
+ edge_add(e);
+ }
+
+ /* Tell the rest about the new edge */
+
+ for(node = connection_tree->head; node; node = node->next)
+ {
+ other = (connection_t *)node->data;
+ if(other->status.active && other != c)
+ send_add_edge(other, e);
+ }
+
+ /* Run MST before or after we tell the rest? */
+
+ mst_kruskal();
+ sssp_bfs(0);
+cp
+ return 0;
+}
+
+int send_del_edge(connection_t *c, edge_t *e)
+{
+cp
+ return send_request(c, "%d %s %s %lx %d", DEL_EDGE,
+ e->from->name, e->to->name, e->options, e->weight);
+}
+
+int del_edge_h(connection_t *c)
+{
+ edge_t *e;
+ char from_name[MAX_STRING_SIZE];
+ char to_name[MAX_STRING_SIZE];
+ node_t *from, *to;
+ long int options;
+ int weight;
+ connection_t *other;
+ avl_node_t *node;
+cp
+ if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %lx %d", from_name, to_name, &options, &weight) != 4)
+ {
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE",
+ c->name, c->hostname);
+ return -1;
+ }
+
+ /* Check if names are valid */
+
+ if(check_id(from_name))
+ {
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("invalid name"));
+ return -1;
+ }
+
+ if(check_id(to_name))
+ {
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("invalid name"));
+ return -1;
+ }
- /* Ok, since EVERYTHING seems to check out all right, delete it */
+ /* Lookup nodes */
- old->status.active = 0;
- terminate_connection(old);
+ from = lookup_node(from_name);
+
+ if(!from)
+ {
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown node"));
+ return -1;
+ }
- /* Tell the rest about the new host */
+ 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;
+ }
+
+ /* Check if edge exists */
+
+ e = lookup_edge(from, to);
+
+ if(e)
+ {
+ if(e->weight != weight || e->options != options)
+ {
+ syslog(LOG_ERR, _("Got %s from %s (%s) which does not match existing entry"), "ADD_EDGE", c->name, c->hostname);
+ return -1;
+ }
+ }
+ else
+ {
+ syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_EDGE", c->name, c->hostname, _("unknown edge"));
+ return -1;
+ }
+
+ /* Tell the rest about the deleted edge */
for(node = connection_tree->head; node; node = node->next)
{
- p = (connection_t *)node->data;
- if(p->status.meta && p->status.active && p!=cl)
- send_del_host(p, old);
+ other = (connection_t *)node->data;
+ if(other->status.active && other != c)
+ send_del_edge(other, e);
}
+
+ /* Delete the edge */
+
+ edge_del(e);
+
+ /* Run MST before or after we tell the rest? */
+
+ mst_kruskal();
+ sssp_bfs(1);
cp
return 0;
}
+
/* Status and error notification routines */
-int send_status(connection_t *cl, int statusno, char *statusstring)
+int send_status(connection_t *c, int statusno, char *statusstring)
{
cp
if(!statusstring)
statusstring = status_text[statusno];
cp
- return send_request(cl, "%d %d %s", STATUS, statusno, statusstring);
+ return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
}
-int status_h(connection_t *cl)
+int status_h(connection_t *c)
{
int statusno;
char statusstring[MAX_STRING_SIZE];
cp
- if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
+ if(sscanf(c->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
{
- syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"),
- cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
+ c->name, c->hostname);
return -1;
}
if(debug_lvl >= DEBUG_STATUS)
{
syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
- cl->name, cl->hostname, status_text[statusno], statusstring);
+ c->name, c->hostname, status_text[statusno], statusstring);
}
cp
return 0;
}
-int send_error(connection_t *cl, int err, char *errstring)
+int send_error(connection_t *c, int err, char *errstring)
{
cp
if(!errstring)
errstring = strerror(err);
- return send_request(cl, "%d %d %s", ERROR, err, errstring);
+ return send_request(c, "%d %d %s", ERROR, err, errstring);
}
-int error_h(connection_t *cl)
+int error_h(connection_t *c)
{
int err;
char errorstring[MAX_STRING_SIZE];
cp
- if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
+ if(sscanf(c->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
{
- syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
- cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
+ c->name, c->hostname);
return -1;
}
if(debug_lvl >= DEBUG_ERROR)
{
syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
- cl->name, cl->hostname, strerror(err), errorstring);
+ c->name, c->hostname, strerror(err), errorstring);
}
- terminate_connection(cl);
+ terminate_connection(c, c->status.active);
cp
return 0;
}
-int send_termreq(connection_t *cl)
+int send_termreq(connection_t *c)
{
cp
- return send_request(cl, "%d", TERMREQ);
+ return send_request(c, "%d", TERMREQ);
}
-int termreq_h(connection_t *cl)
+int termreq_h(connection_t *c)
{
cp
- terminate_connection(cl);
+ terminate_connection(c, c->status.active);
cp
return 0;
}
-int send_ping(connection_t *cl)
+int send_ping(connection_t *c)
{
char salt[SALTLEN*2+1];
cp
- cl->status.pinged = 1;
- cl->last_ping_time = time(NULL);
- RAND_bytes(salt, SALTLEN);
+ c->status.pinged = 1;
+ c->last_ping_time = time(NULL);
+ RAND_pseudo_bytes(salt, SALTLEN);
bin2hex(salt, salt, SALTLEN);
salt[SALTLEN*2] = '\0';
cp
- return send_request(cl, "%d %s", PING, salt);
+ return send_request(c, "%d %s", PING, salt);
}
-int ping_h(connection_t *cl)
+int ping_h(connection_t *c)
{
cp
- return send_pong(cl);
+ return send_pong(c);
}
-int send_pong(connection_t *cl)
+int send_pong(connection_t *c)
{
char salt[SALTLEN*2+1];
cp
- RAND_bytes(salt, SALTLEN);
+ RAND_pseudo_bytes(salt, SALTLEN);
bin2hex(salt, salt, SALTLEN);
salt[SALTLEN*2] = '\0';
cp
- return send_request(cl, "%d %s", PONG, salt);
+ return send_request(c, "%d %s", PONG, salt);
}
-int pong_h(connection_t *cl)
+int pong_h(connection_t *c)
{
cp
- cl->status.pinged = 0;
+ c->status.pinged = 0;
cp
return 0;
}
/* Key exchange */
-int send_key_changed(connection_t *from, connection_t *cl)
+int send_key_changed(connection_t *c, node_t *n)
{
- connection_t *p;
+ 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.
*/
- if(mykeyused)
+ if(n == myself && !mykeyused)
+ return 0;
+
+ for(node = connection_tree->head; node; node = node->next)
{
- for(node = connection_tree->head; node; node = node->next)
- {
- p = (connection_t *)node->data;
- 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;
- }
+ other = (connection_t *)node->data;
+ if(other != c && other->status.active)
+ send_request(other, "%d %s", KEY_CHANGED, n->name);
+ }
cp
return 0;
}
-int key_changed_h(connection_t *cl)
+int key_changed_h(connection_t *c)
{
- char from_id[MAX_STRING_SIZE];
- connection_t *from;
+ char name[MAX_STRING_SIZE];
+ node_t *n;
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING, from_id) != 1)
+ if(sscanf(c->buffer, "%*d "MAX_STRING, name) != 1)
{
- syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
- cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
+ c->name, c->hostname);
return -1;
}
- if(!(from = lookup_id(from_id)))
+ n = lookup_node(name);
+
+ if(!n)
{
- syslog(LOG_ERR, _("Got KEY_CHANGED from %s (%s) origin %s which does not exist in our connection list"),
- cl->name, cl->hostname, from_id);
+ syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist"), "KEY_CHANGED",
+ c->name, c->hostname, name);
return -1;
}
- from->status.validkey = 0;
- from->status.waitingforkey = 0;
+ n->status.validkey = 0;
+ n->status.waitingforkey = 0;
- if(!(from->options | cl->options | myself->options) & OPTION_INDIRECT)
- send_key_changed(from, cl);
+ send_key_changed(c, n);
cp
return 0;
}
-int send_req_key(connection_t *from, connection_t *to)
+int send_req_key(connection_t *c, node_t *from, node_t *to)
{
cp
- return send_request(to->nexthop, "%d %s %s", REQ_KEY,
+ return send_request(c, "%d %s %s", REQ_KEY,
from->name, to->name);
}
-int req_key_h(connection_t *cl)
+int req_key_h(connection_t *c)
{
- char from_id[MAX_STRING_SIZE];
- char to_id[MAX_STRING_SIZE];
- connection_t *from, *to;
- char pktkey[129];
+ char from_name[MAX_STRING_SIZE];
+ char to_name[MAX_STRING_SIZE];
+ node_t *from, *to;
+ char key[MAX_STRING_SIZE];
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, from_id, to_id) != 2)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, from_name, to_name) != 2)
{
- syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
- cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "REQ_KEY",
+ c->name, c->hostname);
return -1;
}
- if(!(from = lookup_id(from_id)))
+ from = lookup_node(from_name);
+
+ if(!from)
{
- syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) origin %s which does not exist in our connection list"),
- cl->name, cl->hostname, from_id);
+ syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"), "REQ_KEY",
+ c->name, c->hostname, from_name);
+ return -1;
+ }
+
+ to = lookup_node(to_name);
+
+ if(!to)
+ {
+ syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"), "REQ_KEY",
+ c->name, c->hostname, to_name);
return -1;
}
/* Check if this key request is for us */
- if(!strcmp(to_id, myself->name)) /* Yes, send our own key back */
+ if(to == myself) /* Yes, send our own key back */
{
- bin2hex(myself->cipher_pktkey, pktkey, myself->cipher_pktkeylength);
- pktkey[myself->cipher_pktkeylength*2] = '\0';
- send_ans_key(myself, from, pktkey);
+ bin2hex(myself->key, key, myself->keylength);
+ key[myself->keylength * 2] = '\0';
+ send_ans_key(c, myself, from, key);
mykeyused = 1;
}
else
{
- if(!(to = lookup_id(to_id)))
- {
- syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) destination %s which does not exist in our connection list"),
- cl->name, cl->hostname, to_id);
- return -1;
- }
-
if(to->status.validkey) /* Proxy keys */
{
- bin2hex(to->cipher_pktkey, pktkey, to->cipher_pktkeylength);
- pktkey[to->cipher_pktkeylength*2] = '\0';
- send_ans_key(to, from, pktkey);
+ bin2hex(to->key, key, to->keylength);
+ key[to->keylength * 2] = '\0';
+ send_ans_key(c, to, from, key);
}
else
- send_req_key(from, to);
+ send_req_key(to->nexthop->connection, from, to);
}
cp
return 0;
}
-int send_ans_key(connection_t *from, connection_t *to, char *pktkey)
+int send_ans_key(connection_t *c, node_t *from, node_t *to, char *key)
{
cp
- return send_request(to->nexthop, "%d %s %s %s", ANS_KEY,
- from->name, to->name, pktkey);
+ return send_request(c, "%d %s %s %s", ANS_KEY,
+ from->name, to->name, key);
}
-int ans_key_h(connection_t *cl)
+int ans_key_h(connection_t *c)
{
- char from_id[MAX_STRING_SIZE];
- char to_id[MAX_STRING_SIZE];
- char pktkey[MAX_STRING_SIZE];
+ char from_name[MAX_STRING_SIZE];
+ char to_name[MAX_STRING_SIZE];
+ char key[MAX_STRING_SIZE];
int keylength;
- connection_t *from, *to;
+ node_t *from, *to;
cp
- if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING, from_id, to_id, pktkey) != 3)
+ if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING, from_name, to_name, key) != 3)
{
- syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
- cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY",
+ c->name, c->hostname);
return -1;
}
- if(!(from = lookup_id(from_id)))
+ from = lookup_node(from_name);
+
+ if(!from)
{
- syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) origin %s which does not exist in our connection list"),
- cl->name, cl->hostname, from_id);
+ syslog(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"), "ANS_KEY",
+ c->name, c->hostname, from_name);
+ return -1;
+ }
+
+ to = lookup_node(to_name);
+
+ if(!to)
+ {
+ syslog(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"), "ANS_KEY",
+ c->name, c->hostname, to_name);
return -1;
}
/* Check correctness of packet key */
- keylength = strlen(pktkey);
+ keylength = strlen(key);
- if(keylength != from->cipher_pktkeylength*2)
+ if(keylength != from->keylength * 2)
{
- syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key length"),
- cl->name, cl->hostname, from->name);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s) origin %s: %s"), "ANS_KEY",
+ c->name, c->hostname, from->name, _("invalid key length"));
return -1;
}
/* Forward it if necessary */
- if(strcmp(to_id, myself->name))
+ if(to != myself)
{
- if(!(to = lookup_id(to_id)))
- {
- syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) destination %s which does not exist in our connection list"),
- cl->name, cl->hostname, to_id);
- return -1;
- }
- send_ans_key(from, to, pktkey);
+ send_ans_key(to->nexthop->connection, from, to, key);
}
/* Update our copy of the origin's packet key */
- if(from->cipher_pktkey)
- free(from->cipher_pktkey);
+ if(from->key)
+ free(from->key);
- from->cipher_pktkey = xstrdup(pktkey);
+ from->key = xstrdup(key);
keylength /= 2;
- hex2bin(from->cipher_pktkey, from->cipher_pktkey, keylength);
- from->cipher_pktkey[keylength] = '\0';
+ hex2bin(from->key, from->key, keylength);
+ from->key[keylength] = '\0';
from->status.validkey = 1;
from->status.waitingforkey = 0;
return 0;
}
-int send_tcppacket(connection_t *cl, vpn_packet_t *packet)
+int send_tcppacket(connection_t *c, vpn_packet_t *packet)
{
int x;
cp
/* Evil hack. */
- x = send_request(cl->nexthop, "%d %hd", PACKET, packet->len);
+ x = send_request(c, "%d %hd", PACKET, packet->len);
if(x)
return x;
cp
- return send_meta(cl, packet->data, packet->len);
+ return send_meta(c, packet->data, packet->len);
}
-int tcppacket_h(connection_t *cl)
+int tcppacket_h(connection_t *c)
{
short int len;
cp
- if(sscanf(cl->buffer, "%*d %hd", &len) != 1)
+ if(sscanf(c->buffer, "%*d %hd", &len) != 1)
{
- syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name, c->hostname);
return -1;
}
/* Set reqlen to len, this will tell receive_meta() that a tcppacket is coming. */
- cl->tcplen = len;
+ c->tcplen = len;
cp
return 0;
}
/* Jumptable for the request handlers */
int (*request_handlers[])(connection_t*) = {
- id_h, metakey_h, challenge_h, chal_reply_h,
+ id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
status_h, error_h, termreq_h,
ping_h, pong_h,
- add_host_h, del_host_h,
+ add_node_h, del_node_h,
add_subnet_h, del_subnet_h,
+ add_edge_h, del_edge_h,
key_changed_h, req_key_h, ans_key_h,
tcppacket_h,
};
/* Request names */
char (*request_name[]) = {
- "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY",
+ "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
"STATUS", "ERROR", "TERMREQ",
"PING", "PONG",
- "ADD_HOST", "DEL_HOST",
+ "ADD_NODE", "DEL_NODE",
"ADD_SUBNET", "DEL_SUBNET",
+ "ADD_EDGE", "DEL_EDGE",
"KEY_CHANGED", "REQ_KEY", "ANS_KEY",
"PACKET",
};
projects / tinc / blobdiff