-int add_edge_h(connection_t *c)
-{
- edge_t *e;
- node_t *from, *to;
- char from_name[MAX_STRING_SIZE];
- char to_name[MAX_STRING_SIZE];
- char to_address[MAX_STRING_SIZE];
- char to_port[MAX_STRING_SIZE];
- sockaddr_t address;
- long int options;
- int weight;
- cp();
- if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
- from_name, to_name, to_address, to_port, &options, &weight) != 6)
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, c->hostname);
- return -1;
- }
-
- /* Check if names are valid */
-
- if(check_id(from_name))
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
- return -1;
- }
-
- if(check_id(to_name))
- {
- syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_EDGE", c->name, c->hostname, _("invalid name"));
- return -1;
- }
-
- if(seen_request(c->buffer))
- return 0;
-
- /* Lookup nodes */
-
- from = lookup_node(from_name);
-
- if(!from)
- {
- from = new_node();
- from->name = xstrdup(from_name);
- node_add(from);
- }
-
- to = lookup_node(to_name);
-
- if(!to)
- {
- to = new_node();
- to->name = xstrdup(to_name);
- node_add(to);
- }
-
- /* Convert addresses */
-
- address = str2sockaddr(to_address, to_port);
-
- /* Check if edge already exists */
-
- e = lookup_edge(from, to);
-
- if(e)
- {
- if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address))
- {
- if(from == myself)
- {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not match existing entry"), "ADD_EDGE", c->name, c->hostname);
- send_add_edge(c, e);
- return 0;
- }
- else
- {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_WARNING, _("Got %s from %s (%s) which does not match existing entry"), "ADD_EDGE", c->name, c->hostname);
- edge_del(e);
- }
- }
- else
- return 0;
- }
- else if(from == myself)
- {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_WARNING, _("Got %s from %s (%s) for ourself which does not exist"), "ADD_EDGE", c->name, c->hostname);
- e = new_edge();
- e->from = from;
- e->to = to;
- send_del_edge(c, e);
- free_edge(e);
- return 0;
- }
-
- e = new_edge();
- e->from = from;
- e->to = to;
- e->address = address;
- e->options = options;
- e->weight = weight;
- edge_add(e);
-
- /* Tell the rest about the new edge */
-
- forward_request(c);
-
- /* Run MST before or after we tell the rest? */
-
- graph();
- cp();
- return 0;
+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;
+ int weight;
+ 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 devclasses are valid
+
+ 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;
+ }
+
+ 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(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;
+ }
+
+ /* Lookup nodes */
+
+ from = lookup_node(mesh, from_name);
+ to = lookup_node(mesh, to_name);
+
+ 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;
+
+ 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;
+
+ /* Convert addresses */
+
+ address = str2sockaddr(to_address, to_port);
+
+ /* Check if edge already exists */
+
+ e = lookup_edge(from, to);
+
+ if(e) {
+ if(e->weight != weight || e->session_id != session_id || sockaddrcmp(&e->address, &address)) {
+ if(from == mesh->self) {
+ 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_DEBUG, "Got %s from %s which does not match existing entry", "ADD_EDGE", c->name);
+ edge_del(mesh, e);
+ }
+ } else {
+ return true;
+ }
+ } else if(from == mesh->self) {
+ 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;
+ e->session_id = session_id;
+ send_del_edge(mesh, c, e, mesh->contradicting_add_edge);
+ free_edge(e);
+ return true;
+ }
+
+ e = new_edge();
+ e->from = from;
+ e->to = to;
+ e->address = address;
+ e->weight = weight;
+ e->session_id = session_id;
+ edge_add(mesh, e);
+
+ /* 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;