#include "protocol.h"
#include "utils.h"
#include "xalloc.h"
+#include "submesh.h"
-extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
-
-bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) {
+bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e, int contradictions) {
bool x;
char *address, *port;
+ char *from_submesh, *to_submesh;
+ submesh_t *s = NULL;
+
+ if(c->node && c->node->submesh) {
+ if(!submesh_allows_node(e->from->submesh, c->node)) {
+ return true;
+ }
+
+ if(!submesh_allows_node(e->to->submesh, c->node)) {
+ return true;
+ }
+ }
+
+ if(e->from->submesh && e->to->submesh && (e->from->submesh != e->to->submesh)) {
+ return true;
+ }
sockaddr2str(&e->address, &address, &port);
- x = send_request(mesh, c, "%d %x %s %d %s %s %s %d %x %d", ADD_EDGE, rand(),
- e->from->name, e->from->devclass, e->to->name, address, port, e->to->devclass,
- e->options, e->weight);
+ if(e->from->submesh) {
+ from_submesh = e->from->submesh->name;
+ } else {
+ from_submesh = CORE_MESH;
+ }
+
+ if(e->to->submesh) {
+ to_submesh = e->to->submesh->name;
+ } else {
+ to_submesh = CORE_MESH;
+ }
+
+ if(e->from->submesh) {
+ s = e->from->submesh;
+ } else {
+ s = e->to->submesh;
+ }
+
+ x = send_request(mesh, c, s, "%d %x %s %d %s %s %s %s %d %s %x %d %d %x", ADD_EDGE, prng(mesh, UINT_MAX),
+ e->from->name, e->from->devclass, from_submesh, e->to->name, address, port,
+ e->to->devclass, to_submesh, OPTION_PMTU_DISCOVERY, e->weight, contradictions, e->from->session_id);
free(address);
free(port);
}
bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ assert(request);
+ assert(*request);
+
edge_t *e;
node_t *from, *to;
char from_name[MAX_STRING_SIZE];
int from_devclass;
+ char from_submesh_name[MAX_STRING_SIZE] = "";
char to_name[MAX_STRING_SIZE];
char to_address[MAX_STRING_SIZE];
char to_port[MAX_STRING_SIZE];
int to_devclass;
+ char to_submesh_name[MAX_STRING_SIZE] = "";
sockaddr_t address;
- uint32_t options;
int weight;
-
- if(sscanf(request, "%*d %*x "MAX_STRING" %d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %x %d",
- from_name, &from_devclass, to_name, to_address, to_port, &to_devclass, &options, &weight) != 8) {
- logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
- c->hostname);
+ int contradictions = 0;
+ uint32_t session_id = 0;
+ submesh_t *s = NULL;
+
+ if(sscanf(request, "%*d %*x "MAX_STRING" %d "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %d "MAX_STRING" %*x %d %d %x",
+ from_name, &from_devclass, from_submesh_name, to_name, to_address, to_port, &to_devclass, to_submesh_name,
+ &weight, &contradictions, &session_id) < 9) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ADD_EDGE", c->name);
return false;
}
- /* Check if names are valid */
+ // Check if devclasses are valid
- if(!check_id(from_name) || !check_id(to_name)) {
- logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
- c->hostname, "invalid name");
+ if(from_devclass < 0 || from_devclass >= DEV_CLASS_COUNT) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "from devclass invalid");
return false;
}
- // Check if devclasses are valid
+ if(to_devclass < 0 || to_devclass >= DEV_CLASS_COUNT) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "to devclass invalid");
+ return false;
+ }
- if(from_devclass < 0 || from_devclass > _DEV_CLASS_MAX) {
- logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
- c->hostname, "from devclass invalid");
+ if(0 == strcmp(from_submesh_name, "")) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "invalid submesh id");
return false;
}
- if(to_devclass < 0 || to_devclass > _DEV_CLASS_MAX) {
- logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
- c->hostname, "to devclass invalid");
+ if(0 == strcmp(to_submesh_name, "")) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ADD_EDGE", c->name, "invalid submesh id");
return false;
}
- if(seen_request(mesh, request))
+ if(seen_request(mesh, request)) {
return true;
+ }
/* Lookup nodes */
if(!from) {
from = new_node();
+ from->status.dirty = true;
from->status.blacklisted = mesh->default_blacklist;
from->name = xstrdup(from_name);
+ from->devclass = from_devclass;
+
+ from->submesh = NULL;
+
+ if(0 != strcmp(from_submesh_name, CORE_MESH)) {
+ if(!(from->submesh = lookup_or_create_submesh(mesh, from_submesh_name))) {
+ return false;
+ }
+ }
+
node_add(mesh, from);
}
+ if(contradictions > 50) {
+ handle_duplicate_node(mesh, from);
+ }
+
from->devclass = from_devclass;
- node_write_devclass(mesh, from);
+
+ if(!from->session_id) {
+ from->session_id = session_id;
+ }
if(!to) {
to = new_node();
+ to->status.dirty = true;
to->status.blacklisted = mesh->default_blacklist;
to->name = xstrdup(to_name);
+ to->devclass = to_devclass;
+
+ to->submesh = NULL;
+
+ if(0 != strcmp(to_submesh_name, CORE_MESH)) {
+ if(!(to->submesh = lookup_or_create_submesh(mesh, to_submesh_name))) {
+ return false;
+
+ }
+ }
+
node_add(mesh, to);
}
to->devclass = to_devclass;
- node_write_devclass(mesh, to);
/* Convert addresses */
e = lookup_edge(from, to);
if(e) {
- if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
+ if(e->weight != weight || e->session_id != session_id || sockaddrcmp(&e->address, &address)) {
if(from == mesh->self) {
- logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
- "ADD_EDGE", c->name, c->hostname);
- send_add_edge(mesh, c, e);
+ logger(mesh, MESHLINK_DEBUG, "Got %s from %s for ourself which does not match existing entry", "ADD_EDGE", c->name);
+ send_add_edge(mesh, c, e, 0);
return true;
} else {
- logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) which does not match existing entry",
- "ADD_EDGE", c->name, c->hostname);
+ logger(mesh, MESHLINK_DEBUG, "Got %s from %s which does not match existing entry", "ADD_EDGE", c->name);
edge_del(mesh, e);
- graph(mesh);
}
- } else
+ } else {
return true;
+ }
} else if(from == mesh->self) {
- logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) for ourself which does not exist",
- "ADD_EDGE", c->name, c->hostname);
+ logger(mesh, MESHLINK_WARNING, "Got %s from %s for ourself which does not exist", "ADD_EDGE", c->name);
mesh->contradicting_add_edge++;
e = new_edge();
e->from = from;
e->to = to;
- send_del_edge(mesh, c, e);
+ e->session_id = session_id;
+ send_del_edge(mesh, c, e, mesh->contradicting_add_edge);
free_edge(e);
return true;
}
e->from = from;
e->to = to;
e->address = address;
- e->options = options;
e->weight = weight;
+ e->session_id = session_id;
edge_add(mesh, e);
- /* Tell the rest about the new edge */
-
- forward_request(mesh, c, request);
-
/* Run MST before or after we tell the rest? */
graph(mesh);
+ if(e->from->submesh && e->to->submesh && (e->from->submesh != e->to->submesh)) {
+ logger(mesh, MESHLINK_ERROR, "Dropping add edge ( %s to %s )", e->from->submesh->name, e->to->submesh->name);
+ return false;
+ }
+
+ if(e->from->submesh) {
+ s = e->from->submesh;
+ } else {
+ s = e->to->submesh;
+ }
+
+ /* Tell the rest about the new edge */
+
+ forward_request(mesh, c, s, request);
+
return true;
}
-bool send_del_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) {
- return send_request(mesh, c, "%d %x %s %s", DEL_EDGE, rand(),
- e->from->name, e->to->name);
+bool send_del_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e, int contradictions) {
+ submesh_t *s = NULL;
+
+ if(c->node && c->node->submesh) {
+ if(!submesh_allows_node(e->from->submesh, c->node)) {
+ return true;
+ }
+
+ if(!submesh_allows_node(e->to->submesh, c->node)) {
+ return true;
+ }
+ }
+
+ if(e->from->submesh && e->to->submesh && (e->from->submesh != e->to->submesh)) {
+ return true;
+ }
+
+
+ if(e->from->submesh) {
+ s = e->from->submesh;
+ } else {
+ s = e->to->submesh;
+ }
+
+ return send_request(mesh, c, s, "%d %x %s %s %d %x", DEL_EDGE, prng(mesh, UINT_MAX),
+ e->from->name, e->to->name, contradictions, e->session_id);
}
bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ assert(request);
+ assert(*request);
+
edge_t *e;
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
+ int contradictions = 0;
+ uint32_t session_id = 0;
+ submesh_t *s = NULL;
- if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
- logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
- c->hostname);
- return false;
- }
-
- /* Check if names are valid */
-
- if(!check_id(from_name) || !check_id(to_name)) {
- logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
- c->hostname, "invalid name");
+ if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" %d %x", from_name, to_name, &contradictions, &session_id) < 2) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "DEL_EDGE", c->name);
return false;
}
- if(seen_request(mesh, request))
+ if(seen_request(mesh, request)) {
return true;
+ }
/* Lookup nodes */
to = lookup_node(mesh, to_name);
if(!from) {
- logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) which does not appear in the edge tree",
- "DEL_EDGE", c->name, c->hostname);
+ logger(mesh, MESHLINK_WARNING, "Got %s from %s which does not appear in the edge tree", "DEL_EDGE", c->name);
return true;
}
if(!to) {
- logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) which does not appear in the edge tree",
- "DEL_EDGE", c->name, c->hostname);
+ logger(mesh, MESHLINK_WARNING, "Got %s from %s which does not appear in the edge tree", "DEL_EDGE", c->name);
return true;
}
+ if(contradictions > 50) {
+ handle_duplicate_node(mesh, from);
+ }
+
/* Check if edge exists */
e = lookup_edge(from, to);
if(!e) {
- logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) which does not appear in the edge tree",
- "DEL_EDGE", c->name, c->hostname);
+ logger(mesh, MESHLINK_WARNING, "Got %s from %s which does not appear in the edge tree", "DEL_EDGE", c->name);
return true;
}
if(e->from == mesh->self) {
- logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) for ourself",
- "DEL_EDGE", c->name, c->hostname);
+ logger(mesh, MESHLINK_WARNING, "Got %s from %s for ourself", "DEL_EDGE", c->name);
mesh->contradicting_del_edge++;
- send_add_edge(mesh, c, e); /* Send back a correction */
+ send_add_edge(mesh, c, e, mesh->contradicting_del_edge); /* Send back a correction */
return true;
}
/* Tell the rest about the deleted edge */
- forward_request(mesh, c, request);
+
+ if(!e->from->submesh || !e->to->submesh || (e->from->submesh == e->to->submesh)) {
+ if(e->from->submesh) {
+ s = e->from->submesh;
+ } else {
+ s = e->to->submesh;
+ }
+
+ /* Tell the rest about the deleted edge */
+ forward_request(mesh, c, s, request);
+
+ } else {
+ logger(mesh, MESHLINK_ERROR, "Dropping del edge ( %s to %s )", e->from->submesh->name, e->to->submesh->name);
+ return false;
+ }
/* Delete the edge */
if(!to->status.reachable) {
e = lookup_edge(to, mesh->self);
+
if(e) {
- send_del_edge(mesh, mesh->everyone, e);
+ send_del_edge(mesh, mesh->everyone, e, 0);
edge_del(mesh, e);
}
}