X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=35b07882275865d3effaf9f54ac538f34ed3cfa0;hp=2081edc642a0be9c421027974ef51f215fd6d6c0;hb=5d0b3516d5e8a46ca2268bdb32657b72295501ec;hpb=9c75350ac6c14886195b6d368af2f118fd5d60e0 diff --git a/src/protocol.c b/src/protocol.c index 2081edc6..35b07882 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.29 2000/09/11 10:05:34 guus Exp $ + $Id: protocol.c,v 1.28.4.33 2000/09/17 21:42:05 guus Exp $ */ #include "config.h" @@ -36,6 +36,8 @@ #include +#include + #include "conf.h" #include "encr.h" #include "net.h" @@ -44,61 +46,96 @@ #include "system.h" +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 outgoing request routine - 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)"), 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); + va_start(args, request); + 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->id, cl->hostname, buffer); + syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request], + cl->name, cl->hostname, buffer); + else if(debug_lvl >= DEBUG_PROTOCOL) + syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname); + - if(cl->status.encryptout) + if(cl->status.encryptin) { /* FIXME: Do encryption */ } - if((write(cl->meta_socket, buffer, buflen)) < 0) + if((write(cl->meta_socket, buffer, len)) < 0) { syslog(LOG_ERR, _("Sending meta data failed: %m")); return -1; } -cp +cp } /* Connection protocol: Client Server - send_id(*) - send_challenge - send_chal_reply(*) - send_id - send_challenge - send_chal_reply - send_ack - send_ack - - (*) Unencrypted. -*/ + send_id(u) + send_challenge(R) + send_chal_reply(H) + send_id(u) + send_challenge(R) + send_chal_reply(H) + --------------------------------------- + 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, + (E) Encrypted with symmetric cipher. + + Part of the challenge is directly used to set the symmetric cipher key and the initial vector. + Since a man-in-the-middle cannot decrypt the RSA challenges, this means that he cannot get or + forge the key for the symmetric cipher. +*/ int send_id(conn_list_t *cl) { cp - return send_request(cl, "%d %s %d %s", ID, myself->id, myself->version, opt2str(myself->options)); + return send_request(cl, "%d %s %d %s", ID, + myself->name, myself->protocol_version, opt2str(myself->options)); } int id_h(conn_list_t *cl) @@ -106,41 +143,42 @@ int id_h(conn_list_t *cl) conn_list_t *old; char *options; cp - if(sscanf(cl->buffer, "%*d %as %d %as", &cl->id, &cl->version, &options) != 3) + if(sscanf(cl->buffer, "%*d %as %d %as", &cl->name, &cl->protocol_version, &options) != 3) { syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname); return -1; } - + /* Check if version matches */ - - if(cl->version != myself->version) + + if(cl->protocol_version != myself->protocol_version) { - syslog(LOG_ERR, _("Peer %s uses incompatible version %d"), cl->hostname, cl->min_version, cl->max_version); + syslog(LOG_ERR, _("Peer %s (%s) uses incompatible version %d"), + 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->id)) + + if(!check_id(cl->name)) { syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname); return -1; } - + /* Load information about peer */ - + if(!read_id(cl)) { - 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; } @@ -152,10 +190,10 @@ 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); + 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); @@ -163,10 +201,6 @@ cp } } - /* Since we know the identity now, we can encrypt the meta channel */ - - cl->status.encryptout = 1; - /* Send a challenge to verify the identity */ cl->allow_request = CHAL_REPLY; @@ -180,23 +214,30 @@ int send_challenge(conn_list_t *cl) int keylength; int x; cp - if(cl->chal_hash) - free(cl->chal_hash); - + if(cl->chal_answer) + free(cl->chal_answer); + /* Allocate buffers for the challenge and the hash */ - - cl->chal_hash = xmalloc(SHA_DIGEST_LEN); - keylength = BN_num_bytes(cl->metakey.n); + + cl->chal_answer = xmalloc(SHA_DIGEST_LENGTH); + keylength = BN_num_bytes(cl->rsakey->length); buffer = xmalloc(keylength*2); /* Copy random data and the public key to the buffer */ - + RAND_bytes(buffer, keylength); - BN_bn2bin(cl->metakey.n, buffer+keylength); + BN_bn2bin(cl->rsakey->length, buffer+keylength); + + /* 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 */ - SHA1(buffer, keylength*2, cl->chal_hash); + SHA1(buffer, keylength*2, cl->chal_answer); /* Convert the random data to a hexadecimal formatted string */ @@ -204,10 +245,11 @@ cp 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; } @@ -215,15 +257,17 @@ cp int challenge_h(conn_list_t *cl) { char *challenge; + int x; + cp - if(sscanf(cl->buffer, "%*d %as", &cl->id, &challenge) != 1) + if(sscanf(cl->buffer, "%*d %as", &cl->name, &challenge) != 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 @@ -236,41 +280,51 @@ int send_chal_reply(conn_list_t *cl, char *challenge) int keylength; char *hash; int x; + cp - keylength = BN_num_bytes(myself->meyakey.n); + keylength = BN_num_bytes(myself->rsakey->length); /* Check if the length of the challenge is all right */ if(strlen(challenge) != keylength*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); + hash = xmalloc(SHA_DIGEST_LENGTH*2+1); /* Copy the incoming random data and our public key to the buffer */ - hex2bin(challenge, buffer, keylength); - BN_bn2bin(myself->metakey.n, buffer+keylength); + hex2bin(challenge, buffer, keylength); + BN_bn2bin(myself->rsakey->length, buffer+keylength); /* Calculate the hash from that */ - + SHA1(buffer, keylength*2, hash); + + /* If we don't have a blowfish key set yet, use the random data from the challenge to do so. */ + + if(!cl->status.encrypted) + { + set_metakey(cl, buffer, keylength); + cl->status.encrypted = 1; + } + free(buffer); /* Convert the hash to a hexadecimal formatted string */ - bin2hex(hash,hash,SHA_DIGEST_LEN); - hash[SHA_DIGEST_LEN*2] = '\0'; + bin2hex(hash,hash,SHA_DIGEST_LENGTH); + hash[SHA_DIGEST_LENGTH*2] = '\0'; /* Send the reply */ if(cl->status.outgoing) - cl->allow_resuest = ID; + cl->allow_request = ID; else cl->allow_request = ACK; @@ -278,35 +332,35 @@ cp free(hash); cp return x; -} +} int chal_reply_h(conn_list_t *cl) { char *hash; cp - if(sscanf(cl->buffer, "%*d %as", &cl->id, &hash) != 2) + if(sscanf(cl->buffer, "%*d %as", &cl->name, &hash) != 2) { - 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(hash) != 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(hash, hash, SHA_DIGEST_LENGTH); + /* Verify the incoming hash with the calculated hash */ - - if{!memcmp(hash, cl->chal_hash, SHA_DIGEST_LEN)} + + if(!memcmp(hash, cl->chal_answer, 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); return -1; } @@ -314,9 +368,9 @@ cp If we are accepting this new connection, then send our identity, if we are making this connecting, acknowledge. */ - + free(hash); - free(cl->chal_hash); + free(cl->chal_answer); cp if(cl->status.outgoing) @@ -339,18 +393,19 @@ cp int ack_h(conn_list_t *cl) { - conn_list_t old; + 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 old connection that has timed out but we don't know it yet. */ - while((old = lookup_id(cl->id))) + 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->id, old->hostname, cl->hostname); + cl->name, old->hostname, cl->hostname); old->status.active = 0; terminate_connection(old); } @@ -361,7 +416,7 @@ cp cl->status.active = 1; if(debug_lvl > DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->id, cl->hostname); + syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname); /* Exchange information about other tinc daemons */ @@ -382,21 +437,112 @@ cp int send_add_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet) { cp - return send_request(cl, "%d %s %d %s", ADD_SUBNET, other->id, subnet->type, net2str(subnet)); + return send_request(cl, "%d %s %s", ADD_SUBNET, + other->name, net2str(subnet)); } 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); + 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); + 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); + return -1; + } + + /* Check if somebody tries to add a subnet of ourself */ + + if(!strcmp(name, myself->name)) + { + syslog(LOG_ERR, _("Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"), + cl->name, cl->hostname); + sighup = 1; + return 0; + } + + /* Check if the owner of the new subnet is in the connection list */ + + if(!(owner = lookup_id(name)) + { + syslog(LOG_NOTICE, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"), + name, cl->name, cl->hostname); + } + + } int send_del_subnet(conn_list_t *cl, conn_list_t *other, subnet_t *subnet) { cp - return send_request(cl, "%d %s %d %s", DEL_SUBNET, other->id, subnet->type, net2str(subnet)); + return send_request(cl, "%d %s %s", DEL_SUBNET, other->name, net2str(subnet)); } 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); + 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); + 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); + return -1; + } + + /* Check if somebody tries to delete a subnet of ourself */ + + if(!strcmp(name, myself->name)) + { + syslog(LOG_ERR, _("Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"), + cl->name, cl->hostname); + sighup = 1; + return 0; + } + + /* Check if the owner of the new subnet is in the connection list */ + + if(!(owner = lookup_id(name)) + { + syslog(LOG_NOTICE, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"), + name, cl->name, cl->hostname); + } } /* New and closed connections notification */ @@ -404,7 +550,7 @@ 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->id, other->address, other->port, opt2str(other->options)); + return send_request(cl, "%d %s %lx:%d %s", ADD_HOST, other->name, other->real_ip, other->port, opt2str(other->options)); } int add_host_h(conn_list_t *cl) @@ -414,55 +560,57 @@ int add_host_h(conn_list_t *cl) cp new = new_conn_list(); - if(sscanf(cl->buffer, "%*d %as %lx:%d %as", &new->id, &new->address, &new->port, &options) != 4) + if(sscanf(cl->buffer, "%*d %as %lx:%d %as", &new->name, &new->real_ip, &new->port, &options) != 4) { - syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->id, cl->hostname); + 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) + + if((new->options = str2opt(options)) == -1) { - syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid option string"), cl->hostname); + 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->id)) + + if(!check_id(new->name)) { - syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->id, cl->hostname); + syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname); return -1; } - + /* Check if somebody tries to add ourself */ - - if(!strcmp(new->id, myself->id)) + + if(!strcmp(new->name, myself->name)) { - syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->id, cl->hostname); + syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname); sighup = 1; return 0; } /* Fill in more of the new conn_list structure */ - new->hostname = hostlookup(htonl(new->address)); - + new->hostname = hostlookup(htonl(new->real_ip)); + /* Check if the new host already exists in the connnection list */ - if((old = lookup_id(id)) + if((old = lookup_id(new->name))) { - if((new->address == old->address) && (new->port == old->port)) + if((new->real_ip == old->real_ip) && (new->port == old->port)) { if(debug_lvl > DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"), old->id, old->hostname, new->id, new->hostname); - return 0; + syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"), + 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->id, old->hostname); + syslog(LOG_NOTICE, _("Removing old entry for %s (%s)"), + old->name, old->hostname); old->status.active = 0; terminate_connection(old); } @@ -472,15 +620,15 @@ cp new->nexthop = 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; } @@ -488,7 +636,8 @@ 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->id, other->address, other->port); + return send_request(cl, "%d %s %lx:%d", DEL_HOST, + other->name, other->real_ip, other->port); } int del_host_h(conn_list_t *cl) @@ -497,34 +646,37 @@ int del_host_h(conn_list_t *cl) ip_t address; port_t port; conn_list_t *old; + cp if(sscanf(cl->buffer, "%*d %as %lx:%d", &id, &address, &port) != 3) { - syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"), cl->id, cl->hostname); - return -1; - } + syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"), + cl->name, cl->hostname); + return -1; + } /* Check if somebody tries to delete ourself */ - - if(!strcmp(id, myself->id)) + + if(!strcmp(id, myself->name)) { - syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"), cl->id, cl->hostname); + syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"), + cl->name, cl->hostname); sighup = 1; return 0; } /* Check if the new host already exists in the connnection list */ - if((old = lookup_id(id)) + if((old = lookup_id(id))) { - if((address == old->address) && (port == old->port)) + if((address == old->real_ip) && (port == old->port)) { notify_others(old, cl, send_del_host); - fw->status.termreq = 1; - fw->status.active = 0; + old->status.termreq = 1; + old->status.active = 0; - terminate_connection(fw); + terminate_connection(old); cp return 0; } @@ -532,7 +684,8 @@ cp if(debug_lvl > DEBUG_CONNECTIONS) { - syslog(LOG_NOTICE, _("Got DEL_HOST for %s from %s (%s) which is not in our connection list"), id, cl->id, cl->hostname); + syslog(LOG_NOTICE, _("Got DEL_HOST for %s from %s (%s) which is not in our connection list"), + id, cl->name, cl->hostname); } cp return 0; @@ -556,13 +709,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->id, cl->hostname, status_text[statusno], statusstring); + syslog(LOG_NOTICE, _("Status message from %s (%s): %s: %s"), + cl->name, cl->hostname, status_text[statusno], statusstring); } cp @@ -573,8 +728,8 @@ cp int send_error(conn_list_t *cl, int errno, char *errstring) { cp - if(!errorstring) - errorstring = error_text[errno]; + if(!errstring) + errstring = strerror(errno); return send_request(cl, "%d %d %s", ERROR, errno, errstring); } @@ -585,13 +740,15 @@ int error_h(conn_list_t *cl) cp if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2) { - syslog(LOG_ERR, _("Got bad error from %s (%s)"), cl->id, cl->hostname); + syslog(LOG_ERR, _("Got bad error from %s (%s)"), + cl->name, cl->hostname); return -1; } if(debug_lvl > DEBUG_error) { - syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"), cl->id, cl->hostname, error_text[errno], errorstring); + syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"), + cl->name, cl->hostname, strerror(errno), errorstring); } free(errorstring); @@ -654,7 +811,8 @@ cp for(p = conn_list; p != NULL; p = p->next) { if(p!=cl && p->status.meta && p->status.active) - send_request(p, "%d %s", KEY_CHANGED, from->id); + send_request(p, "%d %s", KEY_CHANGED, + from->name); } cp return 0; @@ -667,31 +825,34 @@ int key_changed_h(conn_list_t *cl) cp if(sscanf(cl->buffer, "%*d %as", &from_id) != 1) { - syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"), cl->id, cl->hostname); - return -1; - } + syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"), + 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) @@ -701,28 +862,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; } @@ -737,7 +901,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) @@ -748,28 +913,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; } @@ -781,7 +949,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; } @@ -802,7 +971,7 @@ cp */ int notify_others(conn_list_t *new, conn_list_t *source, - int (*function)(conn_list_t*, conn_list_t*)) + int (*function)(conn_list_t*, conn_list_t*)) { conn_list_t *p; cp