X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_edge.c;h=89ed901d1979b0e04e5a865dc18deb78a2e2700f;hb=a021bf25db676353b8ea50740ce343962c3dddb9;hp=bf283dd667949caad12e90f79c7f22ba4e9ae039;hpb=40c28589328a2aa96c2ce1419c5d90616c758b3d;p=meshlink

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index bf283dd6..89ed901d 100644
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -1,8 +1,6 @@
 /*
     protocol_edge.c -- handle the meta-protocol, edges
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
-                  2009      Michael Tokarev <mjt@corpit.ru>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,12 +19,12 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
@@ -35,14 +33,16 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_add_edge(connection_t *c, const edge_t *e) {
+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 x;
 	char *address, *port;
 
 	sockaddr2str(&e->address, &address, &port);
 
-	x = send_request(c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(),
-					 e->from->name, e->to->name, 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);
 	free(address);
 	free(port);
@@ -50,20 +50,22 @@ bool send_add_edge(connection_t *c, const edge_t *e) {
 	return x;
 }
 
-bool add_edge_h(connection_t *c, char *request) {
+bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	edge_t *e;
 	node_t *from, *to;
 	char from_name[MAX_STRING_SIZE];
+	int from_devclass;
 	char to_name[MAX_STRING_SIZE];
 	char to_address[MAX_STRING_SIZE];
 	char to_port[MAX_STRING_SIZE];
+	int to_devclass;
 	sockaddr_t address;
 	uint32_t options;
 	int weight;
 
-	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d",
-			  from_name, to_name, to_address, to_port, &options, &weight) != 6) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
+	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);
 		return false;
 	}
@@ -71,41 +73,50 @@ bool add_edge_h(connection_t *c, char *request) {
 	/* Check if names are valid */
 
 	if(!check_id(from_name) || !check_id(to_name)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
 			   c->hostname, "invalid name");
 		return false;
 	}
 
-	if(seen_request(request))
-		return true;
+	// Check if devclasses are valid
 
-	/* Lookup nodes */
+	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");
+		return false;
+	}
 
-	from = lookup_node(from_name);
-	to = lookup_node(to_name);
+	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");
+		return false;
+	}
 
-	if(tunnelserver &&
-	   from != myself && from != c->node &&
-	   to != myself && to != c->node) {
-		/* ignore indirect edge registrations for tunnelserver */
-		logger(DEBUG_PROTOCOL, LOG_WARNING,
-		   "Ignoring indirect %s from %s (%s)",
-		   "ADD_EDGE", c->name, c->hostname);
+	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->name = xstrdup(from_name);
-		node_add(from);
+		node_add(mesh, from);
 	}
 
+	from->devclass = from_devclass;
+	node_write_devclass(mesh, from);
+
 	if(!to) {
 		to = new_node();
 		to->name = xstrdup(to_name);
-		node_add(to);
+		node_add(mesh, to);
 	}
 
+	to->devclass = to_devclass;
+	node_write_devclass(mesh, to);
 
 	/* Convert addresses */
 
@@ -117,27 +128,27 @@ bool add_edge_h(connection_t *c, char *request) {
 
 	if(e) {
 		if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
-			if(from == myself) {
-				logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
+			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(c, e);
+				send_add_edge(mesh, c, e);
 				return true;
 			} else {
-				logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not match existing entry",
+				logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) which does not match existing entry",
 						   "ADD_EDGE", c->name, c->hostname);
-				edge_del(e);
-				graph();
+				edge_del(mesh, e);
+				graph(mesh);
 			}
 		} else
 			return true;
-	} else if(from == myself) {
-		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not exist",
+	} 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);
-		contradicting_add_edge++;
+		mesh->contradicting_add_edge++;
 		e = new_edge();
 		e->from = from;
 		e->to = to;
-		send_del_edge(c, e);
+		send_del_edge(mesh, c, e);
 		free_edge(e);
 		return true;
 	}
