Don't try to bind Proxy = exec sockets to an address.

[oweals/tinc.git] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index cb271063b0bc5d25ad22d3d0cec65e66ad5052f8..9d5837f99053b43e4993a5325c48675820fbc9e1 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2017 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2009      Florian Forster <octo@verplant.org>
 
@@ -31,6 +31,7 @@
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
+#include "proxy.h"
 #include "utils.h"
 #include "xalloc.h"
 
@@ -354,8 +355,19 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
 #endif
 }
 
+static bool is_valid_host_port(const char *host, const char *port) {
+       for(const char *p = host; *p; p++)
+               if(!isalnum(*p) && *p != '-' && *p != '.')
+                       return false;
+
+       for(const char *p = port; *p; p++)
+               if(!isalnum(*p))
+                       return false;
+
+       return true;
+}
+
 void do_outgoing_connection(connection_t *c) {
-       char *address, *port, *space;
        struct addrinfo *proxyai = NULL;
        int result;
 
@@ -375,6 +387,8 @@ begin:
                        return;
                }
 
+               char *address, *port, *space;
+
                get_config_string(c->outgoing->cfg, &address);
 
                space = strchr(address, ' ');
@@ -387,11 +401,23 @@ begin:
                }
 
                c->outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
-               free(address);
-               free(port);
+
+               // If we cannot resolve the address, maybe we are using a proxy that can?
+               if(!c->outgoing->ai && proxytype != PROXY_NONE && is_valid_host_port(address, port)) {
+                       memset(&c->address, 0, sizeof c->address);
+                       c->address.sa.sa_family = AF_UNKNOWN;
+                       c->address.unknown.address = address;
+                       c->address.unknown.port = port;
+               } else {
+                       free(address);
+                       free(port);
+               }
 
                c->outgoing->aip = c->outgoing->ai;
                c->outgoing->cfg = lookup_config_next(c->config_tree, c->outgoing->cfg);
+
+               if(!c->outgoing->ai && proxytype != PROXY_NONE)
+                       goto connect;
        }
 
        if(!c->outgoing->aip) {
@@ -404,6 +430,7 @@ begin:
        memcpy(&c->address, c->outgoing->aip->ai_addr, c->outgoing->aip->ai_addrlen);
        c->outgoing->aip = c->outgoing->aip->ai_next;
 
+connect:
        if(c->hostname)
                free(c->hostname);
 
@@ -415,6 +442,7 @@ begin:
        if(!proxytype) {
                c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
        } else if(proxytype == PROXY_EXEC) {
+               c->status.proxy_passed = true;
                do_outgoing_pipe(c, proxyhost);
        } else {
                proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);
@@ -444,6 +472,33 @@ begin:
 #endif
 
                bind_to_interface(c->socket);
+
+               int b = -1;
+
+               for(int i = 0; i < listen_sockets; i++) {
+                       if(listen_socket[i].sa.sa.sa_family == c->address.sa.sa_family) {
+                               if(b == -1) {
+                                       b = i;
+                               } else  {
+                                       b = -1;
+                                       break;
+                               }
+                       }
+               }
+
+               if(b != -1) {
+                       sockaddr_t sa = listen_socket[b].sa;
+                       if(sa.sa.sa_family == AF_INET)
+                               sa.in.sin_port = 0;
+                       else if(sa.sa.sa_family == AF_INET6)
+                               sa.in6.sin6_port = 0;
+
+                       if(bind(c->socket, &sa.sa, SALEN(sa.sa))) {
+                               char *addrstr = sockaddr2hostname(&sa);
+                               logger(LOG_ERR, "Can't bind to %s/tcp: %s", addrstr, sockstrerror(sockerrno));
+                               free(addrstr);
+                       }
+               }
        }
 
        /* Connect */
@@ -457,8 +512,11 @@ begin:
                freeaddrinfo(proxyai);
        }
 
+       now = time(NULL);
+
        if(result == -1) {
                if(sockinprogress(sockerrno)) {
+                       c->last_ping_time = now;
                        c->status.connecting = true;
                        return;
                }
@@ -499,13 +557,20 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
        c->outcompression = myself->connection->outcompression;
 
        init_configuration(&c->config_tree);
-       read_connection_config(c);
+       if(!read_connection_config(c)) {
+               free_connection(c);
+               outgoing->timeout = maxtimeout;
+               retry_outgoing(outgoing);
+               return;
+       }
 
        outgoing->cfg = lookup_config(c->config_tree, "Address");
 
        if(!outgoing->cfg) {
                logger(LOG_ERR, "No address specified for %s", c->name);
                free_connection(c);
+               outgoing->timeout = maxtimeout;
+               retry_outgoing(outgoing);
                return;
        }