X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=8d0a0cf481ce9ca34197526ec68752785e487972;hp=6979083f1948690d5f468b2ce45d2c43be5d82f8;hb=035c8e14f3630424c87be520c1c296a58e67424a;hpb=4712d8f92e63e86e835ffb624d6399343ee568ea

diff --git a/src/net.c b/src/net.c
index 6979083f..8d0a0cf4 100644
--- 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-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
 		  2011      Loïc Grenié <loic.grenie@gmail.com>
 
@@ -41,6 +41,14 @@
 #include "subnet.h"
 #include "xalloc.h"
 
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+
 bool do_purge = false;
 volatile bool running = false;
 #ifdef HAVE_PSELECT
@@ -134,7 +142,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;
@@ -182,6 +190,12 @@ void terminate_connection(connection_t *c, bool report) {
 		closesocket(c->socket);
 
 	if(c->edge) {
+		if(!c->node) {
+			logger(LOG_ERR, "Connection to %s (%s) has an edge but node is NULL!", c->name, c->hostname);
+			// And that should never happen.
+			abort();
+		}
+
 		if(report && !tunnelserver)
 			send_del_edge(everyone, c->edge);
 
@@ -204,18 +218,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 +254,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 +283,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 +306,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 +328,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 +345,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;
 			}
@@ -490,9 +508,13 @@ int main_loop(void) {
 			avl_node_t *node;
 			logger(LOG_INFO, "Flushing event queue");
 			expire_events();
+#if HAVE_DECL_RES_INIT
+			res_init();
+#endif
 			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;
 		}