@@ -148,33 +159,32 @@ bool add_edge_h(connection_t *c, char *request) {
 	e->address = address;
 	e->options = options;
 	e->weight = weight;
-	edge_add(e);
+	edge_add(mesh, e);
 
 	/* Tell the rest about the new edge */
 
-	if(!tunnelserver)
-		forward_request(c, request);
+	forward_request(mesh, c, request);
 
 	/* Run MST before or after we tell the rest? */
 
-	graph();
+	graph(mesh);
 
 	return true;
 }
 
-bool send_del_edge(connection_t *c, const edge_t *e) {
-	return send_request(c, "%d %x %s %s", DEL_EDGE, rand(),
+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 del_edge_h(connection_t *c, char *request) {
+bool del_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	edge_t *e;
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
 
 	if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING, from_name, to_name) != 2) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "DEL_EDGE", c->name,
 			   c->hostname);
 		return false;
 	}
@@ -182,37 +192,27 @@ bool del_edge_h(connection_t *c, char *request) {
 	/* Check if names are valid */
 
 	if(!check_id(from_name) || !check_id(to_name)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
 			   c->hostname, "invalid name");
 		return false;
 	}
 
-	if(seen_request(request))
+	if(seen_request(mesh, request))
 		return true;
 
 	/* Lookup nodes */
 
-	from = lookup_node(from_name);
-	to = lookup_node(to_name);
-
-	if(tunnelserver &&
-	   from != myself && from != c->node &&
-	   to != myself && to != c->node) {
-		/* ignore indirect edge registrations for tunnelserver */
-		logger(DEBUG_PROTOCOL, LOG_WARNING,
-		   "Ignoring indirect %s from %s (%s)",
-		   "DEL_EDGE", c->name, c->hostname);
-		return true;
-	}
+	from = lookup_node(mesh, from_name);
+	to = lookup_node(mesh, to_name);
 
 	if(!from) {
-		logger(DEBUG_PROTOCOL, LOG_ERR, "Got %s from %s (%s) which does not appear in the edge tree",
+		logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) which does not appear in the edge tree",
 				   "DEL_EDGE", c->name, c->hostname);
 		return true;
 	}
 
 	if(!to) {
-		logger(DEBUG_PROTOCOL, LOG_ERR, "Got %s from %s (%s) which does not appear in the edge tree",
+		logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) which does not appear in the edge tree",
 				   "DEL_EDGE", c->name, c->hostname);
 		return true;
 	}
@@ -222,40 +222,38 @@ bool del_edge_h(connection_t *c, char *request) {
 	e = lookup_edge(from, to);
 
 	if(!e) {
-		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) which does not appear in the edge tree",
+		logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) which does not appear in the edge tree",
 				   "DEL_EDGE", c->name, c->hostname);
 		return true;
 	}
 
-	if(e->from == myself) {
-		logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself",
+	if(e->from == mesh->self) {
+		logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) for ourself",
 				   "DEL_EDGE", c->name, c->hostname);
-		contradicting_del_edge++;
-		send_add_edge(c, e);	/* Send back a correction */
+		mesh->contradicting_del_edge++;
+		send_add_edge(mesh, c, e);    /* Send back a correction */
 		return true;
 	}
 
 	/* Tell the rest about the deleted edge */
 
-	if(!tunnelserver)
-		forward_request(c, request);
+	forward_request(mesh, c, request);
 
 	/* Delete the edge */
 
-	edge_del(e);
+	edge_del(mesh, e);
 
 	/* Run MST before or after we tell the rest? */
 
-	graph();
+	graph(mesh);
 
 	/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
 
 	if(!to->status.reachable) {
-		e = lookup_edge(to, myself);
+		e = lookup_edge(to, mesh->self);
 		if(e) {
-			if(!tunnelserver)
-				send_del_edge(everyone, e);
-			edge_del(e);
+			send_del_edge(mesh, mesh->everyone, e);
+			edge_del(mesh, e);
 		}
 	}