X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=0e0bc15883c522ba068736675c28c0447ac9538d;hp=2a7b63ef296da80a9cf749985cb08bd15fddb9c6;hb=3831f51a53088bfcc1d148fd54b3083afe7fde32;hpb=77be52422d8c28735f787b1c233b4cec73d4db56 diff --git a/src/tincd.c b/src/tincd.c index 2a7b63ef..0e0bc158 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 2000/05/31 18:23:06 zarq Exp $ + $Id: tincd.c,v 1.10.4.8 2000/08/17 16:51:08 guus Exp $ */ #include "config.h" @@ -43,6 +43,7 @@ #include "encr.h" #include "net.h" #include "netutl.h" +#include "protocol.h" #include "system.h" @@ -62,7 +63,7 @@ static int kill_tincd = 0; static int do_detach = 1; char *confbase = NULL; /* directory in which all config files are */ -char *configfilename = NULL; /* configuration file name */ +/* char *configfilename = NULL; /* configuration file name, moved to config.c */ char *identname; /* program name for syslog */ char *netname = NULL; /* name of the vpn network */ char *pidfilename; /* pid file location */ @@ -156,7 +157,7 @@ parse_options(int argc, char **argv, char **envp) void memory_full(int size) { - syslog(LOG_ERR, _("Memory exhausted (last is %s:%d) (couldn't allocate %d bytes); exiting."), cp_file, cp_line, size); + syslog(LOG_ERR, _("Memory exhausted (last is %s:%d) (couldn't allocate %d bytes), exiting."), cp_file, cp_line, size); exit(1); } @@ -210,11 +211,11 @@ int detach(void) openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON); - if(debug_lvl > 1) - syslog(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d."), + if(debug_lvl > 0) + syslog(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"), VERSION, __DATE__, __TIME__, debug_lvl); else - syslog(LOG_NOTICE, _("tincd %s starting, debug level %d."), VERSION, debug_lvl); + syslog(LOG_NOTICE, _("tincd %s starting"), VERSION, debug_lvl); xalloc_fail_func = memory_full; @@ -229,7 +230,7 @@ void cleanup_and_exit(int c) close_network_connections(); if(debug_lvl > 0) - syslog(LOG_INFO, _("Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d."), + syslog(LOG_INFO, _("Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"), total_tap_out, total_socket_out, total_tap_in, total_socket_in); closelog(); @@ -295,30 +296,24 @@ void make_names(void) { if(netname) { - configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR)); - sprintf(configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname); + asprintf(&configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname); } else { - configfilename = xmalloc(17+strlen(CONFDIR)); - sprintf(configfilename, "%s/tinc/tinc.conf", CONFDIR); + asprintf(&configfilename, "%s/tinc/tinc.conf", CONFDIR); } } if(netname) { - pidfilename = xmalloc(strlen(netname)+20); - sprintf(pidfilename, "/var/run/tinc.%s.pid", netname); - confbase = xmalloc(strlen(netname)+8+strlen(CONFDIR)); - sprintf(confbase, "%s/tinc/%s/", CONFDIR, netname); - identname = xmalloc(strlen(netname)+7); - sprintf(identname, "tinc.%s", netname); + asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname); + asprintf(&confbase, "%s/tinc/%s/", CONFDIR, netname); + asprintf(&identname, "tinc.%s", netname); } else { pidfilename = "/var/run/tinc.pid"; - confbase = xmalloc(7+strlen(CONFDIR)); - sprintf(confbase, "%s/tinc/", CONFDIR); + asprintf(&confbase, "%s/tinc/", CONFDIR); identname = "tinc"; } } @@ -336,7 +331,7 @@ main(int argc, char **argv, char **envp) if(show_version) { - printf(_("%s version %s\n"), PACKAGE, VERSION); + printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, VERSION, __DATE__, __TIME__, PROT_CURRENT); printf(_("Copyright (C) 1998,1999,2000 Ivo Timmermans and others,\n" "see the AUTHORS file for a complete list.\n\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" @@ -352,7 +347,7 @@ main(int argc, char **argv, char **envp) if(geteuid()) { - fprintf(stderr, _("You must be root to run this program. sorry.\n")); + fprintf(stderr, _("You must be root to run this program. Sorry.\n")); return 1; } @@ -374,13 +369,17 @@ main(int argc, char **argv, char **envp) if(security_init()) return 1; - if(setup_network_connections()) - cleanup_and_exit(1); + for(;;) + { + setup_network_connections(); + + main_loop(); - main_loop(); + cleanup_and_exit(1); - cleanup_and_exit(1); - return 1; + syslog(LOG_ERR, _("Unrecoverable error, restarting in %d seconds!"), MAXTIMEOUT); + sleep(MAXTIMEOUT); + } } RETSIGTYPE @@ -410,13 +409,12 @@ RETSIGTYPE sigsegv_handler(int a) { if(cp_file) - syslog(LOG_NOTICE, _("Got SEGV signal after %s line %d. Trying to re-execute."), + syslog(LOG_NOTICE, _("Got SEGV signal after %s line %d, trying to re-execute"), cp_file, cp_line); else - syslog(LOG_NOTICE, _("Got SEGV signal; trying to re-execute.")); + syslog(LOG_NOTICE, _("Got SEGV signal, trying to re-execute")); signal(SIGSEGV, sigsegv_square); - close_network_connections(); remove_pid(pidfilename); execvp(g_argv[0], g_argv); @@ -426,17 +424,15 @@ RETSIGTYPE sighup_handler(int a) { if(debug_lvl > 0) - syslog(LOG_NOTICE, _("Got HUP signal")); - close_network_connections(); - setup_network_connections(); - /* FIXME: read config-file and re-establish network connections */ + syslog(LOG_NOTICE, _("Got HUP signal, rereading configuration and restarting")); + sighup = 1; } RETSIGTYPE sigint_handler(int a) { if(debug_lvl > 0) - syslog(LOG_NOTICE, _("Got INT signal")); + syslog(LOG_NOTICE, _("Got INT signal, exiting")); cleanup_and_exit(0); } @@ -450,7 +446,7 @@ RETSIGTYPE sigusr2_handler(int a) { if(debug_lvl > 1) - syslog(LOG_NOTICE, _("Forcing new key generation")); + syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation")); regenerate_keys(); } @@ -458,10 +454,10 @@ RETSIGTYPE sighuh(int a) { if(cp_file) - syslog(LOG_NOTICE, _("Got unexpected signal (%d) after %s line %d."), + syslog(LOG_NOTICE, _("Got unexpected signal %d after %s line %d"), a, cp_file, cp_line); else - syslog(LOG_NOTICE, _("Got unexpected signal (%d)."), a); + syslog(LOG_NOTICE, _("Got unexpected signal %d"), a); } void @@ -485,7 +481,7 @@ setup_signals(void) signal(SIGINT, sigint_handler); signal(SIGUSR1, sigusr1_handler); signal(SIGUSR2, sigusr2_handler); - signal(SIGCHLD, parent_exit); +// signal(SIGCHLD, parent_exit); } RETSIGTYPE parent_exit(int a)