X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=1ba98077046b3d709b7d7db09ecef73bdfc798ea;hb=fe1a9111456a73a6e690927e90d8bfa1e1d0ad22;hp=ce9a59ad230b0723e5bafeed12f312fed629b4a5;hpb=f2b21858a8e77663a02c2d586b21c5568fb435a0;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index ce9a59ad..1ba98077 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -32,8 +32,6 @@
 #include "utils.h"
 #include "xalloc.h"
 
-int autoconnect = 3;
-
 bool node_read_ecdsa_public_key(meshlink_handle_t *mesh, node_t *n) {
 	if(ecdsa_active(n->ecdsa))
 		return true;
@@ -88,7 +86,7 @@ bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
 	fp = fopen(filename, "r");
 
 	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Error reading ECDSA private key file: %s", strerror(errno));
 		return false;
 	}
 
@@ -96,7 +94,7 @@ bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
 	fclose(fp);
 
 	if(!mesh->self->connection->ecdsa)
-		logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file failed: %s", strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file failed: %s", strerror(errno));
 
 	return mesh->self->connection->ecdsa;
 }
@@ -118,12 +116,69 @@ static bool read_invitation_key(meshlink_handle_t *mesh) {
 		mesh->invitation_key = ecdsa_read_pem_private_key(fp);
 		fclose(fp);
 		if(!mesh->invitation_key)
-			logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
+			logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
 	}
 
 	return mesh->invitation_key;
 }
 
+bool node_read_devclass(meshlink_handle_t *mesh, node_t *n) {
+	
+	splay_tree_t *config_tree;
+	char *p;
+
+	init_configuration(&config_tree);
+	if(!read_host_config(mesh, config_tree, n->name))
+		goto exit;
+
+	if(get_config_string(lookup_config(config_tree, "DeviceClass"), &p))
+	{
+		n->devclass = atoi(p);
+		free(p);
+	}
+
+	if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+		{ n->devclass = _DEV_CLASS_MAX; }
+
+exit:
+	exit_configuration(&config_tree);
+	return n->devclass != 0;
+}
+
+bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
+
+	if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+		return false;
+
+	bool result = false;
+
+	splay_tree_t *config_tree;
+	init_configuration(&config_tree);
+
+	// ignore read errors; in case the file does not exist we will create it
+	read_host_config(mesh, config_tree, n->name);
+
+	config_t* cnf = lookup_config(config_tree, "DeviceClass");
+
+	if(!cnf)
+	{
+		cnf = new_config();
+		cnf->variable = xstrdup("DeviceClass");
+		config_add(config_tree, cnf);
+	}
+
+	set_config_int(cnf, n->devclass);
+
+	if(!write_host_config(mesh, config_tree, n->name))
+		goto fail;
+
+	result = true;
+
+fail:
+	exit_configuration(&config_tree);
+	return result;
+}
+
 void load_all_nodes(meshlink_handle_t *mesh) {
 	DIR *dir;
 	struct dirent *ent;
@@ -132,7 +187,7 @@ void load_all_nodes(meshlink_handle_t *mesh) {
 	snprintf(dname,PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
 	dir = opendir(dname);
 	if(!dir) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
 		return;
 	}
 
@@ -146,6 +201,7 @@ void load_all_nodes(meshlink_handle_t *mesh) {
 
 		n = new_node();
 		n->name = xstrdup(ent->d_name);
+		node_read_devclass(mesh, n);
 		node_add(mesh, n);
 	}
 
@@ -162,7 +218,7 @@ char *get_name(meshlink_handle_t *mesh) {
 		return NULL;
 
 	if(!check_id(name)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for mesh->self!");
+		logger(mesh, MESHLINK_ERROR, "Invalid name for mesh->self!");
 		free(name);
 		return NULL;
 	}
@@ -174,7 +230,6 @@ bool setup_myself_reloadable(meshlink_handle_t *mesh) {
 	mesh->localdiscovery = true;
 	keylifetime = 3600; // TODO: check if this can be removed as well
 	mesh->maxtimeout = 900;
-	autoconnect = 3;
 	mesh->self->options |= OPTION_PMTU_DISCOVERY;
 
 	read_invitation_key(mesh);
@@ -209,7 +264,7 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 	free(address);
 
 	if(err || !ai) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
+		logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
 		return false;
 	}
 
@@ -227,7 +282,7 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 			continue;
 
 		if(mesh->listen_sockets >= MAXSOCKETS) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+			logger(mesh, MESHLINK_ERROR, "Too many listening sockets");
 			return false;
 		}
 
@@ -246,9 +301,9 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 		io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].tcp, handle_new_meta_connection, &mesh->listen_socket[mesh->listen_sockets], tcp_fd, IO_READ);
 		io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].udp, handle_incoming_vpn_data, &mesh->listen_socket[mesh->listen_sockets], udp_fd, IO_READ);
 
-		if(mesh->debug_level >= DEBUG_CONNECTIONS) {
+		if(mesh->log_level >= MESHLINK_INFO) {
 			char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
+			logger(mesh, MESHLINK_INFO, "Listening on %s", hostname);
 			free(hostname);
 		}
 
@@ -269,18 +324,21 @@ bool setup_myself(meshlink_handle_t *mesh) {
 	char *address = NULL;
 
 	if(!(name = get_name(mesh))) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Name for MeshLink instance required!");
+		logger(mesh, MESHLINK_ERROR, "Name for MeshLink instance required!");
 		return false;
 	}
 
 	mesh->self = new_node();
 	mesh->self->connection = new_connection();
 	mesh->self->name = name;
+	mesh->self->devclass = mesh->devclass;
 	mesh->self->connection->name = xstrdup(name);
 	read_host_config(mesh, mesh->config, name);
 
-	if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport))
-		mesh->myport = xstrdup("655");
+	if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport)) {
+		logger(mesh, MESHLINK_ERROR, "Port for MeshLink instance required!");
+		return false;
+	}
 
 	mesh->self->connection->options = 0;
 	mesh->self->connection->protocol_major = PROT_MAJOR;
@@ -320,12 +378,13 @@ bool setup_myself(meshlink_handle_t *mesh) {
 	mesh->self->via = mesh->self;
 	mesh->self->status.reachable = true;
 	mesh->self->last_state_change = mesh->loop.now.tv_sec;
+
+	node_write_devclass(mesh, mesh->self);
 	node_add(mesh, mesh->self);
 
 	graph(mesh);
 
-	if(autoconnect)
-		load_all_nodes(mesh);
+	load_all_nodes(mesh);
 
 	/* Open sockets */
 
@@ -335,15 +394,10 @@ bool setup_myself(meshlink_handle_t *mesh) {
 		return false;
 
 	if(!mesh->listen_sockets) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
+		logger(mesh, MESHLINK_ERROR, "Unable to create any listening socket!");
 		return false;
 	}
 
-	// TODO: require Port to be set? Or use "0" and use getsockname()?
-
-	if(!mesh->myport)
-		mesh->myport = xstrdup("655");
-
 	xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
 	mesh->self->connection->hostname = xstrdup(mesh->self->hostname);