Automatically configure and compile catta.

[meshlink] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index b147bfdf8870c197102407b36b91594931ce5aa5..a74db196973c910ae54dc31d1740ee8c55c43363 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -50,25 +50,23 @@ static void configure_tcp(connection_t *c) {
 #ifdef O_NONBLOCK
        int flags = fcntl(c->socket, F_GETFL);
 
-       if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
-               logger(c->mesh, MESHLINK_ERROR, "fcntl for %s: %s", c->hostname, strerror(errno));
-       }
+       if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
+               logger(c->mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "fcntl", strerror(errno));
 #elif defined(WIN32)
        unsigned long arg = 1;
 
-       if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
-               logger(c->mesh, MESHLINK_ERROR, "ioctlsocket for %s: %s", c->hostname, sockstrerror(sockerrno));
-       }
+       if(ioctlsocket(c->socket, FIONBIO, &arg) != 0)
+               logger(c->mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "ioctlsocket", sockstrerror(sockerrno));
 #endif
 
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
        int nodelay = 1;
-       setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&nodelay, sizeof nodelay);
+       setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&nodelay, sizeof(nodelay));
 #endif
 
 #if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
        int lowdelay = IPTOS_LOWDELAY;
-       setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&lowdelay, sizeof lowdelay);
+       setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&lowdelay, sizeof(lowdelay));
 #endif
 }
 
@@ -119,11 +117,11 @@ int setup_listen_socket(const sockaddr_t *sa) {
        /* Optimize TCP settings */
 
        option = 1;
-       setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
+       setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
 
 #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(bind(nfd, &sa->sa, SALEN(sa->sa))) {
@@ -166,7 +164,7 @@ int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
                if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
                        closesocket(nfd);
                        logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "fcntl",
-                                  strerror(errno));
+                              strerror(errno));
                        return -1;
                }
        }
@@ -182,12 +180,12 @@ int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
 #endif
 
        option = 1;
-       setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);
-       setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof option);
+       setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof(option));
+       setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof(option));
 
 #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)
