X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=2ec901e8e0ecec0914fb1c7b088e3c78f51b55b8;hb=refs%2Fheads%2Ftesting%2Finvitations;hp=69b6e86a10460492e62d4b49e56c0cdfa0cee66f;hpb=c4abbbe7593bf721d9759d51bf3213c23b1f23f5;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 69b6e86a..2ec901e8 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -80,7 +80,7 @@ bool read_ecdsa_public_key(meshlink_handle_t *mesh, connection_t *c) {
 	return false;
 }
 
-static bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
+bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
 	FILE *fp;
 	char filename[PATH_MAX];
 
@@ -154,20 +154,20 @@ void load_all_nodes(meshlink_handle_t *mesh) {
 
 
 char *get_name(meshlink_handle_t *mesh) {
-	char *name = NULL;
+	//char *name = NULL;
 
-	get_config_string(lookup_config(mesh->config, "Name"), &name);
+	//get_config_string(lookup_config(mesh->config, "Name"), &name);
 
-	if(!name)
+	if(!mesh->name)
 		return NULL;
 
-	if(!check_id(name)) {
+	if(!check_id(mesh->name)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for mesh->self!");
-		free(name);
+		//free(name);
 		return NULL;
 	}
 
-	return name;
+	return mesh->name;
 }
 
 bool setup_myself_reloadable(meshlink_handle_t *mesh) {
@@ -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;
@@ -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;