#include "protocol.h"
#include "utils.h"
#include "xalloc.h"
+#include "submesh.h"
extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
+extern bool node_write_submesh(meshlink_handle_t *mesh, node_t *n);
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 %d", ADD_EDGE, rand(),
- e->from->name, e->from->devclass, e->to->name, address, port, e->to->devclass,
- e->options, e->weight, contradictions);
+ 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", ADD_EDGE, rand(),
+ e->from->name, e->from->devclass, from_submesh, e->to->name, address, port,
+ e->to->devclass, to_submesh, e->options, e->weight, contradictions);
free(address);
free(port);
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;
int contradictions = 0;
+ submesh_t *s = NULL;
- if(sscanf(request, "%*d %*x "MAX_STRING" %d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %x %d %d",
- from_name, &from_devclass, to_name, to_address, to_port, &to_devclass, &options, &weight, &contradictions) < 8) {
+ if(sscanf(request, "%*d %*x "MAX_STRING" %d "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %d "MAX_STRING" %x %d %d",
+ from_name, &from_devclass, from_submesh_name, to_name, to_address, to_port, &to_devclass, to_submesh_name,
+ &options, &weight, &contradictions) < 10) {
logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ADD_EDGE", c->name);
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", "ADD_EDGE", c->name, "invalid name");
- return false;
- }
-
// Check if devclasses are valid
if(from_devclass < 0 || from_devclass > _DEV_CLASS_MAX) {
return false;
}
+ 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(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)) {
return true;
}
from = new_node();
from->status.blacklisted = mesh->default_blacklist;
from->name = xstrdup(from_name);
+
+ 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);
}
from->devclass = from_devclass;
node_write_devclass(mesh, from);
+ if(from->submesh) {
+ node_write_submesh(mesh, from);
+ }
+
if(!to) {
to = new_node();
to->status.blacklisted = mesh->default_blacklist;
to->name = xstrdup(to_name);
+
+ 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);
+ if(to->submesh) {
+ node_write_submesh(mesh, to);
+ }
+
/* Convert addresses */
address = str2sockaddr(to_address, to_port);
e->weight = weight;
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, int contradictions) {
- return send_request(mesh, c, "%d %x %s %s %d", DEL_EDGE, rand(),
+ 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", DEL_EDGE, rand(),
e->from->name, e->to->name, contradictions);
}
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
int contradictions = 0;
+ submesh_t *s = NULL;
if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" %d", from_name, to_name, &contradictions) < 2) {
logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "DEL_EDGE", c->name);
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", "DEL_EDGE", c->name, "invalid name");
- return false;
- }
-
if(seen_request(mesh, request)) {
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 */
projects / meshlink / blobdiff