X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=8cfacc3a89188c4660f24a7b458bf23e721ba465;hb=adbe9a0c31825a0285e2a0e06558e1a5d8694005;hp=a7ffa828e8c7bded66ad0556f70a3ffb999aade7;hpb=ba799a101d57c55d4cbf602511aa24c32a5b735e;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index a7ffa828..8cfacc3a 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;
@@ -85,7 +83,7 @@ bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
 	char filename[PATH_MAX];
 
 	snprintf(filename,PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
-	fp = fopen(filename, "r");
+	fp = fopen(filename, "rb");
 
 	if(!fp) {
 		logger(mesh, MESHLINK_ERROR, "Error reading ECDSA private key file: %s", strerror(errno));
@@ -112,7 +110,7 @@ static bool read_invitation_key(meshlink_handle_t *mesh) {
 
 	snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
 
-	fp = fopen(filename, "r");
+	fp = fopen(filename, "rb");
 
 	if(fp) {
 		mesh->invitation_key = ecdsa_read_pem_private_key(fp);
@@ -124,6 +122,63 @@ static bool read_invitation_key(meshlink_handle_t *mesh) {
 	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;
@@ -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);
 	}
 
@@ -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);
@@ -238,7 +293,7 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 
 		int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
 
-		if(tcp_fd < 0) {
+		if(udp_fd < 0) {
 			close(tcp_fd);
 			continue;
 		}
@@ -276,7 +331,7 @@ bool setup_myself(meshlink_handle_t *mesh) {
 	mesh->self = new_node();
 	mesh->self->connection = new_connection();
 	mesh->self->name = name;
-	mesh->self->dclass = mesh->dclass;
+	mesh->self->devclass = mesh->devclass;
 	mesh->self->connection->name = xstrdup(name);
 	read_host_config(mesh, mesh->config, name);
 
@@ -323,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 */