X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-str.c;h=0754553d6c96df77e8dc668628b6f3769755e264;hp=780b27f95d643403798c57e64f33a8a21add2979;hb=03c27e8191546fde9b0821645d72e4234d5d47bc;hpb=d56fd0e479ba9d2e11f1dd520e12c43a2429fc6f diff --git a/pppd/sys-str.c b/pppd/sys-str.c index 780b27f..0754553 100644 --- a/pppd/sys-str.c +++ b/pppd/sys-str.c @@ -18,6 +18,10 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static char rcsid[] = "$Id: sys-str.c,v 1.16 1994/10/24 04:30:35 paulus Exp $"; +#endif + /* * TODO: */ @@ -25,26 +29,27 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include +#include #include #include #include #include +#include +#include #include #include #include #include "pppd.h" -#include "ppp.h" -#include #ifndef ifr_mtu #define ifr_mtu ifr_metric @@ -58,16 +63,34 @@ static int str_module_count = 0; static int pushed_ppp; static int closed_stdio; -extern int hungup; /* has the physical layer been disconnected? */ -extern int kdebugflag; -extern int default_device; -extern int restore_term; +static int restore_term; /* 1 => we've munged the terminal */ +static struct termios inittermios; /* Initial TTY termios */ -#define PAI_FLAGS_B7_0 0x100 -#define PAI_FLAGS_B7_1 0x200 -#define PAI_FLAGS_PAR_EVEN 0x400 -#define PAI_FLAGS_PAR_ODD 0x800 -#define PAI_FLAGS_HIBITS 0xF00 +/* + * sys_init - System-dependent initialization. + */ +void +sys_init() +{ + openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); + setlogmask(LOG_UPTO(LOG_INFO)); + if (debug) + setlogmask(LOG_UPTO(LOG_DEBUG)); +} + +/* + * note_debug_level - note a change in the debug level. + */ +void +note_debug_level() +{ + if (debug) { + syslog(LOG_INFO, "Debug turned ON, Level %d", debug); + setlogmask(LOG_UPTO(LOG_DEBUG)); + } else { + setlogmask(LOG_UPTO(LOG_WARNING)); + } +} /* * daemon - Detach us from the terminal session. @@ -235,6 +258,209 @@ disestablish_ppp() } +/* + * List of valid speeds. + */ +struct speed { + int speed_int, speed_val; +} speeds[] = { +#ifdef B50 + { 50, B50 }, +#endif +#ifdef B75 + { 75, B75 }, +#endif +#ifdef B110 + { 110, B110 }, +#endif +#ifdef B134 + { 134, B134 }, +#endif +#ifdef B150 + { 150, B150 }, +#endif +#ifdef B200 + { 200, B200 }, +#endif +#ifdef B300 + { 300, B300 }, +#endif +#ifdef B600 + { 600, B600 }, +#endif +#ifdef B1200 + { 1200, B1200 }, +#endif +#ifdef B1800 + { 1800, B1800 }, +#endif +#ifdef B2000 + { 2000, B2000 }, +#endif +#ifdef B2400 + { 2400, B2400 }, +#endif +#ifdef B3600 + { 3600, B3600 }, +#endif +#ifdef B4800 + { 4800, B4800 }, +#endif +#ifdef B7200 + { 7200, B7200 }, +#endif +#ifdef B9600 + { 9600, B9600 }, +#endif +#ifdef B19200 + { 19200, B19200 }, +#endif +#ifdef B38400 + { 38400, B38400 }, +#endif +#ifdef EXTA + { 19200, EXTA }, +#endif +#ifdef EXTB + { 38400, EXTB }, +#endif +#ifdef B57600 + { 57600, B57600 }, +#endif +#ifdef B115200 + { 115200, B115200 }, +#endif + { 0, 0 } +}; + +/* + * Translate from bits/second to a speed_t. + */ +int +translate_speed(bps) + int bps; +{ + struct speed *speedp; + + if (bps == 0) + return 0; + for (speedp = speeds; speedp->speed_int; speedp++) + if (bps == speedp->speed_int) + return speedp->speed_val; + syslog(LOG_WARNING, "speed %d not supported", bps); + return 0; +} + +/* + * Translate from a speed_t to bits/second. + */ +int +baud_rate_of(speed) + int speed; +{ + struct speed *speedp; + + if (speed == 0) + return 0; + for (speedp = speeds; speedp->speed_int; speedp++) + if (speed == speedp->speed_val) + return speedp->speed_int; + return 0; +} + +/* + * set_up_tty: Set up the serial port on `fd' for 8 bits, no parity, + * at the requested speed, etc. If `local' is true, set CLOCAL + * regardless of whether the modem option was specified. + */ +set_up_tty(fd, local) + int fd, local; +{ + int speed; + struct termios tios; + + if (tcgetattr(fd, &tios) < 0) { + syslog(LOG_ERR, "tcgetattr: %m"); + die(1); + } + + if (!restore_term) + inittermios = tios; + + tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL); + if (crtscts > 0) + tios.c_cflag |= CRTSCTS; + else if (crtscts < 0) + tios.c_cflag &= ~CRTSCTS; + + tios.c_cflag |= CS8 | CREAD | HUPCL; + if (local || !modem) + tios.c_cflag |= CLOCAL; + tios.c_iflag = IGNBRK | IGNPAR; + tios.c_oflag = 0; + tios.c_lflag = 0; + tios.c_cc[VMIN] = 1; + tios.c_cc[VTIME] = 0; + + if (crtscts == 2) { + tios.c_iflag |= IXOFF; + tios.c_cc[VSTOP] = 0x13; /* DC3 = XOFF = ^S */ + tios.c_cc[VSTART] = 0x11; /* DC1 = XON = ^Q */ + } + + speed = translate_speed(inspeed); + if (speed) { + cfsetospeed(&tios, speed); + cfsetispeed(&tios, speed); + } else { + speed = cfgetospeed(&tios); + /* + * We can't proceed if the serial port speed is B0, + * since that implies that the serial port is disabled. + */ + if (speed == B0) { + syslog(LOG_ERR, "Baud rate for %s is 0; need explicit baud rate", + devnam); + die(1); + } + } + + if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) { + syslog(LOG_ERR, "tcsetattr: %m"); + die(1); + } + + baud_rate = inspeed = baud_rate_of(speed); + restore_term = 1; +} + +/* + * restore_tty - restore the terminal to the saved settings. + */ +void +restore_tty() +{ + if (restore_term) { + if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) + if (errno != ENXIO) + syslog(LOG_WARNING, "tcsetattr: %m"); + restore_term = 0; + } +} + +/* + * setdtr - control the DTR line on the serial port. + * This is called from die(), so it shouldn't call die(). + */ +setdtr(fd, on) +int fd, on; +{ + int modembits = TIOCM_DTR; + + ioctl(fd, (on? TIOCMBIS: TIOCMBIC), &modembits); +} + + /* * output - Output PPP packet. */ @@ -261,7 +487,9 @@ output(unit, p, len) } } - +/* + * wait_input - wait for input, for a length of time specified in *timo. + */ wait_input(timo) struct timeval *timo; { @@ -288,14 +516,14 @@ read_packet(buf) int len, i; unsigned char ctlbuf[16]; - str.maxlen = MTU+DLLHEADERLEN; + str.maxlen = PPP_MTU + PPP_HDRLEN; str.buf = (caddr_t) buf; ctl.maxlen = sizeof(ctlbuf); ctl.buf = (caddr_t) ctlbuf; i = 0; len = getmsg(fd, &ctl, &str, &i); if (len < 0) { - if (errno == EAGAIN || errno == EWOULDBLOCK) { + if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) { return -1; } syslog(LOG_ERR, "getmsg(fd) %m"); @@ -323,7 +551,7 @@ read_packet(buf) void ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) int unit, mtu; - u_long asyncmap; + u_int32_t asyncmap; int pcomp, accomp; { char c; @@ -375,7 +603,7 @@ ppp_set_xaccm(unit, accm) void ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) int unit, mru; - u_long asyncmap; + u_int32_t asyncmap; int pcomp, accomp; { char c; @@ -431,6 +659,24 @@ ccp_flags_set(unit, isopen, isup) syslog(LOG_ERR, "ioctl (SIOCSIFCOMP): %m"); } +/* + * ccp_fatal_error - returns 1 if decompression was disabled as a + * result of an error detected after decompression of a packet, + * 0 otherwise. This is necessary because of patent nonsense. + */ +int +ccp_fatal_error(unit) + int unit; +{ + int x; + + if (ioctl(fd, SIOCGIFCOMP, (caddr_t) &x) < 0) { + syslog(LOG_ERR, "ioctl(SIOCGIFCOMP): %m"); + return 0; + } + return x & CCP_FATALERROR; +} + /* * sifvjcomp - config tcp header compression */ @@ -449,13 +695,14 @@ sifvjcomp(u, vjcomp, cidcomp, maxcid) } /* - * sifup - Config the interface up. + * sifup - Config the interface up and enable IP packets to pass. */ int sifup(u) int u; { struct ifreq ifr; + struct npioctl npi; strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { @@ -467,6 +714,14 @@ sifup(u) syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); return 0; } + npi.protocol = PPP_IP; + npi.mode = NPMODE_PASS; + if (ioctl(fd, SIOCSETNPMODE, &npi) < 0) { + if (errno != ENOTTY) { + syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m"); + return 0; + } + } return 1; } @@ -478,17 +733,31 @@ sifdown(u) int u; { struct ifreq ifr; + int rv; + struct npioctl npi; + + rv = 1; + npi.protocol = PPP_IP; + npi.mode = NPMODE_ERROR; + if (ioctl(fd, SIOCSETNPMODE, (caddr_t) &npi) < 0) { + if (errno != ENOTTY) { + syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m"); + rv = 0; + } + } + strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m"); - return 0; - } - ifr.ifr_flags &= ~IFF_UP; - if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); - return 0; + rv = 0; + } else { + ifr.ifr_flags &= ~IFF_UP; + if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { + syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); + rv = 0; + } } - return 1; + return rv; } /* @@ -504,7 +773,7 @@ sifdown(u) int sifaddr(u, o, h, m) int u; - u_long o, h, m; + u_int32_t o, h, m; { int ret; struct ifreq ifr; @@ -540,7 +809,7 @@ sifaddr(u, o, h, m) int cifaddr(u, o, h) int u; - u_long o, h; + u_int32_t o, h; { struct rtentry rt; @@ -562,7 +831,7 @@ cifaddr(u, o, h) int sifdefaultroute(u, g) int u; - u_long g; + u_int32_t g; { struct rtentry rt; @@ -583,7 +852,7 @@ sifdefaultroute(u, g) int cifdefaultroute(u, g) int u; - u_long g; + u_int32_t g; { struct rtentry rt; @@ -604,7 +873,7 @@ cifdefaultroute(u, g) int sifproxyarp(unit, hisaddr) int unit; - u_long hisaddr; + u_int32_t hisaddr; { struct arpreq arpreq; @@ -636,7 +905,7 @@ sifproxyarp(unit, hisaddr) int cifproxyarp(unit, hisaddr) int unit; - u_long hisaddr; + u_int32_t hisaddr; { struct arpreq arpreq; @@ -707,7 +976,7 @@ static void kread(); int get_ether_addr(ipaddr, hwaddr) - u_long ipaddr; + u_int32_t ipaddr; struct sockaddr *hwaddr; { register kvm_t *kd; @@ -723,7 +992,7 @@ get_ether_addr(ipaddr, hwaddr) struct in_ifaddr in; } ifaddr; #endif - u_long addr, mask; + u_int32_t addr, mask; /* Open kernel memory for reading */ kd = kvm_open(0, 0, 0, O_RDONLY, NULL); @@ -750,7 +1019,7 @@ get_ether_addr(ipaddr, hwaddr) syslog(LOG_ERR, "error reading ifnet addr"); return 0; } - for ( ; addr; addr = (u_long)ifp->if_next) { + for ( ; addr; addr = (u_int32_t)ifp->if_next) { if (kvm_read(kd, addr, (char *)ac, sizeof(*ac)) != sizeof(*ac)) { syslog(LOG_ERR, "error reading ifnet"); return 0; @@ -767,7 +1036,7 @@ get_ether_addr(ipaddr, hwaddr) /* Get interface ip address */ #ifdef SUNOS4 - if (kvm_read(kd, (u_long)ifp->if_addrlist, (char *)&ifaddr, + if (kvm_read(kd, (u_int32_t)ifp->if_addrlist, (char *)&ifaddr, sizeof(ifaddr)) != sizeof(ifaddr)) { syslog(LOG_ERR, "error reading ifaddr"); return 0;