From 1a1ebefd572c18d6af187750847b024ce07551ae Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 30 Jun 2000 21:03:51 +0000 Subject: [PATCH] - Made tinc even more silent if no -d flag is given at all. --- src/encr.c | 8 +++++--- src/net.c | 5 +++-- src/protocol.c | 8 +++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/encr.c b/src/encr.c index cadeba4..7830bbe 100644 --- a/src/encr.c +++ b/src/encr.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: encr.c,v 1.12.4.1 2000/06/25 15:16:11 guus Exp $ + $Id: encr.c,v 1.12.4.2 2000/06/30 21:03:50 guus Exp $ */ #include "config.h" @@ -109,7 +109,8 @@ cp if((f = fopen(filename, "rb")) == NULL) { - syslog(LOG_ERR, _("Could not open %s: %m"), filename); + if(debug_lvl > 1) + syslog(LOG_ERR, _("Could not open %s: %m"), filename); return -1; } @@ -150,7 +151,8 @@ cp else my_key_expiry = (time_t)(time(NULL) + cfg->data.val); - syslog(LOG_NOTICE, _("Generating %d bits keys"), PRIVATE_KEY_BITS); + if(debug_lvl > 1) + syslog(LOG_NOTICE, _("Generating %d bits keys"), PRIVATE_KEY_BITS); if((f = fopen("/dev/urandom", "r")) == NULL) { diff --git a/src/net.c b/src/net.c index c7e8b85..f136a58 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.17 2000/06/30 12:41:05 guus Exp $ + $Id: net.c,v 1.35.4.18 2000/06/30 21:03:51 guus Exp $ */ #include "config.h" @@ -531,7 +531,8 @@ cp return -1; } - syslog(LOG_INFO, _("Connected to %s port %hd"), + if(debug_lvl > 0) + syslog(LOG_INFO, _("Connected to %s port %hd"), cl->real_hostname, cl->port); cp return 0; diff --git a/src/protocol.c b/src/protocol.c index f8d7229..3c20f3b 100644 --- a/src/protocol.c +++ b/src/protocol.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: protocol.c,v 1.28.4.18 2000/06/30 12:41:06 guus Exp $ + $Id: protocol.c,v 1.28.4.19 2000/06/30 21:03:51 guus Exp $ */ #include "config.h" @@ -507,7 +507,8 @@ cp while(old = lookup_conn(cl->vpn_ip)) { - syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"), + if(debug_lvl > 1) + syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"), cl->vpn_hostname, old->real_hostname, cl->real_hostname); old->status.active = 0; terminate_connection(old); @@ -535,7 +536,8 @@ cp cl->status.active = 1; - syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), + if(debug_lvl > 0) + syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->vpn_hostname, cl->real_hostname); notify_others(cl, NULL, send_add_host); -- 2.25.1