X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=e71c32116b292e59867df2411aad7270cf890e29;hp=2aa16dd40cb1bd3d90cb444277ca86cb312e642e;hb=471308e1636e7a06e1d9ebc98e82b1c0c5150dde;hpb=5eca9520d93bced1275d45e5e2a933d69354cd6d diff --git a/src/tincd.c b/src/tincd.c index 2aa16dd4..e71c3211 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 - 2000-2002 Guus Sliepen + Copyright (C) 1998-2003 Ivo Timmermans + 2000-2003 Guus Sliepen 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,32 +17,18 @@ 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.65 2002/09/15 14:55:54 guus Exp $ + $Id: tincd.c,v 1.10.4.75 2003/07/22 12:58:34 guus Exp $ */ -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "system.h" /* Darwin (MacOS/X) needs the following definition... */ #ifndef _P1003_1B_VISIBLE #define _P1003_1B_VISIBLE #endif +#ifdef HAVE_SYS_MMAN_H #include - -#ifdef HAVE_SYS_IOCTL_H -# include #endif #include @@ -50,26 +36,25 @@ #include #include -#include -#include +#include #include "conf.h" +#include "logger.h" #include "net.h" #include "netutl.h" #include "process.h" #include "protocol.h" -#include "subnet.h" - -#include "system.h" +#include "utils.h" +#include "xalloc.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 +68,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 +89,8 @@ 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'}, + {"pidfile", required_argument, NULL, 'P'}, {NULL, 0, NULL, 0} }; @@ -117,6 +108,8 @@ static void usage(int status) " -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" + " --logfile[=FILENAME] Write log entries to a logfile.\n" + " --pidfile=FILENAME Write PID to FILENAME.\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")); @@ -125,7 +118,7 @@ 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; @@ -136,8 +129,7 @@ void parse_options(int argc, char **argv, char **envp) break; case 'c': /* config file */ - confbase = xmalloc(strlen(optarg) + 1); - strcpy(confbase, optarg); + confbase = xstrdup(optarg); break; case 'D': /* no detach */ @@ -150,9 +142,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 */ @@ -187,8 +179,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 */ @@ -206,6 +197,16 @@ 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 'P': /* write PID to a file */ + pidfilename = xstrdup(optarg); + break; + case '?': usage(1); @@ -217,7 +218,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: @@ -256,7 +257,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; @@ -310,28 +311,27 @@ 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(netname) + asprintf(&identname, "tinc.%s", netname); + else + identname = xstrdup("tinc"); + + if(!pidfilename) + asprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname); + if(!logfilename) + asprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname); + + if(netname) { if(!confbase) asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname); else - syslog(LOG_INFO, _("Both netname and configuration directory given, using the latter...")); - - if(!identname) - asprintf(&identname, "tinc.%s", netname); + logger(LOG_INFO, _("Both netname and configuration directory given, using the latter...")); } else { - if(!pidfilename) - pidfilename = LOCALSTATEDIR "/run/tinc.pid"; - if(!confbase) asprintf(&confbase, "%s/tinc", CONFDIR); - - if(!identname) - identname = "tinc"; } } @@ -345,11 +345,12 @@ 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, 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" @@ -361,69 +362,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(LOG_ERR, _("System call `%s' failed: %s"), "mlockall", strerror(errno)); #else { - syslog(LOG_ERR, _("mlockall() not supported on this platform!")); + logger(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(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(LOG_ERR, _("Unrecoverable error")); cp_trace(); if(do_detach) { - syslog(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout); + logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout); sleep(maxtimeout); } else { - syslog(LOG_ERR, _("Not restarting.")); + logger(LOG_ERR, _("Not restarting.")); exit(1); } }