Move proxy variables to mesh.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 63f02753679e4867450e88408a538f0a60ddc510..c48c0d5b66f458ec9e764a6ce917f28cadd359b1 100644 (file)
--- 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));
@@ -181,7 +173,7 @@ void load_all_nodes(void) {
 char *get_name(void) {
        char *name = NULL;
 
-       get_config_string(lookup_config(config_tree, "Name"), &name);
+       get_config_string(lookup_config(mesh->config, "Name"), &name);
 
        if(!name)
                return NULL;
@@ -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, ' ');
@@ -303,10 +295,10 @@ bool setup_myself(void) {
        mesh->self->connection = new_connection();
        mesh->self->name = name;
        mesh->self->connection->name = xstrdup(name);
-       read_host_config(config_tree, name);
+       read_host_config(mesh->config, name);
 
-       if(!get_config_string(lookup_config(config_tree, "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;
 }
@@ -409,15 +401,15 @@ bool setup_network(void) {
   close all open network connections
 */
 void close_network_connections(void) {
-       for(list_node_t *node = connection_list->head, *next; node; node = next) {
+       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);
        }
 
-       if(outgoing_list)
-               list_delete_list(outgoing_list);
+       if(mesh->outgoings)
+               list_delete_list(mesh->outgoings);
 
        if(mesh->self && mesh->self->connection) {
                terminate_connection(mesh->self->connection, false);
@@ -436,7 +428,7 @@ void close_network_connections(void) {
        exit_nodes();
        exit_connections();
 
-       if(myport) free(myport);
+       if(mesh->myport) free(mesh->myport);
 
        return;
 }