/*
protocol_auth.c -- handle the meta-protocol, authentication
- Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "conf.h"
#include "connection.h"
-#include "control.h"
-#include "control_common.h"
-#include "cipher.h"
-#include "crypto.h"
-#include "digest.h"
+#include "devtools.h"
+#include "ecdsa.h"
#include "edge.h"
#include "graph.h"
#include "logger.h"
+#include "meshlink_internal.h"
#include "meta.h"
#include "net.h"
#include "netutl.h"
#include "node.h"
+#include "packmsg.h"
#include "prf.h"
#include "protocol.h"
-#include "rsa.h"
#include "sptps.h"
#include "utils.h"
#include "xalloc.h"
+#include "ed25519/sha512.h"
-static bool send_proxyrequest(connection_t *c) {
- switch(proxytype) {
- case PROXY_HTTP: {
- char *host;
- char *port;
-
- sockaddr2str(&c->address, &host, &port);
- send_request(c, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
- free(host);
- free(port);
- return true;
- }
- case PROXY_SOCKS4: {
- if(c->address.sa.sa_family != AF_INET) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!");
- return false;
- }
- char s4req[9 + (proxyuser ? strlen(proxyuser) : 0)];
- s4req[0] = 4;
- s4req[1] = 1;
- memcpy(s4req + 2, &c->address.in.sin_port, 2);
- memcpy(s4req + 4, &c->address.in.sin_addr, 4);
- if(proxyuser)
- memcpy(s4req + 8, proxyuser, strlen(proxyuser));
- s4req[sizeof s4req - 1] = 0;
- c->tcplen = 8;
- return send_meta(c, s4req, sizeof s4req);
- }
- case PROXY_SOCKS5: {
- int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
- c->tcplen = 2;
- if(proxypass)
- len += 3 + strlen(proxyuser) + strlen(proxypass);
- char s5req[len];
- int i = 0;
- s5req[i++] = 5;
- s5req[i++] = 1;
- if(proxypass) {
- s5req[i++] = 2;
- s5req[i++] = 1;
- s5req[i++] = strlen(proxyuser);
- memcpy(s5req + i, proxyuser, strlen(proxyuser));
- i += strlen(proxyuser);
- s5req[i++] = strlen(proxypass);
- memcpy(s5req + i, proxypass, strlen(proxypass));
- i += strlen(proxypass);
- c->tcplen += 2;
- } else {
- s5req[i++] = 0;
- }
- s5req[i++] = 5;
- s5req[i++] = 1;
- s5req[i++] = 0;
- if(c->address.sa.sa_family == AF_INET) {
- s5req[i++] = 1;
- memcpy(s5req + i, &c->address.in.sin_addr, 4);
- i += 4;
- memcpy(s5req + i, &c->address.in.sin_port, 2);
- i += 2;
- c->tcplen += 10;
- } else if(c->address.sa.sa_family == AF_INET6) {
- s5req[i++] = 3;
- memcpy(s5req + i, &c->address.in6.sin6_addr, 16);
- i += 16;
- memcpy(s5req + i, &c->address.in6.sin6_port, 2);
- i += 2;
- c->tcplen += 22;
- } else {
- logger(DEBUG_ALWAYS, LOG_ERR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family);
- return false;
- }
- if(i > len)
- abort();
- return send_meta(c, s5req, sizeof s5req);
- }
- case PROXY_SOCKS4A:
- logger(DEBUG_ALWAYS, LOG_ERR, "Proxy type not implemented yet");
- return false;
- case PROXY_EXEC:
- return true;
- default:
- logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type");
- return false;
- }
-}
-
-bool send_id(connection_t *c) {
- gettimeofday(&c->start, NULL);
+#include <assert.h>
- int minor = 0;
+extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
- if(experimental) {
- if(c->config_tree && !read_ecdsa_public_key(c))
- minor = 1;
- else
- minor = myself->connection->protocol_minor;
- }
-
- if(proxytype)
- if(!send_proxyrequest(c))
- return false;
-
- return send_request(c, "%d %s %d.%d", ID, myself->connection->name, myself->connection->protocol_major, minor);
+bool send_id(meshlink_handle_t *mesh, connection_t *c) {
+ return send_request(mesh, c, NULL, "%d %s %d.%d %s", ID, mesh->self->name, PROT_MAJOR, PROT_MINOR, mesh->appname);
}
-bool id_h(connection_t *c, const char *request) {
- char name[MAX_STRING_SIZE];
+static bool commit_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data) {
+ // Create a new node
+ node_t *n = new_node();
+ n->name = xstrdup(c->name);
+ n->devclass = DEV_CLASS_UNKNOWN;
+ n->ecdsa = ecdsa_set_public_key(data);
+ n->submesh = c->submesh;
- if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ID", c->name,
- c->hostname);
- return false;
- }
-
- /* Check if this is a control connection */
+ // Remember its current address
+ node_add_recent_address(mesh, n, &c->address);
- if(name[0] == '^' && !strcmp(name + 1, controlcookie)) {
- c->status.control = true;
- c->allow_request = CONTROL;
- c->last_ping_time = time(NULL) + 3600;
-
- free(c->name);
- c->name = xstrdup("<control>");
+ if(!node_write_config(mesh, n) || !config_sync(mesh, "current")) {
+ logger(mesh, MESHLINK_ERROR, "Error writing configuration file for invited node %s!\n", c->name);
+ free_node(n);
+ return false;
- return send_request(c, "%d %d %d", ACK, TINC_CTL_VERSION_CURRENT, getpid());
}
- /* Check if identity is a valid name */
+ node_add(mesh, n);
- if(!check_id(name)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ID", c->name,
- c->hostname, "invalid name");
- return false;
- }
+ logger(mesh, MESHLINK_INFO, "Key successfully received from %s", c->name);
- /* If this is an outgoing connection, make sure we are connected to the right host */
+ //TODO: callback to application to inform of an accepted invitation
- if(c->outgoing) {
- if(strcmp(c->name, name)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s is %s instead of %s", c->hostname, name,
- c->name);
- return false;
- }
- } else {
- if(c->name)
- free(c->name);
- c->name = xstrdup(name);
- }
+ sptps_send_record(&c->sptps, 1, "", 0);
- /* Check if version matches */
+ return true;
+}
- if(c->protocol_major != myself->connection->protocol_major) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) uses incompatible version %d.%d",
- c->name, c->hostname, c->protocol_major, c->protocol_minor);
+static bool process_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data) {
+ // Recover the filename from the cookie and the key
+ char *fingerprint = ecdsa_get_base64_public_key(mesh->invitation_key);
+ char hash[64];
+ char hashbuf[18 + strlen(fingerprint)];
+ char cookie[25];
+ memcpy(hashbuf, data, 18);
+ memcpy(hashbuf + 18, fingerprint, sizeof(hashbuf) - 18);
+ sha512(hashbuf, sizeof(hashbuf), hash);
+ b64encode_urlsafe(hash, cookie, 18);
+ free(fingerprint);
+
+ config_t config;
+
+ if(!invitation_read(mesh, "current", cookie, &config, mesh->config_key)) {
+ logger(mesh, MESHLINK_ERROR, "Error while trying to read invitation file\n");
return false;
}
- if(bypass_security) {
- if(!c->config_tree)
- init_configuration(&c->config_tree);
- c->allow_request = ACK;
- return send_ack(c);
- }
-
- if(!experimental)
- c->protocol_minor = 0;
+ // Read the new node's Name from the file
+ packmsg_input_t in = {config.buf, config.len};
+ packmsg_get_uint32(&in); // skip version
+ free(c->name);
+ c->name = packmsg_get_str_dup(&in);
- if(!c->config_tree) {
- init_configuration(&c->config_tree);
+ // Check if the file contains Sub-Mesh information
+ char *submesh_name = packmsg_get_str_dup(&in);
- if(!read_host_config(c->config_tree, c->name)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname, c->name);
+ if(!strcmp(submesh_name, CORE_MESH)) {
+ free(submesh_name);
+ c->submesh = NULL;
+ } else {
+ if(!check_id(submesh_name)) {
+ logger(mesh, MESHLINK_ERROR, "Invalid invitation file %s\n", cookie);
+ free(submesh_name);
return false;
}
- if(experimental && c->protocol_minor >= 2) {
- if(!read_ecdsa_public_key(c))
- return false;
- }
- } else {
- if(c->protocol_minor && !ecdsa_active(&c->ecdsa))
- c->protocol_minor = 1;
- }
-
- c->allow_request = METAKEY;
-
- if(c->protocol_minor >= 2) {
- c->allow_request = ACK;
- char label[25 + strlen(myself->name) + strlen(c->name)];
+ c->submesh = lookup_or_create_submesh(mesh, submesh_name);
+ free(submesh_name);
- if(c->outgoing)
- snprintf(label, sizeof label, "tinc TCP key expansion %s %s", myself->name, c->name);
- else
- snprintf(label, sizeof label, "tinc TCP key expansion %s %s", c->name, myself->name);
-
- return sptps_start(&c->sptps, c, c->outgoing, false, myself->connection->ecdsa, c->ecdsa, label, sizeof label, send_meta_sptps, receive_meta_sptps);
- } else {
- return send_metakey(c);
+ if(!c->submesh) {
+ logger(mesh, MESHLINK_ERROR, "Unknown submesh in invitation file %s\n", cookie);
+ return false;
+ }
}
-}
-bool send_metakey(connection_t *c) {
- if(!read_rsa_public_key(c))
- return false;
-
- if(!cipher_open_blowfish_ofb(&c->outcipher))
- return false;
-
- if(!digest_open_sha1(&c->outdigest, -1))
+ if(mesh->inviter_commits_first && !commit_invitation(mesh, c, (const char *)data + 18)) {
return false;
-
- size_t len = rsa_size(&c->rsa);
- char key[len];
- char enckey[len];
- char hexkey[2 * len + 1];
-
- /* Create a random key */
-
- randomize(key, len);
-
- /* The message we send must be smaller than the modulus of the RSA key.
- By definition, for a key of k bits, the following formula holds:
-
- 2^(k-1) <= modulus < 2^(k)
-
- Where ^ means "to the power of", not "xor".
- This means that to be sure, we must choose our message < 2^(k-1).
- This can be done by setting the most significant bit to zero.
- */
-
- key[0] &= 0x7F;
-
- cipher_set_key_from_rsa(&c->outcipher, key, len, true);
-
- if(debug_level >= DEBUG_SCARY_THINGS) {
- bin2hex(key, hexkey, len);
- logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Generated random meta key (unencrypted): %s", hexkey);
}
- /* Encrypt the random data
-
- We do not use one of the PKCS padding schemes here.
- This is allowed, because we encrypt a totally random string
- with a length equal to that of the modulus of the RSA key.
- */
-
- if(!rsa_public_encrypt(&c->rsa, key, len, enckey)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error during encryption of meta key for %s (%s)", c->name, c->hostname);
- return false;
+ if(mesh->inviter_commits_first) {
+ devtool_set_inviter_commits_first(true);
}
- /* Convert the encrypted random data to a hexadecimal formatted string */
+ // Send the node the contents of the invitation file
+ sptps_send_record(&c->sptps, 0, config.buf, config.len);
- bin2hex(enckey, hexkey, len);
+ config_free(&config);
- /* Send the meta key */
+ c->status.invitation_used = true;
- bool result = send_request(c, "%d %d %d %d %d %s", METAKEY,
- cipher_get_nid(&c->outcipher),
- digest_get_nid(&c->outdigest), c->outmaclength,
- c->outcompression, hexkey);
-
- c->status.encryptout = true;
- return result;
+ logger(mesh, MESHLINK_INFO, "Invitation %s successfully sent to %s", cookie, c->name);
+ return true;
}
-bool metakey_h(connection_t *c, const char *request) {
- char hexkey[MAX_STRING_SIZE];
- int cipher, digest, maclength, compression;
- size_t len = rsa_size(&myself->connection->rsa);
- char enckey[len];
- char key[len];
+static bool receive_invitation_sptps(void *handle, uint8_t type, const void *data, uint16_t len) {
+ connection_t *c = handle;
+ meshlink_handle_t *mesh = c->mesh;
- if(sscanf(request, "%*d %d %d %d %d " MAX_STRING, &cipher, &digest, &maclength, &compression, hexkey) != 5) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "METAKEY", c->name, c->hostname);
- return false;
+ if(type == SPTPS_HANDSHAKE) {
+ // The peer should send its cookie first.
+ return true;
}
- /* Convert the challenge from hexadecimal back to binary */
-
- int inlen = hex2bin(hexkey, enckey, sizeof enckey);
-
- /* Check if the length of the meta key is all right */
-
- if(inlen != len) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong keylength");
- return false;
- }
-
- /* Decrypt the meta key */
-
- if(!rsa_private_decrypt(&myself->connection->rsa, enckey, len, key)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error during decryption of meta key for %s (%s)", c->name, c->hostname);
- return false;
+ if(mesh->inviter_commits_first) {
+ if(type == 2 && len == 18 + 32 && !c->status.invitation_used) {
+ return process_invitation(mesh, c, data);
+ }
+ } else {
+ if(type == 0 && len == 18 && !c->status.invitation_used) {
+ return process_invitation(mesh, c, data);
+ } else if(type == 1 && len == 32 && c->status.invitation_used) {
+ return commit_invitation(mesh, c, data);
+ }
}
- if(debug_level >= DEBUG_SCARY_THINGS) {
- bin2hex(key, hexkey, len);
- logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Received random meta key (unencrypted): %s", hexkey);
- }
+ return false;
+}
- /* Check and lookup cipher and digest algorithms */
+bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ assert(request);
+ assert(*request);
- if(!cipher_open_by_nid(&c->incipher, cipher) || !cipher_set_key_from_rsa(&c->incipher, key, len, false)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of cipher from %s (%s)", c->name, c->hostname);
- return false;
- }
+ char name[MAX_STRING_SIZE];
- if(!digest_open_by_nid(&c->indigest, digest, -1)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
+ if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ID", c->name);
return false;
}
- c->status.decryptin = true;
+ /* Check if this is an invitation */
- c->allow_request = CHALLENGE;
-
- return send_challenge(c);
-}
-
-bool send_challenge(connection_t *c) {
- size_t len = rsa_size(&c->rsa);
- char buffer[len * 2 + 1];
-
- if(!c->hischallenge)
- c->hischallenge = xrealloc(c->hischallenge, len);
+ if(name[0] == '?') {
+ if(!mesh->invitation_key) {
+ logger(mesh, MESHLINK_ERROR, "Got invitation from %s but we don't have an invitation key", c->name);
+ return false;
+ }
- /* Copy random data to the buffer */
+ c->ecdsa = ecdsa_set_base64_public_key(name + 1);
- randomize(c->hischallenge, len);
+ if(!c->ecdsa) {
+ logger(mesh, MESHLINK_ERROR, "Got bad invitation from %s", c->name);
+ return false;
+ }
- /* Convert to hex */
+ c->status.invitation = true;
+ char *mykey = ecdsa_get_base64_public_key(mesh->invitation_key);
- bin2hex(c->hischallenge, buffer, len);
+ if(!mykey) {
+ return false;
+ }
- /* Send the challenge */
+ if(!send_request(mesh, c, NULL, "%d %s", ACK, mykey)) {
+ return false;
+ }
- return send_request(c, "%d %s", CHALLENGE, buffer);
-}
+ free(mykey);
-bool challenge_h(connection_t *c, const char *request) {
- char buffer[MAX_STRING_SIZE];
- size_t len = rsa_size(&myself->connection->rsa);
- size_t digestlen = digest_length(&c->indigest);
- char digest[digestlen];
+ c->protocol_minor = 2;
+ c->allow_request = 1;
- if(sscanf(request, "%*d " MAX_STRING, buffer) != 1) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "CHALLENGE", c->name, c->hostname);
- return false;
+ return sptps_start(&c->sptps, c, false, false, mesh->invitation_key, c->ecdsa, meshlink_invitation_label, sizeof(meshlink_invitation_label), send_meta_sptps, receive_invitation_sptps);
}
- /* Convert the challenge from hexadecimal back to binary */
-
- int inlen = hex2bin(buffer, buffer, sizeof buffer);
-
- /* Check if the length of the challenge is all right */
+ /* Check if identity is a valid name */
- if(inlen != len) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge length");
+ if(!check_id(name)) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ID", c->name, "invalid name");
return false;
}
- c->allow_request = CHAL_REPLY;
-
- /* Calculate the hash from the challenge we received */
+ /* If this is an outgoing connection, make sure we are connected to the right host */
- digest_create(&c->indigest, buffer, len, digest);
+ if(c->outgoing) {
+ if(strcmp(c->name, name)) {
+ logger(mesh, MESHLINK_ERROR, "Peer is %s instead of %s", name, c->name);
+ return false;
+ }
+ } else {
+ if(c->name) {
+ free(c->name);
+ }
- /* Convert the hash to a hexadecimal formatted string */
+ c->name = xstrdup(name);
+ }
- bin2hex(digest, buffer, digestlen);
+ /* Check if version matches */
- /* Send the reply */
+ if(c->protocol_major != PROT_MAJOR) {
+ logger(mesh, MESHLINK_ERROR, "Peer %s uses incompatible version %d.%d",
+ c->name, c->protocol_major, c->protocol_minor);
+ return false;
+ }
- return send_request(c, "%d %s", CHAL_REPLY, buffer);
-}
+ /* Check if we know this node */
-bool chal_reply_h(connection_t *c, const char *request) {
- char hishash[MAX_STRING_SIZE];
+ node_t *n = lookup_node(mesh, c->name);
- if(sscanf(request, "%*d " MAX_STRING, hishash) != 1) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "CHAL_REPLY", c->name,
- c->hostname);
+ if(!n) {
+ logger(mesh, MESHLINK_ERROR, "Peer %s has unknown identity", c->name);
return false;
}
- /* Convert the hash to binary format */
+ if(n->status.blacklisted) {
+ logger(mesh, MESHLINK_WARNING, "Peer %s is blacklisted", c->name);
+ return false;
+ }
- int inlen = hex2bin(hishash, hishash, sizeof hishash);
+ if(!node_read_public_key(mesh, n)) {
+ logger(mesh, MESHLINK_ERROR, "No key known for peer %s", c->name);
- /* Check if the length of the hash is all right */
+ if(n->status.reachable && !n->status.waitingforkey) {
+ logger(mesh, MESHLINK_INFO, "Requesting key from peer %s", c->name);
+ send_req_key(mesh, n);
+ }
- if(inlen != digest_length(&c->outdigest)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply length");
return false;
}
+ /* Forbid version rollback for nodes whose ECDSA key we know */
- /* Verify the hash */
-
- if(!digest_verify(&c->outdigest, c->hischallenge, rsa_size(&c->rsa), hishash)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply");
+ if(ecdsa_active(c->ecdsa) && c->protocol_minor < 2) {
+ logger(mesh, MESHLINK_ERROR, "Peer %s tries to roll back protocol version to %d.%d",
+ c->name, c->protocol_major, c->protocol_minor);
return false;
}
- /* Identity has now been positively verified.
- Send an acknowledgement with the rest of the information needed.
- */
-
- free(c->hischallenge);
- c->hischallenge = NULL;
c->allow_request = ACK;
+ char label[sizeof(meshlink_tcp_label) + strlen(mesh->self->name) + strlen(c->name) + 2];
- return send_ack(c);
-}
-
-static bool send_upgrade(connection_t *c) {
- /* Special case when protocol_minor is 1: the other end is ECDSA capable,
- * but doesn't know our key yet. So send it now. */
-
- char *pubkey = ecdsa_get_base64_public_key(&myself->connection->ecdsa);
-
- if(!pubkey)
- return false;
+ if(c->outgoing) {
+ snprintf(label, sizeof(label), "%s %s %s", meshlink_tcp_label, mesh->self->name, c->name);
+ } else {
+ snprintf(label, sizeof(label), "%s %s %s", meshlink_tcp_label, c->name, mesh->self->name);
+ }
- bool result = send_request(c, "%d %s", ACK, pubkey);
- free(pubkey);
- return result;
+ char buf1[1024], buf2[1024];
+ bin2hex((uint8_t *)mesh->private_key + 64, buf1, 32);
+ bin2hex((uint8_t *)n->ecdsa + 64, buf2, 32);
+ logger(mesh, MESHLINK_DEBUG, "Connection to %s mykey %s hiskey %s", c->name, buf1, buf2);
+ return sptps_start(&c->sptps, c, c->outgoing, false, mesh->private_key, n->ecdsa, label, sizeof(label) - 1, send_meta_sptps, receive_meta_sptps);
}
-bool send_ack(connection_t *c) {
- if(c->protocol_minor == 1)
- return send_upgrade(c);
-
- /* ACK message contains rest of the information the other end needs
- to create node_t and edge_t structures. */
-
- struct timeval now;
- bool choice;
-
- /* Estimate weight */
-
- gettimeofday(&now, NULL);
- c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
-
- /* Check some options */
-
- if((get_config_bool(lookup_config(c->config_tree, "IndirectData"), &choice) && choice) || myself->options & OPTION_INDIRECT)
- c->options |= OPTION_INDIRECT;
-
- if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
- c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
-
- if(myself->options & OPTION_PMTU_DISCOVERY)
- c->options |= OPTION_PMTU_DISCOVERY;
-
- choice = myself->options & OPTION_CLAMP_MSS;
- get_config_bool(lookup_config(c->config_tree, "ClampMSS"), &choice);
- if(choice)
- c->options |= OPTION_CLAMP_MSS;
-
- get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
-
- return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0));
+bool send_ack(meshlink_handle_t *mesh, connection_t *c) {
+ return send_request(mesh, c, NULL, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, OPTION_PMTU_DISCOVERY | (PROT_MINOR << 24));
}
-static void send_everything(connection_t *c) {
+static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
/* Send all known subnets and edges */
- if(tunnelserver) {
- for splay_each(subnet_t, s, myself->subnet_tree)
- send_add_subnet(c, s);
-
- return;
- }
-
- for splay_each(node_t, n, node_tree) {
- for splay_each(subnet_t, s, n->subnet_tree)
- send_add_subnet(c, s);
-
- for splay_each(edge_t, e, n->edge_tree)
- send_add_edge(c, e);
- }
-}
-
-static bool upgrade_h(connection_t *c, const char *request) {
- char pubkey[MAX_STRING_SIZE];
-
- if(sscanf(request, "%*d " MAX_STRING, pubkey) != 1) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name, c->hostname);
- return false;
- }
-
- if(ecdsa_active(&c->ecdsa) || read_ecdsa_public_key(c)) {
- logger(DEBUG_ALWAYS, LOG_INFO, "Already have ECDSA public key from %s (%s), not upgrading.", c->name, c->hostname);
- return false;
+ for splay_each(node_t, n, mesh->nodes) {
+ for splay_each(edge_t, e, n->edge_tree) {
+ send_add_edge(mesh, c, e, 0);
+ }
}
-
- logger(DEBUG_ALWAYS, LOG_INFO, "Got ECDSA public key from %s (%s), upgrading!", c->name, c->hostname);
- append_config_file(c->name, "ECDSAPublicKey", pubkey);
- c->allow_request = TERMREQ;
- return send_termreq(c);
}
-bool ack_h(connection_t *c, const char *request) {
- if(c->protocol_minor == 1)
- return upgrade_h(c, request);
+bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ assert(request);
+ assert(*request);
char hisport[MAX_STRING_SIZE];
- char *hisaddress;
- int weight, mtu;
+ int devclass;
uint32_t options;
node_t *n;
- bool choice;
- if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &weight, &options) != 3) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name,
- c->hostname);
+ if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &devclass, &options) != 3) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ACK", c->name);
+ return false;
+ }
+
+ if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ACK", c->name, "devclass invalid");
return false;
}
/* Check if we already have a node_t for him */
- n = lookup_node(c->name);
+ n = lookup_node(mesh, c->name);
if(!n) {
n = new_node();
n->name = xstrdup(c->name);
- node_add(n);
+ node_add(mesh, n);
} else {
if(n->connection) {
/* Oh dear, we already have a connection to this node. */
- logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Established a second connection with %s (%s), closing old connection", n->connection->name, n->connection->hostname);
+ logger(mesh, MESHLINK_DEBUG, "Established a second connection with %s, closing old connection", n->connection->name);
if(n->connection->outgoing) {
- if(c->outgoing)
- logger(DEBUG_ALWAYS, LOG_WARNING, "Two outgoing connections to the same node!");
- else
+ if(c->outgoing) {
+ logger(mesh, MESHLINK_WARNING, "Two outgoing connections to the same node!");
+ } else {
c->outgoing = n->connection->outgoing;
+ }
n->connection->outgoing = NULL;
}
- terminate_connection(n->connection, false);
- /* Run graph algorithm to purge key and make sure up/down scripts are rerun with new IP addresses and stuff */
- graph();
- }
- }
+ /* Remove the edge before terminating the connection, to prevent a graph update. */
+ edge_del(mesh, n->connection->edge);
+ n->connection->edge = NULL;
- n->connection = c;
- c->node = n;
- if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {
- c->options &= ~OPTION_PMTU_DISCOVERY;
- options &= ~OPTION_PMTU_DISCOVERY;
+ terminate_connection(mesh, n->connection, false);
+ }
}
- c->options |= options;
- if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
- n->mtu = mtu;
+ n->devclass = devclass;
+ n->status.dirty = true;
- if(get_config_int(lookup_config(config_tree, "PMTU"), &mtu) && mtu < n->mtu)
- n->mtu = mtu;
+ n->last_successfull_connection = mesh->loop.now.tv_sec;
- if(get_config_bool(lookup_config(c->config_tree, "ClampMSS"), &choice)) {
- if(choice)
- c->options |= OPTION_CLAMP_MSS;
- else
- c->options &= ~OPTION_CLAMP_MSS;
- }
+ n->connection = c;
+ c->node = n;
/* Activate this connection */
c->allow_request = ALL;
+ c->last_key_renewal = mesh->loop.now.tv_sec;
c->status.active = true;
- logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection with %s (%s) activated", c->name,
- c->hostname);
+ logger(mesh, MESHLINK_INFO, "Connection with %s activated", c->name);
/* Send him everything we know */
- send_everything(c);
+ send_everything(mesh, c);
/* Create an edge_t for this connection */
+ assert(devclass >= 0 && devclass < DEV_CLASS_COUNT);
+
c->edge = new_edge();
- c->edge->from = myself;
+ c->edge->from = mesh->self;
c->edge->to = n;
- sockaddr2str(&c->address, &hisaddress, NULL);
- c->edge->address = str2sockaddr(hisaddress, hisport);
- free(hisaddress);
- c->edge->weight = (weight + c->estimated_weight) / 2;
+ sockaddrcpy_setport(&c->edge->address, &c->address, atoi(hisport));
+ c->edge->weight = mesh->dev_class_traits[devclass].edge_weight;
c->edge->connection = c;
- c->edge->options = c->options;
- edge_add(c->edge);
+ edge_add(mesh, c->edge);
/* Notify everyone of the new edge */
- if(tunnelserver)
- send_add_edge(c, c->edge);
- else
- send_add_edge(everyone, c->edge);
+ send_add_edge(mesh, mesh->everyone, c->edge, 0);
/* Run MST and SSSP algorithms */
- graph();
+ graph(mesh);
return true;
}
projects / meshlink / blobdiff