#include "conf.h"
#include "connection.h"
-#include "cipher.h"
-#include "crypto.h"
-#include "digest.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 "sptps.h"
#include "utils.h"
#include "xalloc.h"
-
-ecdsa_t *invitation_key = NULL;
+#include "ed25519/sha512.h"
static bool send_proxyrequest(connection_t *c) {
- switch(proxytype) {
+ switch(mesh->proxytype) {
case PROXY_HTTP: {
char *host;
char *port;
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)];
+ char s4req[9 + (mesh->proxyuser ? strlen(mesh->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));
+ if(mesh->proxyuser)
+ memcpy(s4req + 8, mesh->proxyuser, strlen(mesh->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);
+ if(mesh->proxypass)
+ len += 3 + strlen(mesh->proxyuser) + strlen(mesh->proxypass);
char s5req[len];
int i = 0;
s5req[i++] = 5;
s5req[i++] = 1;
- if(proxypass) {
+ if(mesh->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);
+ s5req[i++] = strlen(mesh->proxyuser);
+ memcpy(s5req + i, mesh->proxyuser, strlen(mesh->proxyuser));
+ i += strlen(mesh->proxyuser);
+ s5req[i++] = strlen(mesh->proxypass);
+ memcpy(s5req + i, mesh->proxypass, strlen(mesh->proxypass));
+ i += strlen(mesh->proxypass);
c->tcplen += 2;
} else {
s5req[i++] = 0;
bool send_id(connection_t *c) {
gettimeofday(&c->start, NULL);
- int minor = myself->connection->protocol_minor;
+ int minor = mesh->self->connection->protocol_minor;
- if(proxytype && c->outgoing)
+ if(mesh->proxytype && c->outgoing)
if(!send_proxyrequest(c))
return false;
- return send_request(c, "%d %s %d.%d", ID, myself->connection->name, myself->connection->protocol_major, minor);
+ return send_request(c, "%d %s %d.%d", ID, mesh->self->connection->name, mesh->self->connection->protocol_major, minor);
}
static bool finalize_invitation(connection_t *c, const char *data, uint16_t len) {
// Create a new host config file
char filename[PATH_MAX];
- snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
+ snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name);
if(!access(filename, F_OK)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Host config file for %s (%s) already exists!\n", c->name, c->hostname);
return false;
return false;
// Recover the filename from the cookie and the key
- digest_t *digest = digest_open_by_name("sha256", 18);
- if(!digest)
- abort();
- char *fingerprint = ecdsa_get_base64_public_key(invitation_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);
- digest_create(digest, hashbuf, sizeof hashbuf, cookie);
- b64encode_urlsafe(cookie, cookie, 18);
- digest_close(digest);
+ sha512(hashbuf, sizeof hashbuf, hash);
+ b64encode_urlsafe(hash, cookie, 18);
free(fingerprint);
char filename[PATH_MAX], usedname[PATH_MAX];
- snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", confbase, cookie);
- snprintf(usedname, sizeof usedname, "%s" SLASH "invitations" SLASH "%s.used", confbase, cookie);
+ snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookie);
+ snprintf(usedname, sizeof usedname, "%s" SLASH "invitations" SLASH "%s.used", mesh->confbase, cookie);
// Atomically rename the invitation file
if(rename(filename, usedname)) {
/* Check if this is an invitation */
if(name[0] == '?') {
- if(!invitation_key) {
+ if(!mesh->invitation_key) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got invitation from %s but we don't have an invitation key", c->hostname);
return false;
}
}
c->status.invitation = true;
- char *mykey = ecdsa_get_base64_public_key(invitation_key);
+ char *mykey = ecdsa_get_base64_public_key(mesh->invitation_key);
if(!mykey)
return false;
if(!send_request(c, "%d %s", ACK, mykey))
c->protocol_minor = 2;
- return sptps_start(&c->sptps, c, false, false, invitation_key, c->ecdsa, "tinc invitation", 15, send_meta_sptps, receive_invitation_sptps);
+ return sptps_start(&c->sptps, c, false, false, mesh->invitation_key, c->ecdsa, "tinc invitation", 15, send_meta_sptps, receive_invitation_sptps);
}
/* Check if identity is a valid name */
/* Check if version matches */
- if(c->protocol_major != myself->connection->protocol_major) {
+ if(c->protocol_major != mesh->self->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);
return false;
}
c->allow_request = ACK;
- char label[25 + strlen(myself->name) + strlen(c->name)];
+ char label[25 + strlen(mesh->self->name) + strlen(c->name)];
if(c->outgoing)
- snprintf(label, sizeof label, "tinc TCP key expansion %s %s", myself->name, c->name);
+ snprintf(label, sizeof label, "tinc TCP key expansion %s %s", mesh->self->name, c->name);
else
- snprintf(label, sizeof label, "tinc TCP key expansion %s %s", c->name, myself->name);
+ snprintf(label, sizeof label, "tinc TCP key expansion %s %s", c->name, mesh->self->name);
- return sptps_start(&c->sptps, c, c->outgoing, false, myself->connection->ecdsa, c->ecdsa, label, sizeof label, send_meta_sptps, receive_meta_sptps);
+ return sptps_start(&c->sptps, c, c->outgoing, false, mesh->self->connection->ecdsa, c->ecdsa, label, sizeof label, send_meta_sptps, receive_meta_sptps);
}
bool send_ack(connection_t *c) {
/* 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)
+ if(mesh->self->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;
-
- if(!get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight))
- get_config_int(lookup_config(config_tree, "Weight"), &c->estimated_weight);
-
- return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24));
+ return send_request(c, "%d %s %d %x", ACK, mesh->myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24));
}
static void send_everything(connection_t *c) {
/* Send all known subnets and edges */
- // TODO: remove this
- if(disablebuggypeers) {
- static struct {
- vpn_packet_t pkt;
- char pad[MAXBUFSIZE - MAXSIZE];
- } zeropkt;
-
- memset(&zeropkt, 0, sizeof zeropkt);
- zeropkt.pkt.len = MAXBUFSIZE;
- send_tcppacket(c, &zeropkt.pkt);
- }
-
- for splay_each(node_t, n, node_tree) {
+ for splay_each(node_t, n, mesh->nodes) {
for splay_each(edge_t, e, n->edge_tree)
send_add_edge(c, e);
}
}
c->options |= options;
- if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
- n->mtu = mtu;
-
- if(get_config_int(lookup_config(config_tree, "PMTU"), &mtu) && mtu < n->mtu)
- n->mtu = mtu;
-
- if(get_config_bool(lookup_config(c->config_tree, "ClampMSS"), &choice)) {
- if(choice)
- c->options |= OPTION_CLAMP_MSS;
- else
- c->options &= ~OPTION_CLAMP_MSS;
- }
-
/* Activate this connection */
c->allow_request = ALL;
/* Create an edge_t for this connection */
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);
/* Notify everyone of the new edge */
- send_add_edge(everyone, c->edge);
+ send_add_edge(mesh->everyone, c->edge);
/* Run MST and SSSP algorithms */
projects / meshlink / blobdiff