Don't forget about outgoing connections on host file read errors.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index e63da75..284bab7 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>
 
@@ -473,6 +473,33 @@ connect:
                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 */
 
        if(!proxytype) {
@@ -529,13 +556,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;
        }