Convert sizeof foo to sizeof(foo).

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index e63da75..1497a8d 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>
 
@@ -140,7 +140,7 @@ int setup_listen_socket(const sockaddr_t *sa) {
 
 #if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
        if(sa->sa.sa_family == AF_INET6)
-               setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
+               setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
 #endif
 
        if(get_config_string(lookup_config(config_tree, "BindToInterface"), &iface)) {
@@ -230,7 +230,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 
 #if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
        if(sa->sa.sa_family == AF_INET6)
-               setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
+               setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
 #endif
 
 #if defined(IP_DONTFRAG) && !defined(IP_DONTFRAGMENT)
@@ -404,7 +404,7 @@ begin:
 
                // 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);
+                       memset(&c->address, 0, sizeof(c->address));
                        c->address.sa.sa_family = AF_UNKNOWN;
                        c->address.unknown.address = address;
                        c->address.unknown.port = port;
@@ -442,6 +442,7 @@ connect:
        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);
@@ -467,10 +468,37 @@ connect:
 #if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
                int option = 1;
                if(c->address.sa.sa_family == AF_INET6)
-                       setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
+                       setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof(option));
 #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 */
@@ -529,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;
        }