#include "net.h"
#include "netutl.h"
#include "node.h"
+#include "packmsg.h"
#include "prf.h"
#include "protocol.h"
#include "sptps.h"
char *port;
sockaddr2str(&c->address, &host, &port);
- send_request(mesh, c, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
+ send_request(mesh, c, NULL, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
free(host);
free(port);
return true;
}
bool send_id(meshlink_handle_t *mesh, connection_t *c) {
-
- int minor = mesh->self->connection->protocol_minor;
-
if(mesh->proxytype && c->outgoing)
if(!send_proxyrequest(mesh, c)) {
return false;
}
- return send_request(mesh, c, "%d %s %d.%d %s", ID, mesh->self->connection->name, mesh->self->connection->protocol_major, minor, mesh->appname);
+ return send_request(mesh, c, NULL, "%d %s %d.%d %s", ID, mesh->self->name, PROT_MAJOR, PROT_MINOR, mesh->appname);
}
static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data, uint16_t len) {
- (void)len;
-
- if(strchr(data, '\n')) {
+ if(len != 32) {
logger(mesh, MESHLINK_ERROR, "Received invalid key from invited node %s!\n", c->name);
return false;
}
- // Create a new host config file
- char filename[PATH_MAX];
- snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name);
-
- if(!access(filename, F_OK)) {
- logger(mesh, MESHLINK_ERROR, "Host config file for %s already exists!\n", c->name);
- return false;
- }
+ // 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;
+ node_add(mesh, n);
+ node_write_config(mesh, n);
- FILE *f = fopen(filename, "w");
-
- if(!f) {
- logger(mesh, MESHLINK_ERROR, "Error trying to create %s: %s\n", filename, strerror(errno));
- return false;
- }
-
- fprintf(f, "ECDSAPublicKey = %s\n", (const char *)data);
- fclose(f);
-
- logger(mesh, MESHLINK_INFO, "Key succesfully received from %s", c->name);
+ logger(mesh, MESHLINK_INFO, "Key successfully received from %s", c->name);
//TODO: callback to application to inform of an accepted invitation
- sptps_send_record(&c->sptps, 2, data, 0);
-
- load_all_nodes(mesh);
+ sptps_send_record(&c->sptps, 1, "", 0);
return true;
}
b64encode_urlsafe(hash, cookie, 18);
free(fingerprint);
- char filename[PATH_MAX], usedname[PATH_MAX];
- 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)) {
- if(errno == ENOENT) {
- logger(mesh, MESHLINK_ERROR, "Peer %s tried to use non-existing invitation %s\n", c->name, cookie);
- } else {
- logger(mesh, MESHLINK_ERROR, "Error trying to rename invitation %s\n", cookie);
- }
+ config_t config;
- return false;
- }
-
- // Open the renamed file
- FILE *f = fopen(usedname, "r");
-
- if(!f) {
- logger(mesh, MESHLINK_ERROR, "Error trying to open invitation %s\n", cookie);
- unlink(usedname);
- return false;
- }
-
- // Check the timestamp
- struct stat st;
-
- if(fstat(fileno(f), &st)) {
- logger(mesh, MESHLINK_ERROR, "Could not stat invitation file %s\n", usedname);
- fclose(f);
- unlink(usedname);
- return false;
- }
-
- if(time(NULL) > st.st_mtime + mesh->invitation_timeout) {
- logger(mesh, MESHLINK_ERROR, "Peer %s tried to use an outdated invitation file %s\n", c->name, usedname);
- fclose(f);
- unlink(usedname);
+ if(!invitation_read(mesh, "current", cookie, &config, mesh->config_key)) {
+ logger(mesh, MESHLINK_ERROR, "Error while trying to read invitation file\n");
return false;
}
// Read the new node's Name from the file
- char buf[1024];
- fgets(buf, sizeof(buf), f);
-
- if(*buf) {
- buf[strlen(buf) - 1] = 0;
- }
+ packmsg_input_t in = {config.buf, config.len};
+ packmsg_get_uint32(&in); // skip version
+ free(c->name);
+ c->name = packmsg_get_str_dup(&in);
- len = strcspn(buf, " \t=");
- char *name = buf + len;
- name += strspn(name, " \t");
+ // Check if the file contains Sub-Mesh information
+ char *submesh_name = packmsg_get_str_dup(&in);
- if(*name == '=') {
- name++;
- name += strspn(name, " \t");
- }
+ if(!strcmp(submesh_name, CORE_MESH)) {
+ c->submesh = NULL;
+ } else {
+ if(!check_id(submesh_name)) {
+ logger(mesh, MESHLINK_ERROR, "Invalid invitation file %s\n", cookie);
+ abort();
+ return false;
+ }
- buf[len] = 0;
+ c->submesh = lookup_or_create_submesh(mesh, submesh_name);
- if(!*buf || !*name || strcasecmp(buf, "Name") || !check_id(name)) {
- logger(mesh, MESHLINK_ERROR, "Invalid invitation file %s\n", cookie);
- fclose(f);
- return false;
+ if(!c->submesh) {
+ return false;
+ }
}
- free(c->name);
- c->name = xstrdup(name);
-
// Send the node the contents of the invitation file
- rewind(f);
- size_t result;
+ sptps_send_record(&c->sptps, 0, config.buf, config.len);
- while((result = fread(buf, 1, sizeof(buf), f))) {
- sptps_send_record(&c->sptps, 0, buf, result);
- }
-
- sptps_send_record(&c->sptps, 1, buf, 0);
- fclose(f);
- unlink(usedname);
+ config_free(&config);
+ free(submesh_name);
c->status.invitation_used = true;
- logger(mesh, MESHLINK_INFO, "Invitation %s succesfully sent to %s", cookie, c->name);
+ logger(mesh, MESHLINK_INFO, "Invitation %s successfully sent to %s", cookie, c->name);
return true;
}
return false;
}
- if(!send_request(mesh, c, "%d %s", ACK, mykey)) {
+ if(!send_request(mesh, c, NULL, "%d %s", ACK, mykey)) {
return false;
}
/* Check if version matches */
- if(c->protocol_major != mesh->self->connection->protocol_major) {
+ 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;
}
- if(!c->config_tree) {
- init_configuration(&c->config_tree);
+ /* Check if we know this node */
- if(!read_host_config(mesh, c->config_tree, c->name)) {
- logger(mesh, MESHLINK_ERROR, "Peer %s has unknown identity", c->name);
- return false;
- }
+ node_t *n = lookup_node(mesh, c->name);
+
+ if(!n) {
+ logger(mesh, MESHLINK_ERROR, "Peer %s has unknown identity", c->name);
+ return false;
}
- read_ecdsa_public_key(mesh, c);
+ if(n->status.blacklisted) {
+ logger(mesh, MESHLINK_EPEER, "Peer %s is blacklisted", c->name);
+ return false;
+ }
- if(!ecdsa_active(c->ecdsa)) {
- logger(mesh, MESHLINK_ERROR, "No key known for peer %s", c->name);
+ node_read_public_key(mesh, n);
- node_t *n = lookup_node(mesh, c->name);
+ if(!ecdsa_active(n->ecdsa)) {
+ logger(mesh, MESHLINK_ERROR, "No key known for peer %s", c->name);
- if(n && !n->status.waitingforkey) {
+ if(n->status.reachable && !n->status.waitingforkey) {
logger(mesh, MESHLINK_INFO, "Requesting key from peer %s", c->name);
send_req_key(mesh, n);
}
snprintf(label, sizeof(label), "%s %s %s", meshlink_tcp_label, c->name, mesh->self->name);
}
- return sptps_start(&c->sptps, c, c->outgoing, false, mesh->self->connection->ecdsa, c->ecdsa, label, sizeof(label) - 1, send_meta_sptps, receive_meta_sptps);
+ 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(meshlink_handle_t *mesh, connection_t *c) {
-
- /* Check some options */
-
- if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
- c->options |= OPTION_PMTU_DISCOVERY;
- }
-
- return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, (c->options & 0xffffff) | (PROT_MINOR << 24));
+ 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(meshlink_handle_t *mesh, connection_t *c) {
for splay_each(node_t, n, mesh->nodes) {
for splay_each(edge_t, e, n->edge_tree) {
- send_add_edge(mesh, c, e);
+ send_add_edge(mesh, c, e, 0);
}
}
}
bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
char hisport[MAX_STRING_SIZE];
- char *hisaddress;
int devclass;
uint32_t options;
node_t *n;
return false;
}
- if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+ if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ACK", c->name, "devclass invalid");
return false;
}
}
n->devclass = devclass;
- node_write_devclass(mesh, n);
+ n->status.dirty = true;
- n->last_successfull_connection = time(NULL);
+ n->last_successfull_connection = mesh->loop.now.tv_sec;
n->connection = c;
c->node = n;
- if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {
- c->options &= ~OPTION_PMTU_DISCOVERY;
- options &= ~OPTION_PMTU_DISCOVERY;
- }
-
- c->options |= options;
-
/* Activate this connection */
c->allow_request = ALL;
/* Create an edge_t for this connection */
- assert(devclass >= 0 && devclass <= _DEV_CLASS_MAX);
+ assert(devclass >= 0 && devclass < DEV_CLASS_COUNT);
c->edge = new_edge();
c->edge->from = mesh->self;
c->edge->to = n;
- sockaddr2str(&c->address, &hisaddress, NULL);
- c->edge->address = str2sockaddr(hisaddress, hisport);
- free(hisaddress);
+ sockaddrcpy_setport(&c->edge->address, &c->address, atoi(hisport));
c->edge->weight = dev_class_traits[devclass].edge_weight;
c->edge->connection = c;
- c->edge->options = c->options;
edge_add(mesh, c->edge);
/* Notify everyone of the new edge */
- send_add_edge(mesh, mesh->everyone, c->edge);
+ send_add_edge(mesh, mesh->everyone, c->edge, 0);
/* Run MST and SSSP algorithms */