X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fradiusd.c;h=cffb8267d991a969fa5d07857efcaf8769fd1104;hb=bca85674a83f94b9cfae0ebdc129bbaf645c8f7d;hp=11948b65e26386369f9285ef3b9ac9a3dd4b23b8;hpb=c7d3fcafd24552fa8315d440a682594bf4597e02;p=freeradius.git diff --git a/src/main/radiusd.c b/src/main/radiusd.c index 11948b6..cffb826 100644 --- a/src/main/radiusd.c +++ b/src/main/radiusd.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -57,17 +57,16 @@ RCSID("$Id$") * Global variables. */ const char *progname = NULL; -const char *radius_dir = NULL; +char *radius_dir = NULL; const char *radacct_dir = NULL; const char *radlog_dir = NULL; const char *radlib_dir = NULL; int log_stripped_names; int debug_flag = 0; -int log_auth_detail = FALSE; +int check_config = FALSE; const char *radiusd_version = "FreeRADIUS Version " RADIUSD_VERSION ", for host " HOSTINFO ", built on " __DATE__ " at " __TIME__; -time_t time_now; pid_t radius_pid; static int debug_memory = 0; @@ -82,7 +81,9 @@ static int debug_memory = 0; static void usage(int); static void sig_fatal (int); +#ifdef SIGHUP static void sig_hup (int); +#endif /* * The main guy. @@ -90,11 +91,10 @@ static void sig_hup (int); int main(int argc, char *argv[]) { int rcode; - unsigned char buffer[4096]; int argval; - pid_t pid; int spawn_flag = TRUE; int dont_fork = FALSE; + int flag = 0; #ifdef HAVE_SIGACTION struct sigaction act; @@ -104,11 +104,21 @@ int main(int argc, char *argv[]) set_auth_parameters(argc,argv); #endif - if ((progname = strrchr(argv[0], '/')) == NULL) + if ((progname = strrchr(argv[0], FR_DIR_SEP)) == NULL) progname = argv[0]; else progname++; +#ifdef WIN32 + { + WSADATA wsaData; + if (WSAStartup(MAKEWORD(2, 0), &wsaData)) { + fprintf(stderr, "%s: Unable to initialize socket library.\n"); + return 1; + } + } +#endif + debug_flag = 0; spawn_flag = TRUE; radius_dir = strdup(RADIUS_DIR); @@ -119,7 +129,7 @@ int main(int argc, char *argv[]) memset(&mainconfig, 0, sizeof(mainconfig)); mainconfig.myip.af = AF_UNSPEC; mainconfig.port = -1; - mainconfig.radiusd_conf = strdup("radiusd.conf"); + mainconfig.name = "radiusd"; #ifdef HAVE_SIGACTION memset(&act, 0, sizeof(act)); @@ -131,25 +141,18 @@ int main(int argc, char *argv[]) * Don't put output anywhere until we get told a little * more. */ + mainconfig.radlog_dest = RADLOG_NULL; mainconfig.radlog_fd = -1; mainconfig.log_file = NULL; /* Process the options. */ - while ((argval = getopt(argc, argv, "Aa:bcd:fg:hi:l:mn:p:sSvxXyz")) != EOF) { + while ((argval = getopt(argc, argv, "Cd:fhi:l:mn:p:stvxX")) != EOF) { switch(argval) { - - case 'A': - log_auth_detail = TRUE; - break; - - case 'a': - if (radacct_dir) free(radacct_dir); - radacct_dir = strdup(optarg); - break; - - case 'c': - /* ignore for backwards compatibility with Cistron */ + case 'C': + check_config = TRUE; + spawn_flag = FALSE; + dont_fork = TRUE; break; case 'd': @@ -165,49 +168,36 @@ int main(int argc, char *argv[]) usage(0); break; - case 'i': - if (ip_hton(optarg, AF_UNSPEC, &mainconfig.myip) < 0) { - fprintf(stderr, "radiusd: Invalid IP Address or hostname \"%s\"\n", optarg); + case 'l': + if (strcmp(optarg, "stdout") == 0) { + goto do_stdout; + } + mainconfig.log_file = strdup(optarg); + mainconfig.radlog_dest = RADLOG_FILES; + mainconfig.radlog_fd = open(mainconfig.log_file, + O_WRONLY | O_APPEND | O_CREAT, 0640); + if (mainconfig.radlog_fd < 0) { + fprintf(stderr, "radiusd: Failed to open log file %s: %s\n", mainconfig.log_file, strerror(errno)); exit(1); } - break; + break; - case 'l': - if ((strcmp(optarg, "stdout") == 0) || - (strcmp(optarg, "stderr") == 0) || - (strcmp(optarg, "syslog") == 0)) { - fprintf(stderr, "radiusd: -l %s is unsupported. Use log_destination in radiusd.conf\n", optarg); + case 'i': + if (ip_hton(optarg, AF_UNSPEC, &mainconfig.myip) < 0) { + fprintf(stderr, "radiusd: Invalid IP Address or hostname \"%s\"\n", optarg); exit(1); } - if (radlog_dir) free(radlog_dir); - radlog_dir = strdup(optarg); + flag |= 1; break; - case 'g': - fprintf(stderr, "radiusd: -g is unsupported. Use log_destination in radiusd.conf.\n"); - exit(1); + case 'n': + mainconfig.name = optarg; break; case 'm': debug_memory = 1; break; - case 'n': - if ((strchr(optarg, '/') != NULL) || - (strchr(optarg, '.') != NULL) || - (strlen(optarg) > 45)) usage(1); - - snprintf(buffer, sizeof(buffer), "%s.conf", - optarg); - if (mainconfig.radiusd_conf) - free(mainconfig.radiusd_conf); - mainconfig.radiusd_conf = strdup(buffer); - break; - - case 'S': - log_stripped_names++; - break; - case 'p': mainconfig.port = atoi(optarg); if ((mainconfig.port <= 0) || @@ -215,6 +205,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "radiusd: Invalid port number %s\n", optarg); exit(1); } + flag |= 2; break; case 's': /* Single process mode */ @@ -222,14 +213,14 @@ int main(int argc, char *argv[]) dont_fork = TRUE; break; + case 't': /* no child threads */ + spawn_flag = FALSE; + break; + case 'v': version(); break; - /* - * BIG debugging mode for users who are - * TOO LAZY to type '-sfxxyz -l stdout' themselves. - */ case 'X': spawn_flag = FALSE; dont_fork = TRUE; @@ -237,37 +228,34 @@ int main(int argc, char *argv[]) mainconfig.log_auth = TRUE; mainconfig.log_auth_badpass = TRUE; mainconfig.log_auth_goodpass = TRUE; + do_stdout: mainconfig.radlog_dest = RADLOG_STDOUT; mainconfig.radlog_fd = STDOUT_FILENO; + fr_log_fp = stdout; break; case 'x': debug_flag++; break; - case 'y': - mainconfig.log_auth = TRUE; - mainconfig.log_auth_badpass = TRUE; - break; - - case 'z': - mainconfig.log_auth_badpass = TRUE; - mainconfig.log_auth_goodpass = TRUE; - break; - default: usage(1); break; } } + if (flag && (flag != 0x03)) { + fprintf(stderr, "radiusd: The options -i and -p cannot be used individually.\n"); + exit(1); + } + if (debug_flag) { radlog(L_INFO, "%s", radiusd_version); - radlog(L_INFO, "Copyright (C) 2000-2007 The FreeRADIUS server project.\n"); + radlog(L_INFO, "Copyright (C) 1999-2009 The FreeRADIUS server project and contributors.\n"); radlog(L_INFO, "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"); radlog(L_INFO, "PARTICULAR PURPOSE.\n"); radlog(L_INFO, "You may redistribute copies of FreeRADIUS under the terms of the\n"); - radlog(L_INFO, "GNU General Public License.\n"); + radlog(L_INFO, "GNU General Public License v2.\n"); fflush(NULL); } @@ -276,13 +264,15 @@ int main(int argc, char *argv[]) exit(1); } +#ifndef __MINGW32__ /* * Disconnect from session */ - if (debug_flag == 0 && dont_fork == FALSE) { - pid = fork(); - if(pid < 0) { - radlog(L_ERR|L_CONS, "Couldn't fork"); + if (dont_fork == FALSE) { + pid_t pid = fork(); + + if (pid < 0) { + radlog(L_ERR, "Couldn't fork: %s", strerror(errno)); exit(1); } @@ -296,24 +286,7 @@ int main(int argc, char *argv[]) setsid(); #endif } - - /* - * If we're NOT debugging, trap fatal signals, so we can - * easily clean up after ourselves. - * - * If we ARE debugging, don't trap them, so we can - * dump core. - */ - if ((mainconfig.allow_core_dumps == FALSE) && (debug_flag == 0)) { -#ifdef SIGSEGV -#ifdef HAVE_SIGACTION - act.sa_handler = sig_fatal; - sigaction(SIGSEGV, &act, NULL); -#else - signal(SIGSEGV, sig_fatal); #endif -#endif - } /* * Ensure that we're using the CORRECT pid after forking, @@ -322,30 +295,6 @@ int main(int argc, char *argv[]) radius_pid = getpid(); /* - * Only write the PID file if we're running as a daemon. - * - * And write it AFTER we've forked, so that we write the - * correct PID. - */ - if (dont_fork == FALSE) { - FILE *fp; - - fp = fopen(mainconfig.pid_file, "w"); - if (fp != NULL) { - /* - * FIXME: What about following symlinks, - * and having it over-write a normal file? - */ - fprintf(fp, "%d\n", (int) radius_pid); - fclose(fp); - } else { - radlog(L_ERR|L_CONS, "Failed creating PID file %s: %s\n", - mainconfig.pid_file, strerror(errno)); - exit(1); - } - } - - /* * If we're running as a daemon, close the default file * descriptors, AFTER forking. */ @@ -361,41 +310,42 @@ int main(int argc, char *argv[]) dup2(devnull, STDIN_FILENO); if (mainconfig.radlog_dest == RADLOG_STDOUT) { mainconfig.radlog_fd = dup(STDOUT_FILENO); + setlinebuf(stdout); } dup2(devnull, STDOUT_FILENO); if (mainconfig.radlog_dest == RADLOG_STDERR) { mainconfig.radlog_fd = dup(STDERR_FILENO); + setlinebuf(stdout); } dup2(devnull, STDERR_FILENO); close(devnull); + + } else { + setlinebuf(stdout); /* unbuffered output */ } /* - * It's called the thread pool, but it does a little - * more than that. + * Initialize the event pool, including threads. */ radius_event_init(mainconfig.config, spawn_flag); /* - * Use linebuffered or unbuffered stdout if - * the debug flag is on. - */ - if (debug_flag == TRUE) - setlinebuf(stdout); - - /* * Now that we've set everything up, we can install the signal * handlers. Before this, if we get any signal, we don't know * what to do, so we might as well do the default, and die. */ +#ifdef SIGPIPE signal(SIGPIPE, SIG_IGN); +#endif #ifdef HAVE_SIGACTION act.sa_handler = sig_hup; sigaction(SIGHUP, &act, NULL); act.sa_handler = sig_fatal; sigaction(SIGTERM, &act, NULL); #else +#ifdef SIGHUP signal(SIGHUP, sig_hup); +#endif signal(SIGTERM, sig_fatal); #endif /* @@ -410,20 +360,59 @@ int main(int argc, char *argv[]) sigaction(SIGQUIT, &act, NULL); #else signal(SIGINT, sig_fatal); +#ifdef SIGQUIT signal(SIGQUIT, sig_fatal); #endif +#endif + } + + /* + * Everything seems to have loaded OK, exit gracefully. + */ + if (check_config) { + DEBUG("Configuration appears to be OK."); + exit(0); + } + +#ifdef WITH_STATS + radius_stats_init(0); +#endif + + /* + * Only write the PID file if we're running as a daemon. + * + * And write it AFTER we've forked, so that we write the + * correct PID. + */ + if (dont_fork == FALSE) { + FILE *fp; + + fp = fopen(mainconfig.pid_file, "w"); + if (fp != NULL) { + /* + * FIXME: What about following symlinks, + * and having it over-write a normal file? + */ + fprintf(fp, "%d\n", (int) radius_pid); + fclose(fp); + } else { + radlog(L_ERR|L_CONS, "Failed creating PID file %s: %s\n", + mainconfig.pid_file, strerror(errno)); + exit(1); + } } /* - * Loop while doing stuff. + * Process requests until HUP or exit. */ while ((rcode = radius_event_process()) == 0x80) { - /* - * HUP handler. - */ +#ifdef WITH_STATS + radius_stats_init(1); +#endif + hup_mainconfig(); } - DEBUG("Exiting..."); + radlog(L_INFO, "Exiting normally."); /* * Ignore the TERM signal: we're @@ -437,7 +426,9 @@ int main(int argc, char *argv[]) * (including us, which gets * ignored.) */ - kill(-radius_pid, SIGTERM); +#ifndef __MINGW32__ + if (spawn_flag) kill(-radius_pid, SIGTERM); +#endif /* * We're exiting, so we can delete the PID @@ -460,8 +451,14 @@ int main(int argc, char *argv[]) */ detach_modules(); + xlat_free(); /* modules may have xlat's */ + free(radius_dir); +#ifdef WIN32 + WSACleanup(); +#endif + return (rcode - 1); } @@ -474,23 +471,19 @@ static void NEVER_RETURNS usage(int status) FILE *output = status?stderr:stdout; fprintf(output, - "Usage: %s [-a acct_dir] [-d db_dir] [-l log_dir] [-i address] [-AcfnsSvXxyz]\n", progname); + "Usage: %s [-d db_dir] [-l log_dir] [-i address] [-n name] [-fsvXx]\n", progname); fprintf(output, "Options:\n\n"); - fprintf(output, " -a acct_dir use accounting directory 'acct_dir'.\n"); - fprintf(output, " -A Log auth detail.\n"); + fprintf(output, " -C Check configuration and exit.\n"); fprintf(output, " -d raddb_dir Configuration files are in \"raddbdir/*\".\n"); fprintf(output, " -f Run as a foreground process, not a daemon.\n"); fprintf(output, " -h Print this help message.\n"); fprintf(output, " -i ipaddr Listen on ipaddr ONLY\n"); - fprintf(output, " -l log_dir Log file is \"log_dir/radius.log\" (not used in debug mode)\n"); + fprintf(output, " -n name Read raddb/name.conf instead of raddb/radiusd.conf\n"); fprintf(output, " -p port Listen on port ONLY\n"); fprintf(output, " -s Do not spawn child processes to handle requests.\n"); - fprintf(output, " -S Log stripped names.\n"); fprintf(output, " -v Print server version information.\n"); fprintf(output, " -X Turn on full debugging.\n"); fprintf(output, " -x Turn on additional debugging. (-xx gives more debugging).\n"); - fprintf(output, " -y Log authentication failures, with password.\n"); - fprintf(output, " -z Log authentication successes, with password.\n"); exit(status); } @@ -501,19 +494,14 @@ static void NEVER_RETURNS usage(int status) static void sig_fatal(int sig) { switch(sig) { - case SIGSEGV: - /* - * We can't really do anything - * intelligent here so just die - */ - _exit(1); - case SIGTERM: radius_signal_self(RADIUS_SIGNAL_SELF_TERM); break; case SIGINT: +#ifdef SIGQUIT case SIGQUIT: +#endif if (debug_memory) { radius_signal_self(RADIUS_SIGNAL_SELF_TERM); break; @@ -521,12 +509,11 @@ static void sig_fatal(int sig) /* FALL-THROUGH */ default: - radius_signal_self(RADIUS_SIGNAL_SELF_EXIT); - break; + _exit(sig); } } - +#ifdef SIGHUP /* * We got the hangup signal. * Re-read the configuration files. @@ -537,7 +524,6 @@ static void sig_hup(int sig) reset_signal(SIGHUP, sig_hup); - write(STDOUT_FILENO, "STUFF\n", 6); - radius_signal_self(RADIUS_SIGNAL_SELF_HUP); } +#endif