X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=bcbd54a667ca8a03f709c19455f28476bdaa850d;hp=8ebbe42aa89a4a920b3258a10537f63795809c31;hb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;hpb=38c80bdd46fab68c686a293e2820041291972f3a diff --git a/src/tincd.c b/src/tincd.c index 8ebbe42a..bcbd54a6 100644 --- a/src/tincd.c +++ b/src/tincd.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: tincd.c,v 1.10.4.64 2002/09/15 12:26:04 guus Exp $ + $Id: tincd.c,v 1.10.4.71 2003/07/06 23:16:29 guus Exp $ */ #include "config.h" @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -50,6 +49,8 @@ #include #include +#include + #include #include @@ -59,17 +60,18 @@ #include "process.h" #include "protocol.h" #include "subnet.h" +#include "logger.h" #include "system.h" /* The name this program was run with. */ -char *program_name; +char *program_name = NULL; /* If nonzero, display usage information and exit. */ -int show_help; +int show_help = 0; /* If nonzero, print the version on standard output and exit. */ -int show_version; +int show_version = 0; /* If nonzero, it will attempt to kill a running tincd and exit. */ int kill_tincd = 0; @@ -83,8 +85,12 @@ int bypass_security = 0; /* If nonzero, disable swapping for this process. */ int do_mlock = 0; -char *identname; /* program name for syslog */ -char *pidfilename; /* pid file location */ +/* If nonzero, write log entries to a separate file. */ +int use_logfile = 0; + +char *identname = NULL; /* program name for syslog */ +char *pidfilename = NULL; /* pid file location */ +char *logfilename = NULL; /* log file location */ char **g_argv; /* a copy of the cmdline arguments */ char **environment; /* A pointer to the environment on startup */ @@ -100,6 +106,7 @@ static struct option const long_options[] = { {"debug", optional_argument, NULL, 'd'}, {"bypass-security", no_argument, &bypass_security, 1}, {"mlock", no_argument, &do_mlock, 1}, + {"logfile", optional_argument, NULL, 'F'}, {NULL, 0, NULL, 0} }; @@ -110,14 +117,14 @@ static void usage(int status) program_name); else { printf(_("Usage: %s [option]...\n\n"), program_name); - printf(_ - (" -c, --config=DIR Read configuration options from DIR.\n" + printf(_(" -c, --config=DIR Read configuration options from DIR.\n" " -D, --no-detach Don't fork and detach.\n" " -d, --debug[=LEVEL] Increase debug level or set it to LEVEL.\n" " -k, --kill[=SIGNAL] Attempt to kill a running tincd and exit.\n" " -n, --net=NETNAME Connect to net NETNAME.\n" " -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n" " -L, --mlock Lock tinc into main memory.\n" + " -F, --logfile[=FILENAME] Write log entries to a logfile.\n" " --help Display this help and exit.\n" " --version Output version information and exit.\n\n")); printf(_("Report bugs to tinc@nl.linux.org.\n")); @@ -126,12 +133,12 @@ static void usage(int status) exit(status); } -void parse_options(int argc, char **argv, char **envp) +static void parse_options(int argc, char **argv, char **envp) { int r; int option_index = 0; - while((r = getopt_long(argc, argv, "c:DLd::k::n:K::", long_options, &option_index)) != EOF) { + while((r = getopt_long(argc, argv, "c:DLd::k::n:K::F::", long_options, &option_index)) != EOF) { switch (r) { case 0: /* long option */ break; @@ -151,9 +158,9 @@ void parse_options(int argc, char **argv, char **envp) case 'd': /* inc debug level */ if(optarg) - debug_lvl = atoi(optarg); + debug_level = atoi(optarg); else - debug_lvl++; + debug_level++; break; case 'k': /* kill old tincds */ @@ -178,9 +185,7 @@ void parse_options(int argc, char **argv, char **envp) kill_tincd = atoi(optarg); if(!kill_tincd) { - fprintf(stderr, - _ - ("Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, USR1, USR2, WINCH, INT or ALRM.\n"), + fprintf(stderr, _("Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, USR1, USR2, WINCH, INT or ALRM.\n"), optarg); usage(1); } @@ -190,8 +195,7 @@ void parse_options(int argc, char **argv, char **envp) break; case 'n': /* net name given */ - netname = xmalloc(strlen(optarg) + 1); - strcpy(netname, optarg); + netname = xstrdup(optarg); break; case 'K': /* generate public/private keypair */ @@ -199,9 +203,7 @@ void parse_options(int argc, char **argv, char **envp) generate_keys = atoi(optarg); if(generate_keys < 512) { - fprintf(stderr, - _ - ("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"), + fprintf(stderr, _("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"), optarg); usage(1); } @@ -211,6 +213,12 @@ void parse_options(int argc, char **argv, char **envp) generate_keys = 1024; break; + case 'F': /* write log entries to a file */ + use_logfile = 1; + if(optarg) + logfilename = xstrdup(optarg); + break; + case '?': usage(1); @@ -222,7 +230,7 @@ void parse_options(int argc, char **argv, char **envp) /* This function prettyprints the key generation process */ -void indicator(int a, int b, void *p) +static void indicator(int a, int b, void *p) { switch (a) { case 0: @@ -261,7 +269,7 @@ void indicator(int a, int b, void *p) Generate a public/private RSA keypair, and ask for a file to store them in. */ -int keygen(int bits) +static int keygen(int bits) { RSA *rsa_key; FILE *f; @@ -315,22 +323,26 @@ int keygen(int bits) /* Set all files and paths according to netname */ -void make_names(void) +static void make_names(void) { if(netname) { if(!pidfilename) asprintf(&pidfilename, LOCALSTATEDIR "/run/tinc.%s.pid", netname); + if(!logfilename) + asprintf(&logfilename, LOCALSTATEDIR "/log/tinc.%s.log", netname); if(!confbase) asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname); else - syslog(LOG_INFO, _("Both netname and configuration directory given, using the latter...")); + logger(DEBUG_ALWAYS, LOG_INFO, _("Both netname and configuration directory given, using the latter...")); if(!identname) asprintf(&identname, "tinc.%s", netname); } else { if(!pidfilename) pidfilename = LOCALSTATEDIR "/run/tinc.pid"; + if(!logfilename) + logfilename = LOCALSTATEDIR "/log/tinc.log"; if(!confbase) asprintf(&confbase, "%s/tinc", CONFDIR); @@ -350,6 +362,7 @@ int main(int argc, char **argv, char **envp) environment = envp; parse_options(argc, argv, envp); + make_names(); if(show_version) { printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, @@ -366,69 +379,65 @@ int main(int argc, char **argv, char **envp) if(show_help) usage(0); -#ifndef LOG_PERROR - openlog("tinc", LOG_CONS, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */ -#else - openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */ -#endif + if(kill_tincd) + exit(kill_other(kill_tincd)); + + openlogger("tinc", LOGMODE_STDERR); /* Lock all pages into memory if requested */ if(do_mlock) #ifdef HAVE_MLOCKALL if(mlockall(MCL_CURRENT | MCL_FUTURE)) { - syslog(LOG_ERR, _("System call `%s' failed: %s"), "mlockall", + logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "mlockall", strerror(errno)); #else { - syslog(LOG_ERR, _("mlockall() not supported on this platform!")); + logger(DEBUG_ALWAYS, LOG_ERR, _("mlockall() not supported on this platform!")); #endif return -1; } g_argv = argv; - make_names(); init_configuration(&config_tree); /* Slllluuuuuuurrrrp! */ RAND_load_file("/dev/urandom", 1024); -#ifdef HAVE_SSLEAY_ADD_ALL_ALGORITHMS - SSLeay_add_all_algorithms(); -#else OpenSSL_add_all_algorithms(); -#endif if(generate_keys) { read_server_config(); exit(keygen(generate_keys)); } - if(kill_tincd) - exit(kill_other(kill_tincd)); - if(read_server_config()) exit(1); + if(lzo_init() != LZO_E_OK) { + logger(DEBUG_ALWAYS, LOG_ERR, _("Error initializing LZO compressor!")); + exit(1); + } + if(detach()) exit(0); - + for(;;) { if(!setup_network_connections()) { main_loop(); cleanup_and_exit(1); } - syslog(LOG_ERR, _("Unrecoverable error")); + logger(DEBUG_ALWAYS, LOG_ERR, _("Unrecoverable error")); cp_trace(); if(do_detach) { - syslog(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout); + logger(DEBUG_ALWAYS, LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout); sleep(maxtimeout); } else { - syslog(LOG_ERR, _("Not restarting.")); + logger(DEBUG_ALWAYS, LOG_ERR, _("Not restarting.")); exit(1); } }