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.67 2003/05/06 23:14:45 guus Exp $
+ $Id: tincd.c,v 1.10.4.71 2003/07/06 23:16:29 guus Exp $
*/
#include "config.h"
#include <signal.h>
#include <stdio.h>
#include <sys/types.h>
-#include <syslog.h>
#include <unistd.h>
#include <signal.h>
#include <string.h>
#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;
/* 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 */
{"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}
};
" -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"));
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;
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 */
break;
case 'n': /* net name given */
- netname = xmalloc(strlen(optarg) + 1);
- strcpy(netname, optarg);
+ netname = xstrdup(optarg);
break;
case 'K': /* generate public/private keypair */
generate_keys = 1024;
break;
+ case 'F': /* write log entries to a file */
+ use_logfile = 1;
+ if(optarg)
+ logfilename = xstrdup(optarg);
+ break;
+
case '?':
usage(1);
/* 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:
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;
/*
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);
environment = envp;
parse_options(argc, argv, envp);
+ make_names();
if(show_version) {
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
if(kill_tincd)
exit(kill_other(kill_tincd));
-#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
+ 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_OPENSSL_ADD_ALL_ALGORITHMS_NOCONF
- OPENSSL_add_all_algorithms_noconf();
-#else
-#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
OpenSSL_add_all_algorithms();
-#else
-#ifdef HAVE_SSLEAY_ADD_ALL_ALGORITHMS
- SSLeay_add_all_algorithms();
-#else
-#error No add_all_algorithms function available!
-#endif
-#endif
-#endif
if(generate_keys) {
read_server_config();
exit(1);
if(lzo_init() != LZO_E_OK) {
- syslog(LOG_ERR, _("Error initializing LZO compressor!"));
+ logger(DEBUG_ALWAYS, LOG_ERR, _("Error initializing LZO compressor!"));
exit(1);
}
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);
}
}
projects / tinc / blobdiff