X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Ftty.c;h=852cee700ac2d6811a9dfad81665defd1566238d;hp=5d65cd2765a485f43a07a3d99dcef81b47ddc851;hb=e712ba49ba8dd497958d415e988bf93008c8fbb4;hpb=7977da267649fee17261d0d163a12863f3534b57 diff --git a/pppd/tty.c b/pppd/tty.c index 5d65cd2..852cee7 100644 --- a/pppd/tty.c +++ b/pppd/tty.c @@ -68,12 +68,11 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: tty.c,v 1.18 2004/11/04 10:02:26 paulus Exp $" - #include #include #include #include +#include #include #include #include @@ -82,7 +81,6 @@ #include #include #include -#include #include #include #include @@ -97,28 +95,28 @@ #include "fsm.h" #include "lcp.h" -void tty_process_extra_options __P((void)); -void tty_check_options __P((void)); -int connect_tty __P((void)); -void disconnect_tty __P((void)); -void tty_close_fds __P((void)); -void cleanup_tty __P((void)); -void tty_do_send_config __P((int, u_int32_t, int, int)); - -static int setdevname __P((char *, char **, int)); -static int setspeed __P((char *, char **, int)); -static int setxonxoff __P((char **)); -static int setescape __P((char **)); -static void printescape __P((option_t *, void (*)(void *, char *,...),void *)); -static void finish_tty __P((void)); -static int start_charshunt __P((int, int)); -static void stop_charshunt __P((void *, 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 *)); -static int open_socket __P((char *)); -static void maybe_relock __P((void *, int)); +void tty_process_extra_options(void); +void tty_check_options(void); +int connect_tty(void); +void disconnect_tty(void); +void tty_close_fds(void); +void cleanup_tty(void); +void tty_do_send_config(int, u_int32_t, int, int); + +static int setdevname(char *, char **, int); +static int setspeed(char *, char **, int); +static int setxonxoff(char **); +static int setescape(char **); +static void printescape(option_t *, void (*)(void *, char *,...),void *); +static void finish_tty(void); +static int start_charshunt(int, int); +static void stop_charshunt(void *, int); +static void charshunt_done(void *); +static void charshunt(int, int, char *); +static int record_write(FILE *, int code, u_char *buf, int nb, + struct timeval *); +static int open_socket(char *); +static void maybe_relock(void *, int); static int pty_master; /* fd for master side of pty */ static int pty_slave; /* fd for slave side of pty */ @@ -135,6 +133,7 @@ struct stat devstat; /* result of stat() on devnam */ /* option variables */ int crtscts = 0; /* Use hardware flow control */ +int stop_bits = 1; /* Number of serial port stop bits */ bool modem = 1; /* Use modem control lines */ int inspeed = 0; /* Input/Output speed requested */ bool lockflag = 0; /* Create lock file to lock the serial dev */ @@ -152,6 +151,8 @@ int using_pty = 0; /* we're allocating a pty as the device */ extern uid_t uid; extern int kill_link; +extern int asked_to_quit; +extern int got_sigterm; /* XXX */ extern int privopen; /* don't lock, open device as root */ @@ -218,6 +219,9 @@ option_t tty_options[] = { OPT_PRIOSUB | OPT_ALIAS | OPT_NOARG | OPT_VAL(-1) }, { "xonxoff", o_special_noarg, (void *)setxonxoff, "Set software (XON/XOFF) flow control", OPT_PRIOSUB }, + { "stop-bits", o_int, &stop_bits, + "Number of stop bits in serial port", + OPT_PRIO | OPT_PRIVFIX | OPT_LIMITS, NULL, 2, 1 }, { "modem", o_bool, &modem, "Use modem control lines", OPT_PRIO | 1 }, @@ -259,10 +263,7 @@ struct channel tty_channel = { * potentially a speed value. */ static int -setspeed(arg, argv, doit) - char *arg; - char **argv; - int doit; +setspeed(char *arg, char **argv, int doit) { char *ptr; int spd; @@ -284,10 +285,7 @@ setspeed(arg, argv, doit) * potentially a device name. */ static int -setdevname(cp, argv, doit) - char *cp; - char **argv; - int doit; +setdevname(char *cp, char **argv, int doit) { struct stat statbuf; char dev[MAXPATHLEN]; @@ -326,8 +324,7 @@ setdevname(cp, argv, doit) } static int -setxonxoff(argv) - char **argv; +setxonxoff(char **argv) { lcp_wantoptions[0].asyncmap |= 0x000A0000; /* escape ^S and ^Q */ lcp_wantoptions[0].neg_asyncmap = 1; @@ -340,8 +337,7 @@ setxonxoff(argv) * setescape - add chars to the set we escape on transmission. */ static int -setescape(argv) - char **argv; +setescape(char **argv) { int n, ret; char *p, *endp; @@ -369,10 +365,7 @@ setescape(argv) } static void -printescape(opt, printer, arg) - option_t *opt; - void (*printer) __P((void *, char *, ...)); - void *arg; +printescape(option_t *opt, void (*printer)(void *, char *, ...), void *arg) { int n; int first = 1; @@ -395,7 +388,7 @@ printescape(opt, printer, arg) /* * tty_init - do various tty-related initializations. */ -void tty_init() +void tty_init(void) { add_notifier(&pidchange, maybe_relock, 0); the_channel = &tty_channel; @@ -406,7 +399,7 @@ void tty_init() * tty_process_extra_options - work out which tty device we are using * and read its options file. */ -void tty_process_extra_options() +void tty_process_extra_options(void) { using_pty = notty || ptycommand != NULL || pty_socket != NULL; if (using_pty) @@ -438,12 +431,17 @@ void tty_process_extra_options() * tty_check_options - do consistency checks on the options we were given. */ void -tty_check_options() +tty_check_options(void) { struct stat statbuf; int fdflags; - if (demand && connect_script == 0) { + if (demand && notty) { + option_error("demand-dialling is incompatible with notty"); + exit(EXIT_OPTION_ERROR); + } + if (demand && connect_script == 0 && ptycommand == NULL + && pty_socket == NULL) { option_error("connect script is required for demand-dialling\n"); exit(EXIT_OPTION_ERROR); } @@ -503,7 +501,7 @@ tty_check_options() * That is, open the serial port, set its speed and mode, and run * the connector and/or welcomer. */ -int connect_tty() +int connect_tty(void) { char *connector; int fdflags; @@ -535,7 +533,7 @@ int connect_tty() status = EXIT_LOCK_FAILED; if (lockflag && !privopen) { if (lock(devnam) < 0) - return -1; + goto errret; locked = 1; } @@ -546,8 +544,7 @@ int connect_tty() * 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; + got_sigterm = 0; connector = doing_callback? callback_script: connect_script; if (devnam[0] != 0) { for (;;) { @@ -556,13 +553,17 @@ int connect_tty() int err, prio; prio = privopen? OPRIO_ROOT: tty_options[0].priority; - if (prio < OPRIO_ROOT) - seteuid(uid); - ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0); + if (prio < OPRIO_ROOT && seteuid(uid) == -1) { + error("Unable to drop privileges before opening %s: %m\n", + devnam); + status = EXIT_OPEN_FAILED; + goto errret; + } + real_ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0); err = errno; - if (prio < OPRIO_ROOT) - seteuid(0); - if (ttyfd >= 0) + if (prio < OPRIO_ROOT && seteuid(0) == -1) + fatal("Unable to regain privileges"); + if (real_ttyfd >= 0) break; errno = err; if (err != EINTR) { @@ -570,9 +571,9 @@ int connect_tty() status = EXIT_OPEN_FAILED; } if (!persist || err != EINTR) - return -1; + goto errret; } - real_ttyfd = ttyfd; + ttyfd = real_ttyfd; 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"); @@ -629,30 +630,38 @@ int connect_tty() close(opipe[0]); close(opipe[1]); if (!ok) - return -1; + goto errret; } else { if (device_script(ptycommand, pty_master, pty_master, 1) < 0) - return -1; - ttyfd = pty_slave; - close(pty_master); - pty_master = -1; + goto errret; } } else if (pty_socket != NULL) { int fd = open_socket(pty_socket); if (fd < 0) - return -1; + goto errret; if (!start_charshunt(fd, fd)) - return -1; + goto errret; + close(fd); } else if (notty) { if (!start_charshunt(0, 1)) - return -1; + goto errret; + dup2(fd_devnull, 0); + dup2(fd_devnull, 1); + if (log_to_fd == 1) + log_to_fd = -1; + if (log_to_fd != 2) + dup2(fd_devnull, 2); } else if (record_file != NULL) { - if (!start_charshunt(ttyfd, ttyfd)) - return -1; + int fd = dup(ttyfd); + if (!start_charshunt(fd, fd)) + goto errret; } - if (using_pty || record_file != NULL) + if (using_pty || record_file != NULL) { ttyfd = pty_slave; + close(pty_master); + pty_master = -1; + } /* run connection script */ if ((connector && connector[0]) || initializer) { @@ -669,11 +678,11 @@ int connect_tty() if (device_script(initializer, ttyfd, ttyfd, 0) < 0) { error("Initializer script failed"); status = EXIT_INIT_FAILED; - return -1; + goto errretf; } - if (kill_link) { + if (got_sigterm) { disconnect_tty(); - return -1; + goto errretf; } info("Serial port initialized."); } @@ -682,11 +691,11 @@ int connect_tty() if (device_script(connector, ttyfd, ttyfd, 0) < 0) { error("Connect script failed"); status = EXIT_CONNECT_FAILED; - return -1; + goto errretf; } - if (kill_link) { + if (got_sigterm) { disconnect_tty(); - return -1; + goto errretf; } info("Serial connection established."); } @@ -710,8 +719,8 @@ int connect_tty() error("Failed to reopen %s: %m", devnam); status = EXIT_OPEN_FAILED; } - if (!persist || errno != EINTR || hungup || kill_link) - return -1; + if (!persist || errno != EINTR || hungup || got_sigterm) + goto errret; } close(i); } @@ -730,14 +739,27 @@ int connect_tty() * 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) + if (connector != NULL || ptycommand != NULL || pty_socket != NULL) listen_time = connect_delay; return ttyfd; + + errretf: + if (real_ttyfd >= 0) + tcflush(real_ttyfd, TCIOFLUSH); + errret: + if (pty_master >= 0) { + close(pty_master); + pty_master = -1; + } + ttyfd = -1; + if (got_sigterm) + asked_to_quit = 1; + return -1; } -void disconnect_tty() +void disconnect_tty(void) { if (disconnect_script == NULL || hungup) return; @@ -748,12 +770,11 @@ void disconnect_tty() } else { info("Serial link disconnected."); } + stop_charshunt(NULL, 0); } -void tty_close_fds() +void tty_close_fds(void) { - if (pty_master >= 0) - close(pty_master); if (pty_slave >= 0) close(pty_slave); if (real_ttyfd >= 0) { @@ -763,7 +784,7 @@ void tty_close_fds() /* N.B. ttyfd will == either pty_slave or real_ttyfd */ } -void cleanup_tty() +void cleanup_tty(void) { if (real_ttyfd >= 0) finish_tty(); @@ -779,10 +800,7 @@ void cleanup_tty() * We set the extended transmit ACCM here as well. */ void -tty_do_send_config(mtu, accm, pcomp, accomp) - int mtu; - u_int32_t accm; - int pcomp, accomp; +tty_do_send_config(int mtu, u_int32_t accm, int pcomp, int accomp) { tty_set_xaccm(xmit_accm); tty_send_config(mtu, accm, pcomp, accomp); @@ -792,7 +810,7 @@ tty_do_send_config(mtu, accm, pcomp, accomp) * finish_tty - restore the terminal device to its original settings */ static void -finish_tty() +finish_tty(void) { /* drop dtr to hang up */ if (!default_device && modem) { @@ -821,9 +839,7 @@ finish_tty() * maybe_relock - our PID has changed, maybe update the lock file. */ static void -maybe_relock(arg, pid) - void *arg; - int pid; +maybe_relock(void *arg, int pid) { if (locked) relock(pid); @@ -834,8 +850,7 @@ maybe_relock(arg, pid) * host and port. */ static int -open_socket(dest) - char *dest; +open_socket(char *dest) { char *sep, *endp = NULL; int sock, port = -1; @@ -888,47 +903,42 @@ open_socket(dest) * start_charshunt - create a child process to run the character shunt. */ static int -start_charshunt(ifd, ofd) - int ifd, ofd; +start_charshunt(int ifd, int ofd) { int cpid; - cpid = safe_fork(); + cpid = safe_fork(ifd, ofd, (log_to_fd >= 0? log_to_fd: 2)); if (cpid == -1) { error("Can't fork process for character shunt: %m"); return 0; } if (cpid == 0) { /* child */ - close(pty_slave); + reopen_log(); + if (!nodetach) + log_to_fd = -1; + else if (log_to_fd >= 0) + log_to_fd = 2; + setgid(getgid()); setuid(uid); if (getuid() != uid) fatal("setuid failed"); - setgid(getgid()); - if (!nodetach) - log_to_fd = -1; - charshunt(ifd, ofd, record_file); + charshunt(0, 1, record_file); exit(0); } charshunt_pid = cpid; - add_notifier(&sigreceived, stop_charshunt, 0); - close(pty_master); - pty_master = -1; - record_child(cpid, "pppd (charshunt)", charshunt_done, NULL); + record_child(cpid, "pppd (charshunt)", charshunt_done, NULL, 1); return 1; } static void -charshunt_done(arg) - void *arg; +charshunt_done(void *arg) { charshunt_pid = 0; } static void -stop_charshunt(arg, sig) - void *arg; - int sig; +stop_charshunt(void *arg, int sig) { if (charshunt_pid) kill(charshunt_pid, (sig == SIGINT? sig: SIGTERM)); @@ -941,9 +951,7 @@ stop_charshunt(arg, sig) * (We assume ofd >= ifd which is true the way this gets called. :-). */ static void -charshunt(ifd, ofd, record_file) - int ifd, ofd; - char *record_file; +charshunt(int ifd, int ofd, char *record_file) { int n, nfds; fd_set ready, writey; @@ -1038,7 +1046,7 @@ charshunt(ifd, ofd, record_file) pty_readable = stdin_readable = 1; ilevel = olevel = 0; - gettimeofday(&levelt, NULL); + get_time(&levelt); if (max_data_rate) { max_level = max_data_rate / 10; if (max_level < 100) @@ -1087,7 +1095,7 @@ charshunt(ifd, ofd, record_file) int nbt; struct timeval now; - gettimeofday(&now, NULL); + get_time(&now); dt = (now.tv_sec - levelt.tv_sec + (now.tv_usec - levelt.tv_usec) / 1e6); nbt = (int)(dt * max_data_rate); @@ -1110,9 +1118,6 @@ charshunt(ifd, ofd, record_file) } 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; @@ -1149,7 +1154,8 @@ charshunt(ifd, ofd, record_file) if (!record_write(recordf, 1, obufp, nobuf, &lasttime)) recordf = NULL; } - } + } else if (!stdin_readable) + pty_readable = 0; if (FD_ISSET(ofd, &writey)) { n = nobuf; if (olevel + n > max_level) @@ -1193,12 +1199,7 @@ charshunt(ifd, ofd, record_file) } static int -record_write(f, code, buf, nb, tp) - FILE *f; - int code; - u_char *buf; - int nb; - struct timeval *tp; +record_write(FILE *f, int code, u_char *buf, int nb, struct timeval *tp) { struct timeval now; int diff;