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.26 2000/09/10 16:15:35 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-%d %s", ID, myself->id, myself->min_version, myself->max_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-%d %as", &cl->id, &cl->min_version, &cl->max_version, &options) != 4)
+ 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 ranges overlap */
+ /* Check if version matches */
- if((cl->min_version > myself->max_version) || (cl->max_version < myself_min_version) || (cl->min_version > cl->max_version))
+ if(cl->protocol_version != myself->protocol_version)
{
- syslog(LOG_ERR, _("Peer %s uses incompatible version (%d-%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(str2opt(options) == -1)
+ 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;
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_meta(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_meta(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_meta(cl, "%d %lx:%d", ADD_HOST, other->id, other->address, other->port);
+ 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)
{
+ char *options;
+ conn_list_t *old, *new;
+cp
+ new = new_conn_list();
+
+ 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->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))
+ {
+ 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->name, myself->name))
+ {
+ 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->real_ip));
+
+ /* Check if the new host already exists in the connnection list */
+
+ if((old = lookup_id(new->name)))
+ {
+ 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->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->status.active = 0;
+ terminate_connection(old);
+ }
+ }
+
+ /* Fill in rest of conn_list structure */
+
+ 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;
}
int send_del_host(conn_list_t *cl, conn_list_t *other)
{
cp
- return send_meta(cl, "%d %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)
{
+ char *id;
+ 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->name, cl->hostname);
+ return -1;
+ }
+
+ /* Check if somebody tries to delete ourself */
+
+ if(!strcmp(id, myself->name))
+ {
+ 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((address == old->real_ip) && (port == old->port))
+ {
+ notify_others(old, cl, send_del_host);
+
+ old->status.termreq = 1;
+ old->status.active = 0;
+
+ 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->name, cl->hostname);
+ }
+cp
+ return 0;
}
/* Status and error notification routines */
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);
}
-cp
free(errorstring);
+ cl->status.termreq = 1;
+ terminate_connection(cl);
+cp
return 0;
}
int send_termreq(conn_list_t *cl)
{
+cp
+ return send_request(cl, "%d", TERMREQ);
}
int termreq_h(conn_list_t *cl)
{
+cp
+ cl->status.termreq = 1;
+ terminate_connection(cl);
+cp
+ return 0;
}
-/* Keepalive routines */
+/* Keepalive routines - FIXME: needs a closer look */
int send_ping(conn_list_t *cl)
{
+ cl->status.pinged = 1;
cp
- return send_meta(cl, "%d", PING);
+ return send_request(cl, "%d", PING);
}
int ping_h(conn_list_t *cl)
{
+cp
+ return send_pong(cl);
}
int send_pong(conn_list_t *cl)
{
cp
- return send_meta(cl, "%d", PONG);
+ return send_request(cl, "%d", PONG);
}
int pong_h(conn_list_t *cl)
{
-}
-
-/* Key exchange */
-
-int send_req_key(conn_list_t *cl, conn_list_t *source)
-{
-cp
- return send_meta(cl, "%d %s", REQ_KEY, source->id);
-}
-
-int req_key_h(conn_list_t *cl)
-{
-}
-
-int send_key(conn_list_t *cl)
-{
-}
-
-int key_h(conn_list_t *cl)
-{
-}
-
-
-
-
-/* Old routines */
-
-
-int send_termreq(conn_list_t *cl)
-{
cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending TERMREQ to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
-
- if(write(cl->meta_socket, buffer, buflen) < 0)
- {
- if(debug_lvl > 1)
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
+ cl->status.got_pong = 1;
cp
return 0;
}
-int send_timeout(conn_list_t *cl)
+/* Key exchange */
+
+int send_key_changed(conn_list_t *from, conn_list_t *cl)
{
+ conn_list_t *p;
cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending TIMEOUT to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ for(p = conn_list; p != NULL; p = p->next)
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
+ if(p!=cl && p->status.meta && p->status.active)
+ send_request(p, "%d %s", KEY_CHANGED,
+ from->name);
}
cp
return 0;
}
-int send_del_host(conn_list_t *cl, conn_list_t *new_host)
+int key_changed_h(conn_list_t *cl)
{
+ char *from_id;
+ conn_list_t *from;
cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending DEL_HOST for %s (%s) to %s (%s)"),
- new_host->vpn_hostname, new_host->real_hostname, cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ if(sscanf(cl->buffer, "%*d %as", &from_id) != 1)
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
+ cl->name, cl->hostname);
return -1;
- }
-cp
- return 0;
-}
-
-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)
+ if(!(from = lookup_id(from_id)))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ 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_id);
return -1;
}
+
+ free(from_id);
- if((write(cl->meta_socket, data, len)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
+ from->status.validkey = 0;
+ from->status.waitingforkey = 0;
+
+ send_key_changed(from, cl);
cp
return 0;
}
-
-int send_ping(conn_list_t *cl)
+
+int send_req_key(conn_list_t *from, conn_list_t *to)
{
cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PING to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
+ return send_request(to->nexthop, "%d %s %s", REQ_KEY, from->id, to->id);
}
-int send_pong(conn_list_t *cl)
+int req_key_h(conn_list_t *cl)
{
+ char *from_id, *to_id;
+ conn_list_t *from, *to;
cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PONG to %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ if(sscanf(cl->buffer, "%*d %as %as", &from_id, &to_id) != 2)
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
-}
+ syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"), cl->id, cl->hostname);
+ return -1;
+ }
-int send_add_host(conn_list_t *cl, conn_list_t *new_host)
-{
- ip_t real_ip;
- int flags;
- char *hostname;
-cp
- real_ip = new_host->real_ip;
- hostname = new_host->real_hostname;
- flags = new_host->flags;
-
- /* If we need to propagate information about a new host that wants us to export
- * it's indirectdata flag, we set the INDIRECTDATA flag and unset the EXPORT...
- * flag, and set it's real_ip to our vpn_ip, so that net.c send_packet() will
- * work correctly.
- */
-
- if(flags & EXPORTINDIRECTDATA)
+ if(!(from = lookup_id(from_id)))
{
- flags &= ~EXPORTINDIRECTDATA;
- flags |= INDIRECTDATA;
- real_ip = myself->vpn_ip;
- hostname = myself->real_hostname;
+ 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_id); free(to_id);
+ return -1;
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ADD_HOST for %s (%s) to %s (%s)"),
- new_host->vpn_hostname, hostname, cl->vpn_hostname, cl->real_hostname);
+ /* Check if this key request is for us */
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x %d\n", ADD_HOST, real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port, flags);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ if(!strcmp(id, myself->strcmp))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
+ send_ans_key(myself, from, myself->datakey);
}
-cp
- return 0;
-}
-
-int send_key_changed(conn_list_t *cl, conn_list_t *src)
-{
-cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin %s to %s (%s)"),
- src->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ else
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- 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_id); free(to_id);
+ return -1;
+ }
+ send_req_key(from, to);
}
+
+ free(from_id); free(to_id);
cp
return 0;
}
-void send_key_changed_all(void)
+int send_ans_key(conn_list_t *from, conn_list_t *to, char *datakey)
{
- conn_list_t *p;
-cp
- for(p = conn_list; p != NULL; p = p->next)
- if(p->status.meta && p->status.active)
- send_key_changed(p, myself);
cp
+ return send_request(to->nexthop, "%d %s %s %s", ANS_KEY, from->id, to->id, datakey);
}
-
-int send_key_request(ip_t to)
+int ans_key_h(conn_list_t *cl)
{
- conn_list_t *fw;
+ char *from_id, *to_id, *datakey;
+ int keylength;
+ conn_list_t *from, *to;
cp
- fw = lookup_conn(to);
- if(!fw)
+ if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &datakey) != 3)
{
- syslog(LOG_ERR, _("Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"),
- IP_ADDR_V(to));
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending REQ_KEY to %s (%s)"),
- fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
+ syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"), cl->id, cl->hostname);
+ return -1;
+ }
- if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
+ if(!(from = lookup_id(from_id)))
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+ 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_id); free(to_id); free(datakey);
return -1;
}
- fw->status.waitingforkey = 1;
-cp
- return 0;
-}
-int send_key_answer(conn_list_t *cl, ip_t to)
-{
- conn_list_t *fw;
-cp
+ /* Check if this key request is for us */
- fw = lookup_conn(to);
-
- if(!fw)
+ if(!strcmp(id, myself->strcmp))
{
- syslog(LOG_ERR, _("Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"),
- IP_ADDR_V(to));
- return -1;
+ /* 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);
}
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ANS_KEY to %s (%s)"),
- fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
-
- if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
+ else
{
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
+ 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_id); free(to_id); free(datakey);
+ return -1;
+ }
+ send_ans_key(from, to, datakey);
}
+
+ free(from_id); free(to_id); free(datakey);
cp
return 0;
}
+/* Old routines */
+
/*
- notify all my direct connections of a new host
+ 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*))
{
}
/*
- notify one connection of everything
- i have connected
+ Notify one connection of everything
+ I have connected
*/
+
int notify_one(conn_list_t *new)
{
conn_list_t *p;
return 0;
}
-/*
- The incoming request handlers
-*/
-
-
-int termreq_h(conn_list_t *cl)
-{
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized TERMREQ from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got TERMREQ from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- cl->status.termreq = 1;
-
- terminate_connection(cl);
-cp
- return 0;
-}
-
-int timeout_h(conn_list_t *cl)
-{
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized TIMEOUT from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got TIMEOUT from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- cl->status.termreq = 1;
- terminate_connection(cl);
-cp
- return 0;
-}
-
-int del_host_h(conn_list_t *cl)
-{
- ip_t vpn_ip;
- conn_list_t *fw;
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized DEL_HOST from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
- {
- syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(!(fw = lookup_conn(vpn_ip)))
- {
- syslog(LOG_ERR, _("Got DEL_HOST for %d.%d.%d.%d from %s (%s) which does not exist?"),
- IP_ADDR_V(vpn_ip), cl->vpn_hostname, cl->real_hostname);
- return 0;
- }
-
- /* Connections lists are really messed up if this happens */
- if(vpn_ip == myself->vpn_ip)
- {
- syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
- cl->vpn_hostname, cl->real_hostname);
- sighup = 1;
- return 0;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got DEL_HOST for %s (%s) from %s (%s)"),
- fw->vpn_hostname, fw->real_hostname, cl->vpn_hostname, cl->real_hostname);
-
- notify_others(fw, cl, send_del_host);
-
- fw->status.termreq = 1;
- fw->status.active = 0;
-
- terminate_connection(fw);
-cp
- return 0;
-}
-
-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;
-}
-
-
-int ping_h(conn_list_t *cl)
-{
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized PING from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PING from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- cl->status.pinged = 0;
- cl->status.got_pong = 1;
-
- send_pong(cl);
-cp
- return 0;
-}
-
-int pong_h(conn_list_t *cl)
-{
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized PONG from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PONG from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
-
- cl->status.got_pong = 1;
-cp
- return 0;
-}
-
-int add_host_h(conn_list_t *cl)
-{
- ip_t real_ip;
- ip_t vpn_ip;
- ip_t vpn_mask;
- unsigned short port;
- int flags;
- conn_list_t *ncn, *old;
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized ADD_HOST from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(sscanf(cl->buffer, "%*d %lx %lx/%lx:%hx %d", &real_ip, &vpn_ip, &vpn_mask, &port, &flags) != 5)
- {
- syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if((old = lookup_conn(vpn_ip)))
- {
- if((real_ip==old->real_ip) && (vpn_mask==old->vpn_mask) && (port==old->port))
- {
- if(debug_lvl>1)
- syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
- old->vpn_hostname, old->real_hostname, cl->vpn_hostname, cl->real_hostname);
- goto skip_add_host; /* One goto a day keeps the deeply nested if constructions away. */
- }
- else
- {
- if(debug_lvl>1)
- syslog(LOG_NOTICE, _("Removing old entry for %s (%s)"),
- old->vpn_hostname, old->real_hostname);
- old->status.active = 0;
- terminate_connection(old);
- }
- }
-
- /* Connections lists are really messed up if this happens */
- if(vpn_ip == myself->vpn_ip)
- {
- syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"),
- cl->vpn_hostname, cl->real_hostname);
- sighup = 1;
- return 0;
- }
-
- ncn = new_conn_list();
- ncn->real_ip = real_ip;
- ncn->real_hostname = hostlookup(htonl(real_ip));
- ncn->vpn_ip = vpn_ip;
- ncn->vpn_mask = vpn_mask;
- ncn->vpn_hostname = hostlookup(htonl(vpn_ip));
- ncn->port = port;
- ncn->flags = flags;
- ncn->nexthop = cl;
- ncn->next = conn_list;
- conn_list = ncn;
- ncn->status.active = 1;
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got ADD_HOST for %s (%s) from %s (%s)"),
- ncn->vpn_hostname, ncn->real_hostname, cl->vpn_hostname, cl->real_hostname);
-
- notify_others(ncn, cl, send_add_host);
-
-skip_add_host:
-cp
- return 0;
-}
-
-int req_key_h(conn_list_t *cl)
-{
- ip_t to;
- ip_t from;
- conn_list_t *fw;
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized REQ_KEY from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2)
- {
- syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got REQ_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
- IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
-
- if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
- { /* hey! they want something from ME! :) */
- send_key_answer(cl, from);
- return 0;
- }
-
- fw = lookup_conn(to);
-
- if(!fw)
- {
- syslog(LOG_ERR, _("Attempting to forward REQ_KEY to %d.%d.%d.%d, which does not exist?"),
- IP_ADDR_V(to));
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Forwarding REQ_KEY to %s (%s)"),
- fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-
- cl->buffer[cl->reqlen-1] = '\n';
-
- if(write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-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 ans_key_h(conn_list_t *cl)
-{
- ip_t to;
- ip_t from;
- int expiry;
- char *key;
- conn_list_t *fw, *gk;
-cp
- if(!cl->status.active)
- {
- syslog(LOG_ERR, _("Got unauthorized ANS_KEY from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4)
- {
- syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
- cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got ANS_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
- IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
-
- if(to == myself->vpn_ip)
- { /* hey! that key's for ME! :) */
- gk = lookup_conn(from);
-
- if(!gk)
- {
- syslog(LOG_ERR, _("Receiving ANS_KEY origin %d.%d.%d.%d from %s (%s), which does not exist?"),
- IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
- return -1;
- }
-
- set_keys(gk, expiry, key);
- gk->status.validkey = 1;
- gk->status.waitingforkey = 0;
- flush_queues(gk);
- return 0;
- }
-
- fw = lookup_conn(to);
-
- if(!fw)
- {
- syslog(LOG_ERR, _("Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"),
- IP_ADDR_V(to));
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Forwarding ANS_KEY to %s (%s)"),
- fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
-
- cl->buffer[cl->reqlen-1] = '\n';
-
- if((write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
-}
-
-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*) = {
id_h, challenge_h, chal_reply_h, ack_h,
status_h, error_h, termreq_h,
- add_host_h, del_host_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,
};
char (*request_name[]) = {
"ID", "CHALLENGE", "CHAL_REPLY", "ACK",
"STATUS", "ERROR", "TERMREQ",
- "ADD_HOST", "DEL_HOST",
"PING", "PONG",
+ "ADD_HOST", "DEL_HOST",
+ "ADD_SUBNET", "DEL_SUBNET",
+ "KEY_CHANGED", "REQ_KEY", "ANS_KEY",
};
projects / tinc / blobdiff