X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fmain.c;h=a33a5e242188bfc6f0437ce0f448f58853e9750b;hp=e67e18c9b5abf6bfcb85fa17039a4a264ecdd7c4;hb=a4efaa63e68e25e712af030a138a272dfe0d2180;hpb=0c7a998d2528a7f39af06e5c1eaaaad8ba24dc4b diff --git a/pppd/main.c b/pppd/main.c index e67e18c..a33a5e2 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: main.c,v 1.77 1999/04/28 02:45:44 paulus Exp $"; +static char rcsid[] = "$Id: main.c,v 1.80 1999/07/21 00:24:31 paulus Exp $"; #endif #include @@ -58,10 +58,6 @@ static char rcsid[] = "$Id: main.c,v 1.77 1999/04/28 02:45:44 paulus Exp $"; #include "cbcp.h" #endif -#if defined(SUNOS4) -extern char *strerror(); -#endif - #ifdef IPX_CHANGE #include "ipxcp.h" #endif /* IPX_CHANGE */ @@ -87,7 +83,10 @@ 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 */ +int devnam_fixed; /* set while in options.ttyxx file */ +volatile int status; /* exit status for pppd */ static int fd_ppp = -1; /* fd for talking PPP */ static int fd_loop; /* fd for getting demand-dial packets */ @@ -112,6 +111,7 @@ 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,6 +121,7 @@ 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 */ @@ -214,10 +215,8 @@ 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. @@ -259,31 +258,45 @@ main(argc, argv) progname = *argv; + prepass = 0; 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 */ + 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. */ - 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; + 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 (!options_for_tty() - || !parse_args(argc-1, argv+1)) - exit(1); + devnam_fixed = 1; + if (!using_pty) { + if (!options_for_tty()) + exit(EXIT_OPTION_ERROR); + } + + devnam_fixed = 0; + if (!parse_args(argc-1, argv+1)) + exit(EXIT_OPTION_ERROR); /* * Check that we are running as root. @@ -291,51 +304,68 @@ 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 (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) { option_error("pty option is incompatible with notty option"); - exit(1); + exit(EXIT_OPTION_ERROR); } default_device = notty; lockflag = 0; modem = 0; + if (notty && log_to_fd <= 1) + log_to_fd = -1; } else { - if (devnam[0] == 0) { - option_error("no device specified and stdin is not a tty"); - exit(1); + /* + * 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. + */ + 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 */ + + /* + * Don't send log messages to the serial port, it tends to + * confuse the peer. :-) + */ + 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); @@ -467,6 +497,7 @@ main(argc, argv) need_holdoff = 1; ttyfd = -1; real_ttyfd = -1; + status = EXIT_OK; if (demand) { /* @@ -510,6 +541,8 @@ main(argc, argv) info("Starting link"); } + phase = PHASE_SERIALCONN; + /* * Get a pty master/slave pair if the pty, notty, or record * options were specified. @@ -520,6 +553,7 @@ 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); @@ -528,7 +562,8 @@ main(argc, argv) /* * 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; @@ -548,17 +583,19 @@ main(argc, argv) /* If the user specified the device name, become the user before opening it. */ int err; - if (!devnam_info.priv && !default_device) + if (!devnam_info.priv && !privopen) seteuid(uid); ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0); err = errno; - if (!devnam_info.priv && !default_device) + if (!devnam_info.priv && !privopen) seteuid(0); if (ttyfd >= 0) break; errno = err; - if (err != EINTR) + if (err != EINTR) { error("Failed to open %s: %m", devnam); + status = EXIT_OPEN_FAILED; + } if (!persist || err != EINTR) goto fail; } @@ -577,7 +614,7 @@ main(argc, argv) /* * Set line speed, flow control, etc. - * If we have a non-null connection script, + * If we have a non-null connection or initializer 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 @@ -585,7 +622,8 @@ main(argc, argv) * 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)); + set_up_tty(ttyfd, ((connector != NULL && connector[0] != 0) + || initializer != NULL)); real_ttyfd = ttyfd; } @@ -593,6 +631,7 @@ main(argc, argv) * If the notty and/or record option was specified, * start up the character shunt now. */ + status = EXIT_PTYCMD_FAILED; if (ptycommand != NULL) { if (record_file != NULL) { int ipipe[2], opipe[2], ok; @@ -623,9 +662,7 @@ main(argc, argv) } /* run connection script */ - if (connector && connector[0]) { - MAINDEBUG(("Connecting with <%s>", connector)); - + if ((connector && connector[0]) || initializer) { if (real_ttyfd != -1) { if (!default_device && modem) { setdtr(real_ttyfd, 0); /* in case modem is off hook */ @@ -634,14 +671,29 @@ main(argc, argv) } } - if (device_script(connector, ttyfd, ttyfd, 0) < 0) { - error("Connect script failed"); - goto fail; + if (initializer && initializer[0]) { + if (device_script(initializer, ttyfd, ttyfd, 0) < 0) { + error("Initializer script failed"); + status = EXIT_INIT_FAILED; + goto fail; + } + if (kill_link) + goto disconnect; + + info("Serial port initialized."); } - if (kill_link) - goto disconnect; - info("Serial connection established."); + if (connector && connector[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."); + } /* set line speed, flow control, etc.; clear CLOCAL if modem option */ @@ -654,8 +706,10 @@ 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; } @@ -673,8 +727,10 @@ main(argc, argv) /* set up the serial device as a ppp interface */ fd_ppp = establish_ppp(ttyfd); - if (fd_ppp < 0) + if (fd_ppp < 0) { + status = EXIT_FATAL_ERROR; goto disconnect; + } if (!demand) { @@ -691,6 +747,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); /* @@ -708,6 +768,7 @@ 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); @@ -740,12 +801,9 @@ main(argc, argv) /* * 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); } @@ -833,6 +891,7 @@ main(argc, argv) } /* Wait for scripts to finish */ + /* XXX should have a timeout here */ while (n_children > 0) { if (debug) { struct subprocess *chp; @@ -843,7 +902,7 @@ main(argc, argv) reap_kids(1); } - die(0); + die(status); return 0; } @@ -945,6 +1004,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; @@ -1066,6 +1126,30 @@ close_tty() 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); +} + struct callout { struct timeval c_time; /* time at which to call routine */ @@ -1221,6 +1305,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); @@ -1244,6 +1330,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); @@ -1320,7 +1407,7 @@ bad_signal(sig) kill_my_pg(SIGTERM); if (charshunt_pid) kill(charshunt_pid, SIGTERM); - die(1); + die(127); }