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.14 2000/06/28 13:41:02 guus Exp $
+ $Id: protocol.c,v 1.28.4.25 2000/09/10 15:18:03 guus Exp $
*/
#include "config.h"
#include <utils.h>
#include <xalloc.h>
+#include <netinet/in.h>
+
#include "conf.h"
#include "encr.h"
#include "net.h"
#include "system.h"
-char buffer[MAXBUFSIZE+1];
-int buflen;
-
-/* Outgoing request routines */
+/* Generic outgoing request routine - takes care of logging and error detection as well */
-int send_ack(conn_list_t *cl)
+int send_request(conn_list_t *cl, const char *format, int request, /*args*/ ...)
{
+ va_list args;
+ char *buffer = NULL;
cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ACK to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ if(debug_lvl >= DEBUG_PROTOCOL)
+ syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), requestname[request], cl->id, cl->hostname);
+
+ va_start(args, format);
+ len = vasprintf(&buffer, format, args);
+ va_end(args);
+
+ if(len < 0 || !buffer)
+ {
+ syslog(LOG_ERR, _("Error during vasprintf(): %m"));
+ return -1;
+ }
- buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", ACK);
+ if(debug_lvl >= DEBUG_META)
+ syslog(LOG_DEBUG, _("Sending meta data to %s (%s): %s"), cl->id, cl->hostname, buffer);
+
+ if(cl->status.encryptout)
+ {
+ /* FIXME: Do encryption */
+ }
if((write(cl->meta_socket, buffer, buflen)) < 0)
{
- syslog(LOG_ERR, _("Send failed: %d:%d: %m"), __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Sending meta data failed: %m"));
return -1;
}
+cp
+}
+
+/* Connection protocol:
+
+ Client Server
+ send_id(*)
+ send_challenge
+ send_chal_reply(*)
+ send_id
+ send_challenge
+ send_chal_reply
+ send_ack
+ send_ack
+
+ (*) Unencrypted.
+*/
+
+int send_id(conn_list_t *cl)
+{
cp
- return 0;
+ return send_request(cl, "%d %s %d-%d %s", ID, myself->id, myself->min_version, myself->max_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)
+ {
+ syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
+ return -1;
+ }
+
+ /* Check if version ranges overlap */
+
+ if((cl->min_version > myself->max_version) || (cl->max_version < myself_min_version) || (cl->min_version > cl->max_version))
+ {
+ syslog(LOG_ERR, _("Peer %s uses incompatible version (%d-%d)"), cl->hostname, cl->min_version, cl->max_version);
+ return -1;
+ }
+
+ /* Check if option string is valid */
+
+ if(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))
+ {
+ 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);
+ return -1;
+ }
+
+
+ /* First check if the host we connected to is already in our
+ connection list. If so, we are probably making a loop, which
+ is not desirable.
+ */
+
+ if(cl->status.outgoing)
+ {
+ if((old=lookup_id(cl->id)))
+ {
+ if(debug_lvl > DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"), cl->id, cl->hostname);
+ cl->status.outgoing = 0;
+ old->status.outgoing = 1;
+ terminate_connection(cl);
+ return 0;
+ }
+ }
+
+ /* 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;
+cp
+ return send_challenge(cl);
+}
+
+int send_challenge(conn_list_t *cl)
+{
+ char *buffer;
+ int keylength;
+ int x;
+cp
+ if(cl->chal_hash)
+ free(cl->chal_hash);
+
+ /* Allocate buffers for the challenge and the hash */
+
+ cl->chal_hash = xmalloc(SHA_DIGEST_LEN);
+ keylength = BN_num_bytes(cl->metakey.n);
+ 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);
+
+ /* Calculate the hash from that */
+
+ SHA1(buffer, keylength*2, cl->chal_hash);
+
+ /* Convert the random data to a hexadecimal formatted string */
+
+ bin2hex(buffer,buffer,keylength);
+ buffer[keylength*2] = '\0';
+
+ /* Send the challenge */
+
+ cl->allow_request = CHAL_REPLY;
+ x = send_request(cl, "%d %s", CHALLENGE, buffer);
+ free(buffer);
+cp
+ return x;
+}
+
+int challenge_h(conn_list_t *cl)
+{
+ char *challenge;
+cp
+ if(sscanf(cl->buffer, "%*d %as", &cl->id, &challenge) != 1)
+ {
+ syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->id, 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->meyakey.n);
+
+ /* 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);
+ return -1;
+ }
+
+ /* Allocate buffers for the challenge and the hash */
+
+ buffer = xmalloc(keylength*2);
+ hash = xmalloc(SHA_DIGEST_LEN*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);
+
+ /* Calculate the hash from that */
+
+ SHA1(buffer, keylength*2, hash);
+ free(buffer);
+
+ /* Convert the hash to a hexadecimal formatted string */
+
+ bin2hex(hash,hash,SHA_DIGEST_LEN);
+ hash[SHA_DIGEST_LEN*2] = '\0';
+
+ /* Send the reply */
+
+ if(cl->status.outgoing)
+ cl->allow_resuest = ID;
+ else
+ cl->allow_request = ACK;
+
+ x = send_request(cl, "%d %s", CHAL_REPLY, hash);
+ 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)
+ {
+ syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->id, cl->hostname);
+ return -1;
+ }
+
+ /* Check if the length of the hash is all right */
+
+ if(strlen(hash) != SHA_DIGEST_LEN*2)
+ {
+ syslog(LOG_ERROR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->id, cl->hostname);
+ return -1;
+ }
+
+ /* Convert the hash to binary format */
+
+ hex2bin(hash, hash, SHA_DIGEST_LEN);
+
+ /* Verify the incoming hash with the calculated hash */
+
+ if{!memcmp(hash, cl->chal_hash, SHA_DIGEST_LEN)}
+ {
+ syslog(LOG_ERROR, _("Intruder: wrong challenge reply from %s (%s)"), cl->id, cl->hostname);
+ return -1;
+ }
+
+ /* 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_hash);
+
+cp
+ if(cl->status.outgoing)
+ {
+ cl->allow_request = ACK;
+ return send_ack(cl);
+ }
+ else
+ {
+ cl->allow_request = CHALLENGE;
+ return send_id(cl);
+ }
+}
+
+int send_ack(conn_list_t *cl)
+{
+cp
+ return send_request(cl, "%d", ACK);
+}
+
+int ack_h(conn_list_t *cl)
+{
+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_conn(cl->vpn_ip)))
+ {
+ if(debug_lvl > 1)
+ syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
+ cl->vpn_hostname, old->real_hostname, cl->real_hostname);
+ old->status.active = 0;
+ terminate_connection(old);
+ }
+
+ /* Activate this connection */
+
+ cl->allow_request = ALL;
+ cl->status.active = 1;
+
+ if(debug_lvl > DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->id, cl->hostname);
+
+ /* Exchange information about other tinc daemons */
+
+ notify_others(cl, NULL, send_add_host);
+ notify_one(cl);
+
+ upstreamindex = 0;
+
+cp
+ if(cl->status.outgoing)
+ return 0;
+ else
+ return send_ack(cl);
+}
+
+/* Address and subnet information exchange */
+
+/* New and closed connections notification */
+
+/* Status and error notification routines */
+
+int send_status(conn_list_t *cl, int statusno, char *statusstring)
+{
+cp
+ return send_request(cl, "%d %d %s", STATUS, statusno, statusstring);
+}
+
+int send_error(conn_list_t *cl, int errno, char *errstring)
+{
+cp
+ return send_request(cl, "%d %d %s", ERROR, errno, errstring);
+}
+
+/* Old routines */
+
+
int send_termreq(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending TERMREQ to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending TIMEOUT to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " (%s) to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(new_host->vpn_ip), new_host->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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);
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)
+ {
+ 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;
+}
+
int send_ping(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PING to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_DEBUG, _("Sending PING to %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PONG to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_DEBUG, _("Sending PONG to %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
char *hostname;
cp
real_ip = new_host->real_ip;
- hostname = new_host->hostname;
+ hostname = new_host->real_hostname;
flags = new_host->flags;
/* If we need to propagate information about a new host that wants us to export
flags &= ~EXPORTINDIRECTDATA;
flags |= INDIRECTDATA;
real_ip = myself->vpn_ip;
- hostname = myself->hostname;
+ hostname = myself->real_hostname;
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ADD_HOST for " IP_ADDR_S " (%s) to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(new_host->vpn_ip), hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_DEBUG, _("Sending ADD_HOST for %s (%s) to %s (%s)"),
+ new_host->vpn_hostname, hostname, cl->vpn_hostname, cl->real_hostname);
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);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin " IP_ADDR_S " to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(src->vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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);
cp
}
-int send_basic_info(conn_list_t *cl)
-{
-cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending BASIC_INFO to %s"),
- cl->hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %d %lx/%lx:%x %d\n", BASIC_INFO, PROT_CURRENT, myself->vpn_ip, myself->vpn_mask, myself->port, myself->flags);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
-}
-
-int send_passphrase(conn_list_t *cl)
-{
- passphrase_t tmp;
-cp
- encrypt_passphrase(&tmp);
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PASSPHRASE to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PASSPHRASE, tmp.phrase);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
-}
-
-int send_public_key(conn_list_t *cl)
-{
-cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
-}
-
-/* WDN doet deze functie? (GS)
-int send_calculate(conn_list_t *cl, char *k)
-{
-cp
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", CALCULATE, k);
-
- if((write(cl->meta_socket, buffer, buflen)) < 0)
- {
- syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
- return -1;
- }
-cp
- return 0;
-}
-*/
int send_key_request(ip_t to)
{
fw = lookup_conn(to);
if(!fw)
{
- syslog(LOG_ERR, _("Attempting to send REQ_KEY to " IP_ADDR_S ", which does not exist?"),
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+ 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);
if(!fw)
{
- syslog(LOG_ERR, _("Attempting to send ANS_KEY to " IP_ADDR_S ", which does not exist?"),
+ syslog(LOG_ERR, _("Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"),
IP_ADDR_V(to));
return -1;
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ANS_KEY to " IP_ADDR_S " (%s)"),
- IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+ 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);
The incoming request handlers
*/
-int basic_info_h(conn_list_t *cl)
-{
-cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->hostname);
-
- if(sscanf(cl->buffer, "%*d %d %lx/%lx:%hx %d", &cl->protocol_version, &cl->vpn_ip, &cl->vpn_mask, &cl->port, &cl->flags) != 5)
- {
- syslog(LOG_ERR, _("Got bad BASIC_INFO from %s"),
- cl->hostname);
- return -1;
- }
-
- if(cl->protocol_version != PROT_CURRENT)
- {
- syslog(LOG_ERR, _("Peer uses incompatible protocol version %d"),
- cl->protocol_version);
- return -1;
- }
-
- if(cl->status.outgoing)
- {
- if(setup_vpn_connection(cl) < 0)
- return -1;
- send_basic_info(cl);
- }
- else
- {
- if(setup_vpn_connection(cl) < 0)
- return -1;
- send_passphrase(cl);
- }
-cp
- return 0;
-}
-
-int passphrase_h(conn_list_t *cl)
-{
-cp
- cl->pp = xmalloc(sizeof(*(cl->pp)));
-
- if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1)
- {
- syslog(LOG_ERR, _("Got bad PASSPHRASE from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
- return -1;
- }
- cl->pp->len = strlen(cl->pp->phrase);
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PASSPHRASE from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
- if(cl->status.outgoing)
- send_passphrase(cl);
- else
- send_public_key(cl);
-cp
- return 0;
-}
-
-int public_key_h(conn_list_t *cl)
-{
- char *g_n;
- conn_list_t *old;
-cp
- if(sscanf(cl->buffer, "%*d %as", &g_n) != 1)
- {
- syslog(LOG_ERR, _("Got bad PUBLIC_KEY from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
- return -1;
- }
-
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PUBLIC_KEY from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
- if(verify_passphrase(cl, g_n))
- {
- /* intruder! */
- syslog(LOG_ERR, _("Intruder: passphrase does not match!"));
- return -1;
- }
-
- if(cl->status.outgoing)
- send_public_key(cl);
- else
- {
- send_ack(cl);
-
- /* 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. Because our
- conn_list entry is not active, lookup_conn will skip ourself. */
-
- while(old = lookup_conn(cl->vpn_ip))
- terminate_connection(old);
-
- cl->status.active = 1;
-
- if(debug_lvl > 0)
- syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
- notify_others(cl, NULL, send_add_host);
- notify_one(cl);
- }
-cp
- return 0;
-}
-
-int ack_h(conn_list_t *cl)
-{
-cp
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got ACK from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
- cl->status.active = 1;
-
- syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
- notify_others(cl, NULL, send_add_host);
- notify_one(cl);
-
- upstreamindex = 0;
-cp
- return 0;
-}
int termreq_h(conn_list_t *cl)
{
cp
if(!cl->status.active)
{
- syslog(LOG_ERR, _("Got unauthorized TERMREQ from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_DEBUG, _("Got TERMREQ from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
cl->status.termreq = 1;
- if(cl->status.active)
- notify_others(cl, NULL, send_del_host);
-
- cl->status.active = 0;
-
terminate_connection(cl);
cp
return 0;
cp
if(!cl->status.active)
{
- syslog(LOG_ERR, _("Got unauthorized TIMEOUT from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_DEBUG, _("Got TIMEOUT from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
cl->status.termreq = 1;
terminate_connection(cl);
cp
if(!cl->status.active)
{
- syslog(LOG_ERR, _("Got unauthorized DEL_HOST from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " from " IP_ADDR_S " (%s) which does not exist?"),
- IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s) from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(fw->vpn_ip), fw->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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);
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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_DEBUG, _("Got PING from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
cl->status.pinged = 0;
cl->status.got_pong = 1;
cp
if(!cl->status.active)
{
- syslog(LOG_ERR, _("Got unauthorized PONG from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_DEBUG, _("Got PONG from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
cl->status.got_pong = 1;
cp
cp
if(!cl->status.active)
{
- syslog(LOG_ERR, _("Got unauthorized ADD_HOST from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
- while(old = lookup_conn(vpn_ip))
- terminate_connection(old);
+ 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->hostname = hostlookup(htonl(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->status.active = 1;
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got ADD_HOST for " IP_ADDR_S " (%s) from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(ncn->vpn_ip), ncn->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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;
}
cp
if(!cl->status.active)
{
- syslog(LOG_ERR, _("Got unauthorized REQ_KEY from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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! :) */
if(!fw)
{
- syslog(LOG_ERR, _("Attempting to forward REQ_KEY to " IP_ADDR_S ", which does not exist?"),
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+ syslog(LOG_DEBUG, _("Forwarding REQ_KEY to %s (%s)"),
+ fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
cl->buffer[cl->reqlen-1] = '\n';
cp
if(!cl->status.active)
{
- syslog(LOG_ERR, _("Got unauthorized ANS_KEY from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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! :) */
if(!gk)
{
- syslog(LOG_ERR, _("Receiving ANS_KEY from " IP_ADDR_S ", which does not exist?"),
- IP_ADDR_V(from));
+ 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;
}
if(!fw)
{
- syslog(LOG_ERR, _("Attempting to forward ANS_KEY to " IP_ADDR_S ", which does not exist?"),
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
+ syslog(LOG_DEBUG, _("Forwarding ANS_KEY to %s (%s)"),
+ fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
cl->buffer[cl->reqlen-1] = '\n';
cp
if(!cl->status.active)
{
- syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ 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 " IP_ADDR_S " (%s)"),
- IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got KEY_CHANGED origin " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
- IP_ADDR_V(from), IP_ADDR_V(cl->vpn_ip), cl->hostname);
-
ik = lookup_conn(from);
if(!ik)
{
- syslog(LOG_ERR, _("Got KEY_CHANGED from " IP_ADDR_S ", which does not exist?"),
- IP_ADDR_V(from));
+ 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;
return 0;
}
-int (*request_handlers[256])(conn_list_t*) = {
- 0, ack_h, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- termreq_h, timeout_h, del_host_h, 0, 0, 0, 0, 0, 0, 0,
- ping_h, pong_h, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- add_host_h, basic_info_h, passphrase_h, public_key_h, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- req_key_h, ans_key_h, key_changed_h, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+/* "Complete overhaul". */
+
+int (*request_handlers[6])(conn_list_t*) = {
+ id_h, challenge_h, chal_reply_h, ack_h,
+ status_h, error_h,
+};
+
+char (*request_name[6]) = {
+ "ID", "CHALLENGE", "CHAL_REPLY", "ACK",
+ "STATUS", "ERROR",
};
projects / tinc / blobdiff