/*
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
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.77 2003/07/28 22:06:09 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 <syslog.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
#define _P1003_1B_VISIBLE
#endif
+#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
-
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
#endif
#include <openssl/rand.h>
#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 "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;
+bool show_help = false;
/* If nonzero, print the version on standard output and exit. */
-int show_version;
+bool show_version = false;
/* If nonzero, it will attempt to kill a running tincd and exit. */
int kill_tincd = 0;
int generate_keys = 0;
/* If nonzero, use null ciphers and skip all key exchanges. */
-int bypass_security = 0;
+bool bypass_security = false;
/* If nonzero, disable swapping for this process. */
-int do_mlock = 0;
+bool do_mlock = false;
-char *identname; /* program name for syslog */
-char *pidfilename; /* pid file location */
+/* If nonzero, write log entries to a separate file. */
+bool use_logfile = false;
+
+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 */
+char **environment; /* A pointer to the environment on startup */
static struct option const long_options[] = {
{"config", required_argument, NULL, 'c'},
{"kill", optional_argument, NULL, 'k'},
{"net", required_argument, NULL, 'n'},
- {"help", no_argument, &show_help, 1},
- {"version", no_argument, &show_version, 1},
- {"no-detach", no_argument, &do_detach, 0},
+ {"help", no_argument, NULL, 1},
+ {"version", no_argument, NULL, 2},
+ {"no-detach", no_argument, NULL, 'D'},
{"generate-keys", optional_argument, NULL, 'K'},
{"debug", optional_argument, NULL, 'd'},
- {"bypass-security", no_argument, &bypass_security, 1},
- {"mlock", no_argument, &do_mlock, 1},
+ {"bypass-security", no_argument, NULL, 3},
+ {"mlock", no_argument, NULL, 'L'},
+ {"logfile", optional_argument, NULL, 4},
+ {"pidfile", required_argument, NULL, 5},
{NULL, 0, NULL, 0}
};
-static void usage(int status)
+static void usage(bool status)
{
- if(status != 0)
+ if(status)
fprintf(stderr, _("Try `%s --help\' for more information.\n"),
program_name);
else {
" -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"));
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;
break;
case 'c': /* config file */
- confbase = xmalloc(strlen(optarg) + 1);
- strcpy(confbase, optarg);
+ confbase = xstrdup(optarg);
break;
case 'D': /* no detach */
- do_detach = 0;
+ do_detach = false;
break;
case 'L': /* no detach */
- do_mlock = 1;
+ do_mlock = true;
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 */
+#ifndef HAVE_MINGW
if(optarg) {
if(!strcasecmp(optarg, "HUP"))
kill_tincd = SIGHUP;
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"),
optarg);
- usage(1);
+ usage(true);
}
}
} else
kill_tincd = SIGTERM;
+#endif
break;
case 'n': /* net name given */
- netname = xmalloc(strlen(optarg) + 1);
- strcpy(netname, optarg);
+ netname = xstrdup(optarg);
break;
case 'K': /* generate public/private keypair */
if(generate_keys < 512) {
fprintf(stderr, _("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"),
optarg);
- usage(1);
+ usage(true);
}
generate_keys &= ~7; /* Round it to bytes */
generate_keys = 1024;
break;
+ case 1: /* show help */
+ show_help = true;
+ break;
+
+ case 2: /* show version */
+ show_version = true;
+ break;
+
+ case 3: /* bypass security */
+ bypass_security = true;
+ break;
+
+ case 4: /* write log entries to a file */
+ use_logfile = true;
+ if(optarg)
+ logfilename = xstrdup(optarg);
+ break;
+
+ case 5: /* write PID to a file */
+ pidfilename = xstrdup(optarg);
+ break;
+
case '?':
- usage(1);
+ usage(true);
default:
break;
/* 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 bool keygen(int bits)
{
RSA *rsa_key;
FILE *f;
if(!rsa_key) {
fprintf(stderr, _("Error during key generation!\n"));
- return -1;
+ return false;
} else
fprintf(stderr, _("Done.\n"));
- get_config_string(lookup_config(config_tree, "Name"), &name);
-
- if(name)
- asprintf(&filename, "%s/hosts/%s", confbase, name);
- else
- asprintf(&filename, "%s/rsa_key.pub", confbase);
-
- f = ask_and_safe_open(filename, _("public RSA key"), "a");
+ asprintf(&filename, "%s/rsa_key.priv", confbase);
+ f = ask_and_safe_open(filename, _("private RSA key"), true, "a");
if(!f)
- return -1;
+ return false;
if(ftell(f))
fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
- PEM_write_RSAPublicKey(f, rsa_key);
+ PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
fclose(f);
free(filename);
- asprintf(&filename, "%s/rsa_key.priv", confbase);
- f = ask_and_safe_open(filename, _("private RSA key"), "a");
+ get_config_string(lookup_config(config_tree, "Name"), &name);
+
+ if(name)
+ asprintf(&filename, "%s/hosts/%s", confbase, name);
+ else
+ asprintf(&filename, "%s/rsa_key.pub", confbase);
+
+ f = ask_and_safe_open(filename, _("public RSA key"), false, "a");
if(!f)
- return -1;
+ return false;
if(ftell(f))
fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
- PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
+ PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
free(filename);
- return 0;
+ return true;
}
/*
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";
}
}
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"
}
if(show_help)
- usage(0);
+ usage(false);
if(kill_tincd)
- exit(kill_other(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(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_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(keygen(generate_keys));
+ exit(!keygen(generate_keys));
}
- if(read_server_config())
+ if(!read_server_config())
exit(1);
if(lzo_init() != LZO_E_OK) {
- syslog(LOG_ERR, _("Error initializing LZO compressor!"));
+ logger(LOG_ERR, _("Error initializing LZO compressor!"));
exit(1);
}
- if(detach())
- exit(0);
+ if(!detach())
+ exit(1);
for(;;) {
- if(!setup_network_connections()) {
+ 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);
}
}
projects / tinc / blobdiff