X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=c42a10d28701825adef6440f3ccd3b82a4c96e7f;hp=b5de2821c8d28f7c303510fcce26840aa0ff6337;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=fa05f996c5500c056a36c1d43e33a407f876643c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index b5de2821..c42a10d2 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -74,9 +74,9 @@ bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e, in
 		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(),
+	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, e->options, e->weight, contradictions);
+	                 e->to->devclass, to_submesh, OPTION_PMTU_DISCOVERY, e->weight, contradictions, e->from->session_id);
 	free(address);
 	free(port);
 
@@ -84,6 +84,9 @@ bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e, in
 }
 
 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];
@@ -95,26 +98,26 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	int to_devclass;
 	char to_submesh_name[MAX_STRING_SIZE] = "";
 	sockaddr_t address;
-	uint32_t options;
 	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",
+	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,
-	                &options, &weight, &contradictions) < 10) {
+	                &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_MAX) {
+	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_MAX) {
+	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;
 	}
@@ -162,6 +165,10 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	from->devclass = from_devclass;
 
+	if(!from->session_id) {
+		from->session_id = session_id;
+	}
+
 	if(!to) {
 		to = new_node();
 		to->status.dirty = true;
@@ -181,6 +188,8 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		node_add(mesh, to);
 	}
 
+	to->devclass = to_devclass;
+
 	/* Convert addresses */
 
 	address = str2sockaddr(to_address, to_port);
@@ -190,28 +199,25 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	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 for ourself which does not match existing entry",
-				       "ADD_EDGE", c->name);
+				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 which does not match existing entry",
-				       "ADD_EDGE", c->name);
+				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 {
 			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);
+		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;
@@ -221,8 +227,8 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	e->from = from;
 	e->to = to;
 	e->address = address;
-	e->options = options;
 	e->weight = weight;
+	e->session_id = session_id;
 	edge_add(mesh, e);
 
 	/* Run MST before or after we tell the rest? */
@@ -271,19 +277,23 @@ bool send_del_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e, in
 		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);
+	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" %d", from_name, to_name, &contradictions) < 2) {
+	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;
 	}
@@ -298,14 +308,12 @@ bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	to = lookup_node(mesh, to_name);
 
 	if(!from) {
-		logger(mesh, MESHLINK_ERROR, "Got %s from %s which does not appear in the edge tree",
-		       "DEL_EDGE", c->name);
+		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 which does not appear in the edge tree",
-		       "DEL_EDGE", c->name);
+		logger(mesh, MESHLINK_WARNING, "Got %s from %s which does not appear in the edge tree", "DEL_EDGE", c->name);
 		return true;
 	}
 
@@ -318,14 +326,12 @@ bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	e = lookup_edge(from, to);
 
 	if(!e) {
-		logger(mesh, MESHLINK_WARNING, "Got %s from %s which does not appear in the edge tree",
-		       "DEL_EDGE", c->name);
+		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 for ourself",
-		       "DEL_EDGE", c->name);
+		logger(mesh, MESHLINK_WARNING, "Got %s from %s for ourself", "DEL_EDGE", c->name);
 		mesh->contradicting_del_edge++;
 		send_add_edge(mesh, c, e, mesh->contradicting_del_edge);    /* Send back a correction */
 		return true;