X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fprotocol.c;h=0728ea1a1b104e0f6b9971f40ae0e1ba64538794;hp=44f012f75acc7698fd43f7eae16e2b89eed87c1c;hb=afc05797077641baa33b024ffeaafd6cad3ff7a7;hpb=eb1c9814e6b2a5206be1fadf19e0dc779690a69e diff --git a/src/protocol.c b/src/protocol.c index 44f012f..0728ea1 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,6 +1,7 @@ /* protocol.c -- handle the meta-protocol - Copyright (C) 1999 Ivo Timmermans + Copyright (C) 1999,2000 Ivo Timmermans , + 2000 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 @@ -15,856 +16,1263 @@ You should have received a copy of the GNU General Public License 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.57 2000/11/04 20:44:28 guus Exp $ */ #include "config.h" +#include + #include #include #include #include #include +#include #include #include +#include + +#include +#include +#include + #include "conf.h" -#include "encr.h" #include "net.h" #include "netutl.h" #include "protocol.h" +#include "meta.h" +#include "connlist.h" -int send_ack(conn_list_t *cl) +#include "system.h" + +int check_id(char *id) { - unsigned char tmp = ACK; -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Send ACK to %s", cl->hostname); + int i; - syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname); - if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0) - { - syslog(LOG_ERR, "send failed: %d:%d: %m", __FILE__, __LINE__); + for (i = 0; i < strlen(id); i++) + if(!isalnum(id[i]) && id[i] != '_') return -1; - } -cp + return 0; } -int send_termreq(conn_list_t *cl) +/* Generic request routines - takes care of logging and error detection as well */ + +int send_request(conn_list_t *cl, const char *format, ...) { - termreq_t tmp; + va_list args; + char buffer[MAXBUFSIZE]; + int len, request; + cp - memset(&tmp, 0, sizeof(tmp)); - tmp.type = TERMREQ; - tmp.vpn_ip = myself->vpn_ip; + /* Use vsnprintf instead of vasprintf: faster, no memory fragmentation, cleanup is automatic, + and there is a limit on the input buffer anyway */ - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Send TERMREQ(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip), - IP_ADDR_V(cl->vpn_ip)); + va_start(args, format); + len = vsnprintf(buffer, MAXBUFSIZE, format, args); + request = va_arg(args, int); + va_end(args); - if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0) + if(len < 0 || len > MAXBUFSIZE-1) { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); + syslog(LOG_ERR, _("Output buffer overflow while sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname); return -1; } + + len++; + + if(debug_lvl >= DEBUG_PROTOCOL) + syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname); + cp - return 0; + return send_meta(cl, buffer, len); } -int send_timeout(conn_list_t *cl) +int receive_request(conn_list_t *cl) { - termreq_t tmp; -cp - memset(&tmp, 0, sizeof(tmp)); - tmp.type = PINGTIMEOUT; - tmp.vpn_ip = myself->vpn_ip; + int request; +cp + if(sscanf(cl->buffer, "%d", &request) == 1) + { + 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(debug_lvl > 2) - syslog(LOG_DEBUG, "Send TIMEOUT(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip), - IP_ADDR_V(cl->vpn_ip)); + 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, &tmp, sizeof(tmp))) < 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, "send failed: %s:%d: %m", __FILE__, __LINE__); + syslog(LOG_ERR, _("Bogus data received from %s (%s)"), + cl->name, cl->hostname); return -1; } cp return 0; } -int send_del_host(conn_list_t *cl, conn_list_t *new_host) +/* Connection protocol: + + Client Server + 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 + 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) { - del_host_t tmp; + conn_list_t *old; + config_t const *cfg; cp - memset(&tmp, 0, sizeof(tmp)); - tmp.type = DEL_HOST; - tmp.vpn_ip = new_host->vpn_ip; + 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; + } - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Sending delete host %lx to " IP_ADDR_S, - tmp.vpn_ip, IP_ADDR_V(cl->vpn_ip)); + /* Check if version matches */ - if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0) + if(cl->protocol_version != myself->protocol_version) { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); + syslog(LOG_ERR, _("Peer %s (%s) uses incompatible version %d"), + cl->name, cl->hostname, cl->protocol_version); return -1; } -cp - return 0; -} -int send_ping(conn_list_t *cl) -{ - unsigned char tmp = PING; -cp - if(debug_lvl > 3) - syslog(LOG_DEBUG, "pinging " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip)); + /* Check if identity is a valid name */ - if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0) + if(check_id(cl->name)) { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); + syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname); return -1; } + + /* Load information about peer */ cp - return 0; -} + if(read_host_config(cl)) + { + syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name); + return -1; + } -int send_pong(conn_list_t *cl) -{ - unsigned char tmp = PONG; + /* 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((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0) + if(cl->status.outgoing) + { + if((old = lookup_id(cl->name))) + { + 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; + } + } +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, "send failed: %s:%d: %m", __FILE__, __LINE__); + syslog(LOG_ERR, _("No public key known for %s (%s)"), cl->name, cl->hostname); return -1; } cp - return 0; + return send_challenge(cl); } -int send_add_host(conn_list_t *cl, conn_list_t *new_host) +int send_challenge(conn_list_t *cl) { - add_host_t tmp; + char *buffer; + int len, x; cp - memset(&tmp, 0, sizeof(tmp)); - tmp.type = ADD_HOST; - tmp.real_ip = new_host->real_ip; - tmp.vpn_ip = new_host->vpn_ip; - tmp.vpn_mask = new_host->vpn_mask; - tmp.portnr = new_host->port; + 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); - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Sending add host (%lx/%lx %lx:%hd) to " IP_ADDR_S, - tmp.vpn_ip, tmp.vpn_mask, tmp.real_ip, tmp.portnr, - IP_ADDR_V(cl->vpn_ip)); + cl->hischallenge[0] &= 0x7F; /* Somehow if the first byte is more than 0xD0 or something like that, decryption fails... */ - if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0) + if(debug_lvl >= DEBUG_SCARY_THINGS) { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); + bin2hex(cl->hischallenge, buffer, len); + buffer[len*2] = '\0'; + syslog(LOG_DEBUG, _("Generated random challenge (unencrypted): %s"), buffer); + } + + /* 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 - return 0; + /* 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); +cp + return x; } -int send_key_changed(conn_list_t *cl, conn_list_t *src) +int challenge_h(conn_list_t *cl) { - key_changed_t tmp; + char *buffer; + int len; cp - memset(&tmp, 0, sizeof(tmp)); - tmp.type = KEY_CHANGED; - tmp.from = src->vpn_ip; + if(sscanf(cl->buffer, "%*d %as", &buffer) != 1) + { + syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->name, cl->hostname); + return -1; + } + + len = RSA_size(myself->rsa_key); - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Sending KEY_CHANGED (%lx) to " IP_ADDR_S, - tmp.from, IP_ADDR_V(cl->vpn_ip)); + /* Check if the length of the challenge is all right */ - if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0) + if(strlen(buffer) != len*2) { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); + syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), cl->name, cl->hostname); + free(buffer); return -1; } + + /* Allocate buffers for the challenge */ + + if(!cl->mychallenge) + cl->mychallenge = xmalloc(len); + + /* Convert the challenge from hexadecimal back to binary */ + + hex2bin(buffer,buffer,len); + + /* Decrypt the challenge */ + + 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 0; + return send_chal_reply(cl); } -void send_key_changed2(void) +int send_chal_reply(conn_list_t *cl) { - conn_list_t *p; + char hash[SHA_DIGEST_LENGTH*2+1]; cp - for(p = conn_list; p != NULL; p = p->next) - if(p->status.meta && p->protocol_version > PROT_3) - send_key_changed(p, myself); + 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_LENGTH); + hash[SHA_DIGEST_LENGTH*2] = '\0'; + + /* Send the reply */ + + if(cl->status.outgoing) + cl->allow_request = ID; + else + cl->allow_request = METAKEY; + cp + return send_request(cl, "%d %s", CHAL_REPLY, hash); } -int send_basic_info(conn_list_t *cl) +int chal_reply_h(conn_list_t *cl) { - basic_info_t tmp; + char *hishash; + char myhash[SHA_DIGEST_LENGTH]; cp - memset(&tmp, 0, sizeof(tmp)); - tmp.type = BASIC_INFO; - tmp.protocol = PROT_CURRENT; + if(sscanf(cl->buffer, "%*d %as", &hishash) != 1) + { + 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(hishash) != SHA_DIGEST_LENGTH*2) + { + syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->name, cl->hostname); + free(hishash); + return -1; + } - tmp.portnr = myself->port; - tmp.vpn_ip = myself->vpn_ip; - tmp.vpn_mask = myself->vpn_mask; + /* Convert the hash to binary format */ - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Send BASIC_INFO(%d,%hd," IP_ADDR_S "," IP_ADDR_S ") to " IP_ADDR_S, - tmp.protocol, tmp.portnr, IP_ADDR_V(tmp.vpn_ip), IP_ADDR_V(tmp.vpn_mask), - IP_ADDR_V(cl->real_ip)); + hex2bin(hishash, hishash, SHA_DIGEST_LENGTH); - if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0) + /* 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(hishash, myhash, SHA_DIGEST_LENGTH)) { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); + 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. + */ cp - return 0; + if(cl->status.outgoing) + return send_metakey(cl); + else + return send_id(cl); } -int send_passphrase(conn_list_t *cl) +int send_metakey(conn_list_t *cl) { - passphrase_t tmp; + char *buffer; + int len, x; cp - memset(&tmp, 0, sizeof(tmp)); - tmp.type = PASSPHRASE; - encrypt_passphrase(&tmp); + len = RSA_size(cl->rsa_key); - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Send PASSPHRASE(%hd,...) to " IP_ADDR_S, tmp.len, - IP_ADDR_V(cl->vpn_ip)); + /* 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 */ - if((write(cl->meta_socket, &tmp, tmp.len+3)) < 0) + 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 */ { - 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); + free(buffer); return -1; } cp - return 0; + /* 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 send_public_key(conn_list_t *cl) +int metakey_h(conn_list_t *cl) { - public_key_t *tmp; + char *buffer; + int len; cp - tmp = (public_key_t*)xmalloc(strlen(my_public_key_base36)+sizeof(*tmp)); - memset(tmp, 0, sizeof(*tmp)); - tmp->type = PUBLIC_KEY; - tmp->len = strlen(my_public_key_base36); - strcpy(&tmp->key, my_public_key_base36); + if(sscanf(cl->buffer, "%*d %as", &buffer) != 1) + { + syslog(LOG_ERR, _("Got bad METAKEY from %s (%s)"), cl->name, cl->hostname); + return -1; + } + + len = RSA_size(myself->rsa_key); - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Send PUBLIC_KEY(%hd,%s) to " IP_ADDR_S, tmp->len, &tmp->key, - IP_ADDR_V(cl->vpn_ip)); + /* Check if the length of the meta key is all right */ - if((write(cl->meta_socket, tmp, tmp->len+sizeof(*tmp))) < 0) + if(strlen(buffer) != len*2) { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); + 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 - return 0; + 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 x; } -int send_calculate(conn_list_t *cl, char *k) +int ack_h(conn_list_t *cl) { - calculate_t *tmp; + conn_list_t *old, *p; + subnet_t *s; cp - tmp = xmalloc(strlen(k)+sizeof(*tmp)); - memset(tmp, 0, sizeof(*tmp)); - tmp->type = CALCULATE; - tmp->len = strlen(k); - strcpy(&tmp->key, k); + /* 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. + */ - if((write(cl->meta_socket, tmp, tmp->len+sizeof(*tmp))) < 0) + while((old = lookup_id(cl->name))) { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); - return -1; + 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->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); + +cp + if(!cl->status.outgoing) + send_ack(cl); + + /* Send him our subnets */ + + for(s = myself->subnets; s; s = s->next) + send_add_subnet(cl, s); + + /* 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); + + /* 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 return 0; } -int send_key_request(ip_t to) +/* Address and subnet information exchange */ + +int send_add_subnet(conn_list_t *cl, subnet_t *subnet) { - key_req_t *tmp; - conn_list_t *fw; + int x; + char *netstr; cp - tmp = xmalloc(sizeof(*tmp)); - memset(tmp, 0, sizeof(*tmp)); - tmp->type = REQ_KEY; - tmp->to = to; - tmp->from = myself->vpn_ip; - tmp->len = 0; + x = send_request(cl, "%d %s %s", ADD_SUBNET, + subnet->owner->name, netstr = net2str(subnet)); + free(netstr); +cp + return x; +} - fw = lookup_conn(to); - if(!fw) +int add_subnet_h(conn_list_t *cl) +{ + char *subnetstr; + char *name; + conn_list_t *owner, *p; + subnet_t *subnet; +cp + if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 2) { - syslog(LOG_ERR, "Attempting to send key request to " IP_ADDR_S ", which does not exist?", - IP_ADDR_V(to)); + syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), cl->name, cl->hostname); + free(name); free(subnetstr); return -1; } - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Sending out request for public key to " IP_ADDR_S, - IP_ADDR_V(fw->nexthop->vpn_ip)); - if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)) < 0) + /* Check if owner name is a valid */ + + 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; } - fw->status.waitingforkey = 1; -cp - return 0; -} -int send_key_answer(conn_list_t *cl, ip_t to) -{ - key_req_t *tmp; - conn_list_t *fw; -cp - tmp = xmalloc(sizeof(*tmp)+strlen(my_public_key_base36)); - memset(tmp, 0, sizeof(*tmp)); - tmp->type = ANS_KEY; - tmp->to = to; - tmp->from = myself->vpn_ip; - tmp->expiry = my_key_expiry; - tmp->len = strlen(my_public_key_base36); - strcpy(&(tmp->key), my_public_key_base36); + /* Check if subnet string is valid */ -cp - syslog(LOG_DEBUG, "key sent = %s", my_public_key_base36); -cp - fw = lookup_conn(to); - -cp - if(!fw) + if(!(subnet = str2net(subnetstr))) { - syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?", - IP_ADDR_V(to)); + syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname); + free(name); free(subnetstr); return -1; } -cp - syslog(LOG_DEBUG, "key sent = %s", &(tmp->key)); -cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S, - IP_ADDR_V(fw->nexthop->vpn_ip)); -cp - if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)+tmp->len) < 0) + free(subnetstr); + + /* 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); + free(name); + sighup = 1; + return 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; } + + /* If everything is correct, add the subnet to the list of the owner */ + + subnet_add(owner, subnet); + + /* 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; } -/* - 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*)) +int send_del_subnet(conn_list_t *cl, subnet_t *subnet) { - conn_list_t *p; + int x; + char *netstr; cp - for(p = conn_list; p != NULL; p = p->next) - if(p != new && p != source && p->status.meta && p->protocol_version > PROT_3) - function(p, new); + netstr = net2str(subnet); + x = send_request(cl, "%d %s %s", DEL_SUBNET, subnet->owner->name, netstr); + free(netstr); cp - return 0; + return x; } -/* - notify one connection of everything - i have connected -*/ -int notify_one(conn_list_t *new) +int del_subnet_h(conn_list_t *cl) { - conn_list_t *p; -cp - for(p = conn_list; p != NULL; p = p->next) - if(p != new && p->protocol_version > PROT_3) - send_add_host(new, p); + char *subnetstr; + char *name; + conn_list_t *owner, *p; + subnet_t *subnet; cp - return 0; -} + if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 3) + { + syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), cl->name, cl->hostname); + free(name); free(subnetstr); + return -1; + } -/* - The incoming request handlers -*/ + /* Check if owner name is a valid */ -int basic_info_h(conn_list_t *cl) -{ - basic_info_t tmp; -cp - if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0) + if(check_id(name)) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); + syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname); + free(name); free(subnetstr); return -1; } - cl->protocol_version = tmp.protocol; - cl->port = tmp.portnr; - cl->vpn_ip = tmp.vpn_ip; - cl->vpn_mask = tmp.vpn_mask; + /* Check if subnet string is valid */ - if(cl->protocol_version < PROT_CURRENT) + if(!(subnet = str2net(subnetstr))) { - syslog(LOG_ERR, "Peer uses protocol version %d which is too old.", - cl->protocol_version); + syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname); + free(name); free(subnetstr); return -1; } - if(debug_lvl > 2) - syslog(LOG_DEBUG, "got BASIC_INFO(%hd," IP_ADDR_S "," IP_ADDR_S ")", cl->port, - IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->vpn_mask)); - if(debug_lvl > 1) - syslog(LOG_DEBUG, "Peer uses protocol version %d", - cl->protocol_version); + free(subnetstr); + + /* Check if somebody tries to add a subnet of ourself */ - if(cl->status.outgoing) + if(!strcmp(name, myself->name)) { - if(setup_vpn_connection(cl) < 0) - return -1; - send_basic_info(cl); + syslog(LOG_ERR, _("Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"), + cl->name, cl->hostname); + free(name); + sighup = 1; + return 0; } - else + + /* Check if the owner of the new subnet is in the connection list */ + + if(!(owner = lookup_id(name))) { - if(setup_vpn_connection(cl) < 0) - return -1; - send_passphrase(cl); + 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; } - cl->status.active = 0; + /* 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; } -int passphrase_h(conn_list_t *cl) +/* New and closed connections notification */ + +int send_add_host(conn_list_t *cl, conn_list_t *other) +{ +cp + return send_request(cl, "%d %s %lx:%d %lx", ADD_HOST, + other->name, other->address, other->port, other->options); +} + +int add_host_h(conn_list_t *cl) { - char unused; - unsigned short int len; + conn_list_t *old, *new; + conn_list_t *p; + cp - if(read(cl->meta_socket, &unused, sizeof(unused)) <= 0) + 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, "%d: Receive failed: %m", __LINE__); - return -1; + syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname); + return -1; } - if(read(cl->meta_socket, &len, sizeof(len)) <= 0) + /* Check if identity is a valid name */ + + if(check_id(new->name)) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); + syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname); + free_conn_list(new); return -1; } - - cl->pp = xmalloc(len+4); - cl->pp->len = len; - if(read(cl->meta_socket, &(cl->pp->phrase), len) <= 0) + /* Check if somebody tries to add ourself */ + + if(!strcmp(new->name, myself->name)) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); - 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; } - - if(debug_lvl > 2) - syslog(LOG_DEBUG, "got PASSPHRASE(%hd,...)", len); + + /* Fill in more of the new conn_list structure */ + + new->hostname = hostlookup(htonl(new->address)); + + /* Check if the new host already exists in the connnection list */ + + if((old = lookup_id(new->name))) + { + 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); + } + } + + /* Hook it up into the conn_list */ + + conn_list_add(new); + + /* 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); + + /* 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; - if(cl->status.outgoing) - send_passphrase(cl); - else - send_public_key(cl); cp return 0; } -int public_key_h(conn_list_t *cl) +int send_del_host(conn_list_t *cl, conn_list_t *other) { - char *g_n; - unsigned short int len; - char unused; cp - if(read(cl->meta_socket, &unused, sizeof(unused)) <= 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) +{ + char *name; + ip_t address; + port_t port; + long int options; + conn_list_t *old, *p; +cp + if(sscanf(cl->buffer, "%*d %as %lx:%d %lx", &name, &address, &port, &options) != 4) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); + syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"), + cl->name, cl->hostname); return -1; } - if(read(cl->meta_socket, &len, sizeof(len)) <= 0) + + /* Check if identity is a valid name */ + + if(check_id(name)) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); + syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname); + free(name); return -1; } - g_n = xmalloc(len+2); + /* Check if somebody tries to delete ourself */ - if(read(cl->meta_socket, g_n, len+2) <= 0) + if(!strcmp(name, myself->name)) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); - return -1; + syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"), + cl->name, cl->hostname); + free(name); + sighup = 1; + return 0; } - if(debug_lvl > 2) - syslog(LOG_DEBUG, "got PUBLIC_KEY(%hd,%s)", len, g_n); + /* Check if the new host already exists in the connnection list */ - if(verify_passphrase(cl, g_n)) + if(!(old = lookup_id(name))) { - /* intruder! */ - syslog(LOG_ERR, "Intruder: passphrase does not match."); + 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; + } - if(debug_lvl > 2) - syslog(LOG_INFO, "Passphrase OK"); + /* Ok, since EVERYTHING seems to check out all right, delete it */ - if(cl->status.outgoing) - send_public_key(cl); - else - send_ack(cl); + old->status.active = 0; + terminate_connection(old); - cl->status.active = 1; - notify_others(cl, NULL, send_add_host); - notify_one(cl); + /* 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_del_host(p, old); cp return 0; } -int ack_h(conn_list_t *cl) +/* Status and error notification routines */ + +int send_status(conn_list_t *cl, int statusno, char *statusstring) { cp - if(debug_lvl > 2) - syslog(LOG_DEBUG, "got ACK"); - - cl->status.active = 1; - syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname); + if(!statusstring) + statusstring = status_text[statusno]; cp - return 0; + return send_request(cl, "%d %d %s", STATUS, statusno, statusstring); } -int termreq_h(conn_list_t *cl) +int status_h(conn_list_t *cl) { + int statusno; + char *statusstring; cp - syslog(LOG_NOTICE, IP_ADDR_S " wants to quit", IP_ADDR_V(cl->vpn_ip)); - cl->status.termreq = 1; - terminate_connection(cl); + if(sscanf(cl->buffer, "%*d %d %as", &statusno, &statusstring) != 2) + { + syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"), + cl->name, cl->hostname); + return -1; + } + + if(debug_lvl >= DEBUG_STATUS) + { + syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"), + cl->name, cl->hostname, status_text[statusno], statusstring); + } - notify_others(cl, NULL, send_del_host); cp + free(statusstring); return 0; } -int timeout_h(conn_list_t *cl) +int send_error(conn_list_t *cl, int errno, char *errstring) { cp - syslog(LOG_NOTICE, IP_ADDR_S " says it's gotten a timeout from us", IP_ADDR_V(cl->vpn_ip)); - cl->status.termreq = 1; - terminate_connection(cl); -cp - return 0; + if(!errstring) + errstring = strerror(errno); + return send_request(cl, "%d %d %s", ERROR, errno, errstring); } -int del_host_h(conn_list_t *cl) +int error_h(conn_list_t *cl) { - del_host_t tmp; - conn_list_t *fw; + int errno; + char *errorstring; cp - if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0) + if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); - return -1; + syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"), + cl->name, cl->hostname); + return -1; } - if(debug_lvl > 2) - syslog(LOG_DEBUG, "got DEL_HOST for " IP_ADDR_S, - IP_ADDR_V(tmp.vpn_ip)); - - if(!(fw = lookup_conn(tmp.vpn_ip))) + if(debug_lvl >= DEBUG_ERROR) { - syslog(LOG_ERR, "Somebody wanted to delete " IP_ADDR_S " which does not exist?", - IP_ADDR_V(tmp.vpn_ip)); - return 0; + syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"), + cl->name, cl->hostname, strerror(errno), errorstring); } - notify_others(cl, fw, send_del_host); + free(errorstring); + terminate_connection(cl); +cp + return 0; +} + +int send_termreq(conn_list_t *cl) +{ +cp + return send_request(cl, "%d", TERMREQ); +} - fw->status.termreq = 1; - terminate_connection(fw); +int termreq_h(conn_list_t *cl) +{ +cp + terminate_connection(cl); cp return 0; } +/* Keepalive routines - FIXME: needs a closer look */ + +int send_ping(conn_list_t *cl) +{ +cp + cl->status.pinged = 1; + cl->last_ping_time = time(NULL); +cp + return send_request(cl, "%d", PING); +} + int ping_h(conn_list_t *cl) { cp - if(debug_lvl > 3) - syslog(LOG_DEBUG, "responding to ping from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip)); - cl->status.pinged = 0; - cl->status.got_pong = 1; + return send_pong(cl); +} - send_pong(cl); +int send_pong(conn_list_t *cl) +{ cp - return 0; + return send_request(cl, "%d", PONG); } int pong_h(conn_list_t *cl) { cp - if(debug_lvl > 3) - syslog(LOG_DEBUG, "ok, got pong from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip)); - cl->status.got_pong = 1; + cl->status.pinged = 0; 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) { - add_host_t tmp; - conn_list_t *ncn, *fw; + conn_list_t *p; cp - if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0) - { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); - return -1; - } - - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Add host request from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip)); - if(debug_lvl > 3) - syslog(LOG_DEBUG, "got ADD_HOST(" IP_ADDR_S "," IP_ADDR_S ",%hd)", - IP_ADDR_V(tmp.vpn_ip), IP_ADDR_V(tmp.vpn_mask), tmp.portnr); - - /* - Suggestion of Hans Bayle - */ - if((fw = lookup_conn(tmp.vpn_ip))) + for(p = conn_list; p != NULL; p = p->next) { - notify_others(fw, cl, send_add_host); - return 0; + if(p!=cl && p->status.meta && p->status.active) + send_request(p, "%d %s", KEY_CHANGED, + from->name); } - - ncn = new_conn_list(); - ncn->real_ip = tmp.real_ip; - ncn->vpn_ip = tmp.vpn_ip; - ncn->vpn_mask = tmp.vpn_mask; - ncn->port = tmp.portnr; - ncn->hostname = hostlookup(tmp.real_ip); - ncn->nexthop = cl; - ncn->next = conn_list; - conn_list = ncn; - ncn->status.active = 1; - notify_others(ncn, cl, send_add_host); cp return 0; } -int req_key_h(conn_list_t *cl) +int key_changed_h(conn_list_t *cl) { - key_req_t tmp; - conn_list_t *fw; + char *from_id; + conn_list_t *from; cp - if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0) + if(sscanf(cl->buffer, "%*d %as", &from_id) != 1) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); + syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"), + cl->name, cl->hostname); return -1; } - if(debug_lvl > 2) - syslog(LOG_DEBUG, "got REQ_KEY from " IP_ADDR_S " for " IP_ADDR_S, - IP_ADDR_V(tmp.from), IP_ADDR_V(tmp.to)); - - if((tmp.to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask)) - { /* hey! they want something from ME! :) */ - send_key_answer(cl, tmp.from); - return 0; - } - - fw = lookup_conn(tmp.to); - - if(!fw) + if(!(from = lookup_id(from_id))) { - syslog(LOG_ERR, "Attempting to forward key request to " IP_ADDR_S ", which does not exist?", - IP_ADDR_V(tmp.to)); + 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; } - if(debug_lvl > 3) - syslog(LOG_DEBUG, "Forwarding request for public key to " IP_ADDR_S, - IP_ADDR_V(fw->nexthop->vpn_ip)); - - tmp.type = REQ_KEY; - tmp.key = 0; - if(write(fw->nexthop->meta_socket, &tmp, sizeof(tmp)) < 0) - { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); - return -1; - } + free(from_id); + + from->status.validkey = 0; + from->status.waitingforkey = 0; + + send_key_changed(from, cl); cp return 0; } -void set_keys(conn_list_t *cl, key_req_t *k, char *key) +int send_req_key(conn_list_t *from, conn_list_t *to) { - char *ek; -cp - if(!cl->public_key) - { - cl->public_key = xmalloc(sizeof(*cl->key)); - cl->public_key->key = NULL; - } - if(cl->public_key->key) - free(cl->public_key->key); - cl->public_key->length = k->len; - cl->public_key->expiry = k->expiry; - cl->public_key->key = xmalloc(k->len + 1); - strcpy(cl->public_key->key, key); - - ek = make_shared_key(key); - if(!cl->key) - { - cl->key = xmalloc(sizeof(*cl->key)); - cl->key->key = NULL; - } - if(cl->key->key) - free(cl->key->key); - cl->key->length = strlen(ek); - cl->key->expiry = k->expiry; - cl->key->key = xmalloc(strlen(ek) + 1); - strcpy(cl->key->key, ek); cp + return send_request(to->nexthop, "%d %s %s", REQ_KEY, + from->name, to->name); } -int ans_key_h(conn_list_t *cl) +int req_key_h(conn_list_t *cl) { - key_req_t tmp; - conn_list_t *fw, *gk; - char *key; + char *from_id, *to_id; + conn_list_t *from, *to; + char pktkey[129]; cp - if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-2) <= 0) + if(sscanf(cl->buffer, "%*d %as %as", &from_id, &to_id) != 2) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); - return -1; + syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"), + cl->name, cl->hostname); + return -1; } - key = xmalloc(tmp.len); - - if(read(cl->meta_socket, key, tmp.len + 1) <= 0) + if(!(from = lookup_id(from_id))) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); + 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; } - syslog(LOG_DEBUG, "key = %s", key); - - if(debug_lvl > 3) - syslog(LOG_DEBUG, "got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S, - IP_ADDR_V(tmp.from), IP_ADDR_V(tmp.to)); - - if(tmp.to == myself->vpn_ip) - { /* hey! that key's for ME! :) */ - if(debug_lvl > 2) - syslog(LOG_DEBUG, "Yeah! key arrived. Now do something with it."); - gk = lookup_conn(tmp.from); + /* Check if this key request is for us */ - if(!gk) + if(!strcmp(to_id, myself->name)) + { + 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, "Receiving key from " IP_ADDR_S ", which does not exist?", - IP_ADDR_V(tmp.from)); + 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; } - - set_keys(gk, &tmp, key); - gk->status.validkey = 1; - gk->status.waitingforkey = 0; - flush_queues(gk); - return 0; - } - - fw = lookup_conn(tmp.to); - - if(!fw) - { - syslog(LOG_ERR, "Attempting to forward key to " IP_ADDR_S ", which does not exist?", - IP_ADDR_V(tmp.to)); - 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(debug_lvl > 2) - syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S, - IP_ADDR_V(fw->nexthop->vpn_ip)); - tmp.type = ANS_KEY; - if(write(fw->nexthop->meta_socket, &tmp, sizeof(tmp) -1) < 0) - { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); - return -1; - } - if(write(fw->nexthop->meta_socket, key, tmp.len + 1) < 0) - { - syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__); - return -1; - } + free(from_id); free(to_id); cp return 0; } -int key_changed_h(conn_list_t *cl) +int send_ans_key(conn_list_t *from, conn_list_t *to, char *pktkey) { - key_changed_t tmp; - conn_list_t *ik; cp - if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0) + return send_request(to->nexthop, "%d %s %s %s", ANS_KEY, + from->name, to->name, pktkey); +} + +int ans_key_h(conn_list_t *cl) +{ + char *from_id, *to_id, *pktkey; + int keylength; + conn_list_t *from, *to; +cp + if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &pktkey) != 3) { - syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__); + syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"), + cl->name, cl->hostname); + return -1; + } + + if(!(from = lookup_id(from_id))) + { + 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 > 2) - syslog(LOG_DEBUG, "got KEY_CHANGED from " IP_ADDR_S, - IP_ADDR_V(tmp.from)); + /* Check correctness of packet key */ - ik = lookup_conn(tmp.from); + keylength = strlen(pktkey); - if(!ik) + if(keylength != from->cipher_pktkeylength*2) { - syslog(LOG_ERR, "Got changed key from " IP_ADDR_S ", which does not exist?", - IP_ADDR_V(tmp.from)); + 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; } - ik->status.validkey = 0; - ik->status.waitingforkey = 0; + /* Forward it if necessary */ + + if(strcmp(to_id, myself->name)) + { + 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); + } + + /* Update our copy of the origin's packet key */ - if(debug_lvl > 3) - syslog(LOG_DEBUG, "Forwarding key invalidation request"); + if(from->cipher_pktkey) + free(from->cipher_pktkey); - notify_others(cl, ik, send_key_changed); + keylength /= 2; + hex2bin(pktkey, pktkey, keylength); + pktkey[keylength] = '\0'; + from->cipher_pktkey = pktkey; + + from->status.validkey = 1; + from->status.waitingforkey = 0; + + free(from_id); free(to_id); cp return 0; } -int (*request_handlers[256])(conn_list_t*) = { - 0, ack_h, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - termreq_h, timeout_h, del_host_h, 0, 0, 0, 0, 0, 0, 0, - ping_h, pong_h, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - add_host_h, basic_info_h, passphrase_h, public_key_h, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - req_key_h, ans_key_h, key_changed_h, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +/* 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 */ + +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", +}; + +/* Status strings */ + +char (*status_text[]) = { + "Warning", +}; + +/* Error strings */ + +char (*error_text[]) = { + "Error", };