Clean up child processes from proxy type exec.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index fc9ec57..c5e5707 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                  2011      Loïc Grenié <loic.grenie@gmail.com>
 
@@ -134,7 +134,7 @@ static int build_fdset(fd_set *readset, fd_set *writeset) {
                                purge();
                } else {
                        FD_SET(c->socket, readset);
-                       if(c->outbuflen > 0)
+                       if(c->outbuflen > 0 || c->status.connecting)
                                FD_SET(c->socket, writeset);
                        if(c->socket > max)
                                max = c->socket;
@@ -204,18 +204,20 @@ void terminate_connection(connection_t *c, bool report) {
                }
        }
 
+       free_connection_partially(c);
+
        /* Check if this was our outgoing connection */
 
        if(c->outgoing) {
-               retry_outgoing(c->outgoing);
-               c->outgoing = NULL;
+               c->status.remove = false;
+               do_outgoing_connection(c);      
        }
 
-       free(c->outbuf);
-       c->outbuf = NULL;
-       c->outbuflen = 0;
-       c->outbufsize = 0;
-       c->outbufstart = 0;
+#ifndef HAVE_MINGW
+       /* Clean up dead proxy processes */
+
+       while(waitpid(-1, NULL, WNOHANG) > 0);
+#endif
 }
 
 /*
@@ -238,7 +240,7 @@ static void check_dead_connections(void) {
                        if(c->status.active) {
                                if(c->status.pinged) {
                                        ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
-                                                          c->name, c->hostname, now - c->last_ping_time);
+                                                          c->name, c->hostname, (long)now - c->last_ping_time);
                                        c->status.timeout = true;
                                        terminate_connection(c, true);
                                } else if(c->last_ping_time + pinginterval <= now) {
@@ -267,7 +269,7 @@ static void check_dead_connections(void) {
                        if(c->status.active) {
                                ifdebug(CONNECTIONS) logger(LOG_INFO,
                                                "%s (%s) could not flush for %ld seconds (%d bytes remaining)",
-                                               c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
+                                               c->name, c->hostname, (long)now - c->last_flushed_time, c->outbuflen);
                                c->status.timeout = true;
                                terminate_connection(c, true);
                        }
@@ -290,9 +292,11 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
        /* check input from kernel */
        if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
                if(devops.read(&packet)) {
-                       errors = 0;
-                       packet.priority = 0;
-                       route(myself, &packet);
+                       if(packet.len) {
+                               errors = 0;
+                               packet.priority = 0;
+                               route(myself, &packet);
+                       }
                } else {
                        usleep(errors * 50000);
                        errors++;
@@ -310,7 +314,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
                if(c->status.remove)
                        continue;
 
-               if(FD_ISSET(c->socket, readset)) {
+               if(FD_ISSET(c->socket, writeset)) {
                        if(c->status.connecting) {
                                c->status.connecting = false;
                                getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
@@ -327,14 +331,14 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
                                }
                        }
 
-                       if(!receive_meta(c)) {
+                       if(!flush_meta(c)) {
                                terminate_connection(c, c->status.active);
                                continue;
                        }
                }
 
-               if(FD_ISSET(c->socket, writeset)) {
-                       if(!flush_meta(c)) {
+               if(FD_ISSET(c->socket, readset)) {
+                       if(!receive_meta(c)) {
                                terminate_connection(c, c->status.active);
                                continue;
                        }
@@ -343,7 +347,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 
        for(i = 0; i < listen_sockets; i++) {
                if(FD_ISSET(listen_socket[i].udp, readset))
-                       handle_incoming_vpn_data(listen_socket[i].udp);
+                       handle_incoming_vpn_data(i);
 
                if(FD_ISSET(listen_socket[i].tcp, readset))
                        handle_new_meta_connection(listen_socket[i].tcp);
@@ -492,7 +496,8 @@ int main_loop(void) {
                        expire_events();
                        for(node = connection_tree->head; node; node = node->next) {
                                connection_t *c = node->data;
-                               send_ping(c);
+                               if(c->status.active)
+                                       send_ping(c);
                        }
                        sigalrm = false;
                }