X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=7f1f77b38b192ea2e14db8b1a5afe300a6333371;hp=0b617bd08ac3bffaf420c570eb56de7563607f26;hb=4c85542894f7fca823b119b05e07179deb24229a;hpb=5dde6461a321ee47b06e33f8203f2acf00a31a51

diff --git a/src/net.c b/src/net.c
index 0b617bd0..7f1f77b3 100644
--- a/src/net.c
+++ b/src/net.c
@@ -52,9 +52,7 @@ static void purge(void) {
 	edge_t *e;
 	subnet_t *s;
 
-	cp();
-
-	ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
+	ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes");
 
 	/* Remove all edges and subnets owned by unreachable nodes. */
 
@@ -63,7 +61,7 @@ static void purge(void) {
 		n = nnode->data;
 
 		if(!n->status.reachable) {
-			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
+			ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Purging node %s (%s)", n->name,
 					   n->hostname);
 
 			for(snode = n->subnet_tree->head; snode; snode = snext) {
@@ -114,8 +112,6 @@ static int build_fdset(fd_set *readset, fd_set *writeset) {
 	connection_t *c;
 	int i, max = 0;
 
-	cp();
-
 	FD_ZERO(readset);
 	FD_ZERO(writeset);
 
@@ -161,12 +157,10 @@ static int build_fdset(fd_set *readset, fd_set *writeset) {
   - Deactivate the host
 */
 void terminate_connection(connection_t *c, bool report) {
-	cp();
-
 	if(c->status.remove)
 		return;
 
-	ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
+	ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Closing connection with %s (%s)",
 			   c->name, c->hostname);
 
 	c->status.remove = true;
@@ -227,8 +221,6 @@ static void check_dead_connections(void) {
 	avl_node_t *node, *next;
 	connection_t *c;
 
-	cp();
-
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
 		c = node->data;
@@ -236,7 +228,7 @@ static void check_dead_connections(void) {
 		if(c->last_ping_time + pingtimeout < now) {
 			if(c->status.active) {
 				if(c->status.pinged) {
-					ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"),
+					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->status.timeout = true;
 					terminate_connection(c, true);
@@ -245,12 +237,12 @@ static void check_dead_connections(void) {
 				}
 			} else {
 				if(c->status.remove) {
-					logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
+					logger(LOG_WARNING, "Old connection_t for %s (%s) status %04x still lingering, deleting...",
 						   c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status));
 					connection_del(c);
 					continue;
 				}
-				ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
+				ifdebug(CONNECTIONS) logger(LOG_WARNING, "Timeout from %s (%s) during authentication",
 						   c->name, c->hostname);
 				if(c->status.connecting) {
 					c->status.connecting = false;
@@ -265,7 +257,7 @@ static void check_dead_connections(void) {
 		if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
 			if(c->status.active) {
 				ifdebug(CONNECTIONS) logger(LOG_INFO,
-						_("%s (%s) could not flush for %ld seconds (%d bytes remaining)"),
+						"%s (%s) could not flush for %ld seconds (%d bytes remaining)",
 						c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
 				c->status.timeout = true;
 				terminate_connection(c, true);
@@ -285,8 +277,6 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 	socklen_t len = sizeof(result);
 	vpn_packet_t packet;
 
-	cp();
-
 	/* check input from kernel */
 	if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
 		if(read_packet(&packet)) {
@@ -311,7 +301,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 					finish_connecting(c);
 				else {
 					ifdebug(CONNECTIONS) logger(LOG_DEBUG,
-							   _("Error while connecting to %s (%s): %s"),
+							   "Error while connecting to %s (%s): %s",
 							   c->name, c->hostname, strerror(result));
 					closesocket(c->socket);
 					do_outgoing_connection(c);
@@ -352,8 +342,6 @@ int main_loop(void) {
 	time_t last_ping_check, last_config_check, last_graph_dump;
 	event_t *event;
 
-	cp();
-
 	last_ping_check = now;
 	last_config_check = now;
 	last_graph_dump = now;
@@ -381,9 +369,8 @@ int main_loop(void) {
 
 		if(r < 0) {
 			if(errno != EINTR && errno != EAGAIN) {
-				logger(LOG_ERR, _("Error while waiting for input: %s"),
+				logger(LOG_ERR, "Error while waiting for input: %s",
 					   strerror(errno));
-				cp_trace();
 				dump_connections();
 				return 1;
 			}
@@ -415,7 +402,7 @@ int main_loop(void) {
 				avl_node_t *node;
 				node_t *n;
 
-				ifdebug(STATUS) logger(LOG_INFO, _("Expiring symmetric keys"));
+				ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
 
 				for(node = node_tree->head; node; node = node->next) {
 					n = node->data;
@@ -431,7 +418,7 @@ int main_loop(void) {
 		}
 
 		if(sigalrm) {
-			logger(LOG_INFO, _("Flushing event queue"));
+			logger(LOG_INFO, "Flushing event queue");
 			expire_events();
 			sigalrm = false;
 		}
@@ -455,7 +442,7 @@ int main_loop(void) {
 			init_configuration(&config_tree);
 
 			if(!read_server_config()) {
-				logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
+				logger(LOG_ERR, "Unable to reread configuration file, exitting.");
 				return 1;
 			}