X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fmain.c;h=31828a788f48ae0960d00e3b594303876993ca4f;hp=1c72a8c5dcb30cfbb8657106e309b9b2f048bfcf;hb=8821c36a7798fd1c16d85ce63bcf519618975800;hpb=23b8b9ee87e6355245f4697861454eab83440a4c diff --git a/pppd/main.c b/pppd/main.c index 1c72a8c..31828a7 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -18,12 +18,14 @@ */ #ifndef lint -static char rcsid[] = "$Id: main.c,v 1.22 1995/05/01 01:44:30 paulus Exp $"; +static char rcsid[] = "$Id: main.c,v 1.75 1999/04/12 06:44:42 paulus Exp $"; #endif #include +#include #include #include +#include #include #include #include @@ -31,6 +33,7 @@ static char rcsid[] = "$Id: main.c,v 1.22 1995/05/01 01:44:30 paulus Exp $"; #include #include #include +#include #include #include #include @@ -38,7 +41,7 @@ static char rcsid[] = "$Id: main.c,v 1.22 1995/05/01 01:44:30 paulus Exp $"; #include #include #include -#include +#include #include "pppd.h" #include "magic.h" @@ -51,169 +54,294 @@ static char rcsid[] = "$Id: main.c,v 1.22 1995/05/01 01:44:30 paulus Exp $"; #include "pathnames.h" #include "patchlevel.h" -/* - * If REQ_SYSOPTIONS is defined to 1, pppd will not run unless - * /etc/ppp/options exists. - */ -#ifndef REQ_SYSOPTIONS -#define REQ_SYSOPTIONS 1 +#ifdef CBCP_SUPPORT +#include "cbcp.h" +#endif + +#if defined(SUNOS4) +extern char *strerror(); +#endif + +#ifdef IPX_CHANGE +#include "ipxcp.h" +#endif /* IPX_CHANGE */ +#ifdef AT_CHANGE +#include "atcp.h" #endif /* interface vars */ -char ifname[IFNAMSIZ]; /* Interface name */ +char ifname[32]; /* Interface name */ int ifunit; /* Interface unit number */ 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 pid_t pgrpid; /* Process Group ID */ +static char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */ +static pid_t pid; /* Our pid */ static uid_t uid; /* Our real user-id */ +static int conn_running; /* we have a [dis]connector running */ -int fd = -1; /* Device file descriptor */ +int ttyfd; /* 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 */ +int log_to_fd; /* send log messages to this fd too */ + +static int fd_ppp = -1; /* fd for talking PPP */ +static int fd_loop; /* fd for getting demand-dial packets */ +static int pty_master; /* fd for master side of pty */ +static int pty_slave; /* fd for slave side of pty */ +static int real_ttyfd; /* fd for actual serial port (not pty) */ int phase; /* where the link is at */ int kill_link; int open_ccp_flag; -static int initfdflags = -1; /* Initial file descriptor flags */ +static int waiting; +static sigjmp_buf sigjmp; + +char **script_env; /* Env. variable values for scripts */ +int s_env_nalloc; /* # words avail at script_env */ u_char outpacket_buf[PPP_MRU+PPP_HDRLEN]; /* buffer for outgoing packet */ -static u_char inpacket_buf[PPP_MRU+PPP_HDRLEN]; /* buffer for incoming packet */ +u_char inpacket_buf[PPP_MRU+PPP_HDRLEN]; /* buffer for incoming packet */ -int hungup; /* terminal has been hung up */ 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 */ + +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 */ -int baud_rate; +static struct timeval start_time; /* Time when link was started. */ -/* prototypes */ +struct pppd_stats link_stats; +int link_stats_valid; + +static int charshunt_pid; /* Process ID for charshunt */ + +/* + * 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 create_pidfile __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 *)); +static void kill_my_pg __P((int)); static void hup __P((int)); static void term __P((int)); static void chld __P((int)); static void toggle_debug __P((int)); static void open_ccp __P((int)); - -static void get_input __P((void)); -void establish_ppp __P((void)); -void calltimeout __P((void)); -struct timeval *timeleft __P((struct timeval *)); -void reap_kids __P((void)); -void cleanup __P((int, caddr_t)); -void close_fd __P((void)); -void die __P((int)); -void novm __P((char *)); - -void log_packet __P((u_char *, int, char *)); -void format_packet __P((u_char *, int, - void (*) (void *, char *, ...), void *)); -void pr_log __P((void *, char *, ...)); +static void bad_signal __P((int)); +static void holdoff_end __P((void *)); +static int device_script __P((char *, int, int, int)); +static void reap_kids __P((int waitfor)); +static void record_child __P((int, char *, void (*) (void *), void *)); +static int start_charshunt __P((int, int)); +static void charshunt_done __P((void *)); +static void charshunt __P((int, int, char *)); +static int record_write __P((FILE *, int code, u_char *buf, int nb, + struct timeval *)); extern char *ttyname __P((int)); extern char *getlogin __P((void)); +int main __P((int, char *[])); #ifdef ultrix #undef O_NONBLOCK #define O_NONBLOCK O_NDELAY #endif +#ifdef ULTRIX +#define setlogmask(x) +#endif + /* * PPP Data Link Layer "protocol" table. * One entry per supported protocol. + * The last entry must be NULL. */ -static struct protent { - u_short protocol; - void (*init)(); - void (*input)(); - void (*protrej)(); - int (*printpkt)(); - void (*datainput)(); - char *name; -} prottbl[] = { - { PPP_LCP, lcp_init, lcp_input, lcp_protrej, - lcp_printpkt, NULL, "LCP" }, - { PPP_IPCP, ipcp_init, ipcp_input, ipcp_protrej, - ipcp_printpkt, NULL, "IPCP" }, - { PPP_PAP, upap_init, upap_input, upap_protrej, - upap_printpkt, NULL, "PAP" }, - { PPP_CHAP, ChapInit, ChapInput, ChapProtocolReject, - ChapPrintPkt, NULL, "CHAP" }, - { PPP_CCP, ccp_init, ccp_input, ccp_protrej, - ccp_printpkt, ccp_datainput, "CCP" }, +struct protent *protocols[] = { + &lcp_protent, + &pap_protent, + &chap_protent, +#ifdef CBCP_SUPPORT + &cbcp_protent, +#endif + &ipcp_protent, + &ccp_protent, +#ifdef IPX_CHANGE + &ipxcp_protent, +#endif +#ifdef AT_CHANGE + &atcp_protent, +#endif + NULL }; -#define N_PROTO (sizeof(prottbl) / sizeof(prottbl[0])) - +int main(argc, argv) int argc; char *argv[]; { - int i, nonblock; + int i, fdflags; struct sigaction sa; - struct cmd *cmdp; - FILE *pidfile; char *p; struct passwd *pw; struct timeval timo; sigset_t mask; + struct protent *protp; + struct stat statbuf; + char numbuf[16]; + struct timeval now; - p = ttyname(0); - if (p) - strcpy(devnam, p); - strcpy(default_devnam, devnam); + phase = PHASE_INITIALIZE; + log_to_fd = -1; + + script_env = NULL; + + /* Initialize syslog facilities */ + reopen_log(); if (gethostname(hostname, MAXNAMELEN) < 0 ) { - perror("couldn't get hostname"); - die(1); + option_error("Couldn't get hostname: %m"); + exit(1); } hostname[MAXNAMELEN-1] = 0; uid = getuid(); + privileged = uid == 0; + slprintf(numbuf, sizeof(numbuf), "%d", uid); + script_setenv("ORIG_UID", numbuf); - if (!ppp_available()) { - fprintf(stderr, "Sorry - PPP is not available on this system\n"); - exit(1); - } + ngroups = getgroups(NGROUPS_MAX, groups); /* * Initialize to the standard option set, then parse, in order, - * the system options file, the user's options file, and the command - * line arguments. + * the system options file, the user's options file, + * the tty's options file, and the command line arguments. */ - for (i = 0; i < N_PROTO; i++) - (*prottbl[i].init)(0); - + for (i = 0; (protp = protocols[i]) != NULL; ++i) + (*protp->init)(0); + progname = *argv; - if (!options_from_file(_PATH_SYSOPTIONS, REQ_SYSOPTIONS, 0) || - !options_from_user() || - !parse_args(argc-1, argv+1) || - !options_for_tty()) - die(1); - check_auth_options(); - setipdefault(); + if (!options_from_file(_PATH_SYSOPTIONS, !privileged, 0, 1) + || !options_from_user()) + exit(1); + using_pty = notty || ptycommand != NULL; + scan_args(argc-1, argv+1); /* look for tty name on command line */ + + /* + * Work out the device name, if it hasn't already been specified. + */ + if (!using_pty) { + p = isatty(0)? ttyname(0): NULL; + if (p != NULL) { + if (default_device) + strlcpy(devnam, p, sizeof(devnam)); + else if (strcmp(devnam, p) == 0) + default_device = 1; + } + } /* - * If the user has specified the default device name explicitly, - * pretend they hadn't. + * Parse the tty options file and the command line. */ - if (!default_device && strcmp(devnam, default_devnam) == 0) - default_device = 1; + if (!options_for_tty() + || !parse_args(argc-1, argv+1)) + exit(1); + + /* + * Check that we are running as root. + */ + if (geteuid() != 0) { + option_error("must be root to run %s, since it is not setuid-root", + argv[0]); + exit(1); + } + + if (!ppp_available()) { + option_error(no_ppp_msg); + exit(1); + } + + /* + * Check that the options given are valid and consistent. + */ + if (!sys_check_options()) + exit(1); + auth_check_options(); + for (i = 0; (protp = protocols[i]) != NULL; ++i) + if (protp->check_options != NULL) + (*protp->check_options)(); + if (demand && connector == 0) { + option_error("connect script is required for demand-dialling\n"); + exit(1); + } + + if (using_pty) { + if (!default_device) { + option_error("%s option precludes specifying device name", + notty? "notty": "pty"); + exit(1); + } + if (ptycommand != NULL && notty) { + option_error("pty option is incompatible with notty option"); + exit(1); + } + default_device = notty; + lockflag = 0; + modem = 0; + } else { + if (devnam[0] == 0) { + option_error("no device specified and stdin is not a tty"); + exit(1); + } + } + if (default_device) + nodetach = 1; + else + log_to_fd = 1; /* default to stdout */ + + script_setenv("DEVICE", devnam); /* * Initialize system-dependent stuff and magic number package. */ sys_init(); magic_init(); + if (debug) + setlogmask(LOG_UPTO(LOG_DEBUG)); /* * Detach ourselves from the terminal, if required, * and identify who is running us. */ - if (!default_device && !nodetach && daemon(0, 0) < 0) { - perror("Couldn't detach from controlling terminal"); - exit(1); - } + if (!nodetach && !updetach) + detach(); pid = getpid(); p = getlogin(); if (p == NULL) { @@ -223,9 +351,10 @@ main(argc, argv) else p = "(unknown)"; } - syslog(LOG_NOTICE, "pppd %s.%d started by %s, uid %d", - VERSION, PATCHLEVEL, p, uid); - + syslog(LOG_NOTICE, "pppd %s.%d%s started by %s, uid %d", + VERSION, PATCHLEVEL, IMPLEMENTATION, p, uid); + script_setenv("PPPLOGNAME", p); + /* * Compute mask of all interesting signals and install signal handlers * for each. Only one signal handler may be active at a time. Therefore, @@ -236,14 +365,13 @@ main(argc, argv) sigaddset(&mask, SIGINT); sigaddset(&mask, SIGTERM); sigaddset(&mask, SIGCHLD); + sigaddset(&mask, SIGUSR2); -#define SIGNAL(s, handler) { \ +#define SIGNAL(s, handler) do { \ sa.sa_handler = handler; \ - if (sigaction(s, &sa, NULL) < 0) { \ - syslog(LOG_ERR, "Couldn't establish signal handler (%d): %m", s); \ - die(1); \ - } \ - } + 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; @@ -252,146 +380,541 @@ main(argc, argv) SIGNAL(SIGTERM, term); /* Terminate */ SIGNAL(SIGCHLD, chld); - signal(SIGUSR1, toggle_debug); /* Toggle debug flag */ - signal(SIGUSR2, open_ccp); /* Reopen CCP */ + 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); + + waiting = 0; /* - * Lock the device if we've been asked to. + * If we're doing dial-on-demand, set up the interface now. */ - if (lockflag && !default_device) - if (lock(devnam) < 0) - die(1); + if (demand) { + /* + * Open the loopback channel and set it up to be the ppp interface. + */ + fd_loop = open_ppp_loopback(); - do { + syslog(LOG_INFO, "Using interface ppp%d", ifunit); + slprintf(ifname, sizeof(ifname), "ppp%d", ifunit); + script_setenv("IFNAME", ifname); + + create_pidfile(); /* write pid to file */ /* - * Open the serial device and set it up to be the ppp interface. - * If we're dialling out, or we don't want to use the modem lines, - * we open it in non-blocking mode, but then we need to clear - * the non-blocking I/O bit. + * Configure the interface and mark it up, etc. */ - nonblock = (connector || !modem)? O_NONBLOCK: 0; - if ((fd = open(devnam, nonblock | O_RDWR, 0)) < 0) { - syslog(LOG_ERR, "Failed to open %s: %m", devnam); - die(1); + demand_conf(); + } + + for (;;) { + + need_holdoff = 1; + ttyfd = -1; + real_ttyfd = -1; + + if (demand) { + /* + * Don't do anything until we see some activity. + */ + kill_link = 0; + phase = PHASE_DORMANT; + demand_unblock(); + add_fd(fd_loop); + for (;;) { + if (sigsetjmp(sigjmp, 1) == 0) { + sigprocmask(SIG_BLOCK, &mask, NULL); + if (kill_link) { + sigprocmask(SIG_UNBLOCK, &mask, NULL); + } else { + waiting = 1; + sigprocmask(SIG_UNBLOCK, &mask, NULL); + wait_input(timeleft(&timo)); + } + } + waiting = 0; + calltimeout(); + if (kill_link) { + if (!persist) + break; + kill_link = 0; + } + if (get_loop_output()) + break; + if (got_sigchld) + reap_kids(0); + } + remove_fd(fd_loop); + if (kill_link && !persist) + break; + + /* + * Now we want to bring up the link. + */ + demand_block(); + info("Starting link"); } - if ((initfdflags = fcntl(fd, F_GETFL)) == -1) { - syslog(LOG_ERR, "Couldn't get device fd flags: %m"); - die(1); + + /* + * Get a pty master/slave pair if the pty, notty, or record + * options were specified. + */ + strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam)); + pty_master = -1; + pty_slave = -1; + if (ptycommand != NULL || notty || record_file != NULL) { + if (!get_pty(&pty_master, &pty_slave, ppp_devnam, uid)) { + error("Couldn't allocate pseudo-tty"); + goto fail; + } + set_up_tty(pty_slave, 1); } - if (nonblock) { - initfdflags &= ~O_NONBLOCK; - fcntl(fd, F_SETFL, initfdflags); + + /* + * 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. + */ hungup = 0; kill_link = 0; + if (devnam[0] != 0) { + for (;;) { + /* If the user specified the device name, become the + user before opening it. */ + int err; + if (!devnam_info.priv && !default_device) + seteuid(uid); + ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0); + err = errno; + if (!devnam_info.priv && !default_device) + seteuid(0); + if (ttyfd >= 0) + break; + errno = err; + if (err != EINTR) + error("Failed to open %s: %m", devnam); + if (!persist || err != EINTR) + goto fail; + } + if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1 + || fcntl(ttyfd, F_SETFL, fdflags & ~O_NONBLOCK) < 0) + warn("Couldn't reset non-blocking mode on device: %m"); + + /* + * 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) { + warn("Couldn't restrict write permissions to %s: %m", devnam); + } else + tty_mode = statbuf.st_mode; + + /* + * Set line speed, flow control, etc. + * If we have a non-null connection script, + * 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 could clear CLOCAL at this point. + */ + set_up_tty(ttyfd, (connector != NULL && connector[0] != 0)); + real_ttyfd = ttyfd; + } + + /* + * If the notty and/or record option was specified, + * start up the character shunt now. + */ + if (ptycommand != NULL) { + if (record_file != NULL) { + int ipipe[2], opipe[2], ok; + + if (pipe(ipipe) < 0 || pipe(opipe) < 0) + fatal("Couldn't create pipes for record option: %m"); + ok = device_script(ptycommand, opipe[0], ipipe[1], 1) == 0 + && start_charshunt(ipipe[0], opipe[1]); + close(ipipe[0]); + close(ipipe[1]); + close(opipe[0]); + close(opipe[1]); + if (!ok) + goto fail; + } else { + if (device_script(ptycommand, pty_master, pty_master, 1) < 0) + goto fail; + ttyfd = pty_slave; + close(pty_master); + pty_master = -1; + } + } else if (notty) { + if (!start_charshunt(0, 1)) + goto fail; + } else if (record_file != NULL) { + if (!start_charshunt(ttyfd, ttyfd)) + goto fail; + } /* run connection script */ if (connector && connector[0]) { - MAINDEBUG((LOG_INFO, "Connecting with <%s>", connector)); + MAINDEBUG(("Connecting with <%s>", connector)); - /* set line speed, flow control, etc.; set CLOCAL for now */ - set_up_tty(fd, 1); + if (real_ttyfd != -1) { + if (!default_device && modem) { + setdtr(real_ttyfd, 0); /* in case modem is off hook */ + sleep(1); + setdtr(real_ttyfd, 1); + } + } - /* drop dtr to hang up in case modem is off hook */ - if (!default_device && modem) { - setdtr(fd, FALSE); - sleep(1); - setdtr(fd, TRUE); + if (device_script(connector, ttyfd, ttyfd, 0) < 0) { + error("Connect script failed"); + goto fail; } + if (kill_link) + goto disconnect; + + info("Serial connection established."); - if (device_script(connector, fd, fd) < 0) { - syslog(LOG_ERR, "Connect script failed"); - setdtr(fd, FALSE); - die(1); + /* set line speed, flow control, etc.; + clear CLOCAL if modem option */ + if (real_ttyfd != -1) + set_up_tty(real_ttyfd, 0); + } + + /* reopen tty if necessary to wait for carrier */ + if (connector == NULL && modem && devnam[0] != 0) { + for (;;) { + if ((i = open(devnam, O_RDWR)) >= 0) + break; + if (errno != EINTR) + error("Failed to reopen %s: %m", devnam); + if (!persist || errno != EINTR || hungup || kill_link) + goto fail; } + close(i); + } - syslog(LOG_INFO, "Connected..."); - sleep(1); /* give it time to set up its terminal */ + slprintf(numbuf, sizeof(numbuf), "%d", baud_rate); + script_setenv("SPEED", numbuf); + + /* run welcome script, if any */ + if (welcomer && welcomer[0]) { + if (device_script(welcomer, ttyfd, ttyfd, 0) < 0) + warn("Welcome script failed"); } - - /* set line speed, flow control, etc.; clear CLOCAL if modem option */ - set_up_tty(fd, 0); /* set up the serial device as a ppp interface */ - establish_ppp(); + fd_ppp = establish_ppp(ttyfd); + if (fd_ppp < 0) + goto disconnect; - syslog(LOG_INFO, "Using interface ppp%d", ifunit); - (void) sprintf(ifname, "ppp%d", ifunit); + if (!demand) { + + info("Using interface ppp%d", ifunit); + slprintf(ifname, sizeof(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; + create_pidfile(); /* write pid to file */ } /* - * Set device for non-blocking reads. - */ - if (fcntl(fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) { - syslog(LOG_ERR, "Couldn't set device to non-blocking mode: %m"); - die(1); - } - - /* - * Block all signals, start opening the connection, and wait for + * Start opening the connection and wait for * incoming events (reply, timeout, etc.). */ - syslog(LOG_NOTICE, "Connect: %s <--> %s", ifname, devnam); + notice("Connect: %s <--> %s", ifname, ppp_devnam); + gettimeofday(&start_time, NULL); lcp_lowerup(0); + + /* + * If we are initiating this connection, wait for a short + * time for something from the peer. This can avoid bouncing + * our packets off his tty before he has it set up. + */ + if (connector != NULL || ptycommand != NULL) { + struct timeval t; + t.tv_sec = 1; + t.tv_usec = 0; + wait_input(&t); + } + lcp_open(0); /* Start protocol */ + open_ccp_flag = 0; + add_fd(fd_ppp); for (phase = PHASE_ESTABLISH; phase != PHASE_DEAD; ) { - wait_input(timeleft(&timo)); + if (sigsetjmp(sigjmp, 1) == 0) { + sigprocmask(SIG_BLOCK, &mask, NULL); + if (kill_link || open_ccp_flag) { + sigprocmask(SIG_UNBLOCK, &mask, NULL); + } else { + waiting = 1; + sigprocmask(SIG_UNBLOCK, &mask, NULL); + wait_input(timeleft(&timo)); + } + } + waiting = 0; calltimeout(); + get_input(); if (kill_link) { - lcp_close(0); + lcp_close(0, "User request"); kill_link = 0; } if (open_ccp_flag) { if (phase == PHASE_NETWORK) { ccp_fsm[0].flags = OPT_RESTART; /* clears OPT_SILENT */ - ccp_open(0); + (*ccp_protent.open)(0); } open_ccp_flag = 0; } - get_input(); - reap_kids(); /* Don't leave dead kids lying around */ + if (got_sigchld) + reap_kids(0); /* Don't leave dead kids lying around */ + } + + /* + * Print connect time and statistics. + */ + if (gettimeofday(&now, NULL) >= 0) { + int t = now.tv_sec - start_time.tv_sec; + t = (t + 5) / 6; /* now in 1/10ths of minutes */ + info("Connect time %d.%d minutes.", t/10, t%10); } + if (link_stats_valid) { + info("Sent %d bytes, received %d bytes.", + link_stats.bytes_out, link_stats.bytes_in); + } + + /* + * If we may want to bring the link up again, transfer + * 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); + fd_ppp = -1; + if (!hungup) + lcp_lowerdown(0); /* * Run disconnector script, if requested. - * First we need to reset non-blocking mode. + * XXX we may not be able to do this if the line has hung up! */ - if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) >= 0) - initfdflags = -1; - disestablish_ppp(); - if (disconnector) { - set_up_tty(fd, 1); - if (device_script(disconnector, fd, fd) < 0) { - syslog(LOG_WARNING, "disconnect script failed"); - die(1); + disconnect: + if (disconnector && !hungup) { + if (real_ttyfd >= 0) + set_up_tty(real_ttyfd, 1); + if (device_script(disconnector, ttyfd, ttyfd, 0) < 0) { + warn("disconnect script failed"); + } else { + info("Serial link disconnected."); } + } - syslog(LOG_INFO, "Disconnected..."); + fail: + if (pty_master >= 0) + close(pty_master); + if (pty_slave >= 0) + close(pty_slave); + if (real_ttyfd >= 0) + close_tty(); + if (locked) { + unlock(); + locked = 0; } - close_fd(); - if (unlink(pidfilename) < 0 && errno != ENOENT) - syslog(LOG_WARNING, "unable to delete pid file: %m"); - pidfilename[0] = 0; + if (!demand) { + if (pidfilename[0] != 0 + && unlink(pidfilename) < 0 && errno != ENOENT) + warn("unable to delete pid file: %m"); + pidfilename[0] = 0; + } - } while (persist); + if (!persist) + break; - if (lockflag && !default_device) - unlock(); + kill_link = 0; + if (demand) + demand_discard(); + if (holdoff > 0 && need_holdoff) { + phase = PHASE_HOLDOFF; + TIMEOUT(holdoff_end, NULL, holdoff); + do { + if (sigsetjmp(sigjmp, 1) == 0) { + sigprocmask(SIG_BLOCK, &mask, NULL); + if (kill_link) { + sigprocmask(SIG_UNBLOCK, &mask, NULL); + } else { + waiting = 1; + sigprocmask(SIG_UNBLOCK, &mask, NULL); + wait_input(timeleft(&timo)); + } + } + waiting = 0; + calltimeout(); + if (kill_link) { + kill_link = 0; + phase = PHASE_DORMANT; /* allow signal to end holdoff */ + } + if (got_sigchld) + reap_kids(0); + } while (phase == PHASE_HOLDOFF); + if (!persist) + break; + } + } - exit(0); + /* Wait for scripts to finish */ + 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); + } + reap_kids(1); + } + + die(0); + return 0; +} + +/* + * detach - detach us from the controlling terminal. + */ +void +detach() +{ + int pid; + + if (detached) + return; + if ((pid = fork()) < 0) { + error("Couldn't detach (fork failed: %m)"); + die(1); /* or just return? */ + } + if (pid != 0) { + /* parent */ + if (locked) + relock(pid); + exit(0); /* parent dies */ + } + setsid(); + chdir("/"); + close(0); /* XXX we should make sure that none */ + close(1); /* of the fds we need are <= 2 */ + close(2); + detached = 1; + log_to_fd = -1; + pid = getpid(); + /* update pid file if it has been written already */ + if (pidfilename[0]) + create_pidfile(); } +/* + * reopen_log - (re)open our connection to syslog. + */ +void +reopen_log() +{ +#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; + char numbuf[16]; + + slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid", + _PATH_VARRUN, ifname); + if ((pidfile = fopen(pidfilename, "w")) != NULL) { + fprintf(pidfile, "%d\n", pid); + (void) fclose(pidfile); + } else { + error("Failed to create pid file %s: %m", pidfilename); + pidfilename[0] = 0; + } + slprintf(numbuf, sizeof(numbuf), "%d", pid); + script_setenv("PPPD_PID", numbuf); +} + +/* + * holdoff_end - called via a timeout when the holdoff period ends. + */ +static void +holdoff_end(arg) + void *arg; +{ + phase = PHASE_DORMANT; +} /* * get_input - called when incoming data is available. @@ -402,6 +925,7 @@ get_input() int len, i; u_char *p; u_short protocol; + struct protent *protp; p = inpacket_buf; /* point to beginning of packet buffer */ @@ -410,18 +934,18 @@ get_input() return; if (len == 0) { - MAINDEBUG((LOG_DEBUG, "End of file on fd!")); + notice("Modem hangup"); hungup = 1; lcp_lowerdown(0); /* serial link is no longer available */ - phase = PHASE_DEAD; + link_terminated(0); return; } if (debug /*&& (debugflags & DBG_INPACKET)*/) - log_packet(p, len, "rcvd "); + dbglog("rcvd %P", p, len); if (len < PPP_HDRLEN) { - MAINDEBUG((LOG_INFO, "io(): Received short packet.")); + MAINDEBUG(("io(): Received short packet.")); return; } @@ -433,74 +957,51 @@ get_input() * Toss all non-LCP packets unless LCP is OPEN. */ if (protocol != PPP_LCP && lcp_fsm[0].state != OPENED) { - MAINDEBUG((LOG_INFO, - "io(): Received non-LCP packet when LCP not open.")); + MAINDEBUG(("get_input: Received non-LCP packet when LCP not open.")); return; } /* - * Upcall the proper protocol input routine. + * Until we get past the authentication phase, toss all packets + * except LCP, LQR and authentication packets. */ - for (i = 0; i < sizeof (prottbl) / sizeof (struct protent); i++) - if (prottbl[i].protocol == protocol) { - (*prottbl[i].input)(0, p, len); - break; - } else if (protocol == (prottbl[i].protocol & ~0x8000) - && prottbl[i].datainput != NULL) { - (*prottbl[i].datainput)(0, p, len); - break; - } - - if (i == sizeof (prottbl) / sizeof (struct protent)) { - if (debug) - syslog(LOG_WARNING, "Unknown protocol (0x%x) received", protocol); - lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN); + if (phase <= PHASE_AUTHENTICATE + && !(protocol == PPP_LCP || protocol == PPP_LQR + || protocol == PPP_PAP || protocol == PPP_CHAP)) { + MAINDEBUG(("get_input: discarding proto 0x%x in phase %d", + protocol, phase)); + return; } -} - - -/* - * demuxprotrej - Demultiplex a Protocol-Reject. - */ -void -demuxprotrej(unit, protocol) - int unit; - u_short protocol; -{ - int i; /* - * Upcall the proper Protocol-Reject routine. + * Upcall the proper protocol input routine. */ - for (i = 0; i < sizeof (prottbl) / sizeof (struct protent); i++) - if (prottbl[i].protocol == protocol) { - (*prottbl[i].protrej)(unit); + for (i = 0; (protp = protocols[i]) != NULL; ++i) { + if (protp->protocol == protocol && protp->enabled_flag) { + (*protp->input)(0, p, len); return; } + if (protocol == (protp->protocol & ~0x8000) && protp->enabled_flag + && protp->datainput != NULL) { + (*protp->datainput)(0, p, len); + return; + } + } - syslog(LOG_WARNING, - "demuxprotrej: Unrecognized Protocol-Reject for protocol 0x%x", - protocol); + if (debug) + warn("Unsupported protocol (0x%x) received", protocol); + lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN); } /* - * quit - Clean up state and exit. - */ -void -quit() -{ - die(0); -} - -/* - * 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; { - cleanup(0, NULL); + cleanup(); syslog(LOG_INFO, "Exit."); exit(status); } @@ -509,49 +1010,58 @@ die(status) * cleanup - restore anything which needs to be restored before we exit */ /* ARGSUSED */ -void -cleanup(status, arg) - int status; - caddr_t arg; +static void +cleanup() { - if (fd >= 0) - close_fd(); + sys_cleanup(); + + if (fd_ppp >= 0) + disestablish_ppp(ttyfd); + if (real_ttyfd >= 0) + close_tty(); if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT) - syslog(LOG_WARNING, "unable to delete pid file: %m"); + warn("unable to delete pid file: %m"); pidfilename[0] = 0; - if (lockflag && !default_device) + if (locked) unlock(); } /* - * close_fd - restore the terminal device and close it. + * close_tty - restore the terminal device and close it. */ -void -close_fd() +static void +close_tty() { /* drop dtr to hang up */ - if (modem) - setdtr(fd, FALSE); - - if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0) - syslog(LOG_WARNING, "Couldn't restore device fd flags: %m"); - initfdflags = -1; + if (!default_device && modem) { + setdtr(real_ttyfd, 0); + /* + * 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); + } - disestablish_ppp(); + restore_tty(real_ttyfd); - restore_tty(); + if (tty_mode != (mode_t) -1) { + if (fchmod(real_ttyfd, tty_mode) != 0) { + /* XXX if devnam is a symlink, this will change the link */ + chmod(devnam, tty_mode); + } + } - close(fd); - fd = -1; + close(real_ttyfd); + real_ttyfd = -1; } struct callout { struct timeval c_time; /* time at which to call routine */ - caddr_t c_arg; /* argument to routine */ - void (*c_func)(); /* routine */ + void *c_arg; /* argument to routine */ + void (*c_func) __P((void *)); /* routine */ struct callout *c_next; }; @@ -566,22 +1076,19 @@ static struct timeval timenow; /* Current time */ */ void timeout(func, arg, time) - void (*func)(); - caddr_t arg; + void (*func) __P((void *)); + void *arg; int time; { 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 seconds.", func, arg, time)); /* * 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); @@ -594,7 +1101,7 @@ timeout(func, arg, time) 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; @@ -606,14 +1113,12 @@ timeout(func, arg, time) */ void untimeout(func, arg) - void (*func)(); - caddr_t arg; + void (*func) __P((void *)); + void *arg; { - struct itimerval itv; struct callout **copp, *freep; - int reschedule = 0; - 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. @@ -630,7 +1135,7 @@ untimeout(func, arg) /* * calltimeout - Call any timeout routines which are now due. */ -void +static void calltimeout() { struct callout *p; @@ -638,10 +1143,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))) @@ -658,7 +1161,7 @@ calltimeout() /* * timeleft - return the length of time until the next timeout is due. */ -struct timeval * +static struct timeval * timeleft(tvp) struct timeval *tvp; { @@ -677,7 +1180,24 @@ timeleft(tvp) return tvp; } - + + +/* + * kill_my_pg - send a signal to our process group, and ignore it ourselves. + */ +static void +kill_my_pg(sig) + int sig; +{ + struct sigaction act, oldact; + + act.sa_handler = SIG_IGN; + act.sa_flags = 0; + kill(0, sig); + sigaction(sig, &act, &oldact); + sigaction(sig, &oldact, NULL); +} + /* * hup - Catch SIGHUP signal. @@ -690,8 +1210,15 @@ static void hup(sig) int sig; { - syslog(LOG_INFO, "Hangup (SIGHUP)"); + info("Hangup (SIGHUP)"); kill_link = 1; + if (conn_running) + /* Send the signal to the [dis]connector process(es) also */ + kill_my_pg(sig); + if (charshunt_pid) + kill(charshunt_pid, sig); + if (waiting) + siglongjmp(sigjmp, 1); } @@ -705,21 +1232,30 @@ static void term(sig) int sig; { - syslog(LOG_INFO, "Terminating on signal %d.", sig); + info("Terminating on signal %d.", sig); persist = 0; /* don't try to restart */ kill_link = 1; + if (conn_running) + /* Send the signal to the [dis]connector process(es) also */ + kill_my_pg(sig); + if (charshunt_pid) + kill(charshunt_pid, 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); } @@ -734,7 +1270,11 @@ toggle_debug(sig) int sig; { debug = !debug; - note_debug_level(); + if (debug) { + setlogmask(LOG_UPTO(LOG_DEBUG)); + } else { + setlogmask(LOG_UPTO(LOG_WARNING)); + } } @@ -749,44 +1289,114 @@ open_ccp(sig) int sig; { open_ccp_flag = 1; + if (waiting) + siglongjmp(sigjmp, 1); } /* - * device_script - run a program to connect or disconnect the - * serial device. + * bad_signal - We've caught a fatal signal. Clean up state and exit. */ -int -device_script(program, in, out) +static void +bad_signal(sig) + int sig; +{ + static int crashed = 0; + + if (crashed) + _exit(127); + crashed = 1; + error("Fatal signal %d", sig); + if (conn_running) + kill_my_pg(SIGTERM); + if (charshunt_pid) + kill(charshunt_pid, SIGTERM); + die(1); +} + + +/* + * device_script - run a program to talk to the serial device + * (e.g. to run the connector or disconnector script). + */ +static int +device_script(program, in, out, dont_wait) char *program; int in, out; + int dont_wait; { int pid; - int status; + int status = -1; + int errfd; + ++conn_running; pid = fork(); if (pid < 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) { - setuid(getuid()); + sys_close(); + closelog(); + if (in == 2) { + /* aargh!!! */ + int newin = dup(in); + if (in == out) + out = newin; + in = newin; + } else if (out == 2) { + out = dup(out); + } + if (log_to_fd >= 0) { + if (log_to_fd != 2) + dup2(log_to_fd, 2); + } else { + close(2); + errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600); + if (errfd >= 0 && errfd != 2) { + dup2(errfd, 2); + close(errfd); + } + } + if (in != 0) { + if (out == 0) + out = dup(out); + dup2(in, 0); + } + if (out != 1) { + dup2(out, 1); + } + if (real_ttyfd > 2) + close(real_ttyfd); + if (pty_master > 2) + close(pty_master); + if (pty_slave > 2) + close(pty_slave); + setuid(uid); + if (getuid() != uid) { + error("setuid failed"); + exit(1); + } setgid(getgid()); - dup2(in, 0); - dup2(out, 1); execl("/bin/sh", "sh", "-c", program, (char *)0); - syslog(LOG_ERR, "could not exec /bin/sh: %m"); - _exit(99); + error("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); + if (dont_wait) { + record_child(pid, program, NULL, NULL); + status = 0; + } else { + while (waitpid(pid, &status, 0) < 0) { + if (errno == EINTR) + continue; + fatal("error waiting for (dis)connection process: %m"); + } + --conn_running; } return (status == 0 ? 0 : -1); @@ -798,37 +1408,60 @@ 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; - char *nullenv[1]; + 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. */ + sys_close(); + closelog(); close (0); close (1); close (2); - close (fd); /* tty interface to the ppp device */ - /* XXX should call sysdep cleanup procedure here */ + close (ttyfd); /* tty interface to the ppp device */ + if (real_ttyfd >= 0) + close(real_ttyfd); /* Don't pass handles to the PPP device, even by accident. */ new_fd = open (_PATH_DEVNULL, O_RDWR); @@ -844,21 +1477,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 */ - nullenv[0] = NULL; - execve(prog, args, nullenv); - if (must_exist || errno != ENOENT) - syslog(LOG_WARNING, "Can't execute %s: %m", prog); + /* run the program */ + execve(prog, args, script_env); + 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. + */ +static 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; + } } @@ -866,168 +1535,402 @@ run_program(prog, args, must_exist) * reap_kids - get status from any dead child processes, * and log a message for abnormal terminations. */ -void -reap_kids() +static void +reap_kids(waitfor) + int waitfor; { int pid, status; + struct subprocess *chp, **prevp; + got_sigchld = 0; 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) { + while ((pid = waitpid(-1, &status, (waitfor? 0: WNOHANG))) != -1 + && pid != 0) { --n_children; + for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) + if (chp->pid == pid) + break; if (WIFSIGNALED(status)) { - syslog(LOG_WARNING, "Child process %d terminated with signal %d", - pid, WTERMSIG(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, status); + if (chp && chp->done) + (*chp->done)(chp->arg); } + if (pid == -1 && errno != ECHILD && errno != EINTR) + error("Error waiting for child process: %m"); } /* - * log_packet - format a packet and log it. + * novm - log an error message saying we ran out of memory, and die. */ - -char line[256]; /* line to be logged accumulated here */ -char *linep; - void -log_packet(p, len, prefix) - u_char *p; - int len; - char *prefix; +novm(msg) + char *msg; { - strcpy(line, prefix); - linep = line + strlen(line); - format_packet(p, len, pr_log, NULL); - if (linep != line) - syslog(LOG_DEBUG, "%s", line); + fatal("Virtual memory exhausted allocating %s\n", msg); } /* - * format_packet - make a readable representation of a packet, - * calling `printer(arg, format, ...)' to output it. + * script_setenv - set an environment variable value to be used + * for scripts that we run (e.g. ip-up, auth-up, etc.) */ void -format_packet(p, len, printer, arg) - u_char *p; - int len; - void (*printer) __P((void *, char *, ...)); - void *arg; +script_setenv(var, value) + char *var, *value; { - int i, n; - u_short proto; - u_char x; - - if (len >= PPP_HDRLEN && p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) { - p += 2; - GETSHORT(proto, p); - len -= PPP_HDRLEN; - for (i = 0; i < N_PROTO; ++i) - if (proto == prottbl[i].protocol) - break; - if (i < N_PROTO) { - printer(arg, "[%s", prottbl[i].name); - n = (*prottbl[i].printpkt)(p, len, printer, arg); - printer(arg, "]"); - p += n; - len -= n; - } else { - printer(arg, "[proto=0x%x]", proto); + size_t vl = strlen(var) + strlen(value) + 2; + int i; + char *p, *newstring; + + newstring = (char *) malloc(vl); + if (newstring == 0) + return; + 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); + script_env[i] = newstring; + return; + } } + } else { + i = 0; + script_env = (char **) malloc(16 * sizeof(char *)); + if (script_env == 0) + return; + s_env_nalloc = 16; } - for (; len > 0; --len) { - GETCHAR(x, p); - printer(arg, " %.2x", x); + /* reallocate script_env with more space if needed */ + if (i + 1 >= s_env_nalloc) { + int new_n = i + 17; + char **newenv = (char **) realloc((void *)script_env, + new_n * sizeof(char *)); + if (newenv == 0) + return; + script_env = newenv; + s_env_nalloc = new_n; } -} -#ifdef __STDC__ -#include + script_env[i] = newstring; + script_env[i+1] = 0; +} +/* + * script_unsetenv - remove a variable from the environment + * for scripts. + */ void -pr_log(void *arg, char *fmt, ...) +script_unsetenv(var) + char *var; { - int n; - va_list pvar; - char buf[256]; - - va_start(pvar, fmt); - vsprintf(buf, fmt, pvar); - va_end(pvar); - - n = strlen(buf); - if (linep + n + 1 > line + sizeof(line)) { - syslog(LOG_DEBUG, "%s", line); - linep = line; + int vl = strlen(var); + int i; + char *p; + + if (script_env == 0) + return; + for (i = 0; (p = script_env[i]) != 0; ++i) { + if (strncmp(p, var, vl) == 0 && p[vl] == '=') { + free(p); + while ((script_env[i] = script_env[i+1]) != 0) + ++i; + break; + } } - strcpy(linep, buf); - linep += n; } -#else /* __STDC__ */ -#include - -void -pr_log(arg, fmt, va_alist) -void *arg; -char *fmt; -va_dcl +/* + * start_charshunt - create a child process to run the character shunt. + */ +static int +start_charshunt(ifd, ofd) + int ifd, ofd; { - int n; - va_list pvar; - char buf[256]; - - va_start(pvar); - vsprintf(buf, fmt, pvar); - va_end(pvar); - - n = strlen(buf); - if (linep + n + 1 > line + sizeof(line)) { - syslog(LOG_DEBUG, "%s", line); - linep = line; + int cpid; + + cpid = fork(); + if (cpid == -1) { + error("Can't fork process for character shunt: %m"); + return 0; + } + if (cpid == 0) { + /* child */ + close(pty_slave); + setuid(uid); + if (getuid() != uid) + fatal("setuid failed"); + setgid(getgid()); + if (!nodetach) + log_to_fd = -1; + charshunt(ifd, ofd, record_file); + exit(0); } - strcpy(linep, buf); - linep += n; + charshunt_pid = cpid; + close(pty_master); + pty_master = -1; + ttyfd = pty_slave; + record_child(cpid, "pppd (charshunt)", charshunt_done, NULL); + return 1; +} + +static void +charshunt_done(arg) + void *arg; +{ + charshunt_pid = 0; } -#endif /* - * print_string - print a readable representation of a string using - * printer. + * charshunt - the character shunt, which passes characters between + * the pty master side and the serial port (or stdin/stdout). + * This runs as the user (not as root). + * (We assume ofd >= ifd which is true the way this gets called. :-). */ -void -print_string(p, len, printer, arg) - char *p; - int len; - void (*printer) __P((void *, char *, ...)); - void *arg; +static void +charshunt(ifd, ofd, record_file) + int ifd, ofd; + char *record_file; { - int c; + int n, nfds; + fd_set ready, writey; + u_char *ibufp, *obufp; + int nibuf, nobuf; + int flags; + int pty_readable, stdin_readable; + struct timeval lasttime; + FILE *recordf = NULL; - printer(arg, "\""); - for (; len > 0; --len) { - c = *p++; - if (' ' <= c && c <= '~') - printer(arg, "%c", c); - else - printer(arg, "\\%.3o", c); + /* + * Reset signal handlers. + */ + signal(SIGHUP, SIG_IGN); /* Hangup */ + signal(SIGINT, SIG_DFL); /* Interrupt */ + signal(SIGTERM, SIG_DFL); /* Terminate */ + signal(SIGCHLD, SIG_DFL); + signal(SIGUSR1, SIG_DFL); + signal(SIGUSR2, SIG_DFL); + signal(SIGABRT, SIG_DFL); + signal(SIGALRM, SIG_DFL); + signal(SIGFPE, SIG_DFL); + signal(SIGILL, SIG_DFL); + signal(SIGPIPE, SIG_DFL); + signal(SIGQUIT, SIG_DFL); + signal(SIGSEGV, SIG_DFL); +#ifdef SIGBUS + signal(SIGBUS, SIG_DFL); +#endif +#ifdef SIGEMT + signal(SIGEMT, SIG_DFL); +#endif +#ifdef SIGPOLL + signal(SIGPOLL, SIG_DFL); +#endif +#ifdef SIGPROF + signal(SIGPROF, SIG_DFL); +#endif +#ifdef SIGSYS + signal(SIGSYS, SIG_DFL); +#endif +#ifdef SIGTRAP + signal(SIGTRAP, SIG_DFL); +#endif +#ifdef SIGVTALRM + signal(SIGVTALRM, SIG_DFL); +#endif +#ifdef SIGXCPU + signal(SIGXCPU, SIG_DFL); +#endif +#ifdef SIGXFSZ + signal(SIGXFSZ, SIG_DFL); +#endif + + /* + * Open the record file if required. + */ + if (record_file != NULL) { + recordf = fopen(record_file, "a"); + if (recordf == NULL) + error("Couldn't create record file %s: %m", record_file); + } + + /* set all the fds to non-blocking mode */ + flags = fcntl(pty_master, F_GETFL); + if (flags == -1 + || fcntl(pty_master, F_SETFL, flags | O_NONBLOCK) == -1) + warn("couldn't set pty master to nonblock: %m"); + flags = fcntl(ifd, F_GETFL); + if (flags == -1 + || fcntl(ifd, F_SETFL, flags | O_NONBLOCK) == -1) + warn("couldn't set %s to nonblock: %m", (ifd==0? "stdin": "tty")); + if (ofd != ifd) { + flags = fcntl(ofd, F_GETFL); + if (flags == -1 + || fcntl(ofd, F_SETFL, flags | O_NONBLOCK) == -1) + warn("couldn't set stdout to nonblock: %m"); + } + + nibuf = nobuf = 0; + ibufp = obufp = NULL; + pty_readable = stdin_readable = 1; + nfds = (ofd > pty_master? ofd: pty_master) + 1; + if (recordf != NULL) { + gettimeofday(&lasttime, NULL); + putc(7, recordf); /* put start marker */ + putc(lasttime.tv_sec >> 24, recordf); + putc(lasttime.tv_sec >> 16, recordf); + putc(lasttime.tv_sec >> 8, recordf); + putc(lasttime.tv_sec, recordf); + lasttime.tv_usec = 0; + } + + while (nibuf != 0 || nobuf != 0 || pty_readable || stdin_readable) { + FD_ZERO(&ready); + FD_ZERO(&writey); + if (nibuf != 0) + FD_SET(pty_master, &writey); + else if (stdin_readable) + FD_SET(ifd, &ready); + if (nobuf != 0) + FD_SET(ofd, &writey); + else if (pty_readable) + FD_SET(pty_master, &ready); + if (select(nfds, &ready, &writey, NULL, NULL) < 0) { + if (errno != EINTR) + fatal("select"); + continue; + } + if (FD_ISSET(ifd, &ready)) { + ibufp = inpacket_buf; + nibuf = read(ifd, ibufp, sizeof(inpacket_buf)); + if (nibuf < 0 && errno == EIO) + nibuf = 0; + if (nibuf < 0) { + if (!(errno == EINTR || errno == EAGAIN)) { + error("Error reading standard input: %m"); + break; + } + nibuf = 0; + } else if (nibuf == 0) { + /* end of file from stdin */ + stdin_readable = 0; + /* do a 0-length write, hopefully this will generate + an EOF (hangup) on the slave side. */ + write(pty_master, inpacket_buf, 0); + if (recordf) + if (!record_write(recordf, 4, NULL, 0, &lasttime)) + recordf = NULL; + } else { + FD_SET(pty_master, &writey); + if (recordf) + if (!record_write(recordf, 2, ibufp, nibuf, &lasttime)) + recordf = NULL; + } + } + if (FD_ISSET(pty_master, &ready)) { + obufp = outpacket_buf; + nobuf = read(pty_master, obufp, sizeof(outpacket_buf)); + if (nobuf < 0 && errno == EIO) + nobuf = 0; + if (nobuf < 0) { + if (!(errno == EINTR || errno == EAGAIN)) { + error("Error reading pseudo-tty master: %m"); + break; + } + nobuf = 0; + } else if (nobuf == 0) { + /* end of file from the pty - slave side has closed */ + pty_readable = 0; + stdin_readable = 0; /* pty is not writable now */ + nibuf = 0; + close(ofd); + if (recordf) + if (!record_write(recordf, 3, NULL, 0, &lasttime)) + recordf = NULL; + } else { + FD_SET(ofd, &writey); + if (recordf) + if (!record_write(recordf, 1, obufp, nobuf, &lasttime)) + recordf = NULL; + } + } + if (FD_ISSET(ofd, &writey)) { + n = write(ofd, obufp, nobuf); + if (n < 0) { + if (errno != EIO) { + error("Error writing standard output: %m"); + break; + } + pty_readable = 0; + nobuf = 0; + } else { + obufp += n; + nobuf -= n; + } + } + if (FD_ISSET(pty_master, &writey)) { + n = write(pty_master, ibufp, nibuf); + if (n < 0) { + if (errno != EIO) { + error("Error writing pseudo-tty master: %m"); + break; + } + stdin_readable = 0; + nibuf = 0; + } else { + ibufp += n; + nibuf -= n; + } + } } - printer(arg, "\""); + exit(0); } -/* - * novm - log an error message saying we ran out of memory, and die. - */ -void -novm(msg) - char *msg; +static int +record_write(f, code, buf, nb, tp) + FILE *f; + int code; + u_char *buf; + int nb; + struct timeval *tp; { - syslog(LOG_ERR, "Virtual memory exhausted allocating %s\n", msg); - die(1); + struct timeval now; + int diff; + + gettimeofday(&now, NULL); + now.tv_usec /= 100000; /* actually 1/10 s, not usec now */ + diff = (now.tv_sec - tp->tv_sec) * 10 + (now.tv_usec - tp->tv_usec); + if (diff > 0) { + if (diff > 255) { + putc(5, f); + putc(diff >> 24, f); + putc(diff >> 16, f); + putc(diff >> 8, f); + putc(diff, f); + } else { + putc(6, f); + putc(diff, f); + } + *tp = now; + } + putc(code, f); + if (buf != NULL) { + putc(nb >> 8, f); + putc(nb, f); + fwrite(buf, nb, 1, f); + } + fflush(f); + if (ferror(f)) { + error("Error writing record file: %m"); + return 0; + } + return 1; }