X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fmain.c;h=7eee19215e5439dc6aea01d3cb5cb01d92c728e3;hb=25a5dd4d485057f59b7ee31413945cada446e6fc;hp=4a4e14b010cbbf23559380017c7bdf48561bebd8;hpb=5ba9d88b943e9d5a3ababdadf1d2e246581dfdc6;p=ppp.git diff --git a/pppd/main.c b/pppd/main.c index 4a4e14b..7eee192 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: main.c,v 1.64 1999/03/22 05:55:31 paulus Exp $"; +static char rcsid[] = "$Id: main.c,v 1.79 1999/05/13 00:35:23 paulus Exp $"; #endif #include @@ -58,10 +58,6 @@ static char rcsid[] = "$Id: main.c,v 1.64 1999/03/22 05:55:31 paulus Exp $"; #include "cbcp.h" #endif -#if defined(SUNOS4) -extern char *strerror(); -#endif - #ifdef IPX_CHANGE #include "ipxcp.h" #endif /* IPX_CHANGE */ @@ -77,7 +73,6 @@ char *progname; /* Name of this program */ char hostname[MAXNAMELEN]; /* Our hostname */ static char pidfilename[MAXPATHLEN]; /* name of pid file */ 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 */ @@ -88,9 +83,11 @@ 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 */ +struct stat devstat; /* result of stat() on devnam */ +int prepass = 0; /* doing prepass to find device name */ +volatile int status; /* exit status for pppd */ -static int fd_ppp; /* fd for talking PPP */ +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 */ @@ -110,8 +107,10 @@ 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 */ +static int privopen; /* don't lock, open device as root */ char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n"; @@ -121,10 +120,24 @@ 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; static int charshunt_pid; /* Process ID for charshunt */ -static FILE *recordf; /* File for recording chars sent/rcvd */ + +/* + * 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. */ @@ -142,17 +155,14 @@ 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 int device_script __P((char *, int, int, int)); static void reap_kids __P((int waitfor)); -static void pr_log __P((void *, char *, ...)); -static void logit __P((int, char *, va_list)); -static void vslp_printer __P((void *, char *, ...)); -static void format_packet __P((u_char *, int, void (*) (void *, char *, ...), - void *)); static void record_child __P((int, char *, void (*) (void *), void *)); -static void charshunt __P((int)); -static int record_write(FILE *, int code, u_char *buf, int nb, - struct timeval *); +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)); @@ -204,20 +214,25 @@ main(argc, argv) struct protent *protp; struct stat statbuf; char numbuf[16]; - struct timeval now; phase = PHASE_INITIALIZE; - log_to_fd = -1; + + /* + * 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"); @@ -242,13 +257,56 @@ main(argc, argv) progname = *argv; + prepass = 0; 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() - || !parse_args(argc-1, argv+1)) - exit(1); + exit(EXIT_OPTION_ERROR); + + /* scan command line and options files to find device name */ + prepass = 1; + parse_args(argc-1, argv+1); + prepass = 0; + + /* + * Work out the device name, if it hasn't already been specified. + */ + using_pty = notty || ptycommand != NULL; + if (!using_pty && default_device) { + char *p; + if (!isatty(0) || (p = ttyname(0)) == NULL) { + option_error("no device specified and stdin is not a tty"); + exit(EXIT_OPTION_ERROR); + } + strlcpy(devnam, p, sizeof(devnam)); + if (stat(devnam, &devstat) < 0) + fatal("Couldn't stat default device %s: %m", devnam); + } + + /* + * Parse the tty options file and the command line. + * The per-tty options file should not change + * ptycommand, notty or devnam. + */ + if (!using_pty) { + int save_defdev = default_device; + + default_device = 1; + if (!options_for_tty()) + exit(EXIT_OPTION_ERROR); + if (notty || ptycommand != NULL) { + option_error("%s option may not be used in per-tty options file", + notty? "notty": "pty"); + exit(EXIT_OPTION_ERROR); + } + if (!default_device) { + option_error("per-tty options file may not specify device name"); + exit(EXIT_OPTION_ERROR); + } + default_device = save_defdev; + } + + if (!parse_args(argc-1, argv+1)) + exit(EXIT_OPTION_ERROR); /* * Check that we are running as root. @@ -256,81 +314,70 @@ main(argc, argv) if (geteuid() != 0) { option_error("must be root to run %s, since it is not setuid-root", argv[0]); - exit(1); + exit(EXIT_NOT_ROOT); } if (!ppp_available()) { option_error(no_ppp_msg); - exit(1); + exit(EXIT_NO_KERNEL_SUPPORT); } /* * Check that the options given are valid and consistent. */ if (!sys_check_options()) - exit(1); + exit(EXIT_OPTION_ERROR); 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); + exit(EXIT_OPTION_ERROR); } - if (ptycommand != NULL || notty) { + if (using_pty) { if (!default_device) { option_error("%s option precludes specifying device name", notty? "notty": "pty"); - exit(1); + exit(EXIT_OPTION_ERROR); } - if (ptycommand != NULL && (notty || record_file != NULL)) { - option_error("pty option is incompatible with %s option", - notty? "notty": "record"); - exit(1); + if (ptycommand != NULL && notty) { + option_error("pty option is incompatible with notty option"); + exit(EXIT_OPTION_ERROR); } default_device = notty; lockflag = 0; modem = 0; + if (notty && log_to_fd <= 1) + log_to_fd = -1; } else { /* - * If the user has specified the default device name explicitly, - * pretend they hadn't. + * If the user has specified a device which is the same as + * the one on stdin, pretend they didn't specify any. + * If the device is already open read/write on stdin, + * we assume we don't need to lock it, and we can open it as root. */ - p = isatty(0)? ttyname(0): NULL; - if (p == NULL) { - if (default_device) { - option_error("no device specified and stdin is not a tty"); - exit(1); - } - } else { - if (default_device) - strlcpy(devnam, p, sizeof(devnam)); - else if (strcmp(devnam, p) == 0) - default_device = 1; + if (fstat(0, &statbuf) >= 0 && S_ISCHR(statbuf.st_mode) + && statbuf.st_rdev == devstat.st_rdev) { + default_device = 1; + fdflags = fcntl(0, F_GETFL); + if (fdflags != -1 && (fdflags & O_ACCMODE) == O_RDWR) + privopen = 1; } } if (default_device) nodetach = 1; - else - log_to_fd = 1; /* default to stdout */ - - script_setenv("DEVICE", devnam); - slprintf(numbuf, sizeof(numbuf), "%d", baud_rate); - script_setenv("SPEED", numbuf); /* - * Open the record file (as the user) if required. + * Don't send log messages to the serial port, it tends to + * confuse the peer. :-) */ - if (record_file != NULL) { - if (uid != 0) - seteuid(uid); - recordf = fopen(record_file, "a"); - if (uid != 0) - seteuid(0); - if (recordf == NULL) - option_error("Couldn't create record file %s: %m", record_file); - } + if (log_to_fd >= 0 && fstat(log_to_fd, &statbuf) >= 0 + && S_ISCHR(statbuf.st_mode) && statbuf.st_rdev == devstat.st_rdev) + log_to_fd = -1; + + script_setenv("DEVICE", devnam); /* * Initialize system-dependent stuff and magic number package. @@ -346,7 +393,6 @@ main(argc, argv) */ if (!nodetach && !updetach) detach(); - pid = getpid(); p = getlogin(); if (p == NULL) { pw = getpwuid(uid); @@ -357,7 +403,8 @@ main(argc, argv) } 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, @@ -460,6 +507,7 @@ main(argc, argv) need_holdoff = 1; ttyfd = -1; real_ttyfd = -1; + status = EXIT_OK; if (demand) { /* @@ -472,7 +520,7 @@ main(argc, argv) for (;;) { if (sigsetjmp(sigjmp, 1) == 0) { sigprocmask(SIG_BLOCK, &mask, NULL); - if (kill_link) { + if (kill_link || got_sigchld) { sigprocmask(SIG_UNBLOCK, &mask, NULL); } else { waiting = 1; @@ -489,7 +537,8 @@ main(argc, argv) } if (get_loop_output()) break; - reap_kids(0); + if (got_sigchld) + reap_kids(0); } remove_fd(fd_loop); if (kill_link && !persist) @@ -512,22 +561,17 @@ main(argc, argv) if (ptycommand != NULL || notty || record_file != NULL) { if (!get_pty(&pty_master, &pty_slave, ppp_devnam, uid)) { error("Couldn't allocate pseudo-tty"); + status = EXIT_FATAL_ERROR; goto fail; } set_up_tty(pty_slave, 1); - if (ptycommand != NULL) { - if (device_script(ptycommand, pty_master, 1) < 0) - goto fail; - ttyfd = pty_slave; - close(pty_master); - pty_master = -1; - } } /* * Lock the device if we've been asked to. */ - if (lockflag && !default_device) { + status = EXIT_LOCK_FAILED; + if (lockflag && !privopen) { if (lock(devnam) < 0) goto fail; locked = 1; @@ -546,16 +590,21 @@ main(argc, argv) for (;;) { /* If the user specified the device name, become the user before opening it. */ - if (!devnam_info.priv) + int err; + if (!devnam_info.priv && !privopen) seteuid(uid); ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0); - if (!devnam_info.priv) + err = errno; + if (!devnam_info.priv && !privopen) seteuid(0); if (ttyfd >= 0) break; - if (errno != EINTR) + errno = err; + if (err != EINTR) { error("Failed to open %s: %m", devnam); - if (!persist || errno != EINTR) + status = EXIT_OPEN_FAILED; + } + if (!persist || err != EINTR) goto fail; } if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1 @@ -589,30 +638,34 @@ main(argc, argv) * If the notty and/or record option was specified, * start up the character shunt now. */ - if (notty || record_file != NULL) { - int cpid; - - cpid = fork(); - if (cpid == -1) { - error("Can't fork process for character shunt: %m"); - goto fail; - } - if (cpid == 0) { - close(pty_slave); - setuid(uid); - if (getuid() != uid) - fatal("setuid failed"); - setgid(getgid()); - charshunt(ttyfd); - exit(0); + status = EXIT_PTYCMD_FAILED; + 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; } - charshunt_pid = cpid; - close(pty_master); - pty_master = -1; - if (ttyfd >= 0) - close(ttyfd); - ttyfd = pty_slave; - record_child(cpid, "pppd (charshunt)", NULL, NULL); + } 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 */ @@ -627,10 +680,13 @@ main(argc, argv) } } - if (device_script(connector, ttyfd, 0) < 0) { + if (device_script(connector, ttyfd, ttyfd, 0) < 0) { error("Connect script failed"); + status = EXIT_CONNECT_FAILED; goto fail; } + if (kill_link) + goto disconnect; info("Serial connection established."); @@ -645,24 +701,31 @@ main(argc, argv) for (;;) { if ((i = open(devnam, O_RDWR)) >= 0) break; - if (errno != EINTR) + if (errno != EINTR) { error("Failed to reopen %s: %m", devnam); + status = EXIT_OPEN_FAILED; + } if (!persist || errno != EINTR || hungup || kill_link) goto fail; } close(i); } + 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, 0) < 0) + if (device_script(welcomer, ttyfd, ttyfd, 0) < 0) warn("Welcome script failed"); } /* set up the serial device as a ppp interface */ fd_ppp = establish_ppp(ttyfd); - if (fd_ppp < 0) - goto fail; + if (fd_ppp < 0) { + status = EXIT_FATAL_ERROR; + goto disconnect; + } if (!demand) { @@ -679,6 +742,10 @@ main(argc, argv) */ notice("Connect: %s <--> %s", ifname, ppp_devnam); gettimeofday(&start_time, NULL); + link_stats_valid = 0; + script_unsetenv("CONNECT_TIME"); + script_unsetenv("BYTES_SENT"); + script_unsetenv("BYTES_RCVD"); lcp_lowerup(0); /* @@ -696,10 +763,11 @@ main(argc, argv) lcp_open(0); /* Start protocol */ open_ccp_flag = 0; add_fd(fd_ppp); + status = EXIT_NEGOTIATION_FAILED; for (phase = PHASE_ESTABLISH; phase != PHASE_DEAD; ) { if (sigsetjmp(sigjmp, 1) == 0) { sigprocmask(SIG_BLOCK, &mask, NULL); - if (kill_link || open_ccp_flag) { + if (kill_link || open_ccp_flag || got_sigchld) { sigprocmask(SIG_UNBLOCK, &mask, NULL); } else { waiting = 1; @@ -721,18 +789,16 @@ main(argc, argv) } open_ccp_flag = 0; } - reap_kids(0); /* 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) { + int t = (link_connect_time + 5) / 6; /* 1/10ths of minutes */ + info("Connect time %d.%d minutes.", t/10, t%10); info("Sent %d bytes, received %d bytes.", link_stats.bytes_out, link_stats.bytes_in); } @@ -747,28 +813,31 @@ main(argc, argv) if (demand) restore_loop(); disestablish_ppp(ttyfd); + fd_ppp = -1; + if (!hungup) + lcp_lowerdown(0); /* * Run disconnector script, if requested. * XXX we may not be able to do this if the line has hung up! */ + disconnect: if (disconnector && !hungup) { - set_up_tty(ttyfd, 1); - if (device_script(disconnector, ttyfd, 0) < 0) { + 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."); } } - if (!hungup) - lcp_lowerdown(0); fail: if (pty_master >= 0) close(pty_master); - if (pty_slave >= 0 && pty_slave != ttyfd) + if (pty_slave >= 0) close(pty_slave); - if (ttyfd >= 0) + if (real_ttyfd >= 0) close_tty(); if (locked) { unlock(); @@ -794,7 +863,7 @@ main(argc, argv) do { if (sigsetjmp(sigjmp, 1) == 0) { sigprocmask(SIG_BLOCK, &mask, NULL); - if (kill_link) { + if (kill_link || got_sigchld) { sigprocmask(SIG_UNBLOCK, &mask, NULL); } else { waiting = 1; @@ -808,7 +877,8 @@ main(argc, argv) kill_link = 0; phase = PHASE_DORMANT; /* allow signal to end holdoff */ } - reap_kids(0); + if (got_sigchld) + reap_kids(0); } while (phase == PHASE_HOLDOFF); if (!persist) break; @@ -816,10 +886,17 @@ main(argc, argv) } /* Wait for scripts to finish */ - while (n_children > 0) + 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); + die(status); return 0; } @@ -829,20 +906,46 @@ main(argc, argv) void detach() { + int pid; + if (detached) return; - if (daemon(0, 0) < 0) { - perror("Couldn't detach from controlling terminal"); - die(1); + 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); + close(1); + 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. */ @@ -855,13 +958,13 @@ create_pidfile() slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid", _PATH_VARRUN, ifname); if ((pidfile = fopen(pidfilename, "w")) != NULL) { - fprintf(pidfile, "%d\n", pid); + fprintf(pidfile, "%d\n", getpid()); (void) fclose(pidfile); } else { error("Failed to create pid file %s: %m", pidfilename); pidfilename[0] = 0; } - slprintf(numbuf, sizeof(numbuf), "%d", pid); + slprintf(numbuf, sizeof(numbuf), "%d", getpid()); script_setenv("PPPD_PID", numbuf); } @@ -895,6 +998,7 @@ get_input() if (len == 0) { notice("Modem hangup"); hungup = 1; + status = EXIT_HANGUP; lcp_lowerdown(0); /* serial link is no longer available */ link_terminated(0); return; @@ -974,7 +1078,9 @@ cleanup() { sys_cleanup(); - if (ttyfd >= 0) + if (fd_ppp >= 0) + disestablish_ppp(ttyfd); + if (real_ttyfd >= 0) close_tty(); if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT) @@ -991,11 +1097,9 @@ cleanup() static void close_tty() { - disestablish_ppp(ttyfd); - /* drop dtr to hang up */ if (!default_device && modem) { - setdtr(ttyfd, 0); + 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. @@ -1003,17 +1107,41 @@ close_tty() sleep(1); } - restore_tty(ttyfd); + restore_tty(real_ttyfd); if (tty_mode != (mode_t) -1) { - if (fchmod(ttyfd, tty_mode) != 0) { + if (fchmod(real_ttyfd, tty_mode) != 0) { /* XXX if devnam is a symlink, this will change the link */ chmod(devnam, tty_mode); } } - close(ttyfd); - ttyfd = -1; + close(real_ttyfd); + real_ttyfd = -1; +} + +/* + * update_link_stats - get stats at link termination. + */ +void +update_link_stats(u) + int u; +{ + struct timeval now; + char numbuf[32]; + + 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), "%d", link_connect_time); + script_setenv("CONNECT_TIME", numbuf); + slprintf(numbuf, sizeof(numbuf), "%d", link_stats.bytes_out); + script_setenv("BYTES_SENT", numbuf); + slprintf(numbuf, sizeof(numbuf), "%d", link_stats.bytes_in); + script_setenv("BYTES_RCVD", numbuf); } @@ -1171,6 +1299,8 @@ hup(sig) { info("Hangup (SIGHUP)"); kill_link = 1; + if (status != EXIT_HANGUP) + status = EXIT_USER_REQUEST; if (conn_running) /* Send the signal to the [dis]connector process(es) also */ kill_my_pg(sig); @@ -1194,6 +1324,7 @@ term(sig) info("Terminating on signal %d.", sig); persist = 0; /* don't try to restart */ kill_link = 1; + status = EXIT_USER_REQUEST; if (conn_running) /* Send the signal to the [dis]connector process(es) also */ kill_my_pg(sig); @@ -1206,12 +1337,13 @@ term(sig) /* * 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; { + got_sigchld = 1; if (waiting) siglongjmp(sigjmp, 1); } @@ -1269,22 +1401,22 @@ bad_signal(sig) kill_my_pg(SIGTERM); if (charshunt_pid) kill(charshunt_pid, SIGTERM); - die(1); + die(127); } /* - * device_script - run a program to connect or disconnect the - * serial device. + * 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, inout, dont_wait) +device_script(program, in, out, dont_wait) char *program; - int inout; + int in, out; int dont_wait; { int pid; - int status = 0; + int status = -1; int errfd; ++conn_running; @@ -1299,11 +1431,14 @@ device_script(program, inout, dont_wait) if (pid == 0) { sys_close(); closelog(); - if (inout == 2) { + if (in == 2) { /* aargh!!! */ - int newio = dup(inout); - close(inout); - inout = newio; + 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) @@ -1316,18 +1451,25 @@ device_script(program, inout, dont_wait) close(errfd); } } - if (inout != 0) { - dup2(inout, 0); - close(inout); + if (in != 0) { + if (out == 0) + out = dup(out); + dup2(in, 0); + } + if (out != 1) { + dup2(out, 1); } - dup2(0, 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); } - if (ttyfd > 2 && ttyfd != inout) - close(ttyfd); setgid(getgid()); execl("/bin/sh", "sh", "-c", program, (char *)0); error("could not exec /bin/sh: %m"); @@ -1337,6 +1479,7 @@ device_script(program, inout, dont_wait) if (dont_wait) { record_child(pid, program, NULL, NULL); + status = 0; } else { while (waitpid(pid, &status, 0) < 0) { if (errno == EINTR) @@ -1350,20 +1493,6 @@ device_script(program, inout, dont_wait) } -/* - * 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. @@ -1421,6 +1550,8 @@ run_program(prog, args, must_exist, done, arg) close (1); close (2); 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); @@ -1446,12 +1577,7 @@ run_program(prog, args, must_exist, done, arg) if (must_exist || errno != ENOENT) { /* have to reopen the log, there's nowhere else for the message to go. */ -#ifdef ULTRIX - openlog("pppd", LOG_PID); -#else - openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); - setlogmask(LOG_UPTO(LOG_INFO)); -#endif + reopen_log(); syslog(LOG_ERR, "Can't execute %s: %m", prog); closelog(); } @@ -1459,7 +1585,7 @@ run_program(prog, args, must_exist, done, arg) } if (debug) - dbglog("Script %s started; pid = %d", prog, pid); + dbglog("Script %s started (pid %d)", prog, pid); record_child(pid, prog, done, arg); return pid; @@ -1506,199 +1632,34 @@ reap_kids(waitfor) int pid, status; struct subprocess *chp, **prevp; + got_sigchld = 0; if (n_children == 0) return; 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) + for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) { + if (chp->pid == pid) { + *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("process %d (%s) finished, status = 0x%x", - pid, (chp? chp->prog: "??"), status); + dbglog("Script %s finished (pid %d), status = 0x%x", + (chp? chp->prog: "??"), pid, status); if (chp && chp->done) (*chp->done)(chp->arg); + if (chp) + free(chp); } if (pid == -1 && errno != ECHILD && errno != EINTR) error("Error waiting for child process: %m"); } -/* - * log_packet - format a packet and log it. - */ - -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; -{ - strlcpy(line, prefix, sizeof(line)); - linep = line + strlen(line); - format_packet(p, len, pr_log, NULL); - if (linep != line) - syslog(level, "%s", line); -} - -/* - * format_packet - make a readable representation of a packet, - * calling `printer(arg, format, ...)' to output it. - */ -static void -format_packet(p, len, printer, arg) - u_char *p; - int len; - void (*printer) __P((void *, char *, ...)); - void *arg; -{ - int i, n; - u_short proto; - struct protent *protp; - - 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 { - for (i = 0; (protp = protocols[i]) != NULL; ++i) - if (proto == (protp->protocol & ~0x8000)) - break; - if (protp != 0 && protp->data_name != 0) { - printer(arg, "[%s data]", protp->data_name); - if (len > 8) - printer(arg, "%.8B ...", p); - else - printer(arg, "%.*B", len, p); - len = 0; - } else - printer(arg, "[proto=0x%x]", proto); - } - } - - if (len > 32) - printer(arg, "%.32B ...", p); - else - printer(arg, "%.*B", len, p); -} - -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 - - n = vslprintf(buf, sizeof(buf), fmt, pvar); - va_end(pvar); - - if (linep + n + 1 > line + sizeof(line)) { - syslog(LOG_DEBUG, "%s", line); - linep = line; - } - strlcpy(linep, buf, line + sizeof(line) - linep); - 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. - */ -void -print_string(p, len, printer, arg) - char *p; - int len; - void (*printer) __P((void *, char *, ...)); - void *arg; -{ - 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); - } - } - } - printer(arg, "\""); -} - /* * novm - log an error message saying we ran out of memory, and die. */ @@ -1709,282 +1670,6 @@ novm(msg) fatal("Virtual memory exhausted allocating %s\n", msg); } -/* - * 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), %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 -slprintf __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 = vslprintf(buf, buflen, fmt, args); - va_end(args); - return n; -} - -/* - * vslprintf - like slprintf, takes a va_list instead of a list of args. - */ -#define OUTCHAR(c) (buflen > 0? (--buflen, *buf++ = (c)): 0) - -int -vslprintf(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; - u_int32_t ip; - static char hexchars[] = "0123456789abcdef"; - struct buffer_info bufinfo; - - 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': - 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': - 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 *); -#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; - 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; - 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 != '%') - --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; -} - /* * script_setenv - set an environment variable value to be used * for scripts that we run (e.g. ip-up, auth-up, etc.) @@ -2059,209 +1744,70 @@ script_unsetenv(var) } /* - * strlcpy - like strcpy/strncpy, doesn't overflow destination buffer, - * always leaves destination null-terminated (for len > 0). + * start_charshunt - create a child process to run the character shunt. */ -size_t -strlcpy(dest, src, len) - char *dest; - const char *src; - size_t len; -{ - size_t ret = strlen(src); - - if (len != 0) { - if (ret < len) - strcpy(dest, src); - else { - strncpy(dest, src, len - 1); - dest[len-1] = 0; - } - } - return ret; -} - -/* - * strlcat - like strcat/strncat, doesn't overflow destination buffer, - * always leaves destination null-terminated (for len > 0). - */ -size_t -strlcat(dest, src, len) - char *dest; - const char *src; - size_t len; +static int +start_charshunt(ifd, ofd) + int ifd, ofd; { - size_t dlen = strlen(dest); - - return dlen + strlcpy(dest + dlen, src, (len > dlen? len - dlen: 0)); -} + int cpid; -/* - * 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]; - - n = vslprintf(buf, sizeof(buf), fmt, args); - syslog(level, "%s", buf); - if (log_to_fd >= 0 && (level != LOG_DEBUG || debug)) { - if (buf[n-1] != '\n') - buf[n++] = '\n'; - if (write(log_to_fd, buf, n) != n) + 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); } + charshunt_pid = cpid; + close(pty_master); + pty_master = -1; + ttyfd = pty_slave; + record_child(cpid, "pppd (charshunt)", charshunt_done, NULL); + return 1; } -/* - * 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, ...)) +static void +charshunt_done(arg) + void *arg; { - 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); + charshunt_pid = 0; } /* * 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. :-). */ static void -charshunt(ttyfd) - int ttyfd; +charshunt(ifd, ofd, record_file) + int ifd, ofd; + char *record_file; { - int ifd, ofd, nfds; - int n; + 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; /* * Reset signal handlers. */ - signal(SIGHUP, SIG_DFL); /* Hangup */ + signal(SIGHUP, SIG_IGN); /* Hangup */ signal(SIGINT, SIG_DFL); /* Interrupt */ signal(SIGTERM, SIG_DFL); /* Terminate */ signal(SIGCHLD, SIG_DFL); @@ -2302,14 +1848,14 @@ charshunt(ttyfd) signal(SIGXFSZ, SIG_DFL); #endif - /* work out which fds we're using. */ - if (notty) { - ifd = 0; - ofd = 1; - } else { - ifd = ofd = ttyfd; + /* + * 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); } - nfds = (ofd > pty_master? ifd: pty_master) + 1; /* set all the fds to non-blocking mode */ flags = fcntl(pty_master, F_GETFL); @@ -2319,8 +1865,8 @@ charshunt(ttyfd) flags = fcntl(ifd, F_GETFL); if (flags == -1 || fcntl(ifd, F_SETFL, flags | O_NONBLOCK) == -1) - warn("couldn't set %s to nonblock: %m", (notty? "stdin": "tty")); - if (notty) { + 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) @@ -2330,7 +1876,17 @@ charshunt(ttyfd) nibuf = nobuf = 0; ibufp = obufp = NULL; pty_readable = stdin_readable = 1; - gettimeofday(&lasttime, NULL); + 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); @@ -2445,8 +2001,8 @@ record_write(f, code, buf, nb, tp) int diff; gettimeofday(&now, NULL); - diff = (now.tv_sec - tp->tv_sec) * 10 - + (now.tv_usec - tp->tv_usec) / 100000; + 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);