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.25 2000/09/10 15:18:03 guus Exp $
+ $Id: protocol.c,v 1.28.4.55 2000/11/04 16:39:19 guus Exp $
*/
#include "config.h"
#include <netinet/in.h>
+#include <openssl/sha.h>
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+
#include "conf.h"
-#include "encr.h"
#include "net.h"
#include "netutl.h"
#include "protocol.h"
+#include "meta.h"
+#include "connlist.h"
#include "system.h"
-/* Generic outgoing request routine - takes care of logging and error detection as well */
+int check_id(char *id)
+{
+ int i;
+
+ for (i = 0; i < strlen(id); i++)
+ if(!isalnum(id[i]) && id[i] != '_')
+ return -1;
+
+ return 0;
+}
+
+/* Generic request routines - takes care of logging and error detection as well */
-int send_request(conn_list_t *cl, const char *format, int request, /*args*/ ...)
+int send_request(conn_list_t *cl, const char *format, ...)
{
va_list args;
- char *buffer = NULL;
+ char buffer[MAXBUFSIZE];
+ int len, request;
+
cp
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), requestname[request], cl->id, cl->hostname);
+ /* Use vsnprintf instead of vasprintf: faster, no memory fragmentation, cleanup is automatic,
+ and there is a limit on the input buffer anyway */
va_start(args, format);
- len = vasprintf(&buffer, format, args);
+ len = vsnprintf(buffer, MAXBUFSIZE, format, args);
+ request = va_arg(args, int);
va_end(args);
- if(len < 0 || !buffer)
+ if(len < 0 || len > MAXBUFSIZE-1)
{
- syslog(LOG_ERR, _("Error during vasprintf(): %m"));
+ syslog(LOG_ERR, _("Output buffer overflow while sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
return -1;
}
- if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Sending meta data to %s (%s): %s"), cl->id, cl->hostname, buffer);
+ len++;
+
+ if(debug_lvl >= DEBUG_PROTOCOL)
+ syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
+
+cp
+ return send_meta(cl, buffer, len);
+}
- if(cl->status.encryptout)
+int receive_request(conn_list_t *cl)
+{
+ int request;
+cp
+ if(sscanf(cl->buffer, "%d", &request) == 1)
{
- /* FIXME: Do encryption */
- }
+ if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
+ {
+ syslog(LOG_ERR, _("Unknown request from %s (%s)"),
+ cl->name, cl->hostname);
+ return -1;
+ }
+ else
+ {
+ if(debug_lvl >= DEBUG_PROTOCOL)
+ syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
+ request_name[request], cl->name, cl->hostname);
+ }
+
+ if((cl->allow_request != ALL) && (cl->allow_request != request))
+ {
+ syslog(LOG_ERR, _("Unauthorized request from %s (%s)"), cl->name, cl->hostname);
+ return -1;
+ }
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ if(request_handlers[request](cl))
+ /* Something went wrong. Probably scriptkiddies. Terminate. */
+ {
+ syslog(LOG_ERR, _("Error while processing %s from %s (%s)"),
+ request_name[request], cl->name, cl->hostname);
+ return -1;
+ }
+ }
+ else
{
- syslog(LOG_ERR, _("Sending meta data failed: %m"));
+ syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+ cl->name, cl->hostname);
return -1;
}
-cp
+cp
+ return 0;
}
/* Connection protocol:
Client Server
- send_id(*)
- send_challenge
- send_chal_reply(*)
- send_id
- send_challenge
- send_chal_reply
- send_ack
- send_ack
-
- (*) Unencrypted.
-*/
+ send_id(u)
+ send_challenge(R)
+ send_chal_reply(H)
+ send_id(u)
+ send_challenge(R)
+ send_chal_reply(H)
+ ---------------------------------------
+ send_metakey(R)
+ send_metakey(R)
+ ---------------------------------------
+ send_ack(u)
+ send_ack(u)
+ ---------------------------------------
+ Other requests(E)...
+
+ (u) Unencrypted,
+ (R) RSA,
+ (H) SHA1,
+ (E) Encrypted with symmetric cipher.
+
+ Part of the challenge is directly used to set the symmetric cipher key and the initial vector.
+ Since a man-in-the-middle cannot decrypt the RSA challenges, this means that he cannot get or
+ forge the key for the symmetric cipher.
+*/
int send_id(conn_list_t *cl)
{
cp
- return send_request(cl, "%d %s %d-%d %s", ID, myself->id, myself->min_version, myself->max_version, opt2str(myself->options));
+ cl->allow_request = CHALLENGE;
+cp
+ return send_request(cl, "%d %s %d %lx %hd", ID, myself->name, myself->protocol_version, myself->options, myself->port);
}
int id_h(conn_list_t *cl)
{
conn_list_t *old;
- char *options;
+ config_t const *cfg;
cp
- if(sscanf(cl->buffer, "%*d %as %d-%d %as", &cl->id, &cl->min_version, &cl->max_version, &options) != 4)
+ if(sscanf(cl->buffer, "%*d %as %d %lx %hd", &cl->name, &cl->protocol_version, &cl->options, &cl->port) != 4)
{
syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
return -1;
}
-
- /* Check if version ranges overlap */
-
- if((cl->min_version > myself->max_version) || (cl->max_version < myself_min_version) || (cl->min_version > cl->max_version))
- {
- syslog(LOG_ERR, _("Peer %s uses incompatible version (%d-%d)"), cl->hostname, cl->min_version, cl->max_version);
- return -1;
- }
- /* Check if option string is valid */
-
- if(str2opt(options) == -1)
+ /* Check if version matches */
+
+ if(cl->protocol_version != myself->protocol_version)
{
- syslog(LOG_ERR, _("Peer %s uses invalid option string"), cl->hostname);
+ 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(cl->id))
+
+ if(check_id(cl->name))
{
syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
return -1;
}
-
+
/* Load information about peer */
-
- if(!read_id(cl))
+cp
+ if(read_host_config(cl))
{
- syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->id);
+ syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
return -1;
}
-
/* 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.
*/
-
+cp
if(cl->status.outgoing)
{
- if((old=lookup_id(cl->id)))
+ if((old = lookup_id(cl->name)))
{
- if(debug_lvl > DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"), cl->id, cl->hostname);
+ 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;
}
}
-
- /* Since we know the identity now, we can encrypt the meta channel */
-
- cl->status.encryptout = 1;
-
- /* Send a challenge to verify the identity */
-
- cl->allow_request = CHAL_REPLY;
+cp
+ if((cfg = get_config_val(cl->config, publickey)))
+ {
+ cl->rsa_key = RSA_new();
+ BN_hex2bn(&cl->rsa_key->n, cfg->data.ptr);
+ BN_hex2bn(&cl->rsa_key->e, "FFFF");
+ }
+ else
+ {
+ syslog(LOG_ERR, _("No public key known for %s (%s)"), cl->name, cl->hostname);
+ return -1;
+ }
cp
return send_challenge(cl);
}
int send_challenge(conn_list_t *cl)
{
char *buffer;
- int keylength;
- int x;
+ int len, x;
cp
- if(cl->chal_hash)
- free(cl->chal_hash);
-
- /* Allocate buffers for the challenge and the hash */
-
- cl->chal_hash = xmalloc(SHA_DIGEST_LEN);
- keylength = BN_num_bytes(cl->metakey.n);
- buffer = xmalloc(keylength*2);
+ len = RSA_size(cl->rsa_key);
- /* Copy random data and the public key to the buffer */
-
- RAND_bytes(buffer, keylength);
- BN_bn2bin(cl->metakey.n, buffer+keylength);
+ /* Allocate buffers for the challenge */
+
+ buffer = xmalloc(len*2+1);
- /* Calculate the hash from that */
+ if(cl->hischallenge)
+ free(cl->hischallenge);
+
+ cl->hischallenge = xmalloc(len);
+cp
+ /* Copy random data to the buffer */
- SHA1(buffer, keylength*2, cl->chal_hash);
+ RAND_bytes(cl->hischallenge, len);
- /* Convert the random data to a hexadecimal formatted string */
+ cl->hischallenge[0] &= 0x7F; /* Somehow if the first byte is more than 0xD0 or something like that, decryption fails... */
- bin2hex(buffer,buffer,keylength);
- buffer[keylength*2] = '\0';
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
+ {
+ bin2hex(cl->hischallenge, buffer, len);
+ buffer[len*2] = '\0';
+ syslog(LOG_DEBUG, _("Generated random challenge (unencrypted): %s"), buffer);
+ }
- /* Send the challenge */
+ /* Encrypt the random data */
+ if(RSA_public_encrypt(len, cl->hischallenge, buffer, cl->rsa_key, RSA_NO_PADDING) != len) /* NO_PADDING because the message size equals the RSA key size and it is totally random */
+ {
+ syslog(LOG_ERR, _("Error during encryption of challenge for %s (%s)"), cl->name, cl->hostname);
+ free(buffer);
+ return -1;
+ }
+cp
+ /* Convert the encrypted random data to a hexadecimal formatted string */
+
+ bin2hex(buffer, buffer, len);
+ buffer[len*2] = '\0';
+
+ /* Send the challenge */
+
cl->allow_request = CHAL_REPLY;
x = send_request(cl, "%d %s", CHALLENGE, buffer);
free(buffer);
int challenge_h(conn_list_t *cl)
{
- char *challenge;
+ char *buffer;
+ int len;
cp
- if(sscanf(cl->buffer, "%*d %as", &cl->id, &challenge) != 1)
+ if(sscanf(cl->buffer, "%*d %as", &buffer) != 1)
{
- syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->id, cl->hostname);
+ syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->name, cl->hostname);
return -1;
}
- /* Rest is done by send_chal_reply() */
-
- x = send_chal_reply(cl, challenge);
- free(challenge);
-cp
- return x;
-}
-
-int send_chal_reply(conn_list_t *cl, char *challenge)
-{
- char *buffer;
- int keylength;
- char *hash;
- int x;
-cp
- keylength = BN_num_bytes(myself->meyakey.n);
+ len = RSA_size(myself->rsa_key);
/* Check if the length of the challenge is all right */
- if(strlen(challenge) != keylength*2)
+ if(strlen(buffer) != len*2)
{
- syslog(LOG_ERROR, _("Intruder: wrong challenge length from %s (%s)"), cl->id, cl->hostname);
+ syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), cl->name, cl->hostname);
+ free(buffer);
return -1;
}
- /* Allocate buffers for the challenge and the hash */
-
- buffer = xmalloc(keylength*2);
- hash = xmalloc(SHA_DIGEST_LEN*2+1);
+ /* Allocate buffers for the challenge */
+
+ if(!cl->mychallenge)
+ cl->mychallenge = xmalloc(len);
- /* Copy the incoming random data and our public key to the buffer */
+ /* Convert the challenge from hexadecimal back to binary */
- hex2bin(challenge, buffer, keylength);
- BN_bn2bin(myself->metakey.n, buffer+keylength);
+ hex2bin(buffer,buffer,len);
- /* Calculate the hash from that */
+ /* Decrypt the challenge */
- SHA1(buffer, keylength*2, hash);
+ if(RSA_private_decrypt(len, buffer, cl->mychallenge, myself->rsa_key, RSA_NO_PADDING) != len) /* See challenge() */
+ {
+ syslog(LOG_ERR, _("Error during encryption of challenge for %s (%s)"), cl->name, cl->hostname);
+ free(buffer);
+ return -1;
+ }
+
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
+ {
+ bin2hex(cl->mychallenge, buffer, len);
+ buffer[len*2] = '\0';
+ syslog(LOG_DEBUG, _("Received random challenge (unencrypted): %s"), buffer);
+ }
+
free(buffer);
+
+ /* Rest is done by send_chal_reply() */
+cp
+ return send_chal_reply(cl);
+}
+
+int send_chal_reply(conn_list_t *cl)
+{
+ 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);
/* Convert the hash to a hexadecimal formatted string */
- bin2hex(hash,hash,SHA_DIGEST_LEN);
- hash[SHA_DIGEST_LEN*2] = '\0';
+ bin2hex(hash,hash,SHA_DIGEST_LENGTH);
+ hash[SHA_DIGEST_LENGTH*2] = '\0';
/* Send the reply */
if(cl->status.outgoing)
- cl->allow_resuest = ID;
+ cl->allow_request = ID;
else
- cl->allow_request = ACK;
+ cl->allow_request = METAKEY;
- x = send_request(cl, "%d %s", CHAL_REPLY, hash);
- free(hash);
cp
- return x;
-}
+ return send_request(cl, "%d %s", CHAL_REPLY, hash);
+}
int chal_reply_h(conn_list_t *cl)
{
- char *hash;
+ char *hishash;
+ char myhash[SHA_DIGEST_LENGTH];
cp
- if(sscanf(cl->buffer, "%*d %as", &cl->id, &hash) != 2)
+ if(sscanf(cl->buffer, "%*d %as", &hishash) != 1)
{
- syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->id, cl->hostname);
+ syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname);
+ free(hishash);
return -1;
}
/* Check if the length of the hash is all right */
-
- if(strlen(hash) != SHA_DIGEST_LEN*2)
+
+ if(strlen(hishash) != SHA_DIGEST_LENGTH*2)
{
- syslog(LOG_ERROR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->id, cl->hostname);
+ syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->name, cl->hostname);
+ free(hishash);
return -1;
}
-
+
/* Convert the hash to binary format */
-
- hex2bin(hash, hash, SHA_DIGEST_LEN);
-
+
+ hex2bin(hishash, hishash, SHA_DIGEST_LENGTH);
+
+ /* Calculate the hash from the challenge we sent */
+
+ SHA1(cl->hischallenge, RSA_size(cl->rsa_key), myhash);
+
/* Verify the incoming hash with the calculated hash */
-
- if{!memcmp(hash, cl->chal_hash, SHA_DIGEST_LEN)}
+
+ if(memcmp(hishash, myhash, SHA_DIGEST_LENGTH))
{
- syslog(LOG_ERROR, _("Intruder: wrong challenge reply from %s (%s)"), cl->id, cl->hostname);
+ syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), cl->name, cl->hostname);
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
+ {
+ bin2hex(myhash, hishash, SHA_DIGEST_LENGTH);
+ hishash[SHA_DIGEST_LENGTH*2] = '\0';
+ syslog(LOG_DEBUG, _("Expected challenge reply: %s"), hishash);
+ }
+ free(hishash);
return -1;
}
+
+ free(hishash);
+
/* Identity has now been positively verified.
If we are accepting this new connection, then send our identity,
if we are making this connecting, acknowledge.
*/
-
- free(hash);
- free(cl->chal_hash);
-
cp
if(cl->status.outgoing)
+ return send_metakey(cl);
+ else
+ return send_id(cl);
+}
+
+int send_metakey(conn_list_t *cl)
+{
+ char *buffer;
+ int len, x;
+cp
+ len = RSA_size(cl->rsa_key);
+
+ /* Allocate buffers for the meta key */
+
+ buffer = xmalloc(len*2+1);
+
+ if(!cl->cipher_outkey)
+ cl->cipher_outkey = xmalloc(len);
+
+ if(!cl->cipher_outctx)
+ cl->cipher_outctx = xmalloc(sizeof(*cl->cipher_outctx));
+cp
+ /* Copy random data to the buffer */
+
+ RAND_bytes(cl->cipher_outkey, len);
+
+ cl->cipher_outkey[0] &= 0x7F; /* FIXME: Somehow if the first byte is more than 0xD0 or something like that, decryption fails... */
+
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
+ {
+ bin2hex(cl->cipher_outkey, buffer, len);
+ buffer[len*2] = '\0';
+ syslog(LOG_DEBUG, _("Generated random meta key (unencrypted): %s"), buffer);
+ }
+
+ /* Encrypt the random data */
+
+ if(RSA_public_encrypt(len, cl->cipher_outkey, buffer, cl->rsa_key, RSA_NO_PADDING) != len) /* NO_PADDING because the message size equals the RSA key size and it is totally random */
{
- cl->allow_request = ACK;
- return send_ack(cl);
+ syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), cl->name, cl->hostname);
+ free(buffer);
+ return -1;
}
+cp
+ /* Convert the encrypted random data to a hexadecimal formatted string */
+
+ bin2hex(buffer, buffer, len);
+ buffer[len*2] = '\0';
+
+ /* Send the meta key */
+
+ if(cl->status.outgoing)
+ cl->allow_request = METAKEY;
else
+ cl->allow_request = ACK;
+
+ x = send_request(cl, "%d %s", METAKEY, buffer);
+ free(buffer);
+
+ EVP_EncryptInit(cl->cipher_outctx, EVP_bf_cfb(), cl->cipher_outkey, cl->cipher_outkey + EVP_bf_cfb()->key_len);
+cp
+ return x;
+}
+
+int metakey_h(conn_list_t *cl)
+{
+ char *buffer;
+ int len;
+cp
+ if(sscanf(cl->buffer, "%*d %as", &buffer) != 1)
{
- cl->allow_request = CHALLENGE;
- return send_id(cl);
+ syslog(LOG_ERR, _("Got bad METAKEY from %s (%s)"), cl->name, cl->hostname);
+ return -1;
+ }
+
+ len = RSA_size(myself->rsa_key);
+
+ /* Check if the length of the meta key is all right */
+
+ if(strlen(buffer) != len*2)
+ {
+ syslog(LOG_ERR, _("Intruder: wrong meta key length from %s (%s)"), cl->name, cl->hostname);
+ free(buffer);
+ return -1;
+ }
+
+ /* Allocate buffers for the meta key */
+
+ if(!cl->cipher_inkey)
+ cl->cipher_inkey = xmalloc(len);
+
+ if(!cl->cipher_inctx)
+ cl->cipher_inctx = xmalloc(sizeof(*cl->cipher_inctx));
+
+ /* Convert the challenge from hexadecimal back to binary */
+
+ hex2bin(buffer,buffer,len);
+
+ /* Decrypt the meta key */
+
+ if(RSA_private_decrypt(len, buffer, cl->cipher_inkey, myself->rsa_key, RSA_NO_PADDING) != len) /* See challenge() */
+ {
+ syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), cl->name, cl->hostname);
+ free(buffer);
+ return -1;
+ }
+
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
+ {
+ bin2hex(cl->cipher_inkey, buffer, len);
+ buffer[len*2] = '\0';
+ syslog(LOG_DEBUG, _("Received random meta key (unencrypted): %s"), buffer);
}
+
+ free(buffer);
+
+ EVP_DecryptInit(cl->cipher_inctx, EVP_bf_cfb(), cl->cipher_inkey, cl->cipher_inkey + EVP_bf_cfb()->key_len);
+
+cp
+ if(cl->status.outgoing)
+ return send_ack(cl);
+ else
+ return send_metakey(cl);
}
int send_ack(conn_list_t *cl)
{
+ int x;
+cp
+ if(cl->status.outgoing)
+ cl->allow_request = ACK;
+
+ x = send_request(cl, "%d", ACK);
+ cl->status.encryptout = 1;
cp
- return send_request(cl, "%d", ACK);
+ return x;
}
int ack_h(conn_list_t *cl)
{
+ conn_list_t *old, *p;
+ subnet_t *s;
cp
/* Okay, before we active the connection, we check if there is another entry
- in the connection list with the same vpn_ip. If so, it presumably is an
+ 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.
*/
- while((old = lookup_conn(cl->vpn_ip)))
+ while((old = lookup_id(cl->name)))
{
- if(debug_lvl > 1)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
- cl->vpn_hostname, old->real_hostname, cl->real_hostname);
- old->status.active = 0;
+ cl->name, old->hostname, cl->hostname);
+
terminate_connection(old);
}
cl->allow_request = ALL;
cl->status.active = 1;
+ cl->status.decryptin = 1;
+ cl->nexthop = cl;
+ cl->cipher_pkttype = EVP_bf_cfb();
+ cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
+
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname);
- if(debug_lvl > DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->id, cl->hostname);
+cp
+ if(!cl->status.outgoing)
+ send_ack(cl);
- /* Exchange information about other tinc daemons */
+ /* Send him our subnets */
+
+ for(s = myself->subnets; s; s = s->next)
+ send_add_subnet(cl, s);
- notify_others(cl, NULL, send_add_host);
- notify_one(cl);
+ /* And send him all the hosts and their subnets we know... */
+
+ for(p = conn_list; p; p = p->next)
+ if(p != cl && p->status.active)
+ {
+ /* Notify others of this connection */
+
+ if(p->status.meta)
+ send_add_host(p, cl);
- upstreamindex = 0;
+ /* Notify new connection of everything we know */
+ send_add_host(cl, p);
+
+ for(s = p->subnets; s; s = s->next)
+ send_add_subnet(cl, s);
+ }
cp
- if(cl->status.outgoing)
- return 0;
- else
- return send_ack(cl);
+ return 0;
}
/* Address and subnet information exchange */
-/* New and closed connections notification */
-
-/* Status and error notification routines */
-
-int send_status(conn_list_t *cl, int statusno, char *statusstring)
+int send_add_subnet(conn_list_t *cl, subnet_t *subnet)
{
+ int x;
+ char *netstr;
cp
- return send_request(cl, "%d %d %s", STATUS, statusno, statusstring);
-}
-
-int send_error(conn_list_t *cl, int errno, char *errstring)
-{
+ x = send_request(cl, "%d %s %s", ADD_SUBNET,
+ subnet->owner->name, netstr = net2str(subnet));
+ free(netstr);
cp
- return send_request(cl, "%d %d %s", ERROR, errno, errstring);
+ return x;
}
-/* Old routines */
-
-
-int send_termreq(conn_list_t *cl)
+int add_subnet_h(conn_list_t *cl)
{
+ char *subnetstr;
+ char *name;
+ conn_list_t *owner, *p;
+ subnet_t *subnet;
cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending TERMREQ to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
-
- if(write(cl->meta_socket, buffer, buflen) < 0)
+ if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 2)
{
- if(debug_lvl > 1)
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), cl->name, cl->hostname);
+ free(name); free(subnetstr);
return -1;
}
-cp
- return 0;
-}
-
-int send_timeout(conn_list_t *cl)
-{
-cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending TIMEOUT to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
+ /* Check if owner name is a valid */
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ if(check_id(name))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
+ free(name); free(subnetstr);
return -1;
}
-cp
- return 0;
-}
-
-int send_del_host(conn_list_t *cl, conn_list_t *new_host)
-{
-cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending DEL_HOST for %s (%s) to %s (%s)"),
- new_host->vpn_hostname, new_host->real_hostname, cl->vpn_hostname, cl->real_hostname);
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
+ /* Check if subnet string is valid */
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ if(!(subnet = str2net(subnetstr)))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
+ free(name); free(subnetstr);
return -1;
}
-cp
- return 0;
-}
-int send_tcppacket(conn_list_t *cl, void *data, int len)
-{
-cp
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Sending PACKET to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %d\n", PACKET, len);
+ free(subnetstr);
+
+ /* Check if somebody tries to add a subnet of ourself */
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ if(!strcmp(name, myself->name))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
+ syslog(LOG_ERR, _("Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"),
+ cl->name, cl->hostname);
+ free(name);
+ sighup = 1;
+ return 0;
}
-
- if((write(cl->meta_socket, data, len)) < 0)
+
+ /* Check if the owner of the new subnet is in the connection list */
+
+ if(!(owner = lookup_id(name)))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
+ name, cl->name, cl->hostname);
+ free(name);
return -1;
}
-cp
- return 0;
-}
-int send_ping(conn_list_t *cl)
-{
-cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PING to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+ /* If everything is correct, add the subnet to the list of the owner */
- buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
+ subnet_add(owner, subnet);
- if((write(cl->meta_socket, buffer, buflen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
+ /* Tell the rest */
+
+ for(p = conn_list; p; p = p->next)
+ if(p->status.meta && p->status.active && p!= cl)
+ send_add_subnet(p, subnet);
cp
return 0;
}
-int send_pong(conn_list_t *cl)
+int send_del_subnet(conn_list_t *cl, subnet_t *subnet)
{
+ int x;
+ char *netstr;
cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PONG to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
+ netstr = net2str(subnet);
+ x = send_request(cl, "%d %s %s", DEL_SUBNET, subnet->owner->name, netstr);
+ free(netstr);
cp
- return 0;
+ return x;
}
-int send_add_host(conn_list_t *cl, conn_list_t *new_host)
+int del_subnet_h(conn_list_t *cl)
{
- ip_t real_ip;
- int flags;
- char *hostname;
+ char *subnetstr;
+ char *name;
+ conn_list_t *owner, *p;
+ subnet_t *subnet;
cp
- real_ip = new_host->real_ip;
- hostname = new_host->real_hostname;
- flags = new_host->flags;
-
- /* If we need to propagate information about a new host that wants us to export
- * it's indirectdata flag, we set the INDIRECTDATA flag and unset the EXPORT...
- * flag, and set it's real_ip to our vpn_ip, so that net.c send_packet() will
- * work correctly.
- */
-
- if(flags & EXPORTINDIRECTDATA)
+ if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 3)
{
- flags &= ~EXPORTINDIRECTDATA;
- flags |= INDIRECTDATA;
- real_ip = myself->vpn_ip;
- hostname = myself->real_hostname;
+ syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), cl->name, cl->hostname);
+ free(name); free(subnetstr);
+ return -1;
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ADD_HOST for %s (%s) to %s (%s)"),
- new_host->vpn_hostname, hostname, cl->vpn_hostname, cl->real_hostname);
+ /* Check if owner name is a valid */
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x %d\n", ADD_HOST, real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port, flags);
+ if(check_id(name))
+ {
+ syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
+ free(name); free(subnetstr);
+ return -1;
+ }
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ /* Check if subnet string is valid */
+
+ if(!(subnet = str2net(subnetstr)))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
+ free(name); free(subnetstr);
return -1;
}
-cp
- return 0;
-}
-int send_key_changed(conn_list_t *cl, conn_list_t *src)
-{
-cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin %s to %s (%s)"),
- src->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
+ 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);
+ free(name);
+ sighup = 1;
+ return 0;
+ }
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
+ /* Check if the owner of the new subnet is in the connection list */
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ if(!(owner = lookup_id(name)))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
+ name, cl->name, cl->hostname);
+ free(name);
return -1;
}
+
+ /* If everything is correct, delete the subnet from the list of the owner */
+
+ subnet_del(subnet);
+
+ /* Tell the rest */
+
+ for(p = conn_list; p; p = p->next)
+ if(p->status.meta && p->status.active && p!= cl)
+ send_del_subnet(p, subnet);
cp
return 0;
}
-void send_key_changed_all(void)
+/* New and closed connections notification */
+
+int send_add_host(conn_list_t *cl, conn_list_t *other)
{
- conn_list_t *p;
-cp
- for(p = conn_list; p != NULL; p = p->next)
- if(p->status.meta && p->status.active)
- send_key_changed(p, myself);
cp
+ return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST,
+ other->name, other->address, other->port, other->options);
}
-
-int send_key_request(ip_t to)
+int add_host_h(conn_list_t *cl)
{
- conn_list_t *fw;
+ conn_list_t *old, *new;
+ conn_list_t *p;
+
cp
- fw = lookup_conn(to);
- if(!fw)
+ new = new_conn_list();
+
+ if(sscanf(cl->buffer, "%*d %as %lx:%d %lx", &new->name, &new->address, &new->port, &new->options) != 4)
{
- syslog(LOG_ERR, _("Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"),
- IP_ADDR_V(to));
- return -1;
+ syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
+ return -1;
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending REQ_KEY to %s (%s)"),
- fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
+ /* Check if identity is a valid name */
- if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
+ if(check_id(new->name))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
+ free_conn_list(new);
return -1;
}
- fw->status.waitingforkey = 1;
-cp
- return 0;
-}
-int send_key_answer(conn_list_t *cl, ip_t to)
-{
- conn_list_t *fw;
-cp
+ /* Check if somebody tries to add ourself */
- fw = lookup_conn(to);
-
- if(!fw)
+ if(!strcmp(new->name, myself->name))
{
- syslog(LOG_ERR, _("Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"),
- IP_ADDR_V(to));
- return -1;
+ syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname);
+ sighup = 1;
+ free_conn_list(new);
+ return 0;
}
+
+ /* Fill in more of the new conn_list structure */
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ANS_KEY to %s (%s)"),
- fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
+ new->hostname = hostlookup(htonl(new->address));
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
+ /* Check if the new host already exists in the connnection list */
- if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
+ if((old = lookup_id(new->name)))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
+ 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, new->name, new->hostname);
+ free_conn_list(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);
+ }
}
-cp
- return 0;
-}
-/*
- notify all my direct connections of a new host
- that was added to the vpn, with the exception
- of the source of the announcement.
-*/
-int notify_others(conn_list_t *new, conn_list_t *source,
- int (*function)(conn_list_t*, conn_list_t*))
-{
- conn_list_t *p;
-cp
- for(p = conn_list; p != NULL; p = p->next)
- if(p != new && p != source && p->status.meta && p->status.active)
- function(p, new);
-cp
- return 0;
-}
+ /* Hook it up into the conn_list */
-/*
- notify one connection of everything
- i have connected
-*/
-int notify_one(conn_list_t *new)
-{
- conn_list_t *p;
-cp
- for(p = conn_list; p != NULL; p = p->next)
- if(p != new && p->status.active)
- send_add_host(new, p);
-cp
- return 0;
-}
+ conn_list_add(new);
-/*
- The incoming request handlers
-*/
+ /* Tell the rest about the new host */
+ for(p = conn_list; p; p = p->next)
+ if(p->status.meta && p->status.active && p!=cl)
+ send_add_host(p, new);
-int termreq_h(conn_list_t *cl)
-{
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized TERMREQ from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got TERMREQ from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- cl->status.termreq = 1;
+ /* Fill in rest of conn_list structure */
+
+ new->nexthop = cl;
+ new->status.active = 1;
+ new->cipher_pkttype = EVP_bf_cfb();
+ new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
- terminate_connection(cl);
cp
return 0;
}
-int timeout_h(conn_list_t *cl)
+int send_del_host(conn_list_t *cl, conn_list_t *other)
{
cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized TIMEOUT from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got TIMEOUT from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- cl->status.termreq = 1;
- terminate_connection(cl);
-cp
- return 0;
+ return send_request(cl, "%d %s %lx:%d %lx", DEL_HOST,
+ other->name, other->address, other->port, other->options);
}
int del_host_h(conn_list_t *cl)
{
- ip_t vpn_ip;
- conn_list_t *fw;
+ char *name;
+ ip_t address;
+ port_t port;
+ long int options;
+ conn_list_t *old, *p;
cp
- if(!cl->status.active)
+ if(sscanf(cl->buffer, "%*d %as %lx:%d %lx", &name, &address, &port, &options) != 4)
{
- syslog(LOG_ERR, _("Got unauthorized DEL_HOST from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+ syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
+ cl->name, cl->hostname);
return -1;
}
- if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
- {
- syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
+ /* Check if identity is a valid name */
- if(!(fw = lookup_conn(vpn_ip)))
+ if(check_id(name))
{
- syslog(LOG_ERR, _("Got DEL_HOST for %d.%d.%d.%d from %s (%s) which does not exist?"),
- IP_ADDR_V(vpn_ip), cl->vpn_hostname, cl->real_hostname);
- return 0;
+ syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
+ free(name);
+ return -1;
}
- /* Connections lists are really messed up if this happens */
- if(vpn_ip == myself->vpn_ip)
+ /* Check if somebody tries to delete ourself */
+
+ if(!strcmp(name, myself->name))
{
syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
- cl->vpn_hostname, cl->real_hostname);
+ cl->name, cl->hostname);
+ free(name);
sighup = 1;
return 0;
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got DEL_HOST for %s (%s) from %s (%s)"),
- fw->vpn_hostname, fw->real_hostname, cl->vpn_hostname, cl->real_hostname);
+ /* Check if the new host already exists in the connnection list */
+
+ if(!(old = lookup_id(name)))
+ {
+ syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for %s which is not in our connection list"),
+ name, cl->name, cl->hostname);
+ free(name);
+ return -1;
+ }
+
+ /* Check if the rest matches */
+
+ if(address!=old->address || port!=old->port || options!=old->options || cl!=old->nexthop)
+ {
+ syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name);
+ return 0;
+ }
+
+ /* Ok, since EVERYTHING seems to check out all right, delete it */
- notify_others(fw, cl, send_del_host);
+ old->status.active = 0;
+ terminate_connection(old);
- fw->status.termreq = 1;
- fw->status.active = 0;
+ /* Tell the rest about the new host */
- terminate_connection(fw);
+ for(p = conn_list; p; p = p->next)
+ if(p->status.meta && p->status.active && p!=cl)
+ send_del_host(p, old);
cp
return 0;
}
-int tcppacket_h(conn_list_t *cl)
+/* Status and error notification routines */
+
+int send_status(conn_list_t *cl, int statusno, char *statusstring)
{
- int len;
cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized PACKET from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
+ if(!statusstring)
+ statusstring = status_text[statusno];
+cp
+ return send_request(cl, "%d %d %s", STATUS, statusno, statusstring);
+}
- if(sscanf(cl->buffer, "%*d %d", &len) != 1)
+int status_h(conn_list_t *cl)
+{
+ int statusno;
+ char *statusstring;
+cp
+ if(sscanf(cl->buffer, "%*d %d %as", &statusno, &statusstring) != 2)
{
- syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+ syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"),
+ cl->name, cl->hostname);
return -1;
- }
+ }
- if(len > MTU)
+ if(debug_lvl >= DEBUG_STATUS)
{
- syslog(LOG_ERR, _("Got too big PACKET from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Got PACKET length %d from %s (%s)"), len,
- cl->vpn_hostname, cl->real_hostname);
+ syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"),
+ cl->name, cl->hostname, status_text[statusno], statusstring);
+ }
- cl->tcppacket=len;
cp
+ free(statusstring);
return 0;
}
+int send_error(conn_list_t *cl, int errno, char *errstring)
+{
+cp
+ if(!errstring)
+ errstring = strerror(errno);
+ return send_request(cl, "%d %d %s", ERROR, errno, errstring);
+}
-int ping_h(conn_list_t *cl)
+int error_h(conn_list_t *cl)
{
+ int errno;
+ char *errorstring;
cp
- if(!cl->status.active)
+ if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2)
{
- syslog(LOG_ERR, _("Got unauthorized PING from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
+ syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
+ cl->name, cl->hostname);
+ return -1;
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PING from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+ if(debug_lvl >= DEBUG_ERROR)
+ {
+ syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
+ cl->name, cl->hostname, strerror(errno), errorstring);
+ }
- cl->status.pinged = 0;
- cl->status.got_pong = 1;
+ free(errorstring);
+ terminate_connection(cl);
+cp
+ return 0;
+}
- send_pong(cl);
+int send_termreq(conn_list_t *cl)
+{
+cp
+ return send_request(cl, "%d", TERMREQ);
+}
+
+int termreq_h(conn_list_t *cl)
+{
+cp
+ terminate_connection(cl);
cp
return 0;
}
-int pong_h(conn_list_t *cl)
+/* Keepalive routines - FIXME: needs a closer look */
+
+int send_ping(conn_list_t *cl)
{
+ cl->status.pinged = 1;
cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized PONG from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
+ return send_request(cl, "%d", PING);
+}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PONG from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+int ping_h(conn_list_t *cl)
+{
+cp
+ return send_pong(cl);
+}
+int send_pong(conn_list_t *cl)
+{
+cp
+ return send_request(cl, "%d", PONG);
+}
+
+int pong_h(conn_list_t *cl)
+{
+cp
cl->status.got_pong = 1;
cp
return 0;
}
-int add_host_h(conn_list_t *cl)
+/* Key exchange */
+
+int send_key_changed(conn_list_t *from, conn_list_t *cl)
{
- ip_t real_ip;
- ip_t vpn_ip;
- ip_t vpn_mask;
- unsigned short port;
- int flags;
- conn_list_t *ncn, *old;
-cp
- if(!cl->status.active)
+ conn_list_t *p;
+cp
+ for(p = conn_list; p != NULL; p = p->next)
{
- syslog(LOG_ERR, _("Got unauthorized ADD_HOST from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
+ if(p!=cl && p->status.meta && p->status.active)
+ send_request(p, "%d %s", KEY_CHANGED,
+ from->name);
}
-
- if(sscanf(cl->buffer, "%*d %lx %lx/%lx:%hx %d", &real_ip, &vpn_ip, &vpn_mask, &port, &flags) != 5)
- {
- syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
+cp
+ return 0;
+}
- if((old = lookup_conn(vpn_ip)))
+int key_changed_h(conn_list_t *cl)
+{
+ char *from_id;
+ conn_list_t *from;
+cp
+ if(sscanf(cl->buffer, "%*d %as", &from_id) != 1)
{
- if((real_ip==old->real_ip) && (vpn_mask==old->vpn_mask) && (port==old->port))
- {
- if(debug_lvl>1)
- syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
- old->vpn_hostname, old->real_hostname, cl->vpn_hostname, cl->real_hostname);
- goto skip_add_host; /* One goto a day keeps the deeply nested if constructions away. */
- }
- else
- {
- if(debug_lvl>1)
- syslog(LOG_NOTICE, _("Removing old entry for %s (%s)"),
- old->vpn_hostname, old->real_hostname);
- old->status.active = 0;
- terminate_connection(old);
- }
+ syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
+ cl->name, cl->hostname);
+ return -1;
}
-
- /* Connections lists are really messed up if this happens */
- if(vpn_ip == myself->vpn_ip)
+
+ if(!(from = lookup_id(from_id)))
{
- syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"),
- cl->vpn_hostname, cl->real_hostname);
- sighup = 1;
- return 0;
+ 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);
+ free(from_id);
+ return -1;
}
-
- ncn = new_conn_list();
- ncn->real_ip = real_ip;
- ncn->real_hostname = hostlookup(htonl(real_ip));
- ncn->vpn_ip = vpn_ip;
- ncn->vpn_mask = vpn_mask;
- ncn->vpn_hostname = hostlookup(htonl(vpn_ip));
- ncn->port = port;
- ncn->flags = flags;
- ncn->nexthop = cl;
- ncn->next = conn_list;
- conn_list = ncn;
- ncn->status.active = 1;
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got ADD_HOST for %s (%s) from %s (%s)"),
- ncn->vpn_hostname, ncn->real_hostname, cl->vpn_hostname, cl->real_hostname);
-
- notify_others(ncn, cl, send_add_host);
-
-skip_add_host:
+
+ free(from_id);
+
+ from->status.validkey = 0;
+ from->status.waitingforkey = 0;
+
+ send_key_changed(from, cl);
cp
return 0;
}
-int req_key_h(conn_list_t *cl)
+int send_req_key(conn_list_t *from, conn_list_t *to)
{
- ip_t to;
- ip_t from;
- conn_list_t *fw;
cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized REQ_KEY from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
+ return send_request(to->nexthop, "%d %s %s", REQ_KEY,
+ from->name, to->name);
+}
- if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2)
+int req_key_h(conn_list_t *cl)
+{
+ char *from_id, *to_id;
+ conn_list_t *from, *to;
+ char pktkey[129];
+cp
+ if(sscanf(cl->buffer, "%*d %as %as", &from_id, &to_id) != 2)
{
syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+ cl->name, cl->hostname);
return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got REQ_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
- IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
-
- if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
- { /* hey! they want something from ME! :) */
- send_key_answer(cl, from);
- return 0;
}
- fw = lookup_conn(to);
-
- if(!fw)
+ if(!(from = lookup_id(from_id)))
{
- syslog(LOG_ERR, _("Attempting to forward REQ_KEY to %d.%d.%d.%d, which does not exist?"),
- IP_ADDR_V(to));
+ 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);
+ free(from_id); free(to_id);
return -1;
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Forwarding REQ_KEY to %s (%s)"),
- fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-
- cl->buffer[cl->reqlen-1] = '\n';
-
- if(write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
-}
+ /* Check if this key request is for us */
-void set_keys(conn_list_t *cl, int expiry, char *key)
-{
- char *ek;
-cp
- if(!cl->public_key)
+ if(!strcmp(to_id, myself->name))
{
- cl->public_key = xmalloc(sizeof(*cl->key));
- cl->public_key->key = NULL;
+ bin2hex(myself->cipher_pktkey, pktkey, myself->cipher_pktkeylength);
+ pktkey[myself->cipher_pktkeylength*2] = '\0';
+ send_ans_key(myself, from, pktkey);
}
-
- if(cl->public_key->key)
- free(cl->public_key->key);
- cl->public_key->length = strlen(key);
- cl->public_key->expiry = expiry;
- cl->public_key->key = xmalloc(cl->public_key->length + 1);
- strcpy(cl->public_key->key, key);
-
- ek = make_shared_key(key);
-
- if(!cl->key)
+ else
{
- cl->key = xmalloc(sizeof(*cl->key));
- cl->key->key = NULL;
+ 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);
+ free(from_id); free(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);
+ }
+ else
+ send_req_key(from, to);
}
- if(cl->key->key)
- free(cl->key->key);
+ free(from_id); free(to_id);
+cp
+ return 0;
+}
- cl->key->length = strlen(ek);
- cl->key->expiry = expiry;
- cl->key->key = xmalloc(cl->key->length + 1);
- strcpy(cl->key->key, ek);
+int send_ans_key(conn_list_t *from, conn_list_t *to, char *pktkey)
+{
cp
+ return send_request(to->nexthop, "%d %s %s %s", ANS_KEY,
+ from->name, to->name, pktkey);
}
int ans_key_h(conn_list_t *cl)
{
- ip_t to;
- ip_t from;
- int expiry;
- char *key;
- conn_list_t *fw, *gk;
+ char *from_id, *to_id, *pktkey;
+ int keylength;
+ conn_list_t *from, *to;
cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized ANS_KEY from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4)
+ if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &pktkey) != 3)
{
syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+ cl->name, cl->hostname);
return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got ANS_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
- IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
-
- if(to == myself->vpn_ip)
- { /* hey! that key's for ME! :) */
- gk = lookup_conn(from);
-
- if(!gk)
- {
- syslog(LOG_ERR, _("Receiving ANS_KEY origin %d.%d.%d.%d from %s (%s), which does not exist?"),
- IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- set_keys(gk, expiry, key);
- gk->status.validkey = 1;
- gk->status.waitingforkey = 0;
- flush_queues(gk);
- return 0;
}
- fw = lookup_conn(to);
-
- if(!fw)
+ if(!(from = lookup_id(from_id)))
{
- syslog(LOG_ERR, _("Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"),
- IP_ADDR_V(to));
+ 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);
+ free(from_id); free(to_id); free(pktkey);
return -1;
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Forwarding ANS_KEY to %s (%s)"),
- fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-
- cl->buffer[cl->reqlen-1] = '\n';
+ /* Update origin's packet key */
- if((write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
-}
+ keylength = strlen(pktkey);
-int key_changed_h(conn_list_t *cl)
-{
- ip_t from;
- conn_list_t *ik;
-cp
- if(!cl->status.active)
+ if(keylength != from->cipher_pktkeylength*2)
{
- syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
+ syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key length"),
+ cl->name, cl->hostname, from->name);
+ free(from_id); free(to_id); free(pktkey);
return -1;
}
- if(sscanf(cl->buffer, "%*d %lx", &from) != 1)
- {
- syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
+ if(from->cipher_pktkey)
+ free(from->cipher_pktkey);
- ik = lookup_conn(from);
+ keylength /= 2;
+ hex2bin(pktkey, pktkey, keylength);
+ pktkey[keylength] = '\0';
+ from->cipher_pktkey = pktkey;
- if(!ik)
+ from->status.validkey = 1;
+ from->status.waitingforkey = 0;
+
+ if(strcmp(to_id, myself->name))
{
- syslog(LOG_ERR, _("Got KEY_CHANGED origin %d.%d.%d.%d from %s (%s), which does not exist?"),
- IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
- return -1;
+ 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);
+ free(from_id); free(to_id);
+ return -1;
+ }
+ send_ans_key(from, to, pktkey);
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got KEY_CHANGED origin %s from %s (%s)"),
- ik->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
-
- ik->status.validkey = 0;
- ik->status.waitingforkey = 0;
-
- notify_others(ik, cl, send_key_changed);
+ free(from_id); free(to_id);
cp
return 0;
}
-/* "Complete overhaul". */
+/* Jumptable for the request handlers */
+
+int (*request_handlers[])(conn_list_t*) = {
+ id_h, challenge_h, chal_reply_h, metakey_h, ack_h,
+ status_h, error_h, termreq_h,
+ ping_h, pong_h,
+ add_host_h, del_host_h,
+ add_subnet_h, del_subnet_h,
+ key_changed_h, req_key_h, ans_key_h,
+};
+
+/* Request names */
-int (*request_handlers[6])(conn_list_t*) = {
- id_h, challenge_h, chal_reply_h, ack_h,
- status_h, error_h,
+char (*request_name[]) = {
+ "ID", "CHALLENGE", "CHAL_REPLY", "METAKEY", "ACK",
+ "STATUS", "ERROR", "TERMREQ",
+ "PING", "PONG",
+ "ADD_HOST", "DEL_HOST",
+ "ADD_SUBNET", "DEL_SUBNET",
+ "KEY_CHANGED", "REQ_KEY", "ANS_KEY",
};
-char (*request_name[6]) = {
- "ID", "CHALLENGE", "CHAL_REPLY", "ACK",
- "STATUS", "ERROR",
+/* Status strings */
+
+char (*status_text[]) = {
+ "Warning",
+};
+
+/* Error strings */
+
+char (*error_text[]) = {
+ "Error",
};
projects / tinc / blobdiff