@@ -245,13 +243,15 @@ void retry_outgoing(meshlink_handle_t *mesh, outgoing_t *outgoing) {
        if(outgoing->timeout > mesh->maxtimeout)
                outgoing->timeout = mesh->maxtimeout;
 
-       timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval){outgoing->timeout, rand() % 100000});
+       timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval) {
+               outgoing->timeout, rand() % 100000
+       });
 
        logger(mesh, MESHLINK_INFO, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout);
 }
 
 void finish_connecting(meshlink_handle_t *mesh, connection_t *c) {
-       logger(mesh, MESHLINK_INFO, "Connected to %s (%s)", c->name, c->hostname);
+       logger(mesh, MESHLINK_INFO, "Connected to %s", c->name);
 
        c->last_ping_time = mesh->loop.now.tv_sec;
        c->status.connecting = false;
@@ -311,14 +311,13 @@ static void handle_meta_write(meshlink_handle_t *mesh, connection_t *c) {
 
        ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, MSG_NOSIGNAL);
        if(outlen <= 0) {
-               if(!errno || errno == EPIPE) {
-                       logger(mesh, MESHLINK_INFO, "Connection closed by %s (%s)", c->name, c->hostname);
-               } else if(sockwouldblock(sockerrno)) {
-                       logger(mesh, MESHLINK_DEBUG, "Sending %d bytes to %s (%s) would block", c->outbuf.len - c->outbuf.offset, c->name, c->hostname);
+               if(!errno || errno == EPIPE)
+                       logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name);
+               else if(sockwouldblock(sockerrno)) {
+                       logger(mesh, MESHLINK_DEBUG, "Sending %d bytes to %s would block", c->outbuf.len - c->outbuf.offset, c->name);
                        return;
-               } else {
-                       logger(mesh, MESHLINK_ERROR, "Could not send %d bytes of data to %s (%s): %s", c->outbuf.len - c->outbuf.offset, c->name, c->hostname, strerror(errno));
-               }
+               } else
+                       logger(mesh, MESHLINK_ERROR, "Could not send %d bytes of data to %s: %s", c->outbuf.len - c->outbuf.offset, c->name, strerror(errno));
 
                terminate_connection(mesh, c, c->status.active);
                return;
@@ -337,13 +336,13 @@ static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
                c->status.connecting = false;
 
                int result;
-               socklen_t len = sizeof result;
+               socklen_t len = sizeof(result);
                getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
 
                if(!result)
                        finish_connecting(mesh, c);
                else {
-                       logger(mesh, MESHLINK_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
+                       logger(mesh, MESHLINK_DEBUG, "Error while connecting to %s: %s", c->name, sockstrerror(result));
                        terminate_connection(mesh, c, false);
                        return;
                }
@@ -374,7 +373,7 @@ static struct addrinfo *get_known_addresses(node_t *n) {
                        continue;
 
                // Create a new struct addrinfo, and put it at the head of the list.
-               struct addrinfo *nai = xzalloc(sizeof *nai + SALEN(e->reverse->address.sa));
+               struct addrinfo *nai = xzalloc(sizeof(*nai) + SALEN(e->reverse->address.sa));
                nai->ai_next = ai;
                ai = nai;
 
@@ -451,19 +450,20 @@ begin:
        memcpy(&c->address, outgoing->aip->ai_addr, outgoing->aip->ai_addrlen);
        outgoing->aip = outgoing->aip->ai_next;
 
-       c->hostname = sockaddr2hostname(&c->address);
+       char *hostname = sockaddr2hostname(&c->address);
 
-       logger(mesh, MESHLINK_INFO, "Trying to connect to %s (%s)", outgoing->name, c->hostname);
+       logger(mesh, MESHLINK_INFO, "Trying to connect to %s at %s", outgoing->name, hostname);
 
        if(!mesh->proxytype) {
                c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
                configure_tcp(c);
-       } else if(mesh->proxytype == PROXY_EXEC) {
+       } else if(mesh->proxytype == PROXY_EXEC)
                do_outgoing_pipe(mesh, c, mesh->proxyhost);
-       } else {
+       else {
                proxyai = str2addrinfo(mesh->proxyhost, mesh->proxyport, SOCK_STREAM);
                if(!proxyai) {
                        free_connection(c);
+                       free(hostname);
                        goto begin;
                }
                logger(mesh, MESHLINK_INFO, "Using proxy at %s port %s", mesh->proxyhost, mesh->proxyport);
@@ -472,11 +472,14 @@ begin:
        }
 
        if(c->socket == -1) {
-               logger(mesh, MESHLINK_ERROR, "Creating socket for %s failed: %s", c->hostname, sockstrerror(sockerrno));
+               logger(mesh, MESHLINK_ERROR, "Creating socket for %s at %s failed: %s", c->name, c->hostname, sockstrerror(sockerrno));
                free_connection(c);
+               free(hostname);
                goto begin;
        }
 
+       free(hostname);
+
 #ifdef FD_CLOEXEC
        fcntl(c->socket, F_SETFD, FD_CLOEXEC);
 #endif
@@ -485,7 +488,7 @@ begin:
 #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_address(mesh, c);
@@ -493,17 +496,17 @@ begin:
 
        /* Connect */
 
-       if(!mesh->proxytype) {
+       if(!mesh->proxytype)
                result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
-       } else if(mesh->proxytype == PROXY_EXEC) {
+       else if(mesh->proxytype == PROXY_EXEC)
                result = 0;
-       } else {
+       else {
                result = connect(c->socket, proxyai->ai_addr, proxyai->ai_addrlen);
                freeaddrinfo(proxyai);
        }
 
        if(result == -1 && !sockinprogress(sockerrno)) {
-               logger(mesh, MESHLINK_ERROR, "Could not connect to %s (%s): %s", outgoing->name, c->hostname, sockstrerror(sockerrno));
+               logger(mesh, MESHLINK_ERROR, "Could not connect to %s: %s", outgoing->name, sockstrerror(sockerrno));
                free_connection(c);
 
                goto begin;
@@ -518,7 +521,7 @@ begin:
 
        connection_add(mesh, c);
 
-       io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ|IO_WRITE);
+       io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ | IO_WRITE);
 
        return true;
 }
@@ -542,7 +545,7 @@ void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
        outgoing->cfg = lookup_config(outgoing->config_tree, "Address");
 
        get_config_bool(lookup_config(outgoing->config_tree, "blacklisted"), &blacklisted);
-       if (blacklisted) return;
+       if(blacklisted) return;
 
        if(!outgoing->cfg) {
                if(n)
@@ -566,7 +569,7 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
        connection_t *c;
        sockaddr_t sa;
        int fd;
-       socklen_t len = sizeof sa;
+       socklen_t len = sizeof(sa);
 
        fd = accept(l->tcp.fd, &sa.sa, &len);
 
@@ -610,7 +613,7 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
                }
        }
 
-       memcpy(&prev_sa, &sa, sizeof sa);
+       memcpy(&prev_sa, &sa, sizeof(sa));
 
        // Check if we get many connections from different hosts
 
@@ -638,11 +641,12 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
        c->outcompression = mesh->self->connection->outcompression;
 
        c->address = sa;
-       c->hostname = sockaddr2hostname(&sa);
        c->socket = fd;
        c->last_ping_time = mesh->loop.now.tv_sec;
 
+       char *hostname = sockaddr2hostname(&sa);
        logger(mesh, MESHLINK_INFO, "Connection from %s", c->hostname);
+       free(hostname);
 
        io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ);
 
@@ -677,9 +681,9 @@ static void free_outgoing(outgoing_t *outgoing) {
 void try_outgoing_connections(meshlink_handle_t *mesh) {
        /* If there is no outgoing list yet, create one. Otherwise, mark all outgoings as deleted. */
 
-       if(!mesh->outgoings) {
+       if(!mesh->outgoings)
                mesh->outgoings = list_alloc((list_action_t)free_outgoing);
-       } else {
+       else {
                for list_each(outgoing_t, outgoing, mesh->outgoings)
                        outgoing->timeout = -1;
        }
@@ -693,8 +697,8 @@ void try_outgoing_connections(meshlink_handle_t *mesh) {
 
                if(!check_id(name)) {
                        logger(mesh, MESHLINK_ERROR,
-                                  "Invalid name for outgoing connection in %s line %d",
-                                  cfg->file, cfg->line);
+                              "Invalid name for outgoing connection in %s line %d",
+                              cfg->file, cfg->line);
                        free(name);
                        continue;
                }
@@ -710,7 +714,7 @@ void try_outgoing_connections(meshlink_handle_t *mesh) {
                }
 
                if(!found) {
-                       outgoing_t *outgoing = xzalloc(sizeof *outgoing);
+                       outgoing_t *outgoing = xzalloc(sizeof(*outgoing));
                        outgoing->mesh = mesh;
                        outgoing->name = name;
                        list_insert_tail(mesh->outgoings, outgoing);