X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-osf.c;h=257df0a6a06d06158fa8c96126c95d87f7f96976;hp=8cd7710b7a4989e72c4c5b8782f33b20c4867f02;hb=df5571391641b9086171b6a07b8b63618a08c535;hpb=7dabc25770ff656c974723282a19f4bdec8deea4 diff --git a/pppd/sys-osf.c b/pppd/sys-osf.c index 8cd7710..257df0a 100644 --- a/pppd/sys-osf.c +++ b/pppd/sys-osf.c @@ -19,7 +19,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: sys-osf.c,v 1.3 1995/04/28 06:26:23 paulus Exp $"; +static char rcsid[] = "$Id: sys-osf.c,v 1.7 1996/01/18 03:23:04 paulus Exp $"; #endif /* @@ -67,10 +67,21 @@ static int closed_stdio; static int restore_term; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ static struct winsize wsinfo; /* Initial window size info */ +static int initfdflags = -1; /* Initial file descriptor flags for fd */ -int sockfd; /* socket for doing interface ioctls */ +static int sockfd; /* socket for doing interface ioctls */ + +int orig_ttyfd = -1; /* Original ttyfd if we did a streamify() */ + +static int if_is_up; /* Interface has been marked up */ +static u_int32_t default_route_gateway; /* Gateway for default route added */ +static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ + +/* Prototypes for procedures local to this file. */ +static int translate_speed __P((int)); +static int baud_rate_of __P((int)); +static int get_ether_addr __P((u_int32_t, struct sockaddr *)); -int ttyfd = -1; /* Original ttyfd if we did a streamify() */ /* * sys_init - System-dependent initialization. @@ -90,6 +101,31 @@ sys_init() } } +/* + * sys_cleanup - restore any system state we modified before exiting: + * mark the interface down, delete default route and/or proxy arp entry. + * This should call die() because it's called from die(). + */ +void +sys_cleanup() +{ + struct ifreq ifr; + + if (if_is_up) { + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) >= 0 + && ((ifr.ifr_flags & IFF_UP) != 0)) { + ifr.ifr_flags &= ~IFF_UP; + ioctl(sockfd, SIOCSIFFLAGS, &ifr); + } + } + + if (default_route_gateway) + cifdefaultroute(0, default_route_gateway); + if (proxy_arp_addr) + cifproxyarp(0, proxy_arp_addr); +} + /* * note_debug_level - note a change in the debug level. */ @@ -230,7 +266,7 @@ streamify(int fd) } } else { close(fdes[1]); - ttyfd = fd; + orig_ttyfd = fd; return(fdes[0]); } } @@ -243,12 +279,13 @@ streamify(int fd) * establish_ppp - Turn the serial port into a ppp interface. */ void -establish_ppp() +establish_ppp(fd) + int fd; { int ret; if (isastream(fd) != 1) { - if ((fd=streamify(fd)) < 0) { + if ((ttyfd = fd = streamify(fd)) < 0) { syslog(LOG_ERR, "Couldn't get a STREAMS module!\n"); die(1); } @@ -308,6 +345,14 @@ establish_ppp() close(i); closed_stdio = 1; } + + /* + * Set device for non-blocking reads. + */ + if ((initfdflags = fcntl(fd, F_GETFL)) == -1 + || fcntl(fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) { + syslog(LOG_WARNING, "Couldn't set device to non-blocking mode: %m"); + } } /* Debugging routine.... */ @@ -338,11 +383,17 @@ void prstrstack(int fd) * modules. This shouldn't call die() because it's called from die(). */ void -disestablish_ppp() +disestablish_ppp(fd) + int fd; { int flags; char *s; + /* Reset non-blocking mode on the file descriptor. */ + if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0) + syslog(LOG_WARNING, "Couldn't restore device fd flags: %m"); + initfdflags = -1; + if (hungup) { /* we can't push or pop modules after the stream has hung up */ str_module_count = 0; @@ -350,11 +401,42 @@ disestablish_ppp() return; } + if (pushed_ppp) { + while (ioctl(fd, I_POP, 0) == 0) /* pop any we pushed */ + ; + pushed_ppp = 0; + + for (; str_module_count > 0; str_module_count--) { + if (ioctl(fd, I_PUSH, str_modules[str_module_count-1].modname)) { + if (errno != ENXIO) + syslog(LOG_WARNING, "str_restore: couldn't push module %s: %m", + str_modules[str_module_count-1].modname); + } else { + MAINDEBUG((LOG_INFO, "str_restore: pushed module %s", + str_modules[str_module_count-1].modname)); + } + } + + if (orig_ttyfd >= 0) { + close(fd); + ttyfd = orig_ttyfd; + fd = -1; + } + } + +} + +/* + * clean_check - check whether the link seems to be 8-bit clean. + */ +void +clean_check() +{ if (pushed_ppp) { /* * Check whether the link seems not to be 8-bit clean. */ - if (ioctl(fd, (int)SIOCGIFDEBUG, (caddr_t) &flags) == 0) { + if (ioctl(ttyfd, (int)SIOCGIFDEBUG, (caddr_t) &flags) == 0) { s = NULL; switch (~flags & PAI_FLAGS_HIBITS) { case PAI_FLAGS_B7_0: @@ -375,32 +457,9 @@ disestablish_ppp() syslog(LOG_WARNING, "All received characters had %s", s); } } - - while (ioctl(fd, I_POP, 0) == 0) /* pop any we pushed */ - ; - pushed_ppp = 0; - - for (; str_module_count > 0; str_module_count--) { - if (ioctl(fd, I_PUSH, str_modules[str_module_count-1].modname)) { - if (errno != ENXIO) - syslog(LOG_WARNING, "str_restore: couldn't push module %s: %m", - str_modules[str_module_count-1].modname); - } else { - MAINDEBUG((LOG_INFO, "str_restore: pushed module %s", - str_modules[str_module_count-1].modname)); - } - } - - if (ttyfd >= 0) { - close(fd); - fd = ttyfd; - ttyfd = -1; - } } - } - /* * List of valid speeds. */ @@ -479,7 +538,7 @@ struct speed { /* * Translate from bits/second to a speed_t. */ -int +static int translate_speed(bps) int bps; { @@ -497,7 +556,7 @@ translate_speed(bps) /* * Translate from a speed_t to bits/second. */ -int +static int baud_rate_of(speed) int speed; { @@ -548,8 +607,8 @@ set_up_tty(fd, local) tios.c_cc[VMIN] = 1; tios.c_cc[VTIME] = 0; - if (crtscts == 2) { - tios.c_iflag |= IXOFF; + if (crtscts == -2) { + tios.c_iflag |= IXON | IXOFF; tios.c_cc[VSTOP] = 0x13; /* DC3 = XOFF = ^S */ tios.c_cc[VSTART] = 0x11; /* DC1 = XON = ^Q */ } @@ -584,9 +643,19 @@ set_up_tty(fd, local) * restore_tty - restore the terminal to the saved settings. */ void -restore_tty() +restore_tty(fd) + int fd; { if (restore_term) { + if (!default_device) { + /* + * Turn off echoing, because otherwise we can get into + * a loop with the tty and the modem echoing to each other. + * We presume we are the sole user of this tty device, so + * when we close it, it will revert to its defaults anyway. + */ + inittermios.c_lflag &= ~(ECHO | ECHONL); + } if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) if (errno != ENXIO) syslog(LOG_WARNING, "tcsetattr: %m"); @@ -618,20 +687,25 @@ output(unit, p, len) u_char *p; int len; { - struct strbuf str; + struct strbuf str; + int retries; + struct pollfd pfd; - if (unit != 0) - MAINDEBUG((LOG_WARNING, "output: unit != 0!")); if (debug) log_packet(p, len, "sent "); str.len = len; str.buf = (caddr_t) p; - if (putmsg(fd, NULL, &str, 0) < 0) { - if (errno != ENXIO) { - syslog(LOG_ERR, "putmsg: %m"); - die(1); + retries = 4; + while (putmsg(ttyfd, NULL, &str, 0) < 0) { + if (--retries < 0 || (errno != EWOULDBLOCK && errno != EAGAIN)) { + if (errno != ENXIO) + syslog(LOG_ERR, "Couldn't send packet: %m"); + break; } + pfd.fd = ttyfd; + pfd.events = POLLOUT; + poll(&pfd, 1, 250); /* wait for up to 0.25 seconds */ } } @@ -646,7 +720,7 @@ wait_input(timo) struct pollfd pfd; t = timo == NULL? -1: timo->tv_sec * 1000 + timo->tv_usec / 1000; - pfd.fd = fd; + pfd.fd = ttyfd; pfd.events = POLLIN | POLLPRI | POLLHUP; if (poll(&pfd, 1, t) < 0 && errno != EINTR) { syslog(LOG_ERR, "poll: %m"); @@ -670,12 +744,12 @@ read_packet(buf) ctl.maxlen = sizeof(ctlbuf); ctl.buf = (caddr_t) ctlbuf; i = 0; - len = getmsg(fd, &ctl, &str, &i); + len = getmsg(ttyfd, &ctl, &str, &i); if (len < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) { return -1; } - syslog(LOG_ERR, "getmsg(fd) %m"); + syslog(LOG_ERR, "getmsg %m"); die(1); } if (len) @@ -713,19 +787,19 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) quit(); } - if(ioctl(fd, (int)SIOCSIFASYNCMAP, (caddr_t) &asyncmap) < 0) { + if(ioctl(ttyfd, (int)SIOCSIFASYNCMAP, (caddr_t) &asyncmap) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFASYNCMAP): %m"); quit(); } c = (pcomp? 1: 0); - if(ioctl(fd, (int)SIOCSIFCOMPPROT, &c) < 0) { + if(ioctl(ttyfd, (int)SIOCSIFCOMPPROT, &c) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m"); quit(); } c = (accomp? 1: 0); - if(ioctl(fd, (int)SIOCSIFCOMPAC, &c) < 0) { + if(ioctl(ttyfd, (int)SIOCSIFCOMPAC, &c) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m"); quit(); } @@ -740,7 +814,7 @@ ppp_set_xaccm(unit, accm) int unit; ext_accm accm; { - if (ioctl(fd, (int)SIOCSIFXASYNCMAP, accm) < 0 && errno != ENOTTY) + if (ioctl(ttyfd, (int)SIOCSIFXASYNCMAP, accm) < 0 && errno != ENOTTY) syslog(LOG_WARNING, "ioctl(set extended ACCM): %m"); } @@ -757,21 +831,21 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) { char c; - if (ioctl(fd, (int)SIOCSIFMRU, &mru) < 0) { + if (ioctl(ttyfd, (int)SIOCSIFMRU, &mru) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFMRU): %m"); } - if (ioctl(fd, (int)SIOCSIFRASYNCMAP, (caddr_t) &asyncmap) < 0) { + if (ioctl(ttyfd, (int)SIOCSIFRASYNCMAP, (caddr_t) &asyncmap) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFRASYNCMAP): %m"); } c = 2 + (pcomp? 1: 0); - if(ioctl(fd, (int)SIOCSIFCOMPPROT, &c) < 0) { + if(ioctl(ttyfd, (int)SIOCSIFCOMPPROT, &c) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m"); } c = 2 + (accomp? 1: 0); - if (ioctl(fd, (int)SIOCSIFCOMPAC, &c) < 0) { + if (ioctl(ttyfd, (int)SIOCSIFCOMPAC, &c) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m"); } } @@ -792,7 +866,9 @@ ccp_test(unit, opt_ptr, opt_len, for_transmit) data.length = opt_len; data.transmit = for_transmit; BCOPY(opt_ptr, data.opt_data, opt_len); - return ioctl(fd, (int)SIOCSCOMPRESS, (caddr_t) &data) >= 0; + if (ioctl(ttyfd, (int)SIOCSCOMPRESS, (caddr_t) &data) >= 0) + return 1; + return (errno == ENOSR)? 0: -1; } /* @@ -805,7 +881,7 @@ ccp_flags_set(unit, isopen, isup) int x; x = (isopen? 1: 0) + (isup? 2: 0); - if (ioctl(fd, (int)SIOCSIFCOMP, (caddr_t) &x) < 0 && errno != ENOTTY) + if (ioctl(ttyfd, (int)SIOCSIFCOMP, (caddr_t) &x) < 0 && errno != ENOTTY) syslog(LOG_ERR, "ioctl (SIOCSIFCOMP): %m"); } @@ -820,7 +896,7 @@ ccp_fatal_error(unit) { int x; - if (ioctl(fd, (int)SIOCGIFCOMP, (caddr_t) &x) < 0) { + if (ioctl(ttyfd, (int)SIOCGIFCOMP, (caddr_t) &x) < 0) { syslog(LOG_ERR, "ioctl(SIOCGIFCOMP): %m"); return 0; } @@ -837,7 +913,7 @@ sifvjcomp(u, vjcomp, cidcomp, maxcid) char x; x = (vjcomp? 1: 0) + (cidcomp? 0: 2) + (maxcid << 4); - if (ioctl(fd, (int)SIOCSIFVJCOMP, (caddr_t) &x) < 0) { + if (ioctl(ttyfd, (int)SIOCSIFVJCOMP, (caddr_t) &x) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFVJCOMP): %m"); return 0; } @@ -864,9 +940,10 @@ sifup(u) syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); return 0; } + if_is_up = 1; npi.protocol = PPP_IP; npi.mode = NPMODE_PASS; - if (ioctl(fd, (int)SIOCSETNPMODE, &npi) < 0) { + if (ioctl(ttyfd, (int)SIOCSETNPMODE, &npi) < 0) { if (errno != ENOTTY) { syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m"); return 0; @@ -889,7 +966,7 @@ sifdown(u) rv = 1; npi.protocol = PPP_IP; npi.mode = NPMODE_ERROR; - if (ioctl(fd, (int)SIOCSETNPMODE, (caddr_t) &npi) < 0) { + if (ioctl(ttyfd, (int)SIOCSETNPMODE, (caddr_t) &npi) < 0) { if (errno != ENOTTY) { syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m"); rv = 0; @@ -905,7 +982,8 @@ sifdown(u) if (ioctl(sockfd, (int)SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); rv = 0; - } + } else + if_is_up = 0; } return rv; } @@ -1002,6 +1080,7 @@ sifdefaultroute(u, g) syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m"); return 0; } + default_route_gateway = g; return 1; } @@ -1023,6 +1102,7 @@ cifdefaultroute(u, g) syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m"); return 0; } + default_route_gateway = 0; return 1; } @@ -1055,6 +1135,7 @@ sifproxyarp(unit, hisaddr) return 0; } + proxy_arp_addr = hisaddr; return 1; } @@ -1075,6 +1156,7 @@ cifproxyarp(unit, hisaddr) syslog(LOG_ERR, "ioctl(SIOCDARP): %m"); return 0; } + proxy_arp_addr = 0; return 1; } @@ -1086,7 +1168,7 @@ cifproxyarp(unit, hisaddr) int s; -int +static int get_ether_addr(ipaddr, hwaddr) u_int ipaddr; struct sockaddr *hwaddr; @@ -1111,7 +1193,7 @@ get_ether_addr(ipaddr, hwaddr) * address on the same subnet as `ipaddr'. */ ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); - for (ifr = ifc.ifc_req; ifr < ifend; ) { + for (ifr = ifc.ifc_req; ifr < ifend; ++ifr) { if (ifr->ifr_addr.sa_family == AF_INET) { ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr; strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); @@ -1136,7 +1218,6 @@ get_ether_addr(ipaddr, hwaddr) break; } - ifr++; } if (ifr >= ifend)