X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fmain.c;h=c3d72a2dae9840b83ce13552721b50f2748267a4;hp=273e90a822a350390f2e3a4db6110283e3dcc2e8;hb=00d6a7e0e3fbe64dcfbfd36eeb45388236c4345e;hpb=0e3ef87b18e5b71756b5b78e30775697573aac61 diff --git a/pppd/main.c b/pppd/main.c index 273e90a..c3d72a2 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -18,10 +18,11 @@ */ #ifndef lint -static char rcsid[] = "$Id: main.c,v 1.38 1996/10/08 04:35:03 paulus Exp $"; +static char rcsid[] = "$Id: main.c,v 1.59 1999/03/16 02:50:15 paulus Exp $"; #endif #include +#include #include #include #include @@ -32,6 +33,7 @@ static char rcsid[] = "$Id: main.c,v 1.38 1996/10/08 04:35:03 paulus Exp $"; #include #include #include +#include #include #include #include @@ -39,7 +41,7 @@ static char rcsid[] = "$Id: main.c,v 1.38 1996/10/08 04:35:03 paulus Exp $"; #include #include #include -#include +#include #include "pppd.h" #include "magic.h" @@ -63,9 +65,12 @@ extern char *strerror(); #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 */ @@ -82,11 +87,21 @@ 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_stderr; /* send log messages to stderr too */ + +static int fd_ppp; /* 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 redirect_stderr; /* Connector's stderr should go to file */ + +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 */ u_char inpacket_buf[PPP_MRU+PPP_HDRLEN]; /* buffer for incoming packet */ @@ -97,14 +112,18 @@ 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 */ + /* 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 connect_time_expired __P((caddr_t)); 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)); @@ -115,9 +134,12 @@ 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 void logit __P((int, char *, va_list)); +static void vslp_printer __P((void *, char *, ...)); extern char *ttyname __P((int)); extern char *getlogin __P((void)); +int main __P((int, char *[])); #ifdef ultrix #undef O_NONBLOCK @@ -144,6 +166,9 @@ struct protent *protocols[] = { &ccp_protent, #ifdef IPX_CHANGE &ipxcp_protent, +#endif +#ifdef AT_CHANGE + &atcp_protent, #endif NULL }; @@ -153,21 +178,23 @@ main(argc, argv) int argc; char *argv[]; { - int i, nonblock, fdflags; + int i, fdflags; struct sigaction sa; - FILE *pidfile; 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); + strlcpy(devnam, sizeof(devnam), p); + strlcpy(default_devnam, sizeof(default_devnam), devnam); + + script_env = NULL; /* Initialize syslog facilities */ #ifdef ULTRIX @@ -178,13 +205,17 @@ main(argc, argv) #endif if (gethostname(hostname, MAXNAMELEN) < 0 ) { - syslog(LOG_ERR, "couldn't get hostname: %m"); - 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); + + ngroups = getgroups(NGROUPS_MAX, groups); /* * Initialize to the standard option set, then parse, in order, @@ -193,7 +224,7 @@ main(argc, argv) */ for (i = 0; (protp = protocols[i]) != NULL; ++i) (*protp->init)(0); - + progname = *argv; if (!options_from_file(_PATH_SYSOPTIONS, !privileged, 0, 1) @@ -204,6 +235,15 @@ main(argc, argv) || !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); @@ -212,23 +252,30 @@ main(argc, argv) /* * Check that the options given are valid and consistent. */ - sys_check_options(); + 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 required for demand-dialling\n"); + option_error("connect script is required for demand-dialling\n"); exit(1); } + script_setenv("DEVICE", devnam); + slprintf(numbuf, sizeof(numbuf), "%d", baud_rate); + script_setenv("SPEED", numbuf); + /* * If the user has specified the default device name explicitly, * pretend they hadn't. */ if (!default_device && strcmp(devnam, default_devnam) == 0) default_device = 1; - redirect_stderr = !nodetach || default_device; + if (default_device) + nodetach = 1; + log_to_stderr = !default_device; /* * Initialize system-dependent stuff and magic number package. @@ -242,10 +289,8 @@ main(argc, argv) * 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) { @@ -255,8 +300,8 @@ 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); /* * Compute mask of all interesting signals and install signal handlers @@ -268,14 +313,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; @@ -333,6 +377,8 @@ main(argc, argv) */ signal(SIGPIPE, SIG_IGN); + waiting = 0; + /* * If we're doing dial-on-demand, set up the interface now. */ @@ -340,20 +386,13 @@ main(argc, argv) /* * Open the loopback channel and set it up to be the ppp interface. */ - open_ppp_loopback(); + fd_loop = open_ppp_loopback(); syslog(LOG_INFO, "Using interface ppp%d", ifunit); - (void) sprintf(ifname, "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 */ /* * Configure the interface and mark it up, etc. @@ -369,27 +408,41 @@ main(argc, argv) /* * Don't do anything until we see some activity. */ - phase = PHASE_DORMANT; kill_link = 0; + phase = PHASE_DORMANT; demand_unblock(); + add_fd(fd_loop); for (;;) { - wait_loop_output(timeleft(&timo)); + 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) - die(0); + break; kill_link = 0; } 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"); + info("Starting link"); } /* @@ -403,109 +456,131 @@ main(argc, argv) /* * 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. + * 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. */ - nonblock = (connector || !modem)? O_NONBLOCK: 0; - if ((ttyfd = open(devnam, nonblock | O_RDWR, 0)) < 0) { - syslog(LOG_ERR, "Failed to open %s: %m", devnam); - goto fail; - } - if (nonblock) { - 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; + for (;;) { + /* If the user specified the device name, become the + user before opening it. */ + if (!devnam_info.priv) + seteuid(uid); + ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0); + if (!devnam_info.priv) + seteuid(0); + if (ttyfd >= 0) + break; + if (errno != EINTR) + error("Failed to open %s: %m", devnam); + if (!persist || errno != 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) { - syslog(LOG_WARNING, - "Couldn't restrict write permissions to %s: %m", devnam); + warn("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)); - - /* set line speed, flow control, etc.; set CLOCAL for now */ - set_up_tty(ttyfd, 1); + MAINDEBUG(("Connecting with <%s>", connector)); - /* drop dtr to hang up in case modem is off hook */ if (!default_device && modem) { - setdtr(ttyfd, FALSE); + hangup_modem(ttyfd); /* in case modem is off hook */ sleep(1); - setdtr(ttyfd, TRUE); } + /* + * 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 could clear CLOCAL at this point. + */ + set_up_tty(ttyfd, 1); + if (device_script(connector, ttyfd, ttyfd) < 0) { - syslog(LOG_ERR, "Connect script failed"); - setdtr(ttyfd, FALSE); + error("Connect script failed"); goto fail; } - syslog(LOG_INFO, "Serial connection established."); + 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) { + 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); + } + /* run welcome script, if any */ if (welcomer && welcomer[0]) { if (device_script(welcomer, ttyfd, ttyfd) < 0) - syslog(LOG_WARNING, "Welcome script failed"); + warn("Welcome script failed"); } /* set up the serial device as a ppp interface */ - establish_ppp(ttyfd); + fd_ppp = establish_ppp(ttyfd); if (!demand) { - syslog(LOG_INFO, "Using interface ppp%d", ifunit); - (void) sprintf(ifname, "ppp%d", ifunit); - - /* 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; - } - } + info("Using interface ppp%d", ifunit); + slprintf(ifname, sizeof(ifname), "ppp%d", ifunit); + script_setenv("IFNAME", ifname); - /* - * Set a timeout to close the connection once the maximum - * connect time has expired. - */ - if (maxconnect > 0) - TIMEOUT(connect_time_expired, 0, maxconnect); + create_pidfile(); /* write pid to file */ + } /* * 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, devnam); lcp_lowerup(0); 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, "User request"); kill_link = 0; } + get_input(); if (open_ccp_flag) { if (phase == PHASE_NETWORK) { ccp_fsm[0].flags = OPT_RESTART; /* clears OPT_SILENT */ @@ -521,6 +596,7 @@ 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(); @@ -533,14 +609,15 @@ main(argc, argv) if (disconnector && !hungup) { set_up_tty(ttyfd, 1); if (device_script(disconnector, ttyfd, ttyfd) < 0) { - syslog(LOG_WARNING, "disconnect script failed"); + warn("disconnect script failed"); } else { - syslog(LOG_INFO, "Serial link disconnected."); + info("Serial link disconnected."); } } fail: - close_tty(); + if (ttyfd >= 0) + close_tty(); if (locked) { unlock(); locked = 0; @@ -549,33 +626,91 @@ main(argc, argv) if (!demand) { 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 (!persist) break; + kill_link = 0; if (demand) demand_discard(); if (holdoff > 0 && need_holdoff) { phase = PHASE_HOLDOFF; TIMEOUT(holdoff_end, NULL, holdoff); do { - wait_time(timeleft(&timo)); + 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) - die(0); kill_link = 0; phase = PHASE_DORMANT; /* allow signal to end holdoff */ } reap_kids(); } while (phase == PHASE_HOLDOFF); + if (!persist) + break; } } + /* Wait for scripts to finish */ + while (n_children > 0) + reap_kids(); + die(0); + return 0; +} + +/* + * detach - detach us from the controlling terminal. + */ +void +detach() +{ + if (detached) + return; + if (daemon(0, 0) < 0) { + perror("Couldn't detach from controlling terminal"); + die(1); + } + detached = 1; + log_to_stderr = 0; + pid = getpid(); + /* update pid file if it has been written already */ + if (pidfilename[0]) + create_pidfile(); +} + +/* + * 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); } /* @@ -606,7 +741,7 @@ get_input() return; if (len == 0) { - syslog(LOG_NOTICE, "Modem hangup"); + notice("Modem hangup"); hungup = 1; lcp_lowerdown(0); /* serial link is no longer available */ link_terminated(0); @@ -614,10 +749,10 @@ get_input() } 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; } @@ -629,8 +764,19 @@ 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; + } + + /* + * Until we get past the authentication phase, toss all packets + * except LCP, LQR and authentication packets. + */ + 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; } @@ -650,7 +796,7 @@ get_input() } if (debug) - syslog(LOG_WARNING, "Unsupported protocol (0x%x) received", protocol); + warn("Unsupported protocol (0x%x) received", protocol); lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN); } @@ -676,17 +822,6 @@ die(status) exit(status); } -/* - * connect_time_expired - log a message and close the connection. - */ -static void -connect_time_expired(arg) - caddr_t arg; -{ - syslog(LOG_INFO, "Connect time expired"); - lcp_close(0, "Connect time expired"); /* Close connection */ -} - /* * cleanup - restore anything which needs to be restored before we exit */ @@ -700,7 +835,7 @@ cleanup() 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 (locked) @@ -716,8 +851,8 @@ close_tty() disestablish_ppp(ttyfd); /* drop dtr to hang up */ - if (modem) { - setdtr(ttyfd, FALSE); + if (!default_device && modem) { + hangup_modem(ttyfd); /* * This sleep is in case the serial port has CLOCAL set by default, * and consequently will reassert DTR when we close the device. @@ -727,18 +862,31 @@ close_tty() restore_tty(ttyfd); - if (tty_mode != (mode_t) -1) - chmod(devnam, tty_mode); + if (tty_mode != (mode_t) -1) { + if (fchmod(ttyfd, tty_mode) != 0) { + /* XXX if devnam is a symlink, this will change the link */ + chmod(devnam, tty_mode); + } + } close(ttyfd); ttyfd = -1; } +/* + * hangup_modem - hang up the modem by clearing DTR. + */ +void hangup_modem(ttyfd) + int ttyfd; +{ + setdtr(ttyfd, 0); +} + 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; }; @@ -753,22 +901,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); @@ -781,7 +926,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; @@ -793,12 +938,12 @@ timeout(func, arg, time) */ void untimeout(func, arg) - void (*func)(); - caddr_t arg; + void (*func) __P((void *)); + 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. @@ -823,10 +968,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))) @@ -875,8 +1018,8 @@ kill_my_pg(sig) act.sa_handler = SIG_IGN; act.sa_flags = 0; + kill(0, sig); sigaction(sig, &act, &oldact); - kill(-getpgrp(), sig); sigaction(sig, &oldact, NULL); } @@ -892,11 +1035,13 @@ 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 (waiting) + siglongjmp(sigjmp, 1); } @@ -910,12 +1055,14 @@ 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 (waiting) + siglongjmp(sigjmp, 1); } @@ -927,7 +1074,8 @@ static void chld(sig) int sig; { - reap_kids(); + if (waiting) + siglongjmp(sigjmp, 1); } @@ -961,6 +1109,8 @@ open_ccp(sig) int sig; { open_ccp_flag = 1; + if (waiting) + siglongjmp(sigjmp, 1); } @@ -971,7 +1121,12 @@ 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); @@ -996,8 +1151,7 @@ device_script(program, in, out) if (pid < 0) { conn_running = 0; - syslog(LOG_ERR, "Failed to create child process: %m"); - die(1); + fatal("Failed to create child process: %m"); } if (pid == 0) { @@ -1021,27 +1175,30 @@ device_script(program, in, out) close(out); } } - if (redirect_stderr) { + if (!nodetach && !updetach) { close(2); - errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0644); + errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600); if (errfd >= 0 && errfd != 2) { dup2(errfd, 2); close(errfd); } } - setuid(getuid()); + setuid(uid); + if (getuid() != uid) { + error("setuid failed"); + exit(1); + } setgid(getgid()); 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); + fatal("error waiting for (dis)connection process: %m"); } conn_running = 0; @@ -1049,34 +1206,67 @@ device_script(program, in, out) } +/* + * 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; +}; + +struct subprocess *children; + /* * run-program - execute a program with given arguments, * 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 subprocess *chp; + struct stat sbuf; - pid = fork(); - if (pid == -1) { - syslog(LOG_ERR, "Failed to create child process for %s: %m", prog); - return -1; + /* + * 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) + fatal("Failed to create child process for %s: %m", prog); 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. */ @@ -1101,21 +1291,35 @@ 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); + /* run the program */ + execve(prog, args, script_env); if (must_exist || errno != ENOENT) - syslog(LOG_WARNING, "Can't execute %s: %m", prog); + warn("Can't execute %s: %m", prog); _exit(-1); } - MAINDEBUG((LOG_DEBUG, "Script %s started; pid = %d", prog, pid)); + + if (debug) + dbglog("Script %s started; pid = %d", prog, pid); ++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; + } + + return pid; } @@ -1127,21 +1331,27 @@ static void reap_kids() { 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) { + while ((pid = waitpid(-1, &status, WNOHANG)) != -1 && pid != 0) { --n_children; + for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) + if (chp->pid == pid) + break; + if (debug) + dbglog("process %d (%s) finished, status = 0x%x", + pid, (chp? chp->prog: "??"), status); 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)); } + if (chp && chp->done) + (*chp->done)(chp->arg); } + if (pid == -1 && errno != ECHILD) + error("Error waiting for child process: %m"); } @@ -1153,16 +1363,17 @@ char line[256]; /* line to be logged accumulated here */ char *linep; void -log_packet(p, len, prefix) +log_packet(p, len, prefix, level) u_char *p; int len; char *prefix; + int level; { - strcpy(line, prefix); + strlcpy(line, sizeof(line), prefix); linep = line + strlen(line); format_packet(p, len, pr_log, NULL); if (linep != line) - syslog(LOG_DEBUG, "%s", line); + syslog(level, "%s", line); } /* @@ -1199,10 +1410,12 @@ format_packet(p, len, printer, arg) } } - for (; len > 0; --len) { + for (i = 0; i < len && i < 32; ++i) { GETCHAR(x, p); printer(arg, " %.2x", x); } + if (i < len) + printer(arg, " ..."); } static void @@ -1222,18 +1435,50 @@ pr_log __V((void *arg, char *fmt, ...)) fmt = va_arg(pvar, char *); #endif - vsprintf(buf, fmt, pvar); + n = vslprintf(buf, sizeof(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); + strlcpy(linep, line + sizeof(line) - linep, buf); linep += n; } +/* + * vslp_printer - used in processing a %P format + */ +struct buffer_info { + char *ptr; + int len; +}; + +static void +vslp_printer __V((void *arg, char *fmt, ...)) +{ + int n; + va_list pvar; + struct buffer_info *bi; + +#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 + + bi = (struct buffer_info *) arg; + n = vslprintf(bi->ptr, bi->len, fmt, pvar); + va_end(pvar); + + bi->ptr += n; + bi->len -= n; +} + /* * print_string - print a readable representation of a string using * printer. @@ -1280,19 +1525,19 @@ void novm(msg) char *msg; { - syslog(LOG_ERR, "Virtual memory exhausted allocating %s\n", msg); - die(1); + fatal("Virtual memory exhausted allocating %s\n", msg); } /* - * fmtmsg - format a message into a buffer. Like sprintf except we + * slprintf - 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. + * %r (recursive format), %m (error message), %v (visible string), + * %q (quoted string), %t (current time) 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, ...)) +slprintf __V((char *buf, int buflen, char *fmt, ...)) { va_list args; int n; @@ -1308,18 +1553,18 @@ fmtmsg __V((char *buf, int buflen, char *fmt, ...)) buflen = va_arg(args, int); fmt = va_arg(args, char *); #endif - n = vfmtmsg(buf, buflen, fmt, args); + n = vslprintf(buf, buflen, fmt, args); va_end(args); return n; } /* - * vfmtmsg - like fmtmsg, takes a va_list instead of a list of args. + * vslprintf - like slprintf, 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) +vslprintf(buf, buflen, fmt, args) char *buf; int buflen; char *fmt; @@ -1328,13 +1573,14 @@ vfmtmsg(buf, buflen, fmt, args) int c, i, n; int width, prec, fillch; int base, len, neg, quoted; - unsigned long val; + unsigned long val = 0; char *str, *f, *buf0; unsigned char *p; - void *a; char num[32]; time_t t; + u_int32_t ip; static char hexchars[] = "0123456789abcdef"; + struct buffer_info bufinfo; buf0 = buf; --buflen; @@ -1399,6 +1645,7 @@ vfmtmsg(buf, buflen, fmt, args) base = 8; break; case 'x': + case 'X': val = va_arg(args, unsigned int); base = 16; break; @@ -1419,16 +1666,20 @@ vfmtmsg(buf, buflen, fmt, args) str = strerror(errno); break; case 'I': - str = ip_ntoa(va_arg(args, u_int32_t)); + ip = va_arg(args, u_int32_t); + ip = ntohl(ip); + slprintf(num, sizeof(num), "%d.%d.%d.%d", (ip >> 24) & 0xff, + (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff); + str = num; break; case 'r': f = va_arg(args, char *); - /* - * XXX We assume a va_list is either a pointer or an array, so - * what gets passed for a va_list is like a void * in some sense. - */ - a = va_arg(args, void *); - n = vfmtmsg(buf, buflen + 1, f, a); +#ifndef __powerpc__ + n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list)); +#else + /* On the powerpc, a va_list is an array of 1 structure */ + n = vslprintf(buf, buflen + 1, f, va_arg(args, void *)); +#endif buf += n; buflen -= n; continue; @@ -1459,7 +1710,7 @@ vfmtmsg(buf, buflen, fmt, args) } if (quoted && (c == '"' || c == '\\')) OUTCHAR('\\'); - if (c < 0x20 || 0x7f <= c && c < 0xa0) { + if (c < 0x20 || (0x7f <= c && c < 0xa0)) { if (quoted) { OUTCHAR('\\'); switch (c) { @@ -1484,6 +1735,25 @@ vfmtmsg(buf, buflen, fmt, args) OUTCHAR(c); } continue; + case 'P': /* print PPP packet */ + bufinfo.ptr = buf; + bufinfo.len = buflen + 1; + p = va_arg(args, unsigned char *); + n = va_arg(args, int); + format_packet(p, n, vslp_printer, &bufinfo); + buf = bufinfo.ptr; + buflen = bufinfo.len - 1; + continue; + case 'B': + p = va_arg(args, unsigned char *); + for (n = prec; n > 0; --n) { + c = *p++; + if (fillch == ' ') + OUTCHAR(' '); + OUTCHAR(hexchars[(c >> 4) & 0xf]); + OUTCHAR(hexchars[c & 0xf]); + } + continue; default: *buf++ = '%'; if (c != '%') @@ -1533,3 +1803,253 @@ vfmtmsg(buf, buflen, fmt, args) *buf = 0; return buf - buf0; } + +/* + * script_setenv - set an environment variable value to be used + * for scripts that we run (e.g. ip-up, auth-up, etc.) + */ +void +script_setenv(var, value) + char *var, *value; +{ + 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; + } + + /* 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; + } + + script_env[i] = newstring; + script_env[i+1] = 0; +} + +/* + * script_unsetenv - remove a variable from the environment + * for scripts. + */ +void +script_unsetenv(var) + char *var; +{ + 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; + } + } +} + +/* + * strlcpy - like strcpy/strncpy, doesn't overflow destination buffer, + * always leaves destination null-terminated (for len > 0). + */ +void +strlcpy(char *dest, size_t len, const char *src) +{ + if (len == 0) + return; + if (strlen(src) < len) + strcpy(dest, src); + else { + strncpy(dest, src, len - 1); + dest[len-1] = 0; + } +} + +/* + * strlcat - like strcat/strncat, doesn't overflow destination buffer, + * always leaves destination null-terminated (for len > 0). + */ +void +strlcat(char *dest, size_t len, const char *src) +{ + size_t dlen; + + if (len == 0) + return; + dlen = strlen(dest); + if (dlen < len - 1) + strlcpy(dest + dlen, len - dlen, src); +} + +/* + * logit - does the hard work for fatal et al. + */ +static void +logit(level, fmt, args) + int level; + char *fmt; + va_list args; +{ + int n; + char buf[256]; + static char nl = '\n'; + + n = vslprintf(buf, sizeof(buf), fmt, args); + syslog(level, "%s", buf); + if (log_to_stderr) { + if (write(2, buf, n) != n + || (buf[n-1] != '\n' && write(2, &nl, 1) != 1)) + log_to_stderr = 0; + } +} + +/* + * fatal - log an error message and die horribly. + */ +void +fatal __V((char *fmt, ...)) +{ + va_list pvar; + +#if __STDC__ + va_start(pvar, fmt); +#else + char *fmt; + va_start(pvar); + fmt = va_arg(pvar, char *); +#endif + + logit(LOG_ERR, fmt, pvar); + va_end(pvar); + + die(1); /* as promised */ +} + +/* + * error - log an error message. + */ +void +error __V((char *fmt, ...)) +{ + va_list pvar; + +#if __STDC__ + va_start(pvar, fmt); +#else + char *fmt; + va_start(pvar); + fmt = va_arg(pvar, char *); +#endif + + logit(LOG_ERR, fmt, pvar); + va_end(pvar); +} + +/* + * warn - log a warning message. + */ +void +warn __V((char *fmt, ...)) +{ + va_list pvar; + +#if __STDC__ + va_start(pvar, fmt); +#else + char *fmt; + va_start(pvar); + fmt = va_arg(pvar, char *); +#endif + + logit(LOG_WARNING, fmt, pvar); + va_end(pvar); +} + +/* + * notice - log a notice-level message. + */ +void +notice __V((char *fmt, ...)) +{ + va_list pvar; + +#if __STDC__ + va_start(pvar, fmt); +#else + char *fmt; + va_start(pvar); + fmt = va_arg(pvar, char *); +#endif + + logit(LOG_NOTICE, fmt, pvar); + va_end(pvar); +} + +/* + * info - log an informational message. + */ +void +info __V((char *fmt, ...)) +{ + va_list pvar; + +#if __STDC__ + va_start(pvar, fmt); +#else + char *fmt; + va_start(pvar); + fmt = va_arg(pvar, char *); +#endif + + logit(LOG_INFO, fmt, pvar); + va_end(pvar); +} + +/* + * dbglog - log a debug message. + */ +void +dbglog __V((char *fmt, ...)) +{ + va_list pvar; + +#if __STDC__ + va_start(pvar, fmt); +#else + char *fmt; + va_start(pvar); + fmt = va_arg(pvar, char *); +#endif + + logit(LOG_DEBUG, fmt, pvar); + va_end(pvar); +}