X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnet_setup.c;h=0718a8c5725acd0576b32110e7600f28e57e0ea4;hp=12b09a91045e716af1165804ba54cf834ff67da2;hb=7203d5fb07be2d3ae006c2b65d0be1e6533e1273;hpb=a227843b739d279b63adcf3736ebb03d856080c4

diff --git a/src/net_setup.c b/src/net_setup.c
index 12b09a9..0718a8c 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -2,6 +2,7 @@
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
                   2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2006      Scott Lamb <slamb@slamb.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -69,7 +70,7 @@ bool read_rsa_public_key(connection_t *c) {
 		fp = fopen(fname, "r");
 
 		if(!fp) {
-			logger(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
+			logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
 				   fname, strerror(errno));
 			free(fname);
 			return false;
@@ -86,7 +87,7 @@ bool read_rsa_public_key(connection_t *c) {
 		fp = fopen(fname, "r");
 
 		if(!fp) {
-			logger(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
+			logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
 				   fname, strerror(errno));
 			free(fname);
 			return false;
@@ -101,7 +102,7 @@ bool read_rsa_public_key(connection_t *c) {
 			return true;
 		}
 
-		logger(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
+		logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s",
 			   fname, strerror(errno));
 		return false;
 	}
@@ -137,7 +138,7 @@ bool read_rsa_public_key(connection_t *c) {
 	if(c->rsa_key)
 		return true;
 
-	logger(LOG_ERR, _("No public key for %s specified!"), c->name);
+	logger(LOG_ERR, "No public key for %s specified!", c->name);
 
 	return false;
 }
@@ -149,7 +150,7 @@ bool read_rsa_private_key(void) {
 
 	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
 		if(!get_config_string(lookup_config(myself->connection->config_tree, "PublicKey"), &pubkey)) {
-			logger(LOG_ERR, _("PrivateKey used but no PublicKey found!"));
+			logger(LOG_ERR, "PrivateKey used but no PublicKey found!");
 			return false;
 		}
 		myself->connection->rsa_key = RSA_new();
@@ -168,7 +169,7 @@ bool read_rsa_private_key(void) {
 	fp = fopen(fname, "r");
 
 	if(!fp) {
-		logger(LOG_ERR, _("Error reading RSA private key file `%s': %s"),
+		logger(LOG_ERR, "Error reading RSA private key file `%s': %s",
 			   fname, strerror(errno));
 		free(fname);
 		return false;
@@ -176,21 +177,21 @@ bool read_rsa_private_key(void) {
 
 #if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
 	if(fstat(fileno(fp), &s)) {
-		logger(LOG_ERR, _("Could not stat RSA private key file `%s': %s'"),
+		logger(LOG_ERR, "Could not stat RSA private key file `%s': %s'",
 				fname, strerror(errno));
 		free(fname);
 		return false;
 	}
 
 	if(s.st_mode & ~0100700)
-		logger(LOG_WARNING, _("Warning: insecure file permissions for RSA private key file `%s'!"), fname);
+		logger(LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
 #endif
 
 	myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
 	fclose(fp);
 
 	if(!myself->connection->rsa_key) {
-		logger(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"),
+		logger(LOG_ERR, "Reading RSA private key file `%s' failed: %s",
 			   fname, strerror(errno));
 		free(fname);
 		return false;
@@ -217,19 +218,19 @@ bool setup_myself(void) {
 	myself->connection = new_connection();
 	init_configuration(&myself->connection->config_tree);
 
-	xasprintf(&myself->hostname, _("MYSELF"));
-	xasprintf(&myself->connection->hostname, _("MYSELF"));
+	myself->hostname = xstrdup("MYSELF");
+	myself->connection->hostname = xstrdup("MYSELF");
 
 	myself->connection->options = 0;
 	myself->connection->protocol_version = PROT_CURRENT;
 
 	if(!get_config_string(lookup_config(config_tree, "Name"), &name)) {	/* Not acceptable */
-		logger(LOG_ERR, _("Name for tinc daemon required!"));
+		logger(LOG_ERR, "Name for tinc daemon required!");
 		return false;
 	}
 
 	if(!check_id(name)) {
-		logger(LOG_ERR, _("Invalid name for myself!"));
+		logger(LOG_ERR, "Invalid name for myself!");
 		free(name);
 		return false;
 	}
@@ -238,7 +239,7 @@ bool setup_myself(void) {
 	myself->connection->name = xstrdup(name);
 
 	if(!read_connection_config(myself->connection)) {
-		logger(LOG_ERR, _("Cannot open host configuration file for myself!"));
+		logger(LOG_ERR, "Cannot open host configuration file for myself!");
 		return false;
 	}
 
@@ -246,7 +247,7 @@ bool setup_myself(void) {
 		return false;
 
 	if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
-		xasprintf(&myport, "655");
+		myport = xstrdup("655");
 
 	/* Read in all the subnets specified in the host configuration file */
 
@@ -288,7 +289,7 @@ bool setup_myself(void) {
 		else if(!strcasecmp(mode, "hub"))
 			routing_mode = RMODE_HUB;
 		else {
-			logger(LOG_ERR, _("Invalid routing mode!"));
+			logger(LOG_ERR, "Invalid routing mode!");
 			return false;
 		}
 		free(mode);
@@ -306,7 +307,7 @@ bool setup_myself(void) {
 
 #if !defined(SOL_IP) || !defined(IP_TOS)
 	if(priorityinheritance)
-		logger(LOG_WARNING, _("%s not supported on this platform"), "PriorityInheritance");
+		logger(LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
 #endif
 
 	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
@@ -314,7 +315,7 @@ bool setup_myself(void) {
 
 	if(get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout)) {
 		if(maxtimeout <= 0) {
-			logger(LOG_ERR, _("Bogus maximum timeout!"));
+			logger(LOG_ERR, "Bogus maximum timeout!");
 			return false;
 		}
 	} else
@@ -328,7 +329,7 @@ bool setup_myself(void) {
 		else if(!strcasecmp(afname, "any"))
 			addressfamily = AF_UNSPEC;
 		else {
-			logger(LOG_ERR, _("Invalid address family!"));
+			logger(LOG_ERR, "Invalid address family!");
 			return false;
 		}
 		free(afname);
@@ -346,19 +347,19 @@ bool setup_myself(void) {
 			myself->incipher = EVP_get_cipherbyname(cipher);
 
 			if(!myself->incipher) {
-				logger(LOG_ERR, _("Unrecognized cipher type!"));
+				logger(LOG_ERR, "Unrecognized cipher type!");
 				return false;
 			}
 		}
 	} else
-		myself->incipher = EVP_aes_256_cbc();
+		myself->incipher = EVP_bf_cbc();
 
 	if(myself->incipher)
 		myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
 	else
 		myself->inkeylength = 1;
 
-	myself->connection->outcipher = EVP_aes_256_ofb();
+	myself->connection->outcipher = EVP_bf_ofb();
 
 	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
 		keylifetime = 3600;
@@ -374,22 +375,22 @@ bool setup_myself(void) {
 			myself->indigest = EVP_get_digestbyname(digest);
 
 			if(!myself->indigest) {
-				logger(LOG_ERR, _("Unrecognized digest type!"));
+				logger(LOG_ERR, "Unrecognized digest type!");
 				return false;
 			}
 		}
 	} else
-		myself->indigest = EVP_sha256();
+		myself->indigest = EVP_sha1();
 
-	myself->connection->outdigest = EVP_sha256();
+	myself->connection->outdigest = EVP_sha1();
 
 	if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->inmaclength)) {
 		if(myself->indigest) {
 			if(myself->inmaclength > myself->indigest->md_size) {
-				logger(LOG_ERR, _("MAC length exceeds size of digest!"));
+				logger(LOG_ERR, "MAC length exceeds size of digest!");
 				return false;
 			} else if(myself->inmaclength < 0) {
-				logger(LOG_ERR, _("Bogus MAC length!"));
+				logger(LOG_ERR, "Bogus MAC length!");
 				return false;
 			}
 		}
@@ -402,7 +403,7 @@ bool setup_myself(void) {
 
 	if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->incompression)) {
 		if(myself->incompression < 0 || myself->incompression > 11) {
-			logger(LOG_ERR, _("Bogus compression level!"));
+			logger(LOG_ERR, "Bogus compression level!");
 			return false;
 		}
 	} else
@@ -452,7 +453,7 @@ bool setup_myself(void) {
 	err = getaddrinfo(address, myport, &hint, &ai);
 
 	if(err || !ai) {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo",
+		logger(LOG_ERR, "System call `%s' failed: %s", "getaddrinfo",
 			   gai_strerror(err));
 		return false;
 	}
@@ -474,7 +475,7 @@ bool setup_myself(void) {
 
 		ifdebug(CONNECTIONS) {
 			hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-			logger(LOG_NOTICE, _("Listening on %s"), hostname);
+			logger(LOG_NOTICE, "Listening on %s", hostname);
 			free(hostname);
 		}
 
@@ -485,9 +486,9 @@ bool setup_myself(void) {
 	freeaddrinfo(ai);
 
 	if(listen_sockets)
-		logger(LOG_NOTICE, _("Ready"));
+		logger(LOG_NOTICE, "Ready");
 	else {
-		logger(LOG_ERR, _("Unable to create any listening socket!"));
+		logger(LOG_ERR, "Unable to create any listening socket!");
 		return false;
 	}
 
@@ -540,10 +541,17 @@ void close_network_connections(void) {
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
 		c = node->data;
-		c->outgoing = false;
+		c->outgoing = NULL;
 		terminate_connection(c, false);
 	}
 
+	for(list_node_t *node = outgoing_list->head; node; node = node->next) {
+		outgoing_t *outgoing = node->data;
+
+		if(outgoing->event)
+			event_del(outgoing->event);
+	}
+
 	list_delete_list(outgoing_list);
 
 	if(myself && myself->connection) {