X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=e26978bd1f7d6c773efcf836d64d04716bdd1fdf;hp=836708ab031afe8d112a5517e427dfd1a839f94b;hb=6e39481d8f2406e60b5e329ace08b5a005d5cc43;hpb=ed397b6ac676329b237e219c806143cccf456b3c diff --git a/src/protocol.c b/src/protocol.c index 836708ab..e26978bd 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -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.31 2000/09/14 21:51:21 zarq Exp $ + $Id: protocol.c,v 1.28.4.37 2000/10/11 13:42:52 guus Exp $ */ #include "config.h" @@ -43,46 +43,85 @@ #include "net.h" #include "netutl.h" #include "protocol.h" +#include "meta.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(!isalpha(id[i]) && id[i] != '_') + { + return 0; + } + } + + return 1; +} + +/* 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*/ ...) { va_list args; - char *buffer = NULL; + char buffer[MAXBUFSIZE+1]; int len; - + cp - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, 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, request); - len = vasprintf(&buffer, format, args); + len = vsnprintf(buffer, MAXBUFSIZE+1, format, args); va_end(args); - if(len < 0 || !buffer) + if(len < 0 || len > MAXBUFSIZE) { - 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->name, cl->hostname, buffer); + 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, length); +} - if(cl->status.encryptin) +int receive_request(conn_list_t *cl) +{ + int request; +cp + if(sscanf(cl->buffer, "%d", &request) == 1) { - /* FIXME: Do encryption */ + if((request < 0) || (request > 255) || (request_handlers[request] == NULL)) + { + syslog(LOG_ERR, _("Unknown request from %s (%s)"), + cl->name, cl->hostname); + return -1; + } + else + { + if(debug_lvl > DEBUG_PROTOCOL) + syslog(LOG_DEBUG, _("Got %s from %s (%s)"), + request_name[request], cl->name, cl->hostname); + } + if(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; + } } - - if((write(cl->meta_socket, buffer, len)) < 0) + 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 } /* Connection protocol: @@ -90,68 +129,65 @@ cp Client Server send_id(u) send_challenge(R) - send_chal_reply(BH) - send_id(B) - send_challenge(BR) - send_chal_reply(BH) - send_ack(B) - send_ack(B) + send_chal_reply(H) + send_id(u) + send_challenge(R) + send_chal_reply(H) + --------------------------------------- + Any negotations about the meta protocol + encryption go here(u). + --------------------------------------- + send_ack(u) + send_ack(u) + --------------------------------------- + Other requests(E)... (u) Unencrypted, (R) RSA, (H) SHA1, - (B) Blowfish. + (E) Encrypted with symmetric cipher. - Part of the challenge is directly used to set the blowfish key and the initial vector. - (Twee vliegen in één klap!) -*/ + Part of the challenge is directly used to set the symmetric cipher key and the initial vector. + Since a man-in-the-middle cannot decrypt the RSA challenges, this means that he cannot get or + forge the key for the symmetric cipher. +*/ int send_id(conn_list_t *cl) { cp - return send_request(cl, "%d %s %d %s", ID, - myself->name, myself->protocol_version, opt2str(myself->options)); + return send_request(cl, "%d %s %d %lx", ID, myself->name, myself->protocol_version, myself->options); } int id_h(conn_list_t *cl) { conn_list_t *old; - char *options; cp - if(sscanf(cl->buffer, "%*d %as %d %as", &cl->name, &cl->protocol_version, &options) != 3) + if(sscanf(cl->buffer, "%*d %as %d %lx", &cl->name, &cl->protocol_version, &cl->options) != 3) { syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname); return -1; } - + /* Check if version matches */ - + if(cl->protocol_version != myself->protocol_version) { syslog(LOG_ERR, _("Peer %s (%s) uses incompatible version %d"), - cl->name, cl->hostname, cl->protocol_version); + cl->name, cl->hostname, cl->protocol_version); return -1; } - /* Check if option string is valid */ - - if((cl->options = str2opt(options)) == -1) - { - syslog(LOG_ERR, _("Peer %s uses invalid option string"), cl->hostname); - return -1; - } - /* Check if identity is a valid name */ - + if(!check_id(cl->name)) { syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname); return -1; } - + /* Load information about peer */ - - if(!read_id(cl)) + + if(!read_host_config(cl)) { syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name); return -1; @@ -185,111 +221,76 @@ cp int send_challenge(conn_list_t *cl) { - char *buffer; - int keylength; - int x; + char buffer[CHAL_LENGTH*2+1]; cp - if(cl->chal_answer) - free(cl->chal_answer); - - /* Allocate buffers for the challenge and the hash */ - - cl->chal_answer = xmalloc(SHA_DIGEST_LENGTH); - keylength = BN_num_bytes(cl->rsakey->length); - buffer = xmalloc(keylength*2); + /* Allocate buffers for the challenge */ - /* Copy random data and the public key to the buffer */ - - RAND_bytes(buffer, keylength); - BN_bn2bin(cl->rsakey->length, buffer+keylength); + if(!cl->hischallenge) + cl->hischallenge = xmalloc(CHAL_LENGTH); - /* If we don't have a blowfish key set yet, use the random data from the challenge to do so. */ - - if(!cl->status.encryptin) - { - set_metakey(cl, buffer, keylength); - } - - /* Calculate the hash from that */ + /* Copy random data to the buffer */ - SHA1(buffer, keylength*2, cl->chal_answer); + RAND_bytes(cl->hischallenge, CHAL_LENGTH); /* Convert the random data to a hexadecimal formatted string */ - bin2hex(buffer,buffer,keylength); + bin2hex(cl->hischallenge,buffer,CHAL_LENGTH); buffer[keylength*2] = '\0'; /* Send the challenge */ - + cl->allow_request = CHAL_REPLY; - x = send_request(cl, "%d %s", CHALLENGE, buffer); - free(buffer); - cl->status.encryptout = 1; cp - return x; + return send_request(cl, "%d %s", CHALLENGE, buffer); } int challenge_h(conn_list_t *cl) { - char *challenge; - int x; - + char *buffer; cp - if(sscanf(cl->buffer, "%*d %as", &cl->name, &challenge) != 1) + if(sscanf(cl->buffer, "%*d %as", &buffer) != 1) { 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->rsakey->length); - /* Check if the length of the challenge is all right */ - if(strlen(challenge) != keylength*2) + if(strlen(buffer) != CHAL_LENGTH*2) { syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), cl->name, cl->hostname); + free(buffer); return -1; } - /* Allocate buffers for the challenge and the hash */ - - buffer = xmalloc(keylength*2); - hash = xmalloc(SHA_DIGEST_LENGTH*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(CHAL_LENGTH); - hex2bin(challenge, buffer, keylength); - BN_bn2bin(myself->rsakey->length, buffer+keylength); + /* Convert the challenge from hexadecimal back to binary */ - /* Calculate the hash from that */ - - SHA1(buffer, keylength*2, hash); + hex2bin(buffer,cl->mychallenge,CHAL_LENGTH); + free(buffer); + + /* Rest is done by send_chal_reply() */ +cp + return send_chal_reply(cl); +} - /* If we don't have a blowfish key set yet, use the random data from the challenge to do so. */ - - if(!cl->status.encrypted) +int send_chal_reply(conn_list_t *cl) +{ + char hash[SHA_DIGEST_LENGTH*2+1]; +cp + if(!cl->mychallenge) { - set_metakey(cl, buffer, keylength); - cl->status.encrypted = 1; + 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 */ - free(buffer); + SHA1(cl->mychallenge, CHAL_LENGTH, hash); /* Convert the hash to a hexadecimal formatted string */ @@ -303,50 +304,54 @@ cp 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) { - char *hash; + char *hishash; + char myhash[SHA_DIGEST_LENGTH]; cp - if(sscanf(cl->buffer, "%*d %as", &cl->name, &hash) != 2) + if(sscanf(cl->buffer, "%*d %as", &hishash) != 2) { syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname); + free(hishash); return -1; } /* Check if the length of the hash is all right */ - - if(strlen(hash) != SHA_DIGEST_LENGTH*2) + + 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; } - + /* Convert the hash to binary format */ - - hex2bin(hash, hash, SHA_DIGEST_LENGTH); - + + hex2bin(hishash, hishash, SHA_DIGEST_LENGTH); + + /* Calculate the hash from the challenge we sent */ + + SHA1(cl->hischallenge, CHAL_LENGTH, myhash); + /* Verify the incoming hash with the calculated hash */ - - if(!memcmp(hash, cl->chal_answer, SHA_DIGEST_LENGTH)) + + if(!memcmp(hishash, myhash, SHA_DIGEST_LENGTH)) { syslog(LOG_ERR, _("Intruder: wrong challenge reply from %s (%s)"), cl->name, cl->hostname); + free(hishash); return -1; } + free(hishash); + /* Identity has now been positively verified. If we are accepting this new connection, then send our identity, if we are making this connecting, acknowledge. */ - - free(hash); - free(cl->chal_answer); - cp if(cl->status.outgoing) { @@ -369,14 +374,13 @@ cp int ack_h(conn_list_t *cl) { conn_list_t *old; - cp /* Okay, before we active the connection, we check if there is another entry - in the connection list with the same vpn_ip. If so, it presumably is an + in the connection list with the same name. If so, it presumably is an old connection that has timed out but we don't know it yet. */ - while((old = lookup_id(cl->name))) + 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"), @@ -411,15 +415,74 @@ cp int send_add_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet) { + int x; + char *netstr; +cp + x = send_request(cl, "%d %s %s", ADD_SUBNET, + other->name, netstr = net2str(subnet)); + free(netstr); cp -/* return send_request(cl, "%d %s %d %s", ADD_SUBNET, - other->name, subnet->type, net2str(subnet)); */ - return send_request(cl, "%d %s %s", ADD_SUBNET, - other->name, net2str(subnet)); + return x; } int add_subnet_h(conn_list_t *cl) { + char *subnetstr; + char *name; + conn_list_t *owner; + subnet_t *subnet, *old; +cp + if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 3) + { + syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), cl->name, cl->hostname); + free(name); free(subnetstr); + return -1; + } + + /* Check if owner name is a valid */ + + if(!check_id(name)) + { + syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname); + free(name); free(subnetstr); + return -1; + } + + /* Check if subnet string is valid */ + + if((subnet = str2net(subnetstr)) == -1) + { + syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname); + free(name); free(subnetstr); + return -1; + } + + 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, _("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 */ +cp + return subnet_add(owner, subnet); } int send_del_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet) @@ -430,6 +493,62 @@ cp int del_subnet_h(conn_list_t *cl) { + char *subnetstr; + char *name; + conn_list_t *owner; + subnet_t *subnet, *old; +cp + 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; + } + + /* Check if owner name is a valid */ + + if(!check_id(name)) + { + syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname); + free(name); free(subnetstr); + return -1; + } + + /* Check if subnet string is valid */ + + if((subnet = str2net(subnetstr)) == -1) + { + syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname); + free(name); free(subnetstr); + return -1; + } + + free(subnetstr); + + /* Check if somebody tries to add a subnet of ourself */ + + if(!strcmp(name, myself->name)) + { + syslog(LOG_ERR, _("Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"), + cl->name, cl->hostname); + 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, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"), + name, cl->name, cl->hostname); + free(name); + return -1; + } + + /* If everything is correct, add the subnet to the list of the owner */ +cp + return subnet_del(owner, subnet); } /* New and closed connections notification */ @@ -437,51 +556,68 @@ int del_subnet_h(conn_list_t *cl) int send_add_host(conn_list_t *cl, conn_list_t *other) { cp - return send_request(cl, "%d %s %lx:%d %s", ADD_HOST, other->name, other->real_ip, other->port, opt2str(other->options)); + return send_request(cl, "%d %s %s %lx:%d %lx", ADD_HOST, + myself->name, other->name, other->real_ip, other->port, other->options); } int add_host_h(conn_list_t *cl) { - char *options; - conn_list_t *old, *new; + char *sender; + conn_list_t *old, *new, *hisuplink; cp new = new_conn_list(); - if(sscanf(cl->buffer, "%*d %as %lx:%d %as", &new->name, &new->real_ip, &new->port, &options) != 4) + if(sscanf(cl->buffer, "%*d %as %as %lx:%d %lx", &sender, &new->name, &new->address, &new->port, &new->options) != 5) { syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname); return -1; - } - - /* Check if option string is valid */ - - if((new->options = str2opt(options)) == -1) - { - syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid option string"), cl->name, cl->hostname); - return -1; } /* Check if identity is a valid name */ - - if(!check_id(new->name)) + + if(!check_id(new->name) || !check_id(sender)) { syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname); + free(sender); return -1; } - + /* Check if somebody tries to add ourself */ - + if(!strcmp(new->name, myself->name)) { syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname); sighup = 1; + free(sender); return 0; } + /* We got an ADD_HOST from ourself!? */ + + if(!strcmp(sender, myself->name)) + { + syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) from ourself, restarting"), cl->name, cl->hostname); + sighup = 1; + free(sender); + return 0; + } + + /* Lookup his uplink */ + + if(!(new->hisuplink = lookup_id(sender)) + { + syslog(LOG_ERR, _("Got ADD_HOST from %s (%s) with origin %s which is not in our connection list"), + sender, cl->name, cl->hostname); + free(sender); + return -1; + } + + free(sender); + /* Fill in more of the new conn_list structure */ new->hostname = hostlookup(htonl(new->real_ip)); - + /* Check if the new host already exists in the connnection list */ if((old = lookup_id(new->name))) @@ -490,14 +626,14 @@ cp { 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); - return 0; + old->name, old->hostname, new->name, new->hostname); + return 0; } else { if(debug_lvl > DEBUG_CONNECTIONS) syslog(LOG_NOTICE, _("Removing old entry for %s (%s)"), - old->name, old->hostname); + old->name, old->hostname); old->status.active = 0; terminate_connection(old); } @@ -505,17 +641,17 @@ cp /* Fill in rest of conn_list structure */ - new->nexthop = cl; + new->myuplink = cl; new->status.active = 1; - + /* Hook it up into the conn_list */ conn_list_add(conn_list, new); /* Tell the rest about the new host */ - + notify_others(new, cl, send_add_host); - + cp return 0; } @@ -523,57 +659,93 @@ cp int send_del_host(conn_list_t *cl, conn_list_t *other) { cp - return send_request(cl, "%d %s %lx:%d", DEL_HOST, - other->name, other->real_ip, other->port); + return send_request(cl, "%d %s %s %lx:%d %lx", DEL_HOST, + myself->name, other->name, other->real_ip, other->port, other->options); } int del_host_h(conn_list_t *cl) { - char *id; + char *name; + char *sender; ip_t address; port_t port; - conn_list_t *old; - + int options; + conn_list_t *old, *hisuplink; + cp - if(sscanf(cl->buffer, "%*d %as %lx:%d", &id, &address, &port) != 3) + if(sscanf(cl->buffer, "%*d %as %as %lx:%d %lx", &sender, &name, &address, &port, &options) != 5) { syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"), - cl->name, cl->hostname); + cl->name, cl->hostname); + return -1; + } + + /* Check if identity is a valid name */ + + if(!check_id(name) || !check_id(sender)) + { + syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname); + free(name); free(sender); return -1; - } + } /* Check if somebody tries to delete ourself */ - - if(!strcmp(id, myself->name)) + + if(!strcmp(name, myself->name)) { syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"), - cl->name, cl->hostname); + cl->name, cl->hostname); + free(name); free(sender); sighup = 1; return 0; } - /* Check if the new host already exists in the connnection list */ + /* We got an ADD_HOST from ourself!? */ - if((old = lookup_id(id))) + if(!strcmp(sender, myself->name)) { - if((address == old->real_ip) && (port == old->port)) - { - notify_others(old, cl, send_del_host); + syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) from ourself, restarting"), cl->name, cl->hostname); + sighup = 1; + free(name); free(sender); + return 0; + } - old->status.termreq = 1; - old->status.active = 0; + /* Lookup his uplink */ - terminate_connection(old); -cp - return 0; - } + if(!(hisuplink = lookup_id(sender)) + { + syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) with origin %s which is not in our connection list"), + cl->name, cl->hostname, sender); + free(name); free(sender); + return -1; } + + free(sender); - if(debug_lvl > DEBUG_CONNECTIONS) + /* Check if the new host already exists in the connnection list */ + + if(!(old = lookup_id(name))) { - syslog(LOG_NOTICE, _("Got DEL_HOST for %s from %s (%s) which is not in our connection list"), - id, cl->name, cl->hostname); + 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 || hisuplink!=old->hisuplink || cl!=old->myuplink) + { + syslog(LOG_WARNING, _("Got DEL_HOST from %s (%s) for %s which doesn't match"), cl->name, cl->hostname, old->name); + return 0; + } + + /* Ok, since EVERYTHING seems to check out all right, delete it */ + + old->status.termreq = 1; + old->status.active = 0; + + terminate_connection(old); cp return 0; } @@ -596,14 +768,15 @@ int status_h(conn_list_t *cl) cp if(sscanf(cl->buffer, "%*d %d %as", &statusno, &statusstring) != 2) { - syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"), cl->id, cl->hostname); + 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); + cl->name, cl->hostname, status_text[statusno], statusstring); } cp @@ -615,7 +788,7 @@ int send_error(conn_list_t *cl, int errno, char *errstring) { cp if(!errstring) - errstring = error_text[errno]; + errstring = strerror(errno); return send_request(cl, "%d %d %s", ERROR, errno, errstring); } @@ -627,14 +800,14 @@ cp if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2) { syslog(LOG_ERR, _("Got bad error from %s (%s)"), - cl->name, cl->hostname); + cl->name, cl->hostname); return -1; } if(debug_lvl > DEBUG_error) { syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"), - cl->name, cl->hostname, error_text[errno], errorstring); + cl->name, cl->hostname, strerror(errno), errorstring); } free(errorstring); @@ -698,7 +871,7 @@ cp { if(p!=cl && p->status.meta && p->status.active) send_request(p, "%d %s", KEY_CHANGED, - from->name); + from->name); } cp return 0; @@ -712,31 +885,33 @@ cp if(sscanf(cl->buffer, "%*d %as", &from_id) != 1) { syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"), - cl->name, cl->hostname); + cl->name, cl->hostname); return -1; - } + } if(!(from = lookup_id(from_id))) { - syslog(LOG_ERR, _("Got KEY_CHANGED from %s (%s) origin %s which does not exist in our connection list"), cl->id, cl->hostname, from_id); + 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; } free(from_id); - + from->status.validkey = 0; from->status.waitingforkey = 0; - + send_key_changed(from, cl); cp return 0; } - + int send_req_key(conn_list_t *from, conn_list_t *to) { cp - return send_request(to->nexthop, "%d %s %s", REQ_KEY, from->id, to->id); + return send_request(to->nexthop, "%d %s %s", REQ_KEY, + from->name, to->name); } int req_key_h(conn_list_t *cl) @@ -746,28 +921,31 @@ int req_key_h(conn_list_t *cl) cp if(sscanf(cl->buffer, "%*d %as %as", &from_id, &to_id) != 2) { - syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"), cl->id, cl->hostname); + syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"), + cl->name, cl->hostname); return -1; - } + } if(!(from = lookup_id(from_id))) { - syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) origin %s which does not exist in our connection list"), cl->id, cl->hostname, from_id); + 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; } /* Check if this key request is for us */ - if(!strcmp(id, myself->strcmp)) + if(!strcmp(to_id, myself->name)) { - send_ans_key(myself, from, myself->datakey); + send_ans_key(myself, from, myself->datakey->key); } 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->id, cl->hostname, to_id); + syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) destination %s which does not exist in our connection list"), + cl->name, cl->hostname, to_id); free(from_id); free(to_id); return -1; } @@ -782,7 +960,8 @@ cp int send_ans_key(conn_list_t *from, conn_list_t *to, char *datakey) { cp - return send_request(to->nexthop, "%d %s %s %s", ANS_KEY, from->id, to->id, datakey); + return send_request(to->nexthop, "%d %s %s %s", ANS_KEY, + from->name, to->name, datakey); } int ans_key_h(conn_list_t *cl) @@ -793,28 +972,31 @@ int ans_key_h(conn_list_t *cl) cp if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &datakey) != 3) { - syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"), cl->id, cl->hostname); + 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->id, cl->hostname, 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(datakey); return -1; } /* Check if this key request is for us */ - if(!strcmp(id, myself->strcmp)) + if(!strcmp(to_id, myself->name)) { /* It is for us, convert it to binary and set the key with it. */ - + keylength = strlen(datakey); - + if((keylength%2) || (keylength <= 0)) { - syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key"), cl->id, cl->hostname, from->id); + syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key"), + cl->name, cl->hostname, from->name); free(from_id); free(to_id); free(datakey); return -1; } @@ -826,7 +1008,8 @@ cp { 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->id, cl->hostname, 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); free(datakey); return -1; } @@ -838,43 +1021,7 @@ cp return 0; } -/* Old routines */ - -/* - Notify all my direct connections of a new host - that was added to the vpn, with the exception - of the source of the announcement. -*/ - -int notify_others(conn_list_t *new, conn_list_t *source, - int (*function)(conn_list_t*, conn_list_t*)) -{ - conn_list_t *p; -cp - for(p = conn_list; p != NULL; p = p->next) - if(p != new && p != source && p->status.meta && p->status.active) - function(p, new); -cp - return 0; -} - -/* - Notify one connection of everything - I have connected -*/ - -int notify_one(conn_list_t *new) -{ - conn_list_t *p; -cp - for(p = conn_list; p != NULL; p = p->next) - if(p != new && p->status.active) - send_add_host(new, p); -cp - return 0; -} - -/* "Complete overhaul". */ +/* Jumptable for the request handlers */ int (*request_handlers[])(conn_list_t*) = { id_h, challenge_h, chal_reply_h, ack_h, @@ -885,6 +1032,8 @@ int (*request_handlers[])(conn_list_t*) = { key_changed_h, req_key_h, ans_key_h, }; +/* Request names */ + char (*request_name[]) = { "ID", "CHALLENGE", "CHAL_REPLY", "ACK", "STATUS", "ERROR", "TERMREQ",