Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index db7fb5c..730cf6b 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-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2009      Florian Forster <octo@verplant.org>
 
@@ -33,8 +33,6 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#include <assert.h>
-
 /* Needed on Mac OS/X */
 #ifndef SOL_TCP
 #define SOL_TCP IPPROTO_TCP
@@ -109,63 +107,6 @@ static bool bind_to_interface(int sd) {
        return true;
 }
 
-static bool bind_to_address(connection_t *c) {
-       char *node;
-       struct addrinfo *ai_list;
-       struct addrinfo *ai_ptr;
-       struct addrinfo ai_hints;
-       int status;
-
-       assert(c != NULL);
-       assert(c->socket >= 0);
-
-       node = NULL;
-       if(!get_config_string(lookup_config(config_tree, "BindToAddress"),
-                               &node))
-               return true;
-
-       assert(node != NULL);
-
-       memset(&ai_hints, 0, sizeof(ai_hints));
-       ai_hints.ai_family = c->address.sa.sa_family;
-       /* We're called from `do_outgoing_connection' only. */
-       ai_hints.ai_socktype = SOCK_STREAM;
-       ai_hints.ai_protocol = IPPROTO_TCP;
-
-       ai_list = NULL;
-
-       status = getaddrinfo(node, /* service = */ NULL,
-                       &ai_hints, &ai_list);
-       if(status) {
-               logger(LOG_WARNING, "Error looking up %s port %s: %s",
-                               node, "any", gai_strerror(status));
-               free(node);
-               return false;
-       }
-       assert(ai_list != NULL);
-
-       status = -1;
-       for(ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) {
-               status = bind(c->socket,
-                               ai_list->ai_addr, ai_list->ai_addrlen);
-               if(!status)
-                       break;
-       }
-
-
-       if(status) {
-               logger(LOG_ERR, "Can't bind to %s/tcp: %s", node, sockstrerror(sockerrno));
-       } else ifdebug(CONNECTIONS) {
-               logger(LOG_DEBUG, "Successfully bound outgoing "
-                               "TCP socket to %s", node);
-       }
-
-       free(node);
-       freeaddrinfo(ai_list);
-
-       return status ? false : true;
-}
-
 int setup_listen_socket(const sockaddr_t *sa) {
        int nfd;
        char *addrstr;
@@ -179,6 +120,10 @@ int setup_listen_socket(const sockaddr_t *sa) {
                return -1;
        }
 
+#ifdef FD_CLOEXEC
+       fcntl(nfd, F_SETFD, FD_CLOEXEC);
+#endif
+
        /* Optimize TCP settings */
 
        option = 1;
@@ -237,6 +182,10 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
                return -1;
        }
 
+#ifdef FD_CLOEXEC
+       fcntl(nfd, F_SETFD, FD_CLOEXEC);
+#endif
+
 #ifdef O_NONBLOCK
        {
                int flags = fcntl(nfd, F_GETFL);
@@ -350,7 +299,7 @@ void finish_connecting(connection_t *c) {
        send_id(c);
 }
 
-void do_outgoing_connection(connection_t *c) {
+bool do_outgoing_connection(connection_t *c) {
        char *address, *port, *space;
        int result;
 
@@ -367,7 +316,7 @@ begin:
                        retry_outgoing(c->outgoing);
                        c->outgoing = NULL;
                        connection_del(c);
-                       return;
+                       return false;
                }
 
                get_config_string(c->outgoing->cfg, &address);
@@ -409,6 +358,10 @@ begin:
 
        c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 
+#ifdef FD_CLOEXEC
+       fcntl(c->socket, F_SETFD, FD_CLOEXEC);
+#endif
+
        if(c->socket == -1) {
                ifdebug(CONNECTIONS) logger(LOG_ERR, "Creating socket for %s failed: %s", c->hostname, sockstrerror(sockerrno));
                goto begin;
@@ -421,7 +374,6 @@ begin:
 #endif
 
        bind_to_interface(c->socket);
-       bind_to_address(c);
 
        /* Optimize TCP settings */
 
@@ -434,7 +386,7 @@ begin:
        if(result == -1) {
                if(sockinprogress(sockerrno)) {
                        c->status.connecting = true;
-                       return;
+                       return true;
                }
 
                closesocket(c->socket);
@@ -446,7 +398,7 @@ begin:
 
        finish_connecting(c);
 
-       return;
+       return true;
 }
 
 static void handle_meta_write(int sock, short events, void *data) {
@@ -454,9 +406,9 @@ static void handle_meta_write(int sock, short events, void *data) {
 
        connection_t *c = data;
 
-       size_t outlen = write(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset);
+       ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0);
        if(outlen <= 0) {
-               logger(LOG_ERR, "Onoes, outlen = %zd (%s)", outlen, strerror(errno));
+               logger(LOG_ERR, "Onoes, outlen = %d (%s)", (int)outlen, strerror(errno));
                terminate_connection(c, c->status.active);
                return;
        }
@@ -466,12 +418,6 @@ static void handle_meta_write(int sock, short events, void *data) {
                event_del(&c->outevent);
 }
 
-static void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
-       connection_t *c = data;
-       logger(LOG_ERR, "handle_meta_connection_error() called: %d: %s", what, strerror(errno));
-       terminate_connection(c, c->status.active);
-}
-
 void setup_outgoing_connection(outgoing_t *outgoing) {
        connection_t *c;
        node_t *n;
@@ -512,11 +458,11 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 
        connection_add(c);
 
-       do_outgoing_connection(c);
-
-       event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
-       event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
-       event_add(&c->inevent, NULL);
+       if (do_outgoing_connection(c)) {
+               event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+               event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
+               event_add(&c->inevent, NULL);
+       }
 }
 
 /*