Rename xmalloc_and_zero() to xzalloc().

[meshlink] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 0ba2bf312757031970098b04efaacac02fa6028d..1b49aeeb4090865dd357cc235e1dffc24fe0de72 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -294,10 +294,7 @@ void retry_outgoing(outgoing_t *outgoing) {
 void finish_connecting(connection_t *c) {
        logger(DEBUG_CONNECTIONS, LOG_INFO, "Connected to %s (%s)", c->name, c->hostname);
 
-       if(proxytype != PROXY_EXEC)
-               configure_tcp(c);
-
-       c->last_ping_time = time(NULL);
+       c->last_ping_time = now.tv_sec;
        c->status.connecting = false;
 
        send_id(c);
@@ -352,6 +349,9 @@ static void do_outgoing_pipe(connection_t *c, char *command) {
 }
 
 static void handle_meta_write(connection_t *c) {
+       if(c->outbuf.len <= c->outbuf.offset)
+               return;
+
        ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0);
        if(outlen <= 0) {
                if(!errno || errno == EPIPE) {
@@ -380,7 +380,7 @@ static void handle_meta_io(void *data, int flags) {
 
                int result;
                socklen_t len = sizeof result;
-               getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+               getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
 
                if(!result)
                        finish_connecting(c);
@@ -459,6 +459,7 @@ begin:
                }
                logger(DEBUG_CONNECTIONS, LOG_INFO, "Using proxy at %s port %s", proxyhost, proxyport);
                c->socket = socket(proxyai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+               configure_tcp(c);
        }
 
        if(c->socket == -1) {
@@ -507,7 +508,7 @@ begin:
        c->outdigest = myself->connection->outdigest;
        c->outmaclength = myself->connection->outmaclength;
        c->outcompression = myself->connection->outcompression;
-       c->last_ping_time = time(NULL);
+       c->last_ping_time = now.tv_sec;
 
        connection_add(c);
 
@@ -570,7 +571,7 @@ void handle_new_meta_connection(void *data, int flags) {
        c->address = sa;
        c->hostname = sockaddr2hostname(&sa);
        c->socket = fd;
-       c->last_ping_time = time(NULL);
+       c->last_ping_time = now.tv_sec;
 
        logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection from %s", c->hostname);
 
@@ -609,7 +610,7 @@ void handle_new_unix_connection(void *data, int flags) {
        c->address = sa;
        c->hostname = xstrdup("localhost port unix");
        c->socket = fd;
-       c->last_ping_time = time(NULL);
+       c->last_ping_time = now.tv_sec;
 
        logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection from %s", c->hostname);
 
@@ -673,7 +674,7 @@ void try_outgoing_connections(void) {
                }
 
                if(!found) {
-                       outgoing_t *outgoing = xmalloc_and_zero(sizeof *outgoing);
+                       outgoing_t *outgoing = xzalloc(sizeof *outgoing);
                        outgoing->name = name;
                        list_insert_tail(outgoing_list, outgoing);
                        setup_outgoing_connection(outgoing);