X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=8ef8c51452bc10a1b6f2df36f29e90ccc99205a1;hb=96ee04b678143defa1040f2defdd3424efedea11;hp=bcbd54a667ca8a03f709c19455f28476bdaa850d;hpb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index bcbd54a6..8ef8c514 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
-    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.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
@@ -17,21 +17,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: tincd.c,v 1.10.4.71 2003/07/06 23:16:29 guus Exp $
+    $Id: tincd.c,v 1.10.4.73 2003/07/17 15:06:27 guus Exp $
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <signal.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <string.h>
-#include <termios.h>
+#include "system.h"
 
 /* Darwin (MacOS/X) needs the following definition... */
 #ifndef _P1003_1B_VISIBLE
@@ -40,10 +29,6 @@
 
 #include <sys/mman.h>
 
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif
-
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
@@ -51,18 +36,14 @@
 
 #include <lzo1x.h>
 
-#include <utils.h>
-#include <xalloc.h>
-
 #include "conf.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "subnet.h"
-#include "logger.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 /* The name this program was run with. */
 char *program_name = NULL;
@@ -334,7 +315,7 @@ static void make_names(void)
 		if(!confbase)
 			asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
 		else
-			logger(DEBUG_ALWAYS, LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
+			logger(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
 
 		if(!identname)
 			asprintf(&identname, "tinc.%s", netname);
@@ -367,7 +348,7 @@ int main(int argc, char **argv, char **envp)
 	if(show_version) {
 		printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
 			   VERSION, __DATE__, __TIME__, PROT_CURRENT);
-		printf(_("Copyright (C) 1998-2002 Ivo Timmermans, Guus Sliepen and others.\n"
+		printf(_("Copyright (C) 1998-2003 Ivo Timmermans, Guus Sliepen and others.\n"
 				"See the AUTHORS file for a complete list.\n\n"
 				"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
 				"and you are welcome to redistribute it under certain conditions;\n"
@@ -389,11 +370,11 @@ int main(int argc, char **argv, char **envp)
 	if(do_mlock)
 #ifdef HAVE_MLOCKALL
 		if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
-			logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
+			logger(LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
 				   strerror(errno));
 #else
 	{
-		logger(DEBUG_ALWAYS, LOG_ERR, _("mlockall() not supported on this platform!"));
+		logger(LOG_ERR, _("mlockall() not supported on this platform!"));
 #endif
 		return -1;
 	}
@@ -417,7 +398,7 @@ int main(int argc, char **argv, char **envp)
 		exit(1);
 
 	if(lzo_init() != LZO_E_OK) {
-		logger(DEBUG_ALWAYS, LOG_ERR, _("Error initializing LZO compressor!"));
+		logger(LOG_ERR, _("Error initializing LZO compressor!"));
 		exit(1);
 	}
 
@@ -430,14 +411,14 @@ int main(int argc, char **argv, char **envp)
 			cleanup_and_exit(1);
 		}
 
-		logger(DEBUG_ALWAYS, LOG_ERR, _("Unrecoverable error"));
+		logger(LOG_ERR, _("Unrecoverable error"));
 		cp_trace();
 
 		if(do_detach) {
-			logger(DEBUG_ALWAYS, LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
+			logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
 			sleep(maxtimeout);
 		} else {
-			logger(DEBUG_ALWAYS, LOG_ERR, _("Not restarting."));
+			logger(LOG_ERR, _("Not restarting."));
 			exit(1);
 		}
 	}