X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=e1580e651ad4d202d1769112ee8a0b05a1c22302;hp=d43aede4e1a45de1013129d635ebaf26f1297fc4;hb=b79e55b183898911e2c2b7b151b281aef8d474e1;hpb=e449d94caef963809d417f16497f6f978e10d731

diff --git a/src/net.c b/src/net.c
index d43aede4..e1580e65 100644
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.191 2003/07/17 15:06:26 guus Exp $
+    $Id: net.c,v 1.35.4.195 2003/07/29 22:59:00 guus Exp $
 */
 
 #include "system.h"
@@ -39,10 +39,9 @@
 #include "protocol.h"
 #include "route.h"
 #include "subnet.h"
+#include "xalloc.h"
 
-int do_purge = 0;
-int sighup = 0;
-int sigalrm = 0;
+bool do_purge = false;
 
 time_t now = 0;
 
@@ -134,11 +133,11 @@ static int build_fdset(fd_set * fs)
 /*
   Terminate a connection:
   - Close the socket
-  - Remove associated edge and tell other connections about it if report = 1
+  - Remove associated edge and tell other connections about it if report = true
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t *c, int report)
+void terminate_connection(connection_t *c, bool report)
 {
 	cp();
 
@@ -148,14 +147,14 @@ void terminate_connection(connection_t *c, int report)
 	ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
 			   c->name, c->hostname);
 
-	c->status.remove = 1;
-	c->status.active = 0;
+	c->status.remove = true;
+	c->status.active = false;
 
 	if(c->node)
 		c->node->connection = NULL;
 
 	if(c->socket)
-		close(c->socket);
+		closesocket(c->socket);
 
 	if(c->edge) {
 		if(report)
@@ -200,21 +199,21 @@ static void check_dead_connections(void)
 				if(c->status.pinged) {
 					ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING"),
 							   c->name, c->hostname);
-					c->status.timeout = 1;
-					terminate_connection(c, 1);
+					c->status.timeout = true;
+					terminate_connection(c, true);
 				} else {
 					send_ping(c);
 				}
 			} else {
 				if(c->status.remove) {
 					logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
-						   c->name, c->hostname, c->status);
+						   c->name, c->hostname, *(uint32_t *)&c->status);
 					connection_del(c);
 					continue;
 				}
 				ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
 						   c->name, c->hostname);
-				terminate_connection(c, 0);
+				terminate_connection(c, false);
 			}
 		}
 	}
@@ -235,7 +234,7 @@ static void check_network_activity(fd_set * f)
 	cp();
 
 	if(FD_ISSET(device_fd, f)) {
-		if(!read_packet(&packet))
+		if(read_packet(&packet))
 			route_outgoing(&packet);
 	}
 
@@ -247,7 +246,7 @@ static void check_network_activity(fd_set * f)
 
 		if(FD_ISSET(c->socket, f)) {
 			if(c->status.connecting) {
-				c->status.connecting = 0;
+				c->status.connecting = false;
 				getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
 
 				if(!result)
@@ -256,13 +255,13 @@ static void check_network_activity(fd_set * f)
 					ifdebug(CONNECTIONS) logger(LOG_DEBUG,
 							   _("Error while connecting to %s (%s): %s"),
 							   c->name, c->hostname, strerror(result));
-					close(c->socket);
+					closesocket(c->socket);
 					do_outgoing_connection(c);
 					continue;
 				}
 			}
 
-			if(receive_meta(c) < 0) {
+			if(!receive_meta(c)) {
 				terminate_connection(c, c->status.active);
 				continue;
 			}
@@ -321,7 +320,7 @@ void main_loop(void)
 
 		if(do_purge) {
 			purge();
-			do_purge = 0;
+			do_purge = false;
 		}
 
 		/* Let's check if everybody is still alive */
@@ -341,7 +340,8 @@ void main_loop(void)
 				ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
 
 				RAND_pseudo_bytes(myself->key, myself->keylength);
-				EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+				if(myself->cipher)
+					EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
 				send_key_changed(broadcast, myself);
 				keyexpires = now + keylifetime;
 			}
@@ -361,7 +361,7 @@ void main_loop(void)
 				event->handler(event->data);
 				event_del(event);
 			}
-			sigalrm = 0;
+			sigalrm = false;
 		}
 
 		if(sighup) {
@@ -370,14 +370,14 @@ void main_loop(void)
 			char *fname;
 			struct stat s;
 			
-			sighup = 0;
+			sighup = false;
 			
 			/* Reread our own configuration file */
 
 			exit_configuration(&config_tree);
 			init_configuration(&config_tree);
 
-			if(read_server_config()) {
+			if(!read_server_config()) {
 				logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
 				exit(1);
 			}