X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=c48c0d5b66f458ec9e764a6ce917f28cadd359b1;hb=4ea5d218c5c8e5739071bc6e57cf8404db5323ef;hp=4c19e268a524fe38508873b2d8bd11e042129b03;hpb=8fc838f88fad6d6a632f9d4e6906e31931c765e3;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 4c19e268..c48c0d5b 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -34,15 +34,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-char *myport;
-
-char *proxyhost;
-char *proxyport;
-char *proxyuser;
-char *proxypass;
-proxytype_t proxytype;
-int autoconnect;
-bool disablebuggypeers;
+int autoconnect = 3;
 
 bool node_read_ecdsa_public_key(node_t *n) {
 	if(ecdsa_active(n->ecdsa))
@@ -94,7 +86,7 @@ static bool read_ecdsa_private_key(void) {
 	FILE *fp;
 	char *fname;
 
-	xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", confbase);
+	xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
 	fp = fopen(fname, "r");
 	free(fname);
 
@@ -121,7 +113,7 @@ static bool read_invitation_key(void) {
 		invitation_key = NULL;
 	}
 
-	xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
+	xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
 
 	fp = fopen(fname, "r");
 
@@ -153,7 +145,7 @@ void load_all_nodes(void) {
 	struct dirent *ent;
 	char *dname;
 
-	xasprintf(&dname, "%s" SLASH "hosts", confbase);
+	xasprintf(&dname, "%s" SLASH "hosts", mesh->confbase);
 	dir = opendir(dname);
 	if(!dir) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
@@ -211,7 +203,7 @@ bool setup_myself_reloadable(void) {
   Add listening sockets.
 */
 static bool add_listen_address(char *address, bool bindto) {
-	char *port = myport;
+	char *port = mesh->myport;
 
 	if(address) {
 		char *space = strchr(address, ' ');
@@ -305,8 +297,8 @@ bool setup_myself(void) {
 	mesh->self->connection->name = xstrdup(name);
 	read_host_config(mesh->config, name);
 
-	if(!get_config_string(lookup_config(mesh->config, "Port"), &myport))
-		myport = xstrdup("655");
+	if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport))
+		mesh->myport = xstrdup("655");
 	else
 		port_specified = true;
 
@@ -319,16 +311,16 @@ bool setup_myself(void) {
 	if(!read_ecdsa_private_key())
 		return false;
 
-	/* Ensure myport is numeric */
+	/* Ensure mesh->myport is numeric */
 
-	if(!atoi(myport)) {
-		struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
+	if(!atoi(mesh->myport)) {
+		struct addrinfo *ai = str2addrinfo("localhost", mesh->myport, SOCK_DGRAM);
 		sockaddr_t sa;
 		if(!ai || !ai->ai_addr)
 			return false;
-		free(myport);
+		free(mesh->myport);
 		memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
-		sockaddr2str(&sa, NULL, &myport);
+		sockaddr2str(&sa, NULL, &mesh->myport);
 	}
 
 	/* Check some options */
@@ -373,15 +365,15 @@ bool setup_myself(void) {
 
 	// TODO: require Port to be set? Or use "0" and use getsockname()?
 
-	if(!myport)
-		myport = xstrdup("655");
+	if(!mesh->myport)
+		mesh->myport = xstrdup("655");
 
-	xasprintf(&mesh->self->hostname, "MYSELF port %s", myport);
+	xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
 	mesh->self->connection->hostname = xstrdup(mesh->self->hostname);
 
 	/* Done. */
 
-	last_config_check = now.tv_sec;
+	mesh->last_config_check = now.tv_sec;
 
 	return true;
 }
@@ -436,7 +428,7 @@ void close_network_connections(void) {
 	exit_nodes();
 	exit_connections();
 
-	if(myport) free(myport);
+	if(mesh->myport) free(mesh->myport);
 
 	return;
 }