X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=ebee1b3bd932ee3ec427bf1b894a37f315e63a8f;hp=b9f9f4f47f140b4b7df57817fc531adcfe07553a;hb=eeb97e3ef4eb9089851f7b71d5393df24313c993;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713 diff --git a/src/tincd.c b/src/tincd.c index b9f9f4f4..ebee1b3b 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.76 2003/07/22 20:55:20 guus Exp $ + $Id: tincd.c,v 1.10.4.88 2003/09/25 10:34:16 guus Exp $ */ #include "system.h" @@ -38,7 +38,10 @@ #include +#include + #include "conf.h" +#include "device.h" #include "logger.h" #include "net.h" #include "netutl.h" @@ -75,7 +78,8 @@ 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 */ + +static int status; static struct option const long_options[] = { {"config", required_argument, NULL, 'c'}, @@ -93,6 +97,10 @@ static struct option const long_options[] = { {NULL, 0, NULL, 0} }; +#ifdef HAVE_MINGW +static struct WSAData wsa_state; +#endif + static void usage(bool status) { if(status) @@ -113,11 +121,9 @@ static void usage(bool status) " --version Output version information and exit.\n\n")); printf(_("Report bugs to tinc@nl.linux.org.\n")); } - - exit(status); } -static void parse_options(int argc, char **argv, char **envp) +static bool parse_options(int argc, char **argv) { int r; int option_index = 0; @@ -147,6 +153,7 @@ static void parse_options(int argc, char **argv, char **envp) break; case 'k': /* kill old tincds */ +#ifndef HAVE_MINGW if(optarg) { if(!strcasecmp(optarg, "HUP")) kill_tincd = SIGHUP; @@ -171,10 +178,14 @@ static void parse_options(int argc, char **argv, char **envp) 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(true); + return false; } } } else kill_tincd = SIGTERM; +#else + kill_tincd = 1; +#endif break; case 'n': /* net name given */ @@ -189,6 +200,7 @@ static void parse_options(int argc, char **argv, char **envp) fprintf(stderr, _("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"), optarg); usage(true); + return false; } generate_keys &= ~7; /* Round it to bytes */ @@ -220,11 +232,14 @@ static void parse_options(int argc, char **argv, char **envp) case '?': usage(true); + return false; default: break; } } + + return true; } /* This function prettyprints the key generation process */ @@ -276,7 +291,7 @@ static bool keygen(int bits) char *filename; fprintf(stderr, _("Generating %d bits keys:\n"), bits); - rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL); + rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL); if(!rsa_key) { fprintf(stderr, _("Error during key generation!\n")); @@ -285,11 +300,16 @@ static bool keygen(int bits) fprintf(stderr, _("Done.\n")); asprintf(&filename, "%s/rsa_key.priv", confbase); - f = ask_and_safe_open(filename, _("private RSA key"), true, "a"); + f = ask_and_open(filename, _("private RSA key"), "a"); if(!f) return false; - + +#ifdef HAVE_FCHMOD + /* Make it unreadable for others. */ + fchmod(fileno(f), 0600); +#endif + if(ftell(f)) fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n")); @@ -304,7 +324,7 @@ static bool keygen(int bits) else asprintf(&filename, "%s/rsa_key.pub", confbase); - f = ask_and_safe_open(filename, _("public RSA key"), false, "a"); + f = ask_and_open(filename, _("public RSA key"), "a"); if(!f) return false; @@ -324,11 +344,35 @@ static bool keygen(int bits) */ static void make_names(void) { +#ifdef HAVE_MINGW + HKEY key; + char installdir[1024] = ""; + long len = sizeof(installdir); +#endif + if(netname) asprintf(&identname, "tinc.%s", netname); else identname = xstrdup("tinc"); +#ifdef HAVE_MINGW + if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) { + if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) { + if(!logfilename) + asprintf(&logfilename, "%s/log/%s.log", identname); + if(!confbase) { + if(netname) + asprintf(&confbase, "%s/%s", installdir, netname); + else + asprintf(&confbase, "%s", installdir); + } + } + RegCloseKey(key); + if(*installdir) + return; + } +#endif + if(!pidfilename) asprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname); @@ -337,16 +381,16 @@ static void make_names(void) if(netname) { if(!confbase) - asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname); + asprintf(&confbase, CONFDIR "/tinc/%s", netname); else logger(LOG_INFO, _("Both netname and configuration directory given, using the latter...")); } else { if(!confbase) - asprintf(&confbase, "%s/tinc", CONFDIR); + asprintf(&confbase, CONFDIR "/tinc"); } } -int main(int argc, char **argv, char **envp) +int main(int argc, char **argv) { program_name = argv[0]; @@ -354,8 +398,9 @@ int main(int argc, char **argv, char **envp) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - environment = envp; - parse_options(argc, argv, envp); + if(!parse_options(argc, argv)) + return 1; + make_names(); if(show_version) { @@ -370,13 +415,15 @@ int main(int argc, char **argv, char **envp) return 0; } - if(show_help) + if(show_help) { usage(false); + return 0; + } if(kill_tincd) - exit(!kill_other(kill_tincd)); + return !kill_other(kill_tincd); - openlogger("tinc", LOGMODE_STDERR); + openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR); /* Lock all pages into memory if requested */ @@ -404,35 +451,65 @@ int main(int argc, char **argv, char **envp) if(generate_keys) { read_server_config(); - exit(!keygen(generate_keys)); + return !keygen(generate_keys); } if(!read_server_config()) - exit(1); + return 1; if(lzo_init() != LZO_E_OK) { logger(LOG_ERR, _("Error initializing LZO compressor!")); - exit(1); + return 1; } +#ifdef HAVE_MINGW + if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) { + logger(LOG_ERR, _("System call `%s' failed: %s"), "WSAStartup", winerror(GetLastError())); + return 1; + } + + if(!do_detach || !init_service()) + return main2(argc, argv); + else + return 1; +} + +int main2(int argc, char **argv) +{ +#endif + if(!detach()) - exit(1); + return 1; - for(;;) { - if(setup_network_connections()) { - main_loop(); - cleanup_and_exit(1); - } - logger(LOG_ERR, _("Unrecoverable error")); - cp_trace(); + /* Setup sockets and open device. If it doesn't work, don't give up but try again. */ + while(!setup_network_connections()) { if(do_detach) { logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout); sleep(maxtimeout); } else { logger(LOG_ERR, _("Not restarting.")); - exit(1); + return 1; } } + + /* Start main loop. It only exits when tinc is killed. */ + + status = main_loop(); + + /* Shutdown properly. */ + + close_network_connections(); + + ifdebug(CONNECTIONS) + dump_device_stats(); + + logger(LOG_NOTICE, _("Terminating")); + +#ifndef HAVE_MINGW + remove_pid(pidfilename); +#endif + + return status; }