X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=97b51b4321b4196d6a50a62b7bcddc7d8ae642d1;hp=f1a9e49bfdcea01e4293ab351d53d9b74364ee99;hb=d2a54597e029f9d4f7bd29837be1be33909d78b1;hpb=28cc30159565a7eda4f66215a5994d84b46b47ad diff --git a/src/protocol.c b/src/protocol.c index f1a9e49b..97b51b43 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,7 +1,7 @@ /* protocol.c -- handle the meta-protocol - Copyright (C) 1999,2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 1999-2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: protocol.c,v 1.28.4.25 2000/09/10 15:18:03 guus Exp $ + $Id: protocol.c,v 1.28.4.84 2001/03/02 11:25:56 guus Exp $ */ #include "config.h" @@ -30,121 +30,209 @@ #include #include #include +#include +#include #include #include +#include +#include #include +#ifdef HAVE_OPENSSL_SHA_H +# include +#else +# include +#endif + +#ifdef HAVE_OPENSSL_RAND_H +# include +#else +# include +#endif + +#ifdef HAVE_OPENSSL_EVP_H +# include +#else +# include +#endif + + #include "conf.h" -#include "encr.h" #include "net.h" #include "netutl.h" #include "protocol.h" +#include "meta.h" +#include "connection.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(connection_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(connection_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. -*/ - -int send_id(conn_list_t *cl) + 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(connection_t *cl) { cp - return send_request(cl, "%d %s %d-%d %s", ID, myself->id, myself->min_version, myself->max_version, opt2str(myself->options)); + 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) +int id_h(connection_t *cl) { - conn_list_t *old; - char *options; + connection_t *old; + unsigned short int port; + char name[MAX_STRING_SIZE]; + avl_node_t *node; 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 "MAX_STRING" %d %lx %hd", name, &cl->protocol_version, &cl->options, &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(name)) { syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname); return -1; } - - /* Load information about peer */ - if(!read_id(cl)) + /* Copy string to cl */ + + cl->name = xstrdup(name); + + /* Load information about peer */ + + 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. @@ -152,974 +240,1112 @@ 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; } } + + /* Now we can add the name to the id tree */ + + id_add(cl); - /* Since we know the identity now, we can encrypt the meta channel */ + /* And uhr... cl->port just changed so we have to unlink it from the connection tree and re-insert... */ - cl->status.encryptout = 1; + node = avl_unlink(connection_tree, cl); + cl->port = port; + avl_insert_node(connection_tree, node); - /* Send a challenge to verify the identity */ + /* Read in the public key, so that we can send a metakey */ - cl->allow_request = CHAL_REPLY; + if(read_rsa_public_key(cl)) + return -1; + + cl->allow_request = METAKEY; cp - return send_challenge(cl); + return send_metakey(cl); } -int send_challenge(conn_list_t *cl) +int ack_h(connection_t *cl) { - char *buffer; - int keylength; - int x; + config_t const *cfg; + connection_t *old, *p; + subnet_t *subnet; + avl_node_t *node, *node2; cp - if(cl->chal_hash) - free(cl->chal_hash); - - /* Allocate buffers for the challenge and the hash */ + /* 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. + */ + + while((old = lookup_id(cl->name))) + { + 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); + + terminate_connection(old); + } + + /* Activate this connection */ + + 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; + + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname); + +cp + /* Check some options */ - cl->chal_hash = xmalloc(SHA_DIGEST_LEN); - keylength = BN_num_bytes(cl->metakey.n); - buffer = xmalloc(keylength*2); + if((cfg = get_config_val(cl->config, config_indirectdata))) + { + if(cfg->data.val == stupid_true) + cl->options |= OPTION_INDIRECT; + } + + if((cfg = get_config_val(cl->config, config_tcponly))) + { + if(cfg->data.val == stupid_true) + cl->options |= OPTION_TCPONLY; + } - /* Copy random data and the public key to the buffer */ + /* Send him our subnets */ + + for(node = myself->subnet_tree->head; node; node = node->next) + { + subnet = (subnet_t *)node->data; + send_add_subnet(cl, subnet); + } + /* And send him all the hosts and their subnets we know... */ - RAND_bytes(buffer, keylength); - BN_bn2bin(cl->metakey.n, buffer+keylength); + for(node = connection_tree->head; node; node = node->next) + { + 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); - /* Calculate the hash from that */ + /* Notify new connection of everything we know */ - SHA1(buffer, keylength*2, cl->chal_hash); + send_add_host(cl, p); - /* Convert the random data to a hexadecimal formatted string */ + for(node2 = p->subnet_tree->head; node2; node2 = node2->next) + { + subnet = (subnet_t *)node2->data; + send_add_subnet(cl, subnet); + } + } + } +cp + return 0; +} + +int send_challenge(connection_t *cl) +{ + char *buffer; + int len, x; +cp + /* CHECKME: what is most reasonable value for len? */ + + len = RSA_size(cl->rsa_key); + + /* Allocate buffers for the challenge */ + + buffer = xmalloc(len*2+1); + + if(cl->hischallenge) + free(cl->hischallenge); + + cl->hischallenge = xmalloc(len); +cp + /* Copy random data to the buffer */ + + RAND_bytes(cl->hischallenge, len); - bin2hex(buffer,buffer,keylength); - buffer[keylength*2] = '\0'; +cp + /* Convert to hex */ + + bin2hex(cl->hischallenge, buffer, len); + buffer[len*2] = '\0'; +cp /* Send the challenge */ - - cl->allow_request = CHAL_REPLY; + x = send_request(cl, "%d %s", CHALLENGE, buffer); free(buffer); cp return x; } -int challenge_h(conn_list_t *cl) +int challenge_h(connection_t *cl) { - char *challenge; + char buffer[MAX_STRING_SIZE]; + int len; cp - if(sscanf(cl->buffer, "%*d %as", &cl->id, &challenge) != 1) + if(sscanf(cl->buffer, "%*d "MAX_STRING, 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); 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 */ - /* Copy the incoming random data and our public key to the buffer */ + if(!cl->mychallenge) + cl->mychallenge = xmalloc(len); - hex2bin(challenge, buffer, keylength); - BN_bn2bin(myself->metakey.n, buffer+keylength); + /* Convert the challenge from hexadecimal back to binary */ - /* Calculate the hash from that */ - - SHA1(buffer, keylength*2, hash); - free(buffer); + hex2bin(buffer,cl->mychallenge,len); + + cl->allow_request = CHAL_REPLY; + + /* Rest is done by send_chal_reply() */ +cp + return send_chal_reply(cl); +} + +int send_chal_reply(connection_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; - else - cl->allow_request = ACK; - - 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) +int chal_reply_h(connection_t *cl) { - char *hash; + char hishash[MAX_STRING_SIZE]; + char myhash[SHA_DIGEST_LENGTH]; cp - if(sscanf(cl->buffer, "%*d %as", &cl->id, &hash) != 2) + if(sscanf(cl->buffer, "%*d "MAX_STRING, 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); 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); 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); + } return -1; } /* Identity has now been positively verified. - If we are accepting this new connection, then send our identity, - if we are making this connecting, acknowledge. + ack_h() handles the rest from now on. */ - - free(hash); - free(cl->chal_hash); - cp - if(cl->status.outgoing) - { - cl->allow_request = ACK; - return send_ack(cl); - } - else - { - cl->allow_request = CHALLENGE; - return send_id(cl); - } + return ack_h(cl); } -int send_ack(conn_list_t *cl) +int send_metakey(connection_t *cl) { + char *buffer; + int len, x; cp - return send_request(cl, "%d", ACK); -} + len = RSA_size(cl->rsa_key); -int ack_h(conn_list_t *cl) -{ + /* 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 - /* 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 - old connection that has timed out but we don't know it yet. - */ + /* Copy random data to the buffer */ - while((old = lookup_conn(cl->vpn_ip))) + RAND_bytes(cl->cipher_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. + */ + + cl->cipher_outkey[0] &= 0x7F; + + if(debug_lvl >= DEBUG_SCARY_THINGS) { - if(debug_lvl > 1) - 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; - terminate_connection(old); + bin2hex(cl->cipher_outkey, buffer, len); + buffer[len*2] = '\0'; + syslog(LOG_DEBUG, _("Generated random meta key (unencrypted): %s"), buffer); } - /* Activate this connection */ + /* 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, cl->cipher_outkey, buffer, cl->rsa_key, RSA_NO_PADDING) != len) + { + 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 */ - cl->allow_request = ALL; - cl->status.active = 1; + bin2hex(buffer, buffer, len); + buffer[len*2] = '\0'; - if(debug_lvl > DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->id, cl->hostname); + /* Send the meta key */ - /* Exchange information about other tinc daemons */ + x = send_request(cl, "%d %s", METAKEY, buffer); + free(buffer); - notify_others(cl, NULL, send_add_host); - notify_one(cl); + /* Further outgoing requests are encrypted with the key we just generated */ - upstreamindex = 0; + 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); + cl->status.encryptout = 1; cp - if(cl->status.outgoing) - return 0; - else - return send_ack(cl); + return x; } -/* Address and subnet information exchange */ +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; + } -/* New and closed connections notification */ + len = RSA_size(myself->rsa_key); -/* Status and error notification routines */ + /* Check if the length of the meta key is all right */ -int send_status(conn_list_t *cl, int statusno, char *statusstring) -{ -cp - return send_request(cl, "%d %d %s", STATUS, statusno, statusstring); -} + if(strlen(buffer) != len*2) + { + syslog(LOG_ERR, _("Intruder: wrong meta key length from %s (%s)"), cl->name, cl->hostname); + return -1; + } -int send_error(conn_list_t *cl, int errno, char *errstring) -{ -cp - return send_request(cl, "%d %d %s", ERROR, errno, errstring); -} + /* Allocate buffers for the meta key */ -/* Old routines */ + if(!cl->cipher_inkey) + cl->cipher_inkey = xmalloc(len); + if(!cl->cipher_inctx) + cl->cipher_inctx = xmalloc(sizeof(*cl->cipher_inctx)); -int send_termreq(conn_list_t *cl) -{ -cp - if(debug_lvl > 1) - syslog(LOG_DEBUG, _("Sending TERMREQ to %s (%s)"), - cl->vpn_hostname, cl->real_hostname); + /* Convert the challenge from hexadecimal back to binary */ - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip); + hex2bin(buffer,buffer,len); - if(write(cl->meta_socket, buffer, buflen) < 0) + /* Decrypt the meta key */ + + if(RSA_private_decrypt(len, buffer, cl->cipher_inkey, myself->rsa_key, RSA_NO_PADDING) != len) /* See challenge() */ { - if(debug_lvl > 1) - syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); + syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), cl->name, cl->hostname); 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); - - if((write(cl->meta_socket, buffer, buflen)) < 0) + if(debug_lvl >= DEBUG_SCARY_THINGS) { - syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; + bin2hex(cl->cipher_inkey, buffer, len); + buffer[len*2] = '\0'; + syslog(LOG_DEBUG, _("Received random meta key (unencrypted): %s"), buffer); } + + /* All incoming requests will now be encrypted. */ + + 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); + + cl->status.decryptin = 1; + + cl->allow_request = CHALLENGE; cp - return 0; + return send_challenge(cl); } -int send_del_host(conn_list_t *cl, conn_list_t *new_host) +/* Address and subnet information exchange */ + +int send_add_subnet(connection_t *cl, subnet_t *subnet) { + int x; + char *netstr; + char *owner; 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); + if(cl->options & OPTION_INDIRECT) + owner = myself->name; + else + owner = subnet->owner->name; - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } + x = send_request(cl, "%d %s %s", ADD_SUBNET, + owner, netstr = net2str(subnet)); + free(netstr); cp - return 0; + return x; } -int send_tcppacket(conn_list_t *cl, void *data, int len) +int add_subnet_h(connection_t *cl) { + char subnetstr[MAX_STRING_SIZE]; + char name[MAX_STRING_SIZE]; + connection_t *owner, *p; + subnet_t *subnet; + avl_node_t *node; cp - if(debug_lvl > 3) - syslog(LOG_DEBUG, _("Sending PACKET to %s (%s)"), - cl->vpn_hostname, cl->real_hostname); + if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2) + { + syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), cl->name, cl->hostname); + return -1; + } - buflen = snprintf(buffer, MAXBUFSIZE, "%d %d\n", PACKET, len); + /* 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); return -1; } - - if((write(cl->meta_socket, data, len)) < 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 ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname); 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); + /* 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; + } - buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING); + /* 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 ADD_SUBNET for %s from %s (%s) which is not in our connection list"), + name, cl->name, cl->hostname); return -1; } -cp - return 0; -} -int send_pong(conn_list_t *cl) -{ -cp - if(debug_lvl > 1) - syslog(LOG_DEBUG, _("Sending PONG 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", PONG); + subnet_add(owner, subnet); - if((write(cl->meta_socket, buffer, buflen)) < 0) + /* Tell the rest */ + + for(node = connection_tree->head; node; node = node->next) { - syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; + p = (connection_t *)node->data; + if(p->status.meta && p->status.active && p!= cl) + send_add_subnet(p, subnet); } cp return 0; } -int send_add_host(conn_list_t *cl, conn_list_t *new_host) +int send_del_subnet(connection_t *cl, subnet_t *subnet) { - ip_t real_ip; - int flags; - char *hostname; + int x; + char *netstr; + char *owner; 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) - { - flags &= ~EXPORTINDIRECTDATA; - flags |= INDIRECTDATA; - real_ip = myself->vpn_ip; - hostname = myself->real_hostname; - } - - 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); - - 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(cl->options & OPTION_INDIRECT) + owner = myself->name; + else + owner = subnet->owner->name; - if((write(cl->meta_socket, buffer, buflen)) < 0) - { - syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } + x = send_request(cl, "%d %s %s", DEL_SUBNET, owner, netstr = net2str(subnet)); + free(netstr); cp - return 0; + return x; } -int send_key_changed(conn_list_t *cl, conn_list_t *src) +int del_subnet_h(connection_t *cl) { + char subnetstr[MAX_STRING_SIZE]; + char name[MAX_STRING_SIZE]; + connection_t *owner, *p; + subnet_t *subnet; + avl_node_t *node; 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); + if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 3) + { + syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), cl->name, cl->hostname); + return -1; + } - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->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 DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname); return -1; } -cp - return 0; -} - -void send_key_changed_all(void) -{ - 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 -} + /* Check if subnet string is valid */ -int send_key_request(ip_t to) -{ - conn_list_t *fw; -cp - fw = lookup_conn(to); - if(!fw) + if(!(subnet = str2net(subnetstr))) { - syslog(LOG_ERR, _("Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"), - IP_ADDR_V(to)); + syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), 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); + free(subnetstr); + + /* Check if somebody tries to add a subnet of ourself */ - if((write(fw->nexthop->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 DEL_SUBNET from %s (%s) for ourself, restarting"), + cl->name, cl->hostname); + sighup = 1; + return 0; } - 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 the owner of the new subnet is in the connection list */ - fw = lookup_conn(to); - - if(!fw) + if(!(owner = lookup_id(name))) { - syslog(LOG_ERR, _("Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"), - IP_ADDR_V(to)); + syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"), + name, cl->name, cl->hostname); return -1; } - if(debug_lvl > 1) - syslog(LOG_DEBUG, _("Sending ANS_KEY to %s (%s)"), - fw->nexthop->vpn_hostname, fw->nexthop->real_hostname); + /* If everything is correct, delete the subnet from the list of the owner */ - buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36); + subnet_del(subnet); - if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0) + /* Tell the rest */ + + for(node = connection_tree->head; node; node = node->next) { - syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; + p = (connection_t *)node->data; + if(p->status.meta && p->status.active && p!= cl) + send_del_subnet(p, subnet); } 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*)) +/* New and closed connections notification */ + +int send_add_host(connection_t *cl, connection_t *other) { - 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; + if(!(cl->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; } -/* - notify one connection of everything - i have connected -*/ -int notify_one(conn_list_t *new) +int add_host_h(connection_t *cl) { - 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); + connection_t *old, *new, *p; + char name[MAX_STRING_SIZE]; + avl_node_t *node; cp - return 0; -} + new = new_connection(); -/* - The incoming request handlers -*/ + if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %lx", name, &new->address, &new->port, &new->options) != 4) + { + syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname); + return -1; + } + /* Check if identity is a valid name */ -int termreq_h(conn_list_t *cl) -{ -cp - if(!cl->status.active) + if(check_id(name)) { - syslog(LOG_ERR, _("Got unauthorized TERMREQ from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); + syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname); + free_connection(new); return -1; } + + /* Check if somebody tries to add ourself */ + + if(!strcmp(name, myself->name)) + { + syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname); + sighup = 1; + free_connection(new); + return 0; + } - if(debug_lvl > 1) - syslog(LOG_DEBUG, _("Got TERMREQ from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); - - cl->status.termreq = 1; + /* Fill in more of the new connection structure */ - terminate_connection(cl); -cp - return 0; -} + new->hostname = hostlookup(htonl(new->address)); -int timeout_h(conn_list_t *cl) -{ -cp - if(!cl->status.active) + /* Check if the new host already exists in the connnection list */ + + if((old = lookup_id(name))) { - syslog(LOG_ERR, _("Got unauthorized TIMEOUT from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); - 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, 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); + } } - if(debug_lvl > 1) - syslog(LOG_DEBUG, _("Got TIMEOUT from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); + /* Hook it up into the connection */ - cl->status.termreq = 1; - terminate_connection(cl); + new->name = xstrdup(name); + connection_add(new); + id_add(new); + + /* Tell the rest about the new host */ + + 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); + } + + /* 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 del_host_h(conn_list_t *cl) +int send_del_host(connection_t *cl, connection_t *other) { - ip_t vpn_ip; - conn_list_t *fw; cp - if(!cl->status.active) + if(!(cl->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; +} + +int del_host_h(connection_t *cl) +{ + char name[MAX_STRING_SIZE]; + ip_t address; + port_t port; + long int options; + connection_t *old, *p; + avl_node_t *node; +cp + if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%hd %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); + 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); 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); + 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; + } - notify_others(fw, cl, send_del_host); + /* Ok, since EVERYTHING seems to check out all right, delete it */ - fw->status.termreq = 1; - fw->status.active = 0; + old->status.active = 0; + terminate_connection(old); - terminate_connection(fw); + /* Tell the rest about the new host */ + + 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); + } cp return 0; } -int tcppacket_h(conn_list_t *cl) +/* Status and error notification routines */ + +int send_status(connection_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(connection_t *cl) +{ + int statusno; + char statusstring[MAX_STRING_SIZE]; +cp + if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &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 return 0; } +int send_error(connection_t *cl, int err, char *errstring) +{ +cp + if(!errstring) + errstring = strerror(err); + return send_request(cl, "%d %d %s", ERROR, err, errstring); +} -int ping_h(conn_list_t *cl) +int error_h(connection_t *cl) { + int err; + char errorstring[MAX_STRING_SIZE]; cp - if(!cl->status.active) + if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &err, 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(err), errorstring); + } - cl->status.pinged = 0; - cl->status.got_pong = 1; + terminate_connection(cl); +cp + return 0; +} - send_pong(cl); +int send_termreq(connection_t *cl) +{ +cp + return send_request(cl, "%d", TERMREQ); +} + +int termreq_h(connection_t *cl) +{ +cp + terminate_connection(cl); cp return 0; } -int pong_h(conn_list_t *cl) +int send_ping(connection_t *cl) { cp - if(!cl->status.active) - { - syslog(LOG_ERR, _("Got unauthorized PONG from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); - return -1; - } + cl->status.pinged = 1; + cl->last_ping_time = time(NULL); +cp + return send_request(cl, "%d", PING); +} + +int ping_h(connection_t *cl) +{ +cp + return send_pong(cl); +} - if(debug_lvl > 1) - syslog(LOG_DEBUG, _("Got PONG from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); +int send_pong(connection_t *cl) +{ +cp + return send_request(cl, "%d", PONG); +} - cl->status.got_pong = 1; +int pong_h(connection_t *cl) +{ +cp + cl->status.pinged = 0; cp return 0; } -int add_host_h(conn_list_t *cl) +/* Key exchange */ + +int send_key_changed(connection_t *from, connection_t *cl) { - ip_t real_ip; - ip_t vpn_ip; - ip_t vpn_mask; - unsigned short port; - int flags; - conn_list_t *ncn, *old; + connection_t *p; + avl_node_t *node; cp - if(!cl->status.active) + for(node = connection_tree->head; node; node = node->next) { - syslog(LOG_ERR, _("Got unauthorized ADD_HOST from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); - return -1; + 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); } - - 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(connection_t *cl) +{ + char from_id[MAX_STRING_SIZE]; + connection_t *from; +cp + if(sscanf(cl->buffer, "%*d "MAX_STRING, 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); + 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: + + 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(connection_t *from, connection_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(connection_t *cl) +{ + char from_id[MAX_STRING_SIZE]; + char to_id[MAX_STRING_SIZE]; + connection_t *from, *to; + char pktkey[129]; +cp + if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, 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); 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) + /* Check if this key request is for us */ + + if(!strcmp(to_id, myself->name)) { - syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; + bin2hex(myself->cipher_pktkey, pktkey, myself->cipher_pktkeylength); + pktkey[myself->cipher_pktkeylength*2] = '\0'; + send_ans_key(myself, from, pktkey); } + 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); + } + else + send_req_key(from, to); + } + cp return 0; } -void set_keys(conn_list_t *cl, int expiry, char *key) +int send_ans_key(connection_t *from, connection_t *to, char *pktkey) { - char *ek; cp - if(!cl->public_key) + return send_request(to->nexthop, "%d %s %s %s", ANS_KEY, + from->name, to->name, pktkey); +} + +int ans_key_h(connection_t *cl) +{ + char from_id[MAX_STRING_SIZE]; + char to_id[MAX_STRING_SIZE]; + char pktkey[MAX_STRING_SIZE]; + int keylength; + connection_t *from, *to; +cp + if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING, from_id, to_id, pktkey) != 3) { - cl->public_key = xmalloc(sizeof(*cl->key)); - cl->public_key->key = NULL; + syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"), + cl->name, cl->hostname); + return -1; } - - 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) + + if(!(from = lookup_id(from_id))) { - cl->key = xmalloc(sizeof(*cl->key)); - cl->key->key = NULL; + 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); + return -1; } - if(cl->key->key) - free(cl->key->key); + /* Check correctness of packet key */ - cl->key->length = strlen(ek); - cl->key->expiry = expiry; - cl->key->key = xmalloc(cl->key->length + 1); - strcpy(cl->key->key, ek); -cp -} + keylength = strlen(pktkey); -int ans_key_h(conn_list_t *cl) -{ - ip_t to; - ip_t from; - int expiry; - char *key; - conn_list_t *fw, *gk; -cp - if(!cl->status.active) + if(keylength != from->cipher_pktkeylength*2) { - syslog(LOG_ERR, _("Got unauthorized ANS_KEY 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); return -1; } - if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4) - { - syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); - return -1; - } + /* Forward it if necessary */ - 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) + if(strcmp(to_id, myself->name)) + { + if(!(to = lookup_id(to_id))) { - 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); + 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; } - - set_keys(gk, expiry, key); - gk->status.validkey = 1; - gk->status.waitingforkey = 0; - flush_queues(gk); - return 0; + send_ans_key(from, to, pktkey); } - fw = lookup_conn(to); - - if(!fw) - { - syslog(LOG_ERR, _("Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"), - IP_ADDR_V(to)); - return -1; - } + /* Update our copy of the origin's packet key */ - if(debug_lvl > 1) - syslog(LOG_DEBUG, _("Forwarding ANS_KEY to %s (%s)"), - fw->nexthop->vpn_hostname, fw->nexthop->real_hostname); + if(from->cipher_pktkey) + free(from->cipher_pktkey); - cl->buffer[cl->reqlen-1] = '\n'; + from->cipher_pktkey = xstrdup(pktkey); + keylength /= 2; + hex2bin(from->cipher_pktkey, from->cipher_pktkey, keylength); + from->cipher_pktkey[keylength] = '\0'; - if((write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen)) < 0) - { - syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); - return -1; - } + from->status.validkey = 1; + from->status.waitingforkey = 0; + + flush_queue(from); cp return 0; } -int key_changed_h(conn_list_t *cl) +int send_tcppacket(connection_t *cl, vpn_packet_t *packet) { - ip_t from; - conn_list_t *ik; -cp - if(!cl->status.active) + int x; + + x = send_request(cl->nexthop, "%d %hd", PACKET, packet->len); + + if(x) + return x; + + return send_meta(cl->nexthop, packet->data, packet->len); +} + +int tcppacket_h(connection_t *cl) +{ + vpn_packet_t packet; + char *p; + int todo, x; + + if(sscanf(cl->buffer, "%*d %hd", packet.len) != 1) { - syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); + syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"), cl->name, cl->hostname); return -1; } - if(sscanf(cl->buffer, "%*d %lx", &from) != 1) + /* Evil hack. */ + + p = packet.data; + todo = packet.len; + + while(todo) { - syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); - return -1; - } + x = read(cl->meta_socket, p, todo); - ik = lookup_conn(from); + if(x<=0) + { + if(x==0) + syslog(LOG_NOTICE, _("Connection closed by %s (%s)"), cl->name, cl->hostname); + else + if(errno==EINTR) + continue; + else + syslog(LOG_ERR, _("Error during reception of PACKET from %s (%s): %m"), cl->name, cl->hostname); - if(!ik) - { - 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; + return -1; + } + + todo -= x; + p += x; } - if(debug_lvl > 1) - syslog(LOG_DEBUG, _("Got KEY_CHANGED origin %s from %s (%s)"), - ik->vpn_hostname, cl->vpn_hostname, cl->real_hostname); + return receive_packet(cl, &packet); +} - ik->status.validkey = 0; - ik->status.waitingforkey = 0; +/* Jumptable for the request handlers */ - notify_others(ik, cl, send_key_changed); -cp - return 0; -} +int (*request_handlers[])(connection_t*) = { + id_h, metakey_h, challenge_h, chal_reply_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, + tcppacket_h, +}; -/* "Complete overhaul". */ +/* 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", "METAKEY", "CHALLENGE", "CHAL_REPLY", + "STATUS", "ERROR", "TERMREQ", + "PING", "PONG", + "ADD_HOST", "DEL_HOST", + "ADD_SUBNET", "DEL_SUBNET", + "KEY_CHANGED", "REQ_KEY", "ANS_KEY", + "PACKET", }; -char (*request_name[6]) = { - "ID", "CHALLENGE", "CHAL_REPLY", "ACK", - "STATUS", "ERROR", +/* Status strings */ + +char (*status_text[]) = { + "Warning", +}; + +/* Error strings */ + +char (*error_text[]) = { + "Error", };