X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fmain.c;h=409628c4b0a03383d7647d32be1993851f7cce63;hp=eec19c760398d598ca9eb8e7650f295db0d9101a;hb=690865e93221a67d2ee33f4d184a8be79c3fc7ec;hpb=8d95b4cae82fe429d2988b3d95d37325e65ea5ad diff --git a/pppd/main.c b/pppd/main.c index eec19c7..409628c 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static char rcsid[] = "$Id: main.c,v 1.46 1998/03/26 04:46:04 paulus Exp $"; -#endif +#define RCSID "$Id: main.c,v 1.117 2002/10/27 12:04:07 fcusack Exp $" #include #include @@ -33,6 +31,7 @@ static char rcsid[] = "$Id: main.c,v 1.46 1998/03/26 04:46:04 paulus Exp $"; #include #include #include +#include #include #include #include @@ -40,24 +39,29 @@ static char rcsid[] = "$Id: main.c,v 1.46 1998/03/26 04:46:04 paulus Exp $"; #include #include #include +#include +#include #include "pppd.h" #include "magic.h" #include "fsm.h" #include "lcp.h" #include "ipcp.h" +#ifdef INET6 +#include "ipv6cp.h" +#endif #include "upap.h" #include "chap.h" #include "ccp.h" +#include "ecp.h" #include "pathnames.h" -#include "patchlevel.h" -#ifdef CBCP_SUPPORT -#include "cbcp.h" +#ifdef USE_TDB +#include "tdb.h" #endif -#if defined(SUNOS4) -extern char *strerror(); +#ifdef CBCP_SUPPORT +#include "cbcp.h" #endif #ifdef IPX_CHANGE @@ -67,29 +71,61 @@ extern char *strerror(); #include "atcp.h" #endif +static const char rcsid[] = RCSID; + /* interface vars */ char ifname[32]; /* Interface name */ int ifunit; /* Interface unit number */ +struct channel *the_channel; + char *progname; /* Name of this program */ char hostname[MAXNAMELEN]; /* Our hostname */ static char pidfilename[MAXPATHLEN]; /* name of pid file */ -static char default_devnam[MAXPATHLEN]; /* name of default device */ -static pid_t pid; /* Our pid */ -static uid_t uid; /* Our real user-id */ -static int conn_running; /* we have a [dis]connector running */ +static char linkpidfile[MAXPATHLEN]; /* name of linkname pid file */ +char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */ +uid_t uid; /* Our real user-id */ +struct notifier *pidchange = NULL; +struct notifier *phasechange = NULL; +struct notifier *exitnotify = NULL; +struct notifier *sigreceived = NULL; -int ttyfd = -1; /* Serial port file descriptor */ -mode_t tty_mode = -1; /* Original access permissions to tty */ -int baud_rate; /* Actual bits/second for serial device */ int hungup; /* terminal has been hung up */ int privileged; /* we're running as real uid root */ int need_holdoff; /* need holdoff period before restarting */ int detached; /* have detached from terminal */ +volatile int status; /* exit status for pppd */ +int unsuccess; /* # unsuccessful connection attempts */ +int do_callback; /* != 0 if we should do callback next */ +int doing_callback; /* != 0 if we are doing callback */ +int ppp_session_number; /* Session number, for channels with such a + concept (eg PPPoE) */ +#ifdef USE_TDB +TDB_CONTEXT *pppdb; /* database for storing status etc. */ +#endif + +char db_key[32]; + +int (*holdoff_hook) __P((void)) = NULL; +int (*new_phase_hook) __P((int)) = NULL; +void (*snoop_recv_hook) __P((unsigned char *p, int len)) = NULL; +void (*snoop_send_hook) __P((unsigned char *p, int len)) = NULL; + +static int conn_running; /* we have a [dis]connector running */ +static int devfd; /* fd of underlying device */ +static int fd_ppp = -1; /* fd for talking PPP */ +static int fd_loop; /* fd for getting demand-dial packets */ int phase; /* where the link is at */ int kill_link; int open_ccp_flag; +int listen_time; +int got_sigusr2; +int got_sigterm; +int got_sighup; + +static int waiting; +static sigjmp_buf sigjmp; char **script_env; /* Env. variable values for scripts */ int s_env_nalloc; /* # words avail at script_env */ @@ -98,15 +134,41 @@ u_char outpacket_buf[PPP_MRU+PPP_HDRLEN]; /* buffer for outgoing packet */ u_char inpacket_buf[PPP_MRU+PPP_HDRLEN]; /* buffer for incoming packet */ static int n_children; /* # child processes still running */ +static int got_sigchld; /* set if we have received a SIGCHLD */ -static int locked; /* lock() has succeeded */ +int privopen; /* don't lock, open device as root */ char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n"; +GIDSET_TYPE groups[NGROUPS_MAX];/* groups the user is in */ +int ngroups; /* How many groups valid in groups */ + +static struct timeval start_time; /* Time when link was started. */ + +struct pppd_stats link_stats; +int link_connect_time; +int link_stats_valid; + +/* + * We maintain a list of child process pids and + * functions to call when they exit. + */ +struct subprocess { + pid_t pid; + char *prog; + void (*done) __P((void *)); + void *arg; + struct subprocess *next; +}; + +static struct subprocess *children; + /* Prototypes for procedures local to this file. */ +static void setup_signals __P((void)); +static void create_pidfile __P((void)); +static void create_linkpidfile __P((void)); static void cleanup __P((void)); -static void close_tty __P((void)); static void get_input __P((void)); static void calltimeout __P((void)); static struct timeval *timeleft __P((struct timeval *)); @@ -118,9 +180,17 @@ static void toggle_debug __P((int)); static void open_ccp __P((int)); static void bad_signal __P((int)); static void holdoff_end __P((void *)); -static int device_script __P((char *, int, int)); -static void reap_kids __P((void)); -static void pr_log __P((void *, char *, ...)); +static int reap_kids __P((int waitfor)); + +#ifdef USE_TDB +static void update_db_entry __P((void)); +static void add_db_key __P((const char *)); +static void delete_db_key __P((const char *)); +static void cleanup_db __P((void)); +#endif + +static void handle_events __P((void)); +static void print_link_stats __P((void)); extern char *ttyname __P((int)); extern char *getlogin __P((void)); @@ -148,7 +218,11 @@ struct protent *protocols[] = { &cbcp_protent, #endif &ipcp_protent, +#ifdef INET6 + &ipv6cp_protent, +#endif &ccp_protent, + &ecp_protent, #ifdef IPX_CHANGE &ipxcp_protent, #endif @@ -158,66 +232,98 @@ struct protent *protocols[] = { NULL }; +/* + * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name. + */ +#if !defined(PPP_DRV_NAME) +#define PPP_DRV_NAME "ppp" +#endif /* !defined(PPP_DRV_NAME) */ + int main(argc, argv) int argc; char *argv[]; { - int i, fdflags; - struct sigaction sa; - FILE *pidfile; + int i, t; char *p; struct passwd *pw; - struct timeval timo; - sigset_t mask; struct protent *protp; - struct stat statbuf; char numbuf[16]; - phase = PHASE_INITIALIZE; - p = ttyname(0); - if (p) - strcpy(devnam, p); - strcpy(default_devnam, devnam); + link_stats_valid = 0; + new_phase(PHASE_INITIALIZE); + + /* + * Ensure that fds 0, 1, 2 are open, to /dev/null if nowhere else. + * This way we can close 0, 1, 2 in detach() without clobbering + * a fd that we are using. + */ + if ((i = open("/dev/null", O_RDWR)) >= 0) { + while (0 <= i && i <= 2) + i = dup(i); + if (i >= 0) + close(i); + } script_env = NULL; /* Initialize syslog facilities */ -#ifdef ULTRIX - openlog("pppd", LOG_PID); -#else - openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); - setlogmask(LOG_UPTO(LOG_INFO)); -#endif + reopen_log(); if (gethostname(hostname, MAXNAMELEN) < 0 ) { option_error("Couldn't get hostname: %m"); - die(1); + exit(1); } hostname[MAXNAMELEN-1] = 0; + /* make sure we don't create world or group writable files. */ + umask(umask(0777) | 022); + uid = getuid(); privileged = uid == 0; - sprintf(numbuf, "%d", uid); - script_setenv("UID", numbuf); + slprintf(numbuf, sizeof(numbuf), "%d", uid); + script_setenv("ORIG_UID", numbuf, 0); + + ngroups = getgroups(NGROUPS_MAX, groups); + + /* + * Initialize magic number generator now so that protocols may + * use magic numbers in initialization. + */ + magic_init(); /* - * Initialize to the standard option set, then parse, in order, - * the system options file, the user's options file, - * the tty's options file, and the command line arguments. + * Initialize each protocol. */ for (i = 0; (protp = protocols[i]) != NULL; ++i) (*protp->init)(0); + /* + * Initialize the default channel. + */ + tty_init(); + progname = *argv; + /* + * Parse, in order, the system options file, the user's options file, + * and the command line arguments. + */ if (!options_from_file(_PATH_SYSOPTIONS, !privileged, 0, 1) - || !options_from_user()) - exit(1); - scan_args(argc-1, argv+1); /* look for tty name on command line */ - if (!options_for_tty() + || !options_from_user() || !parse_args(argc-1, argv+1)) - exit(1); + exit(EXIT_OPTION_ERROR); + devnam_fixed = 1; /* can no longer change device name */ + + /* + * Work out the device name, if it hasn't already been specified, + * and parse the tty's options file. + */ + if (the_channel->process_extra_options) + (*the_channel->process_extra_options)(); + + if (debug) + setlogmask(LOG_UPTO(LOG_DEBUG)); /* * Check that we are running as root. @@ -225,55 +331,73 @@ main(argc, argv) if (geteuid() != 0) { option_error("must be root to run %s, since it is not setuid-root", argv[0]); - die(1); + exit(EXIT_NOT_ROOT); } if (!ppp_available()) { - option_error(no_ppp_msg); - exit(1); + option_error("%s", no_ppp_msg); + exit(EXIT_NO_KERNEL_SUPPORT); } /* * Check that the options given are valid and consistent. */ - sys_check_options(); + check_options(); + if (!sys_check_options()) + exit(EXIT_OPTION_ERROR); auth_check_options(); +#ifdef HAVE_MULTILINK + mp_check_options(); +#endif for (i = 0; (protp = protocols[i]) != NULL; ++i) if (protp->check_options != NULL) (*protp->check_options)(); - if (demand && connector == 0) { - option_error("connect script required for demand-dialling\n"); - exit(1); - } + if (the_channel->check_options) + (*the_channel->check_options)(); - script_setenv("DEVICE", devnam); - sprintf(numbuf, "%d", baud_rate); - script_setenv("SPEED", numbuf); + + if (dump_options || dryrun) { + init_pr_log(NULL, LOG_INFO); + print_options(pr_log, NULL); + end_pr_log(); + } /* - * If the user has specified the default device name explicitly, - * pretend they hadn't. + * Early check for remote number authorization. */ - if (!default_device && strcmp(devnam, default_devnam) == 0) - default_device = 1; - if (default_device) - nodetach = 1; + if (!auth_number()) { + warn("calling number %q is not authorized", remote_number); + exit(EXIT_CNID_AUTH_FAILED); + } + + if (dryrun) + die(0); /* - * Initialize system-dependent stuff and magic number package. + * Initialize system-dependent stuff. */ sys_init(); - magic_init(); - if (debug) - setlogmask(LOG_UPTO(LOG_DEBUG)); + +#ifdef USE_TDB + pppdb = tdb_open(_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644); + if (pppdb != NULL) { + slprintf(db_key, sizeof(db_key), "pppd%d", getpid()); + update_db_entry(); + } else { + warn("Warning: couldn't open ppp database %s", _PATH_PPPDB); + if (multilink) { + warn("Warning: disabling multilink"); + multilink = 0; + } + } +#endif /* * Detach ourselves from the terminal, if required, * and identify who is running us. */ - if (nodetach == 0) + if (!nodetach && !updetach) detach(); - pid = getpid(); p = getlogin(); if (p == NULL) { pw = getpwuid(uid); @@ -282,83 +406,19 @@ main(argc, argv) else p = "(unknown)"; } - syslog(LOG_NOTICE, "pppd %s.%d%s started by %s, uid %d", - VERSION, PATCHLEVEL, IMPLEMENTATION, p, uid); - - /* - * Compute mask of all interesting signals and install signal handlers - * for each. Only one signal handler may be active at a time. Therefore, - * all other signals should be masked when any handler is executing. - */ - sigemptyset(&mask); - sigaddset(&mask, SIGHUP); - sigaddset(&mask, SIGINT); - sigaddset(&mask, SIGTERM); - sigaddset(&mask, SIGCHLD); - -#define SIGNAL(s, handler) { \ - sa.sa_handler = handler; \ - if (sigaction(s, &sa, NULL) < 0) { \ - syslog(LOG_ERR, "Couldn't establish signal handler (%d): %m", s); \ - die(1); \ - } \ - } + syslog(LOG_NOTICE, "pppd %s started by %s, uid %d", VERSION, p, uid); + script_setenv("PPPLOGNAME", p, 0); - sa.sa_mask = mask; - sa.sa_flags = 0; - SIGNAL(SIGHUP, hup); /* Hangup */ - SIGNAL(SIGINT, term); /* Interrupt */ - SIGNAL(SIGTERM, term); /* Terminate */ - SIGNAL(SIGCHLD, chld); + if (devnam[0]) + script_setenv("DEVICE", devnam, 1); + slprintf(numbuf, sizeof(numbuf), "%d", getpid()); + script_setenv("PPPD_PID", numbuf, 1); - SIGNAL(SIGUSR1, toggle_debug); /* Toggle debug flag */ - SIGNAL(SIGUSR2, open_ccp); /* Reopen CCP */ + setup_signals(); - /* - * Install a handler for other signals which would otherwise - * cause pppd to exit without cleaning up. - */ - SIGNAL(SIGABRT, bad_signal); - SIGNAL(SIGALRM, bad_signal); - SIGNAL(SIGFPE, bad_signal); - SIGNAL(SIGILL, bad_signal); - SIGNAL(SIGPIPE, bad_signal); - SIGNAL(SIGQUIT, bad_signal); - SIGNAL(SIGSEGV, bad_signal); -#ifdef SIGBUS - SIGNAL(SIGBUS, bad_signal); -#endif -#ifdef SIGEMT - SIGNAL(SIGEMT, bad_signal); -#endif -#ifdef SIGPOLL - SIGNAL(SIGPOLL, bad_signal); -#endif -#ifdef SIGPROF - SIGNAL(SIGPROF, bad_signal); -#endif -#ifdef SIGSYS - SIGNAL(SIGSYS, bad_signal); -#endif -#ifdef SIGTRAP - SIGNAL(SIGTRAP, bad_signal); -#endif -#ifdef SIGVTALRM - SIGNAL(SIGVTALRM, bad_signal); -#endif -#ifdef SIGXCPU - SIGNAL(SIGXCPU, bad_signal); -#endif -#ifdef SIGXFSZ - SIGNAL(SIGXFSZ, bad_signal); -#endif + waiting = 0; - /* - * Apparently we can get a SIGPIPE when we call syslog, if - * syslogd has died and been restarted. Ignoring it seems - * be sufficient. - */ - signal(SIGPIPE, SIG_IGN); + create_linkpidfile(); /* * If we're doing dial-on-demand, set up the interface now. @@ -367,196 +427,124 @@ main(argc, argv) /* * Open the loopback channel and set it up to be the ppp interface. */ - open_ppp_loopback(); - - syslog(LOG_INFO, "Using interface ppp%d", ifunit); - (void) sprintf(ifname, "ppp%d", ifunit); - script_setenv("IFNAME", ifname); - - /* write pid to file */ - (void) sprintf(pidfilename, "%s%s.pid", _PATH_VARRUN, ifname); - if ((pidfile = fopen(pidfilename, "w")) != NULL) { - fprintf(pidfile, "%d\n", pid); - (void) fclose(pidfile); - } else { - syslog(LOG_ERR, "Failed to create pid file %s: %m", pidfilename); - pidfilename[0] = 0; - } - +#ifdef USE_TDB + tdb_writelock(pppdb); +#endif + fd_loop = open_ppp_loopback(); + set_ifunit(1); +#ifdef USE_TDB + tdb_writeunlock(pppdb); +#endif /* * Configure the interface and mark it up, etc. */ demand_conf(); } + do_callback = 0; for (;;) { + listen_time = 0; need_holdoff = 1; + devfd = -1; + status = EXIT_OK; + ++unsuccess; + doing_callback = do_callback; + do_callback = 0; - if (demand) { + if (demand && !doing_callback) { /* * Don't do anything until we see some activity. */ - phase = PHASE_DORMANT; - kill_link = 0; + new_phase(PHASE_DORMANT); demand_unblock(); + add_fd(fd_loop); for (;;) { - wait_loop_output(timeleft(&timo)); - calltimeout(); - if (kill_link) { - if (!persist) - die(0); - kill_link = 0; - } + handle_events(); + if (kill_link && !persist) + break; if (get_loop_output()) break; - reap_kids(); } + remove_fd(fd_loop); + if (kill_link && !persist) + break; /* * Now we want to bring up the link. */ demand_block(); - syslog(LOG_INFO, "Starting link"); - } - - /* - * Lock the device if we've been asked to. - */ - if (lockflag && !default_device) { - if (lock(devnam) < 0) - goto fail; - locked = 1; - } - - /* - * Open the serial device and set it up to be the ppp interface. - * First we open it in non-blocking mode so we can set the - * various termios flags appropriately. If we aren't dialling - * out and we want to use the modem lines, we reopen it later - * in order to wait for the carrier detect signal from the modem. - */ - while ((ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0)) < 0) { - if (errno != EINTR) - syslog(LOG_ERR, "Failed to open %s: %m", devnam); - if (!persist || errno != EINTR) - goto fail; + info("Starting link"); } - if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1 - || fcntl(ttyfd, F_SETFL, fdflags & ~O_NONBLOCK) < 0) - syslog(LOG_WARNING, - "Couldn't reset non-blocking mode on device: %m"); - - hungup = 0; - kill_link = 0; - - /* - * Do the equivalent of `mesg n' to stop broadcast messages. - */ - if (fstat(ttyfd, &statbuf) < 0 - || fchmod(ttyfd, statbuf.st_mode & ~(S_IWGRP | S_IWOTH)) < 0) { - syslog(LOG_WARNING, - "Couldn't restrict write permissions to %s: %m", devnam); - } else - tty_mode = statbuf.st_mode; - /* run connection script */ - if (connector && connector[0]) { - MAINDEBUG((LOG_INFO, "Connecting with <%s>", connector)); + new_phase(PHASE_SERIALCONN); - /* - * Set line speed, flow control, etc. - * On most systems we set CLOCAL for now so that we can talk - * to the modem before carrier comes up. But this has the - * side effect that we might miss it if CD drops before we - * get to clear CLOCAL below. On systems where we can talk - * successfully to the modem with CLOCAL clear and CD down, - * we can clear CLOCAL at this point. - */ - set_up_tty(ttyfd, 1); - - /* drop dtr to hang up in case modem is off hook */ - if (!default_device && modem) { - setdtr(ttyfd, FALSE); - sleep(1); - setdtr(ttyfd, TRUE); - } - - if (device_script(connector, ttyfd, ttyfd) < 0) { - syslog(LOG_ERR, "Connect script failed"); - setdtr(ttyfd, FALSE); - goto fail; - } - - - syslog(LOG_INFO, "Serial connection established."); - sleep(1); /* give it time to set up its terminal */ - } - - /* set line speed, flow control, etc.; clear CLOCAL if modem option */ - set_up_tty(ttyfd, 0); - - /* reopen tty if necessary to wait for carrier */ - if (connector == NULL && modem) { - while ((i = open(devnam, O_RDWR)) < 0) { - if (errno != EINTR) - syslog(LOG_ERR, "Failed to reopen %s: %m", devnam); - if (!persist || errno != EINTR || hungup || kill_link) - goto fail; - } - close(i); - } - - /* run welcome script, if any */ - if (welcomer && welcomer[0]) { - if (device_script(welcomer, ttyfd, ttyfd) < 0) - syslog(LOG_WARNING, "Welcome script failed"); - } + devfd = the_channel->connect(); + if (devfd < 0) + goto fail; /* set up the serial device as a ppp interface */ - establish_ppp(ttyfd); - - if (!demand) { - - syslog(LOG_INFO, "Using interface ppp%d", ifunit); - (void) sprintf(ifname, "ppp%d", ifunit); - script_setenv("IFNAME", ifname); - - /* write pid to file */ - (void) sprintf(pidfilename, "%s%s.pid", _PATH_VARRUN, ifname); - if ((pidfile = fopen(pidfilename, "w")) != NULL) { - fprintf(pidfile, "%d\n", pid); - (void) fclose(pidfile); - } else { - syslog(LOG_ERR, "Failed to create pid file %s: %m", - pidfilename); - pidfilename[0] = 0; - } +#ifdef USE_TDB + tdb_writelock(pppdb); +#endif + fd_ppp = the_channel->establish_ppp(devfd); + if (fd_ppp < 0) { +#ifdef USE_TDB + tdb_writeunlock(pppdb); +#endif + status = EXIT_FATAL_ERROR; + goto disconnect; } + if (!demand && ifunit >= 0) + set_ifunit(1); +#ifdef USE_TDB + tdb_writeunlock(pppdb); +#endif + /* * Start opening the connection and wait for * incoming events (reply, timeout, etc.). */ - syslog(LOG_NOTICE, "Connect: %s <--> %s", ifname, devnam); + if (ifunit >= 0) + notice("Connect: %s <--> %s", ifname, ppp_devnam); + else + notice("Starting negotiation on %s", ppp_devnam); + gettimeofday(&start_time, NULL); + script_unsetenv("CONNECT_TIME"); + script_unsetenv("BYTES_SENT"); + script_unsetenv("BYTES_RCVD"); lcp_lowerup(0); + + add_fd(fd_ppp); lcp_open(0); /* Start protocol */ - for (phase = PHASE_ESTABLISH; phase != PHASE_DEAD; ) { - wait_input(timeleft(&timo)); - calltimeout(); + status = EXIT_NEGOTIATION_FAILED; + new_phase(PHASE_ESTABLISH); + while (phase != PHASE_DEAD) { + handle_events(); get_input(); - if (kill_link) { + if (kill_link) lcp_close(0, "User request"); - kill_link = 0; - } if (open_ccp_flag) { - if (phase == PHASE_NETWORK) { + if (phase == PHASE_NETWORK || phase == PHASE_RUNNING) { ccp_fsm[0].flags = OPT_RESTART; /* clears OPT_SILENT */ (*ccp_protent.open)(0); } - open_ccp_flag = 0; } - reap_kids(); /* Don't leave dead kids lying around */ + } + + print_link_stats(); + + /* + * Delete pid file before disestablishing ppp. Otherwise it + * can happen that another pppd gets the same unit and then + * we delete its pid file. + */ + if (!demand) { + if (pidfilename[0] != 0 + && unlink(pidfilename) < 0 && errno != ENOENT) + warn("unable to delete pid file %s: %m", pidfilename); + pidfilename[0] = 0; } /* @@ -564,78 +552,306 @@ main(argc, argv) * the ppp unit back to the loopback. Set the * real serial device back to its normal mode of operation. */ + remove_fd(fd_ppp); clean_check(); - if (demand) - restore_loop(); - disestablish_ppp(ttyfd); + the_channel->disestablish_ppp(devfd); + fd_ppp = -1; + if (!hungup) + lcp_lowerdown(0); + if (!demand) + script_unsetenv("IFNAME"); /* * Run disconnector script, if requested. * XXX we may not be able to do this if the line has hung up! */ - if (disconnector && !hungup) { - set_up_tty(ttyfd, 1); - if (device_script(disconnector, ttyfd, ttyfd) < 0) { - syslog(LOG_WARNING, "disconnect script failed"); - } else { - syslog(LOG_INFO, "Serial link disconnected."); - } - } + disconnect: + new_phase(PHASE_DISCONNECT); + the_channel->disconnect(); fail: - if (ttyfd >= 0) - close_tty(); - if (locked) { - unlock(); - locked = 0; - } + if (the_channel->cleanup) + (*the_channel->cleanup)(); if (!demand) { if (pidfilename[0] != 0 - && unlink(pidfilename) < 0 && errno != ENOENT) - syslog(LOG_WARNING, "unable to delete pid file: %m"); + && unlink(pidfilename) < 0 && errno != ENOENT) + warn("unable to delete pid file %s: %m", pidfilename); pidfilename[0] = 0; } - if (!persist) - die(1); + if (!persist || (maxfail > 0 && unsuccess >= maxfail)) + break; if (demand) demand_discard(); - if (holdoff > 0 && need_holdoff) { - phase = PHASE_HOLDOFF; - TIMEOUT(holdoff_end, NULL, holdoff); + t = need_holdoff? holdoff: 0; + if (holdoff_hook) + t = (*holdoff_hook)(); + if (t > 0) { + new_phase(PHASE_HOLDOFF); + TIMEOUT(holdoff_end, NULL, t); do { - wait_time(timeleft(&timo)); - calltimeout(); - if (kill_link) { - if (!persist) - die(0); - kill_link = 0; - phase = PHASE_DORMANT; /* allow signal to end holdoff */ - } - reap_kids(); + handle_events(); + if (kill_link) + new_phase(PHASE_DORMANT); /* allow signal to end holdoff */ } while (phase == PHASE_HOLDOFF); + if (!persist) + break; } } - die(0); - return 0; + /* Wait for scripts to finish */ + /* XXX should have a timeout here */ + while (n_children > 0) { + if (debug) { + struct subprocess *chp; + dbglog("Waiting for %d child processes...", n_children); + for (chp = children; chp != NULL; chp = chp->next) + dbglog(" script %s, pid %d", chp->prog, chp->pid); + } + if (reap_kids(1) < 0) + break; + } + + die(status); + return 0; +} + +/* + * handle_events - wait for something to happen and respond to it. + */ +static void +handle_events() +{ + struct timeval timo; + sigset_t mask; + + kill_link = open_ccp_flag = 0; + if (sigsetjmp(sigjmp, 1) == 0) { + sigprocmask(SIG_BLOCK, &mask, NULL); + if (got_sighup || got_sigterm || got_sigusr2 || got_sigchld) { + sigprocmask(SIG_UNBLOCK, &mask, NULL); + } else { + waiting = 1; + sigprocmask(SIG_UNBLOCK, &mask, NULL); + wait_input(timeleft(&timo)); + } + } + waiting = 0; + calltimeout(); + if (got_sighup) { + kill_link = 1; + got_sighup = 0; + if (status != EXIT_HANGUP) + status = EXIT_USER_REQUEST; + } + if (got_sigterm) { + kill_link = 1; + persist = 0; + status = EXIT_USER_REQUEST; + got_sigterm = 0; + } + if (got_sigchld) { + reap_kids(0); /* Don't leave dead kids lying around */ + got_sigchld = 0; + } + if (got_sigusr2) { + open_ccp_flag = 1; + got_sigusr2 = 0; + } +} + +/* + * setup_signals - initialize signal handling. + */ +static void +setup_signals() +{ + struct sigaction sa; + sigset_t mask; + + /* + * Compute mask of all interesting signals and install signal handlers + * for each. Only one signal handler may be active at a time. Therefore, + * all other signals should be masked when any handler is executing. + */ + sigemptyset(&mask); + sigaddset(&mask, SIGHUP); + sigaddset(&mask, SIGINT); + sigaddset(&mask, SIGTERM); + sigaddset(&mask, SIGCHLD); + sigaddset(&mask, SIGUSR2); + +#define SIGNAL(s, handler) do { \ + sa.sa_handler = handler; \ + if (sigaction(s, &sa, NULL) < 0) \ + fatal("Couldn't establish signal handler (%d): %m", s); \ + } while (0) + + sa.sa_mask = mask; + sa.sa_flags = 0; + SIGNAL(SIGHUP, hup); /* Hangup */ + SIGNAL(SIGINT, term); /* Interrupt */ + SIGNAL(SIGTERM, term); /* Terminate */ + SIGNAL(SIGCHLD, chld); + + SIGNAL(SIGUSR1, toggle_debug); /* Toggle debug flag */ + SIGNAL(SIGUSR2, open_ccp); /* Reopen CCP */ + + /* + * Install a handler for other signals which would otherwise + * cause pppd to exit without cleaning up. + */ + SIGNAL(SIGABRT, bad_signal); + SIGNAL(SIGALRM, bad_signal); + SIGNAL(SIGFPE, bad_signal); + SIGNAL(SIGILL, bad_signal); + SIGNAL(SIGPIPE, bad_signal); + SIGNAL(SIGQUIT, bad_signal); + SIGNAL(SIGSEGV, bad_signal); +#ifdef SIGBUS + SIGNAL(SIGBUS, bad_signal); +#endif +#ifdef SIGEMT + SIGNAL(SIGEMT, bad_signal); +#endif +#ifdef SIGPOLL + SIGNAL(SIGPOLL, bad_signal); +#endif +#ifdef SIGPROF + SIGNAL(SIGPROF, bad_signal); +#endif +#ifdef SIGSYS + SIGNAL(SIGSYS, bad_signal); +#endif +#ifdef SIGTRAP + SIGNAL(SIGTRAP, bad_signal); +#endif +#ifdef SIGVTALRM + SIGNAL(SIGVTALRM, bad_signal); +#endif +#ifdef SIGXCPU + SIGNAL(SIGXCPU, bad_signal); +#endif +#ifdef SIGXFSZ + SIGNAL(SIGXFSZ, bad_signal); +#endif + + /* + * Apparently we can get a SIGPIPE when we call syslog, if + * syslogd has died and been restarted. Ignoring it seems + * be sufficient. + */ + signal(SIGPIPE, SIG_IGN); +} + +/* + * set_ifunit - do things we need to do once we know which ppp + * unit we are using. + */ +void +set_ifunit(iskey) + int iskey; +{ + info("Using interface %s%d", PPP_DRV_NAME, ifunit); + slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit); + script_setenv("IFNAME", ifname, iskey); + if (iskey) { + create_pidfile(); /* write pid to file */ + create_linkpidfile(); + } +} + +/* + * detach - detach us from the controlling terminal. + */ +void +detach() +{ + int pid; + char numbuf[16]; + + if (detached) + return; + if ((pid = fork()) < 0) { + error("Couldn't detach (fork failed: %m)"); + die(1); /* or just return? */ + } + if (pid != 0) { + /* parent */ + notify(pidchange, pid); + exit(0); /* parent dies */ + } + setsid(); + chdir("/"); + close(0); + close(1); + close(2); + detached = 1; + if (log_default) + log_to_fd = -1; + /* update pid files if they have been written already */ + if (pidfilename[0]) + create_pidfile(); + if (linkpidfile[0]) + create_linkpidfile(); + slprintf(numbuf, sizeof(numbuf), "%d", getpid()); + script_setenv("PPPD_PID", numbuf, 1); } /* - * detach - detach us from the controlling terminal. + * reopen_log - (re)open our connection to syslog. */ void -detach() +reopen_log() { - if (detached) +#ifdef ULTRIX + openlog("pppd", LOG_PID); +#else + openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); + setlogmask(LOG_UPTO(LOG_INFO)); +#endif +} + +/* + * Create a file containing our process ID. + */ +static void +create_pidfile() +{ + FILE *pidfile; + + slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid", + _PATH_VARRUN, ifname); + if ((pidfile = fopen(pidfilename, "w")) != NULL) { + fprintf(pidfile, "%d\n", getpid()); + (void) fclose(pidfile); + } else { + error("Failed to create pid file %s: %m", pidfilename); + pidfilename[0] = 0; + } +} + +static void +create_linkpidfile() +{ + FILE *pidfile; + + if (linkname[0] == 0) return; - if (daemon(0, 0) < 0) { - perror("Couldn't detach from controlling terminal"); - die(1); + script_setenv("LINKNAME", linkname, 1); + slprintf(linkpidfile, sizeof(linkpidfile), "%sppp-%s.pid", + _PATH_VARRUN, linkname); + if ((pidfile = fopen(linkpidfile, "w")) != NULL) { + fprintf(pidfile, "%d\n", getpid()); + if (ifname[0]) + fprintf(pidfile, "%s\n", ifname); + (void) fclose(pidfile); + } else { + error("Failed to create pid file %s: %m", linkpidfile); + linkpidfile[0] = 0; } - detached = 1; } /* @@ -645,7 +861,91 @@ static void holdoff_end(arg) void *arg; { - phase = PHASE_DORMANT; + new_phase(PHASE_DORMANT); +} + +/* List of protocol names, to make our messages a little more informative. */ +struct protocol_list { + u_short proto; + const char *name; +} protocol_list[] = { + { 0x21, "IP" }, + { 0x23, "OSI Network Layer" }, + { 0x25, "Xerox NS IDP" }, + { 0x27, "DECnet Phase IV" }, + { 0x29, "Appletalk" }, + { 0x2b, "Novell IPX" }, + { 0x2d, "VJ compressed TCP/IP" }, + { 0x2f, "VJ uncompressed TCP/IP" }, + { 0x31, "Bridging PDU" }, + { 0x33, "Stream Protocol ST-II" }, + { 0x35, "Banyan Vines" }, + { 0x39, "AppleTalk EDDP" }, + { 0x3b, "AppleTalk SmartBuffered" }, + { 0x3d, "Multi-Link" }, + { 0x3f, "NETBIOS Framing" }, + { 0x41, "Cisco Systems" }, + { 0x43, "Ascom Timeplex" }, + { 0x45, "Fujitsu Link Backup and Load Balancing (LBLB)" }, + { 0x47, "DCA Remote Lan" }, + { 0x49, "Serial Data Transport Protocol (PPP-SDTP)" }, + { 0x4b, "SNA over 802.2" }, + { 0x4d, "SNA" }, + { 0x4f, "IP6 Header Compression" }, + { 0x6f, "Stampede Bridging" }, + { 0xfb, "single-link compression" }, + { 0xfd, "1st choice compression" }, + { 0x0201, "802.1d Hello Packets" }, + { 0x0203, "IBM Source Routing BPDU" }, + { 0x0205, "DEC LANBridge100 Spanning Tree" }, + { 0x0231, "Luxcom" }, + { 0x0233, "Sigma Network Systems" }, + { 0x8021, "Internet Protocol Control Protocol" }, + { 0x8023, "OSI Network Layer Control Protocol" }, + { 0x8025, "Xerox NS IDP Control Protocol" }, + { 0x8027, "DECnet Phase IV Control Protocol" }, + { 0x8029, "Appletalk Control Protocol" }, + { 0x802b, "Novell IPX Control Protocol" }, + { 0x8031, "Bridging NCP" }, + { 0x8033, "Stream Protocol Control Protocol" }, + { 0x8035, "Banyan Vines Control Protocol" }, + { 0x803d, "Multi-Link Control Protocol" }, + { 0x803f, "NETBIOS Framing Control Protocol" }, + { 0x8041, "Cisco Systems Control Protocol" }, + { 0x8043, "Ascom Timeplex" }, + { 0x8045, "Fujitsu LBLB Control Protocol" }, + { 0x8047, "DCA Remote Lan Network Control Protocol (RLNCP)" }, + { 0x8049, "Serial Data Control Protocol (PPP-SDCP)" }, + { 0x804b, "SNA over 802.2 Control Protocol" }, + { 0x804d, "SNA Control Protocol" }, + { 0x804f, "IP6 Header Compression Control Protocol" }, + { 0x006f, "Stampede Bridging Control Protocol" }, + { 0x80fb, "Single Link Compression Control Protocol" }, + { 0x80fd, "Compression Control Protocol" }, + { 0xc021, "Link Control Protocol" }, + { 0xc023, "Password Authentication Protocol" }, + { 0xc025, "Link Quality Report" }, + { 0xc027, "Shiva Password Authentication Protocol" }, + { 0xc029, "CallBack Control Protocol (CBCP)" }, + { 0xc081, "Container Control Protocol" }, + { 0xc223, "Challenge Handshake Authentication Protocol" }, + { 0xc281, "Proprietary Authentication Protocol" }, + { 0, NULL }, +}; + +/* + * protocol_name - find a name for a PPP protocol. + */ +const char * +protocol_name(proto) + int proto; +{ + struct protocol_list *lp; + + for (lp = protocol_list; lp->proto != 0; ++lp) + if (proto == lp->proto) + return lp->name; + return NULL; } /* @@ -666,21 +966,22 @@ get_input() return; if (len == 0) { - syslog(LOG_NOTICE, "Modem hangup"); + notice("Modem hangup"); hungup = 1; + status = EXIT_HANGUP; lcp_lowerdown(0); /* serial link is no longer available */ link_terminated(0); return; } - if (debug /*&& (debugflags & DBG_INPACKET)*/) - log_packet(p, len, "rcvd ", LOG_DEBUG); - if (len < PPP_HDRLEN) { - MAINDEBUG((LOG_INFO, "io(): Received short packet.")); + dbglog("received short packet:%.*B", len, p); return; } + dump_packet("rcvd", p, len); + if (snoop_recv_hook) snoop_recv_hook(p, len); + p += 2; /* Skip address and control */ GETSHORT(protocol, p); len -= PPP_HDRLEN; @@ -689,8 +990,7 @@ get_input() * Toss all non-LCP packets unless LCP is OPEN. */ if (protocol != PPP_LCP && lcp_fsm[0].state != OPENED) { - MAINDEBUG((LOG_INFO, - "get_input: Received non-LCP packet when LCP not open.")); + MAINDEBUG(("get_input: Received non-LCP packet when LCP not open.")); return; } @@ -701,7 +1001,7 @@ get_input() if (phase <= PHASE_AUTHENTICATE && !(protocol == PPP_LCP || protocol == PPP_LQR || protocol == PPP_PAP || protocol == PPP_CHAP)) { - MAINDEBUG((LOG_INFO, "get_input: discarding proto 0x%x in phase %d", + MAINDEBUG(("get_input: discarding proto 0x%x in phase %d", protocol, phase)); return; } @@ -721,29 +1021,39 @@ get_input() } } - if (debug) - syslog(LOG_WARNING, "Unsupported protocol (0x%x) received", protocol); + if (debug) { + const char *pname = protocol_name(protocol); + if (pname != NULL) + warn("Unsupported protocol '%s' (0x%x) received", pname, protocol); + else + warn("Unsupported protocol 0x%x received", protocol); + } lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN); } - /* - * quit - Clean up state and exit (with an error indication). + * new_phase - signal the start of a new phase of pppd's operation. */ -void -quit() +void +new_phase(p) + int p; { - die(1); + phase = p; + if (new_phase_hook) + (*new_phase_hook)(p); + notify(phasechange, p); } /* - * die - like quit, except we can specify an exit status. + * die - clean up state and exit with the specified status. */ void die(status) int status; { + print_link_stats(); cleanup(); + notify(exitnotify, status); syslog(LOG_INFO, "Exit."); exit(status); } @@ -757,42 +1067,61 @@ cleanup() { sys_cleanup(); - if (ttyfd >= 0) - close_tty(); + if (fd_ppp >= 0) + the_channel->disestablish_ppp(devfd); + if (the_channel->cleanup) + (*the_channel->cleanup)(); - if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT) - syslog(LOG_WARNING, "unable to delete pid file: %m"); + if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT) + warn("unable to delete pid file %s: %m", pidfilename); pidfilename[0] = 0; + if (linkpidfile[0] != 0 && unlink(linkpidfile) < 0 && errno != ENOENT) + warn("unable to delete pid file %s: %m", linkpidfile); + linkpidfile[0] = 0; + +#ifdef USE_TDB + if (pppdb != NULL) + cleanup_db(); +#endif - if (locked) - unlock(); } -/* - * close_tty - restore the terminal device and close it. - */ -static void -close_tty() +void +print_link_stats() { - disestablish_ppp(ttyfd); - - /* drop dtr to hang up */ - if (modem) { - setdtr(ttyfd, FALSE); - /* - * This sleep is in case the serial port has CLOCAL set by default, - * and consequently will reassert DTR when we close the device. - */ - sleep(1); + /* + * Print connect time and statistics. + */ + if (link_stats_valid) { + int t = (link_connect_time + 5) / 6; /* 1/10ths of minutes */ + info("Connect time %d.%d minutes.", t/10, t%10); + info("Sent %u bytes, received %u bytes.", + link_stats.bytes_out, link_stats.bytes_in); } +} - restore_tty(ttyfd); - - if (tty_mode != (mode_t) -1) - chmod(devnam, tty_mode); +/* + * update_link_stats - get stats at link termination. + */ +void +update_link_stats(u) + int u; +{ + struct timeval now; + char numbuf[32]; - close(ttyfd); - ttyfd = -1; + if (!get_ppp_stats(u, &link_stats) + || gettimeofday(&now, NULL) < 0) + return; + link_connect_time = now.tv_sec - start_time.tv_sec; + link_stats_valid = 1; + + slprintf(numbuf, sizeof(numbuf), "%u", link_connect_time); + script_setenv("CONNECT_TIME", numbuf, 0); + slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_out); + script_setenv("BYTES_SENT", numbuf, 0); + slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_in); + script_setenv("BYTES_RCVD", numbuf, 0); } @@ -808,41 +1137,40 @@ static struct timeval timenow; /* Current time */ /* * timeout - Schedule a timeout. - * - * Note that this timeout takes the number of seconds, NOT hz (as in - * the kernel). */ void -timeout(func, arg, time) +timeout(func, arg, secs, usecs) void (*func) __P((void *)); void *arg; - int time; + int secs, usecs; { struct callout *newp, *p, **pp; - - MAINDEBUG((LOG_DEBUG, "Timeout %lx:%lx in %d seconds.", - (long) func, (long) arg, time)); - + + MAINDEBUG(("Timeout %p:%p in %d.%03d seconds.", func, arg, + secs, usecs/1000)); + /* * Allocate timeout. */ - if ((newp = (struct callout *) malloc(sizeof(struct callout))) == NULL) { - syslog(LOG_ERR, "Out of memory in timeout()!"); - die(1); - } + if ((newp = (struct callout *) malloc(sizeof(struct callout))) == NULL) + fatal("Out of memory in timeout()!"); newp->c_arg = arg; newp->c_func = func; gettimeofday(&timenow, NULL); - newp->c_time.tv_sec = timenow.tv_sec + time; - newp->c_time.tv_usec = timenow.tv_usec; - + newp->c_time.tv_sec = timenow.tv_sec + secs; + newp->c_time.tv_usec = timenow.tv_usec + usecs; + if (newp->c_time.tv_usec >= 1000000) { + newp->c_time.tv_sec += newp->c_time.tv_usec / 1000000; + newp->c_time.tv_usec %= 1000000; + } + /* * Find correct place and link it in. */ for (pp = &callout; (p = *pp); pp = &p->c_next) if (newp->c_time.tv_sec < p->c_time.tv_sec || (newp->c_time.tv_sec == p->c_time.tv_sec - && newp->c_time.tv_usec < p->c_time.tv_sec)) + && newp->c_time.tv_usec < p->c_time.tv_usec)) break; newp->c_next = p; *pp = newp; @@ -858,16 +1186,16 @@ untimeout(func, arg) void *arg; { struct callout **copp, *freep; - - MAINDEBUG((LOG_DEBUG, "Untimeout %lx:%lx.", (long) func, (long) arg)); - + + MAINDEBUG(("Untimeout %p:%p.", func, arg)); + /* * Find first matching timeout and remove it from the list. */ for (copp = &callout; (freep = *copp); copp = &freep->c_next) if (freep->c_func == func && freep->c_arg == arg) { *copp = freep->c_next; - (void) free((char *) freep); + free((char *) freep); break; } } @@ -884,10 +1212,8 @@ calltimeout() while (callout != NULL) { p = callout; - if (gettimeofday(&timenow, NULL) < 0) { - syslog(LOG_ERR, "Failed to get time of day: %m"); - die(1); - } + if (gettimeofday(&timenow, NULL) < 0) + fatal("Failed to get time of day: %m"); if (!(p->c_time.tv_sec < timenow.tv_sec || (p->c_time.tv_sec == timenow.tv_sec && p->c_time.tv_usec <= timenow.tv_usec))) @@ -953,11 +1279,14 @@ static void hup(sig) int sig; { - syslog(LOG_INFO, "Hangup (SIGHUP)"); - kill_link = 1; + info("Hangup (SIGHUP)"); + got_sighup = 1; if (conn_running) /* Send the signal to the [dis]connector process(es) also */ kill_my_pg(sig); + notify(sigreceived, sig); + if (waiting) + siglongjmp(sigjmp, 1); } @@ -971,24 +1300,28 @@ static void term(sig) int sig; { - syslog(LOG_INFO, "Terminating on signal %d.", sig); - persist = 0; /* don't try to restart */ - kill_link = 1; + info("Terminating on signal %d.", sig); + got_sigterm = 1; if (conn_running) /* Send the signal to the [dis]connector process(es) also */ kill_my_pg(sig); + notify(sigreceived, sig); + if (waiting) + siglongjmp(sigjmp, 1); } /* * chld - Catch SIGCHLD signal. - * Calls reap_kids to get status for any dead kids. + * Sets a flag so we will call reap_kids in the mainline. */ static void chld(sig) int sig; { - reap_kids(); + got_sigchld = 1; + if (waiting) + siglongjmp(sigjmp, 1); } @@ -1021,7 +1354,9 @@ static void open_ccp(sig) int sig; { - open_ccp_flag = 1; + got_sigusr2 = 1; + if (waiting) + siglongjmp(sigjmp, 1); } @@ -1032,81 +1367,105 @@ static void bad_signal(sig) int sig; { - syslog(LOG_ERR, "Fatal signal %d", sig); + static int crashed = 0; + + if (crashed) + _exit(127); + crashed = 1; + error("Fatal signal %d", sig); if (conn_running) kill_my_pg(SIGTERM); - die(1); + notify(sigreceived, sig); + die(127); } /* - * device_script - run a program to connect or disconnect the - * serial device. + * device_script - run a program to talk to the specified fds + * (e.g. to run the connector or disconnector script). + * stderr gets connected to the log fd or to the _PATH_CONNERRS file. */ -static int -device_script(program, in, out) +int +device_script(program, in, out, dont_wait) char *program; int in, out; + int dont_wait; { - int pid; - int status; + int pid, fd; + int status = -1; int errfd; - conn_running = 1; + ++conn_running; pid = fork(); if (pid < 0) { - conn_running = 0; - syslog(LOG_ERR, "Failed to create child process: %m"); - die(1); + --conn_running; + error("Failed to create child process: %m"); + return -1; } - if (pid == 0) { - sys_close(); - closelog(); - if (in == out) { - if (in != 0) { - dup2(in, 0); - close(in); - } - dup2(0, 1); + if (pid != 0) { + if (dont_wait) { + record_child(pid, program, NULL, NULL); + status = 0; } else { - if (out == 0) - out = dup(out); - if (in != 0) { - dup2(in, 0); - close(in); - } - if (out != 1) { - dup2(out, 1); - close(out); + while (waitpid(pid, &status, 0) < 0) { + if (errno == EINTR) + continue; + fatal("error waiting for (dis)connection process: %m"); } + --conn_running; } - if (nodetach == 0) { - close(2); - errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600); - if (errfd >= 0 && errfd != 2) { - dup2(errfd, 2); - close(errfd); - } + return (status == 0 ? 0 : -1); + } + + /* here we are executing in the child */ + /* make sure fds 0, 1, 2 are occupied */ + while ((fd = dup(in)) >= 0) { + if (fd > 2) { + close(fd); + break; } - setuid(getuid()); - setgid(getgid()); - execl("/bin/sh", "sh", "-c", program, (char *)0); - syslog(LOG_ERR, "could not exec /bin/sh: %m"); - _exit(99); - /* NOTREACHED */ } - while (waitpid(pid, &status, 0) < 0) { - if (errno == EINTR) - continue; - syslog(LOG_ERR, "error waiting for (dis)connection process: %m"); - die(1); + /* dup in and out to fds > 2 */ + in = dup(in); + out = dup(out); + if (log_to_fd >= 0) { + errfd = dup(log_to_fd); + } else { + errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600); + } + + /* close fds 0 - 2 and any others we can think of */ + close(0); + close(1); + close(2); + sys_close(); + if (the_channel->close) + (*the_channel->close)(); + closelog(); + + /* dup the in, out, err fds to 0, 1, 2 */ + dup2(in, 0); + close(in); + dup2(out, 1); + close(out); + if (errfd >= 0) { + dup2(errfd, 2); + close(errfd); } - conn_running = 0; - return (status == 0 ? 0 : -1); + setuid(uid); + if (getuid() != uid) { + error("setuid failed"); + exit(1); + } + setgid(getgid()); + execl("/bin/sh", "sh", "-c", program, (char *)0); + error("could not exec /bin/sh: %m"); + exit(99); + /* NOTREACHED */ } @@ -1115,28 +1474,49 @@ device_script(program, in, out) * but don't wait for it. * If the program can't be executed, logs an error unless * must_exist is 0 and the program file doesn't exist. + * Returns -1 if it couldn't fork, 0 if the file doesn't exist + * or isn't an executable plain file, or the process ID of the child. + * If done != NULL, (*done)(arg) will be called later (within + * reap_kids) iff the return value is > 0. */ -int -run_program(prog, args, must_exist) +pid_t +run_program(prog, args, must_exist, done, arg) char *prog; char **args; int must_exist; + void (*done) __P((void *)); + void *arg; { int pid; + struct stat sbuf; + + /* + * First check if the file exists and is executable. + * We don't use access() because that would use the + * real user-id, which might not be root, and the script + * might be accessible only to root. + */ + errno = EINVAL; + if (stat(prog, &sbuf) < 0 || !S_ISREG(sbuf.st_mode) + || (sbuf.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0) { + if (must_exist || errno != ENOENT) + warn("Can't execute %s: %m", prog); + return 0; + } pid = fork(); if (pid == -1) { - syslog(LOG_ERR, "Failed to create child process for %s: %m", prog); + error("Failed to create child process for %s: %m", prog); return -1; } if (pid == 0) { int new_fd; /* Leave the current location */ - (void) setsid(); /* No controlling tty. */ + (void) setsid(); /* No controlling tty. */ (void) umask (S_IRWXG|S_IRWXO); - (void) chdir ("/"); /* no current directory. */ - setuid(geteuid()); + (void) chdir ("/"); /* no current directory. */ + setuid(0); /* set real UID = root */ setgid(getegid()); /* Ensure that nothing of our device environment is inherited. */ @@ -1145,7 +1525,8 @@ run_program(prog, args, must_exist) close (0); close (1); close (2); - close (ttyfd); /* tty interface to the ppp device */ + if (the_channel->close) + (*the_channel->close)(); /* Don't pass handles to the PPP device, even by accident. */ new_fd = open (_PATH_DEVNULL, O_RDWR); @@ -1161,20 +1542,57 @@ run_program(prog, args, must_exist) #ifdef BSD /* Force the priority back to zero if pppd is running higher. */ if (setpriority (PRIO_PROCESS, 0, 0) < 0) - syslog (LOG_WARNING, "can't reset priority to 0: %m"); + warn("can't reset priority to 0: %m"); #endif /* SysV recommends a second fork at this point. */ - /* run the program; give it a null environment */ + /* run the program */ execve(prog, args, script_env); - if (must_exist || errno != ENOENT) - syslog(LOG_WARNING, "Can't execute %s: %m", prog); + if (must_exist || errno != ENOENT) { + /* have to reopen the log, there's nowhere else + for the message to go. */ + reopen_log(); + syslog(LOG_ERR, "Can't execute %s: %m", prog); + closelog(); + } _exit(-1); } - MAINDEBUG((LOG_DEBUG, "Script %s started; pid = %d", prog, pid)); + + if (debug) + dbglog("Script %s started (pid %d)", prog, pid); + record_child(pid, prog, done, arg); + + return pid; +} + + +/* + * record_child - add a child process to the list for reap_kids + * to use. + */ +void +record_child(pid, prog, done, arg) + int pid; + char *prog; + void (*done) __P((void *)); + void *arg; +{ + struct subprocess *chp; + ++n_children; - return 0; + + chp = (struct subprocess *) malloc(sizeof(struct subprocess)); + if (chp == NULL) { + warn("losing track of %s process", prog); + } else { + chp->pid = pid; + chp->prog = prog; + chp->done = done; + chp->arg = arg; + chp->next = children; + children = chp; + } } @@ -1182,155 +1600,100 @@ run_program(prog, args, must_exist) * reap_kids - get status from any dead child processes, * and log a message for abnormal terminations. */ -static void -reap_kids() +static int +reap_kids(waitfor) + int waitfor; { int pid, status; + struct subprocess *chp, **prevp; if (n_children == 0) - return; - if ((pid = waitpid(-1, &status, WNOHANG)) == -1) { - if (errno != ECHILD) - syslog(LOG_ERR, "Error waiting for child process: %m"); - return; - } - if (pid > 0) { - --n_children; - if (WIFSIGNALED(status)) { - syslog(LOG_WARNING, "Child process %d terminated with signal %d", - pid, WTERMSIG(status)); + return 0; + while ((pid = waitpid(-1, &status, (waitfor? 0: WNOHANG))) != -1 + && pid != 0) { + for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) { + if (chp->pid == pid) { + --n_children; + *prevp = chp->next; + break; + } } + if (WIFSIGNALED(status)) { + warn("Child process %s (pid %d) terminated with signal %d", + (chp? chp->prog: "??"), pid, WTERMSIG(status)); + } else if (debug) + dbglog("Script %s finished (pid %d), status = 0x%x", + (chp? chp->prog: "??"), pid, + WIFEXITED(status) ? WEXITSTATUS(status) : status); + if (chp && chp->done) + (*chp->done)(chp->arg); + if (chp) + free(chp); } + if (pid == -1) { + if (errno == ECHILD) + return -1; + if (errno != EINTR) + error("Error waiting for child process: %m"); + } + return 0; } - /* - * log_packet - format a packet and log it. + * add_notifier - add a new function to be called when something happens. */ - -char line[256]; /* line to be logged accumulated here */ -char *linep; - void -log_packet(p, len, prefix, level) - u_char *p; - int len; - char *prefix; - int level; +add_notifier(notif, func, arg) + struct notifier **notif; + notify_func func; + void *arg; { - strcpy(line, prefix); - linep = line + strlen(line); - format_packet(p, len, pr_log, NULL); - if (linep != line) - syslog(level, "%s", line); + struct notifier *np; + + np = malloc(sizeof(struct notifier)); + if (np == 0) + novm("notifier struct"); + np->next = *notif; + np->func = func; + np->arg = arg; + *notif = np; } /* - * format_packet - make a readable representation of a packet, - * calling `printer(arg, format, ...)' to output it. + * remove_notifier - remove a function from the list of things to + * be called when something happens. */ void -format_packet(p, len, printer, arg) - u_char *p; - int len; - void (*printer) __P((void *, char *, ...)); +remove_notifier(notif, func, arg) + struct notifier **notif; + notify_func func; void *arg; { - int i, n; - u_short proto; - u_char x; - struct protent *protp; + struct notifier *np; - if (len >= PPP_HDRLEN && p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) { - p += 2; - GETSHORT(proto, p); - len -= PPP_HDRLEN; - for (i = 0; (protp = protocols[i]) != NULL; ++i) - if (proto == protp->protocol) - break; - if (protp != NULL) { - printer(arg, "[%s", protp->name); - n = (*protp->printpkt)(p, len, printer, arg); - printer(arg, "]"); - p += n; - len -= n; - } else { - printer(arg, "[proto=0x%x]", proto); + for (; (np = *notif) != 0; notif = &np->next) { + if (np->func == func && np->arg == arg) { + *notif = np->next; + free(np); + break; } } - - for (; len > 0; --len) { - GETCHAR(x, p); - printer(arg, " %.2x", x); - } -} - -static void -pr_log __V((void *arg, char *fmt, ...)) -{ - int n; - va_list pvar; - char buf[256]; - -#if __STDC__ - va_start(pvar, fmt); -#else - void *arg; - char *fmt; - va_start(pvar); - arg = va_arg(pvar, void *); - fmt = va_arg(pvar, char *); -#endif - - vsprintf(buf, fmt, pvar); - va_end(pvar); - - n = strlen(buf); - if (linep + n + 1 > line + sizeof(line)) { - syslog(LOG_DEBUG, "%s", line); - linep = line; - } - strcpy(linep, buf); - linep += n; } /* - * print_string - print a readable representation of a string using - * printer. + * notify - call a set of functions registered with add_notifier. */ void -print_string(p, len, printer, arg) - char *p; - int len; - void (*printer) __P((void *, char *, ...)); - void *arg; +notify(notif, val) + struct notifier *notif; + int val; { - int c; - - printer(arg, "\""); - for (; len > 0; --len) { - c = *p++; - if (' ' <= c && c <= '~') { - if (c == '\\' || c == '"') - printer(arg, "\\"); - printer(arg, "%c", c); - } else { - switch (c) { - case '\n': - printer(arg, "\\n"); - break; - case '\r': - printer(arg, "\\r"); - break; - case '\t': - printer(arg, "\\t"); - break; - default: - printer(arg, "\\%.3o", c); - } - } + struct notifier *np; + + while ((np = notif) != 0) { + notif = np->next; + (*np->func)(np->arg, val); } - printer(arg, "\""); } /* @@ -1340,257 +1703,7 @@ void novm(msg) char *msg; { - syslog(LOG_ERR, "Virtual memory exhausted allocating %s\n", msg); - die(1); -} - -/* - * fmtmsg - format a message into a buffer. Like sprintf except we - * also specify the length of the output buffer, and we handle - * %r (recursive format), %m (error message) and %I (IP address) formats. - * Doesn't do floating-point formats. - * Returns the number of chars put into buf. - */ -int -fmtmsg __V((char *buf, int buflen, char *fmt, ...)) -{ - va_list args; - int n; - -#if __STDC__ - va_start(args, fmt); -#else - char *buf; - int buflen; - char *fmt; - va_start(args); - buf = va_arg(args, char *); - buflen = va_arg(args, int); - fmt = va_arg(args, char *); -#endif - n = vfmtmsg(buf, buflen, fmt, args); - va_end(args); - return n; -} - -/* - * vfmtmsg - like fmtmsg, takes a va_list instead of a list of args. - */ -#define OUTCHAR(c) (buflen > 0? (--buflen, *buf++ = (c)): 0) - -int -vfmtmsg(buf, buflen, fmt, args) - char *buf; - int buflen; - char *fmt; - va_list args; -{ - int c, i, n; - int width, prec, fillch; - int base, len, neg, quoted; - unsigned long val = 0; - char *str, *f, *buf0; - unsigned char *p; - char num[32]; - time_t t; - static char hexchars[] = "0123456789abcdef"; - - buf0 = buf; - --buflen; - while (buflen > 0) { - for (f = fmt; *f != '%' && *f != 0; ++f) - ; - if (f > fmt) { - len = f - fmt; - if (len > buflen) - len = buflen; - memcpy(buf, fmt, len); - buf += len; - buflen -= len; - fmt = f; - } - if (*fmt == 0) - break; - c = *++fmt; - width = prec = 0; - fillch = ' '; - if (c == '0') { - fillch = '0'; - c = *++fmt; - } - if (c == '*') { - width = va_arg(args, int); - c = *++fmt; - } else { - while (isdigit(c)) { - width = width * 10 + c - '0'; - c = *++fmt; - } - } - if (c == '.') { - c = *++fmt; - if (c == '*') { - prec = va_arg(args, int); - c = *++fmt; - } else { - while (isdigit(c)) { - prec = prec * 10 + c - '0'; - c = *++fmt; - } - } - } - str = 0; - base = 0; - neg = 0; - ++fmt; - switch (c) { - case 'd': - i = va_arg(args, int); - if (i < 0) { - neg = 1; - val = -i; - } else - val = i; - base = 10; - break; - case 'o': - val = va_arg(args, unsigned int); - base = 8; - break; - case 'x': - val = va_arg(args, unsigned int); - base = 16; - break; - case 'p': - val = (unsigned long) va_arg(args, void *); - base = 16; - neg = 2; - break; - case 's': - str = va_arg(args, char *); - break; - case 'c': - num[0] = va_arg(args, int); - num[1] = 0; - str = num; - break; - case 'm': - str = strerror(errno); - break; - case 'I': - str = ip_ntoa(va_arg(args, u_int32_t)); - break; - case 'r': - f = va_arg(args, char *); -#ifndef __powerpc__ - n = vfmtmsg(buf, buflen + 1, f, va_arg(args, va_list)); -#else - /* On the powerpc, a va_list is an array of 1 structure */ - n = vfmtmsg(buf, buflen + 1, f, va_arg(args, void *)); -#endif - buf += n; - buflen -= n; - continue; - case 't': - time(&t); - str = ctime(&t); - str += 4; /* chop off the day name */ - str[15] = 0; /* chop off year and newline */ - break; - case 'v': /* "visible" string */ - case 'q': /* quoted string */ - quoted = c == 'q'; - p = va_arg(args, unsigned char *); - if (fillch == '0' && prec > 0) { - n = prec; - } else { - n = strlen((char *)p); - if (prec > 0 && prec < n) - n = prec; - } - while (n > 0 && buflen > 0) { - c = *p++; - --n; - if (!quoted && c >= 0x80) { - OUTCHAR('M'); - OUTCHAR('-'); - c -= 0x80; - } - if (quoted && (c == '"' || c == '\\')) - OUTCHAR('\\'); - if (c < 0x20 || (0x7f <= c && c < 0xa0)) { - if (quoted) { - OUTCHAR('\\'); - switch (c) { - case '\t': OUTCHAR('t'); break; - case '\n': OUTCHAR('n'); break; - case '\b': OUTCHAR('b'); break; - case '\f': OUTCHAR('f'); break; - default: - OUTCHAR('x'); - OUTCHAR(hexchars[c >> 4]); - OUTCHAR(hexchars[c & 0xf]); - } - } else { - if (c == '\t') - OUTCHAR(c); - else { - OUTCHAR('^'); - OUTCHAR(c ^ 0x40); - } - } - } else - OUTCHAR(c); - } - continue; - default: - *buf++ = '%'; - if (c != '%') - --fmt; /* so %z outputs %z etc. */ - --buflen; - continue; - } - if (base != 0) { - str = num + sizeof(num); - *--str = 0; - while (str > num + neg) { - *--str = hexchars[val % base]; - val = val / base; - if (--prec <= 0 && val == 0) - break; - } - switch (neg) { - case 1: - *--str = '-'; - break; - case 2: - *--str = 'x'; - *--str = '0'; - break; - } - len = num + sizeof(num) - 1 - str; - } else { - len = strlen(str); - if (prec > 0 && len > prec) - len = prec; - } - if (width > 0) { - if (width > buflen) - width = buflen; - if ((n = width - len) > 0) { - buflen -= n; - for (; n > 0; --n) - *buf++ = fillch; - } - } - if (len > buflen) - len = buflen; - memcpy(buf, str, len); - buf += len; - buflen -= len; - } - *buf = 0; - return buf - buf0; + fatal("Virtual memory exhausted allocating %s\n", msg); } /* @@ -1598,30 +1711,41 @@ vfmtmsg(buf, buflen, fmt, args) * for scripts that we run (e.g. ip-up, auth-up, etc.) */ void -script_setenv(var, value) +script_setenv(var, value, iskey) char *var, *value; + int iskey; { - int vl = strlen(var); + size_t varl = strlen(var); + size_t vl = varl + strlen(value) + 2; int i; char *p, *newstring; - newstring = (char *) malloc(vl + strlen(value) + 2); + newstring = (char *) malloc(vl+1); if (newstring == 0) return; - strcpy(newstring, var); - newstring[vl] = '='; - strcpy(newstring+vl+1, value); + *newstring++ = iskey; + slprintf(newstring, vl, "%s=%s", var, value); /* check if this variable is already set */ if (script_env != 0) { for (i = 0; (p = script_env[i]) != 0; ++i) { - if (strncmp(p, var, vl) == 0 && p[vl] == '=') { - free(p); + if (strncmp(p, var, varl) == 0 && p[varl] == '=') { +#ifdef USE_TDB + if (p[-1] && pppdb != NULL) + delete_db_key(p); +#endif + free(p-1); script_env[i] = newstring; +#ifdef USE_TDB + if (iskey && pppdb != NULL) + add_db_key(newstring); + update_db_entry(); +#endif return; } } } else { + /* no space allocated for script env. ptrs. yet */ i = 0; script_env = (char **) malloc(16 * sizeof(char *)); if (script_env == 0) @@ -1642,6 +1766,14 @@ script_setenv(var, value) script_env[i] = newstring; script_env[i+1] = 0; + +#ifdef USE_TDB + if (pppdb != NULL) { + if (iskey) + add_db_key(newstring); + update_db_entry(); + } +#endif } /* @@ -1660,10 +1792,103 @@ script_unsetenv(var) return; for (i = 0; (p = script_env[i]) != 0; ++i) { if (strncmp(p, var, vl) == 0 && p[vl] == '=') { - free(p); +#ifdef USE_TDB + if (p[-1] && pppdb != NULL) + delete_db_key(p); +#endif + free(p-1); while ((script_env[i] = script_env[i+1]) != 0) ++i; break; } } +#ifdef USE_TDB + if (pppdb != NULL) + update_db_entry(); +#endif +} + +#ifdef USE_TDB +/* + * update_db_entry - update our entry in the database. + */ +static void +update_db_entry() +{ + TDB_DATA key, dbuf; + int vlen, i; + char *p, *q, *vbuf; + + if (script_env == NULL) + return; + vlen = 0; + for (i = 0; (p = script_env[i]) != 0; ++i) + vlen += strlen(p) + 1; + vbuf = malloc(vlen); + if (vbuf == 0) + novm("database entry"); + q = vbuf; + for (i = 0; (p = script_env[i]) != 0; ++i) + q += slprintf(q, vbuf + vlen - q, "%s;", p); + + key.dptr = db_key; + key.dsize = strlen(db_key); + dbuf.dptr = vbuf; + dbuf.dsize = vlen; + if (tdb_store(pppdb, key, dbuf, TDB_REPLACE)) + error("tdb_store failed: %s", tdb_error(pppdb)); + + if (vbuf) + free(vbuf); + +} + +/* + * add_db_key - add a key that we can use to look up our database entry. + */ +static void +add_db_key(str) + const char *str; +{ + TDB_DATA key, dbuf; + + key.dptr = (char *) str; + key.dsize = strlen(str); + dbuf.dptr = db_key; + dbuf.dsize = strlen(db_key); + if (tdb_store(pppdb, key, dbuf, TDB_REPLACE)) + error("tdb_store key failed: %s", tdb_error(pppdb)); +} + +/* + * delete_db_key - delete a key for looking up our database entry. + */ +static void +delete_db_key(str) + const char *str; +{ + TDB_DATA key; + + key.dptr = (char *) str; + key.dsize = strlen(str); + tdb_delete(pppdb, key); +} + +/* + * cleanup_db - delete all the entries we put in the database. + */ +static void +cleanup_db() +{ + TDB_DATA key; + int i; + char *p; + + key.dptr = db_key; + key.dsize = strlen(db_key); + tdb_delete(pppdb, key); + for (i = 0; (p = script_env[i]) != 0; ++i) + if (p[-1]) + delete_db_key(p); } +#endif /* USE_TDB */