X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=190eafa3b53303402b764ef75143c9a0b80c53c4;hb=1da7f28315be17a4ed854cdceb97a870f16a511e;hp=896df4327269c73bd9696a891ecbca3c65d054c7;hpb=93f89bcae11e8d250831896bc5694ee8bd2ad22b;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 896df432..190eafa3 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -34,7 +34,7 @@
 
 int autoconnect = 3;
 
-bool node_read_ecdsa_public_key(node_t *n) {
+bool node_read_ecdsa_public_key(meshlink_handle_t *mesh, node_t *n) {
 	if(ecdsa_active(n->ecdsa))
 		return true;
 
@@ -42,7 +42,7 @@ bool node_read_ecdsa_public_key(node_t *n) {
 	char *p;
 
 	init_configuration(&config_tree);
-	if(!read_host_config(config_tree, n->name))
+	if(!read_host_config(mesh, config_tree, n->name))
 		goto exit;
 
 	/* First, check for simple ECDSAPublicKey statement */
@@ -57,7 +57,7 @@ exit:
 	return n->ecdsa;
 }
 
-bool read_ecdsa_public_key(connection_t *c) {
+bool read_ecdsa_public_key(meshlink_handle_t *mesh, connection_t *c) {
 	if(ecdsa_active(c->ecdsa))
 		return true;
 
@@ -65,7 +65,7 @@ bool read_ecdsa_public_key(connection_t *c) {
 
 	if(!c->config_tree) {
 		init_configuration(&c->config_tree);
-		if(!read_host_config(c->config_tree, c->name))
+		if(!read_host_config(mesh, c->config_tree, c->name))
 			return false;
 	}
 
@@ -80,7 +80,7 @@ bool read_ecdsa_public_key(connection_t *c) {
 	return false;
 }
 
-static bool read_ecdsa_private_key(void) {
+bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
 	FILE *fp;
 	char filename[PATH_MAX];
 
@@ -88,7 +88,7 @@ static bool read_ecdsa_private_key(void) {
 	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,12 +96,12 @@ static bool read_ecdsa_private_key(void) {
 	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;
 }
 
-static bool read_invitation_key(void) {
+static bool read_invitation_key(meshlink_handle_t *mesh) {
 	FILE *fp;
 	char filename[PATH_MAX];
 
@@ -118,13 +118,13 @@ static bool read_invitation_key(void) {
 		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;
 }
 
-void load_all_nodes(void) {
+void load_all_nodes(meshlink_handle_t *mesh) {
 	DIR *dir;
 	struct dirent *ent;
 	char dname[PATH_MAX];
@@ -132,7 +132,7 @@ void load_all_nodes(void) {
 	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;
 	}
 
@@ -140,20 +140,20 @@ void load_all_nodes(void) {
 		if(!check_id(ent->d_name))
 			continue;
 
-		node_t *n = lookup_node(ent->d_name);
+		node_t *n = lookup_node(mesh, ent->d_name);
 		if(n)
 			continue;
 
 		n = new_node();
 		n->name = xstrdup(ent->d_name);
-		node_add(n);
+		node_add(mesh, n);
 	}
 
 	closedir(dir);
 }
 
 
-char *get_name(void) {
+char *get_name(meshlink_handle_t *mesh) {
 	char *name = NULL;
 
 	get_config_string(lookup_config(mesh->config, "Name"), &name);
@@ -162,7 +162,7 @@ char *get_name(void) {
 		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;
 	}
@@ -170,14 +170,14 @@ char *get_name(void) {
 	return name;
 }
 
-bool setup_myself_reloadable(void) {
+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();
+	read_invitation_key(mesh);
 
 	return true;
 }
@@ -185,7 +185,7 @@ bool setup_myself_reloadable(void) {
 /*
   Add listening sockets.
 */
-static bool add_listen_address(char *address, bool bindto) {
+static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bindto) {
 	char *port = mesh->myport;
 
 	if(address) {
@@ -209,7 +209,7 @@ static bool add_listen_address(char *address, bool bindto) {
 	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 +227,7 @@ static bool add_listen_address(char *address, bool bindto) {
 			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;
 		}
 
@@ -236,7 +236,7 @@ static bool add_listen_address(char *address, bool bindto) {
 		if(tcp_fd < 0)
 			continue;
 
-		int udp_fd = setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+		int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
 
 		if(tcp_fd < 0) {
 			close(tcp_fd);
@@ -246,9 +246,9 @@ static bool add_listen_address(char *address, bool bindto) {
 		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);
 		}
 
@@ -264,13 +264,12 @@ static bool add_listen_address(char *address, bool bindto) {
 /*
   Configure node_t mesh->self and set up the local sockets (listen only)
 */
-bool setup_myself(void) {
-	char *name, *hostname, *cipher, *digest, *type;
+bool setup_myself(meshlink_handle_t *mesh) {
+	char *name;
 	char *address = NULL;
-	bool port_specified = false;
 
-	if(!(name = get_name())) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
+	if(!(name = get_name(mesh))) {
+		logger(mesh, MESHLINK_ERROR, "Name for MeshLink instance required!");
 		return false;
 	}
 
@@ -278,12 +277,12 @@ bool setup_myself(void) {
 	mesh->self->connection = new_connection();
 	mesh->self->name = name;
 	mesh->self->connection->name = xstrdup(name);
-	read_host_config(mesh->config, name);
+	read_host_config(mesh, mesh->config, name);
 
-	if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport))
-		mesh->myport = xstrdup("655");
-	else
-		port_specified = true;
+	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;
@@ -291,7 +290,7 @@ bool setup_myself(void) {
 
 	mesh->self->options |= PROT_MINOR << 24;
 
-	if(!read_ecdsa_private_key())
+	if(!read_ecdsa_private_key(mesh))
 		return false;
 
 	/* Ensure mesh->myport is numeric */
@@ -308,7 +307,7 @@ bool setup_myself(void) {
 
 	/* Check some options */
 
-	if(!setup_myself_reloadable())
+	if(!setup_myself_reloadable(mesh))
 		return false;
 
 	/* Compression */
@@ -322,38 +321,32 @@ bool setup_myself(void) {
 	mesh->self->nexthop = mesh->self;
 	mesh->self->via = mesh->self;
 	mesh->self->status.reachable = true;
-	mesh->self->last_state_change = now.tv_sec;
-	node_add(mesh->self);
+	mesh->self->last_state_change = mesh->loop.now.tv_sec;
+	node_add(mesh, mesh->self);
 
-	graph();
+	graph(mesh);
 
 	if(autoconnect)
-		load_all_nodes();
+		load_all_nodes(mesh);
 
 	/* Open sockets */
 
 	mesh->listen_sockets = 0;
-	int cfgs = 0;
 
-	if(!add_listen_address(address, NULL))
+	if(!add_listen_address(mesh, address, NULL))
 		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);
 
 	/* Done. */
 
-	mesh->last_config_check = now.tv_sec;
+	mesh->last_config_check = mesh->loop.now.tv_sec;
 
 	return true;
 }
@@ -361,17 +354,17 @@ bool setup_myself(void) {
 /*
   initialize network
 */
-bool setup_network(void) {
-	init_connections();
-	init_nodes();
-	init_edges();
-	init_requests();
+bool setup_network(meshlink_handle_t *mesh) {
+	init_connections(mesh);
+	init_nodes(mesh);
+	init_edges(mesh);
+	init_requests(mesh);
 
 	mesh->pinginterval = 60;
 	mesh->pingtimeout = 5;
 	maxoutbufsize = 10 * MTU;
 
-	if(!setup_myself())
+	if(!setup_myself(mesh))
 		return false;
 
 	return true;
@@ -380,19 +373,21 @@ bool setup_network(void) {
 /*
   close all open network connections
 */
-void close_network_connections(void) {
-	for(list_node_t *node = mesh->connections->head, *next; node; node = next) {
-		next = node->next;
-		connection_t *c = node->data;
-		c->outgoing = NULL;
-		terminate_connection(c, false);
+void close_network_connections(meshlink_handle_t *mesh) {
+	if(mesh->connections) {
+		for(list_node_t *node = mesh->connections->head, *next; node; node = next) {
+			next = node->next;
+			connection_t *c = node->data;
+			c->outgoing = NULL;
+			terminate_connection(mesh, c, false);
+		}
 	}
 
 	if(mesh->outgoings)
 		list_delete_list(mesh->outgoings);
 
 	if(mesh->self && mesh->self->connection) {
-		terminate_connection(mesh->self->connection, false);
+		terminate_connection(mesh, mesh->self->connection, false);
 		free_connection(mesh->self->connection);
 	}
 
@@ -403,10 +398,10 @@ void close_network_connections(void) {
 		close(mesh->listen_socket[i].udp.fd);
 	}
 
-	exit_requests();
-	exit_edges();
-	exit_nodes();
-	exit_connections();
+	exit_requests(mesh);
+	exit_edges(mesh);
+	exit_nodes(mesh);
+	exit_connections(mesh);
 
 	if(mesh->myport) free(mesh->myport);