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.27 2000/09/10 22:49:46 guus Exp $
+ $Id: protocol.c,v 1.28.4.31 2000/09/14 21:51:21 zarq Exp $
*/
#include "config.h"
#include <netinet/in.h>
+#include <openssl/sha.h>
+
#include "conf.h"
#include "encr.h"
#include "net.h"
{
va_list args;
char *buffer = NULL;
+ int len;
+
cp
if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), requestname[request], cl->id, cl->hostname);
+ syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], cl->name, cl->hostname);
- va_start(args, format);
+ va_start(args, request);
len = vasprintf(&buffer, format, args);
va_end(args);
}
if(debug_lvl >= DEBUG_META)
- syslog(LOG_DEBUG, _("Sending meta data to %s (%s): %s"), cl->id, cl->hostname, buffer);
+ syslog(LOG_DEBUG, _("Sending meta data to %s (%s): %s"),
+ cl->name, cl->hostname, buffer);
- 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;
/* 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(BH)
+ send_id(B)
+ send_challenge(BR)
+ send_chal_reply(BH)
+ send_ack(B)
+ send_ack(B)
+
+ (u) Unencrypted,
+ (R) RSA,
+ (H) SHA1,
+ (B) Blowfish.
+
+ Part of the challenge is directly used to set the blowfish key and the initial vector.
+ (Twee vliegen in één klap!)
*/
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)
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 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;
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;
}
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);
}
}
- /* 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;
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 */
cl->allow_request = CHAL_REPLY;
x = send_request(cl, "%d %s", CHALLENGE, buffer);
free(buffer);
+ cl->status.encryptout = 1;
cp
return x;
}
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;
}
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);
+ 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;
{
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;
}
*/
free(hash);
- free(cl->chal_hash);
+ free(cl->chal_answer);
cp
if(cl->status.outgoing)
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);
}
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 */
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 %d %s", ADD_SUBNET,
+ other->name, 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)
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)
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)
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);
+ 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);
}
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)
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;
}
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;
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
int send_error(conn_list_t *cl, int errno, char *errstring)
{
cp
- if(!errorstring)
- errorstring = error_text[errno];
+ if(!errstring)
+ errstring = error_text[errno];
return send_request(cl, "%d %d %s", ERROR, errno, errstring);
}
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, error_text[errno], errorstring);
}
free(errorstring);
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;
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);
- free(from);
+ free(from_id);
return -1;
}
+
+ free(from_id);
from->status.validkey = 0;
from->status.waitingforkey = 0;
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);
- free(from); free(to);
+ free(from_id); free(to_id);
return -1;
}
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);
- free(from); free(to);
+ free(from_id); free(to_id);
return -1;
}
send_req_key(from, to);
}
- free(from); free(to);
+ free(from_id); free(to_id);
cp
return 0;
}
int ans_key_h(conn_list_t *cl)
{
char *from_id, *to_id, *datakey;
+ int keylength;
conn_list_t *from, *to;
cp
if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &datakey) != 3)
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);
- free(from); free(to); free(datakey);
+ free(from_id); free(to_id); free(datakey);
return -1;
}
if(!strcmp(id, myself->strcmp))
{
- send_ans_key(myself, from);
+ /* 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);
+ free(from_id); free(to_id); free(datakey);
+ return -1;
+ }
+ keylength /= 2;
+ hex2bin(datakey, datakey, keylength);
+ BF_set_key(cl->datakey, keylength, datakey);
}
else
{
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);
- free(from); free(to); free(datakey);
+ free(from_id); free(to_id); free(datakey);
return -1;
}
send_ans_key(from, to, datakey);
}
- free(from); free(to); free(datakey);
+ free(from_id); free(to_id); free(datakey);
cp
return 0;
}
-
-
-
/* Old routines */
-
-
-
-int send_tcppacket(conn_list_t *cl, void *data, int len)
-{
-cp
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Sending PACKET to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %d\n", PACKET, len);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-
- if((write(cl->meta_socket, data, len)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
-}
-
/*
Notify all my direct connections of a new host
that was added to the vpn, with the exception
return 0;
}
-/*
- The incoming request handlers
-*/
-
-int tcppacket_h(conn_list_t *cl)
-{
- int len;
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized PACKET from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(sscanf(cl->buffer, "%*d %d", &len) != 1)
- {
- syslog(LOG_ERR, _("Got bad PACKET from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(len > MTU)
- {
- syslog(LOG_ERR, _("Got too big PACKET from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Got PACKET length %d from %s (%s)"), len,
- cl->vpn_hostname, cl->real_hostname);
-
- cl->tcppacket=len;
-cp
- return 0;
-}
-
-void set_keys(conn_list_t *cl, int expiry, char *key)
-{
- 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 = strlen(key);
- cl->public_key->expiry = expiry;
- cl->public_key->key = xmalloc(cl->public_key->length + 1);
- strcpy(cl->public_key->key, key);
-
- ek = make_shared_key(key);
-
- if(!cl->key)
- {
- 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 = expiry;
- cl->key->key = xmalloc(cl->key->length + 1);
- strcpy(cl->key->key, ek);
-cp
-}
-
-
-int key_changed_h(conn_list_t *cl)
-{
- ip_t from;
- conn_list_t *ik;
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(sscanf(cl->buffer, "%*d %lx", &from) != 1)
- {
- syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- ik = lookup_conn(from);
-
- if(!ik)
- {
- syslog(LOG_ERR, _("Got KEY_CHANGED origin %d.%d.%d.%d from %s (%s), which does not exist?"),
- IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got KEY_CHANGED origin %s from %s (%s)"),
- ik->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
-
- ik->status.validkey = 0;
- ik->status.waitingforkey = 0;
-
- notify_others(ik, cl, send_key_changed);
-cp
- return 0;
-}
-
/* "Complete overhaul". */
int (*request_handlers[])(conn_list_t*) = {
projects / tinc / blobdiff