X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=inline;f=src%2Fnet_setup.c;h=4ee4b95362a4a999a9e6b6715a78bb430a57d7fc;hb=1ea408b6c313394078a551fe8839e84a787f34e7;hp=eae283d6aed9c5b68c74f17296825e1c8c1be625;hpb=3268e9a2b9fea6779224fe1f3da48b7fc4b9cb46;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index eae283d6..4ee4b953 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -124,7 +124,7 @@ static bool read_invitation_key(meshlink_handle_t *mesh) {
 	return mesh->invitation_key;
 }
 
-static void load_all_nodes(meshlink_handle_t *mesh) {
+void load_all_nodes(meshlink_handle_t *mesh) {
 	DIR *dir;
 	struct dirent *ent;
 	char dname[PATH_MAX];
@@ -140,13 +140,13 @@ static void load_all_nodes(meshlink_handle_t *mesh) {
 		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);
@@ -265,25 +265,20 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
   Configure node_t mesh->self and set up the local sockets (listen only)
 */
 bool setup_myself(meshlink_handle_t *mesh) {
-	char *name, *hostname, *cipher, *digest, *type;
+	char *name;
 	char *address = NULL;
-	bool port_specified = false;
 
 	if(!(name = get_name(mesh))) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
 		return false;
 	}
 
-	mesh->self = new_node();
-	mesh->self->connection = new_connection();
 	mesh->self->name = name;
 	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");
-	else
-		port_specified = true;
 
 	mesh->self->connection->options = 0;
 	mesh->self->connection->protocol_major = PROT_MAJOR;
@@ -323,9 +318,9 @@ 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_add(mesh->self);
+	node_add(mesh, mesh->self);
 
-	graph();
+	graph(mesh);
 
 	if(autoconnect)
 		load_all_nodes(mesh);
@@ -333,7 +328,6 @@ bool setup_myself(meshlink_handle_t *mesh) {
 	/* Open sockets */
 
 	mesh->listen_sockets = 0;
-	int cfgs = 0;
 
 	if(!add_listen_address(mesh, address, NULL))
 		return false;
@@ -362,10 +356,10 @@ bool setup_myself(meshlink_handle_t *mesh) {
   initialize network
 */
 bool setup_network(meshlink_handle_t *mesh) {
-	init_connections();
-	init_nodes();
-	init_edges();
-	init_requests();
+	init_connections(mesh);
+	init_nodes(mesh);
+	init_edges(mesh);
+	init_requests(mesh);
 
 	mesh->pinginterval = 60;
 	mesh->pingtimeout = 5;
@@ -403,10 +397,10 @@ void close_network_connections(meshlink_handle_t *mesh) {
 		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);