X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-aix4.c;h=d620b2fa37c46bf99013f5aef10676c75fb76dc2;hp=897d24ace5de561b164684f4f6acb7b0481fb56b;hb=96dad36e1d37716004171559280613739e7df29e;hpb=e0903c63abee1abb5c1e86183f0d5abd3ef9cc23 diff --git a/pppd/sys-aix4.c b/pppd/sys-aix4.c index 897d24a..d620b2f 100644 --- a/pppd/sys-aix4.c +++ b/pppd/sys-aix4.c @@ -3,6 +3,7 @@ * PPP interfaces on AIX systems which use the STREAMS ppp interface. * * Copyright (c) 1989 Carnegie Mellon University. + * Copyright (c) 1995 The Australian National University. * All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -10,16 +11,17 @@ * duplicated in all such forms and that any documentation, * advertising materials, and other materials related to such * distribution and use acknowledge that the software was developed - * by Carnegie Mellon University. The name of the - * University may not be used to endorse or promote products derived - * from this software without specific prior written permission. + * by Carnegie Mellon University and The Australian National University. + * The names of the Universities may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #ifndef lint -static char rcsid[] = "$Id: sys-aix4.c,v 1.3 1995/04/24 05:50:43 paulus Exp $"; +static char rcsid[] = "$Id: sys-aix4.c,v 1.12 1997/04/30 05:57:19 paulus Exp $"; #endif /* @@ -68,8 +70,20 @@ static int closed_stdio; static int restore_term; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ +static int initfdflags = -1; /* Initial file descriptor flags for fd */ + +static int sockfd; /* socket for doing interface ioctls */ + +static int if_is_up; /* Interface has been marked up */ +static u_int32_t ifaddrs[2]; /* local and remote addresses */ +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 sockfd; /* socket for doing interface ioctls */ /* * sys_init - System-dependent initialization. @@ -77,11 +91,6 @@ int sockfd; /* socket for doing interface ioctls */ void sys_init() { - openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); - setlogmask(LOG_UPTO(LOG_INFO)); - if (debug) - setlogmask(LOG_UPTO(LOG_DEBUG)); - /* Get an internet socket for doing socket ioctl's on. */ if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { syslog(LOG_ERR, "Couldn't create IP socket: %m"); @@ -90,19 +99,32 @@ sys_init() } /* - * note_debug_level - note a change in the debug level. + * 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 -note_debug_level() +sys_cleanup() { - if (debug) { - syslog(LOG_INFO, "Debug turned ON, Level %d", debug); - setlogmask(LOG_UPTO(LOG_DEBUG)); - } else { - setlogmask(LOG_UPTO(LOG_WARNING)); + 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 (ifaddrs[0]) + cifaddr(0, ifaddrs[0], ifaddrs[1]); + if (default_route_gateway) + cifdefaultroute(0, 0, default_route_gateway); + if (proxy_arp_addr) + cifproxyarp(0, proxy_arp_addr); } + /* * daemon - Detach us from the terminal session. */ @@ -149,7 +171,8 @@ ppp_available() * establish_ppp - Turn the serial port into a ppp interface. */ void -establish_ppp() +establish_ppp(fd) + int fd; { /* go through and save the name of all the modules, then pop em */ for (;;) { @@ -206,6 +229,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"); + } } /* @@ -214,11 +245,17 @@ establish_ppp() * 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; @@ -348,7 +385,7 @@ struct speed { /* * Translate from bits/second to a speed_t. */ -int +static int translate_speed(bps) int bps; { @@ -366,7 +403,7 @@ translate_speed(bps) /* * Translate from a speed_t to bits/second. */ -int +static int baud_rate_of(speed) int speed; { @@ -385,6 +422,7 @@ baud_rate_of(speed) * at the requested speed, etc. If `local' is true, set CLOCAL * regardless of whether the modem option was specified. */ +void set_up_tty(fd, local) int fd, local; { @@ -401,12 +439,12 @@ set_up_tty(fd, local) inittermios = tios; tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL); - if (crtscts == 1) { + if (crtscts > 0) { bzero(&tiox, sizeof(tiox)); ioctl(fd, TCGETX, &tiox); tiox.x_hflag = RTSXOFF; ioctl(fd, TCSETX, &tiox); - tios.c_cflag &= ~(IXOFF); + tios.c_cflag &= ~(IXON | IXOFF); } else if (crtscts < 0) { bzero(&tiox, sizeof(tiox)); ioctl(fd, TCGETX, &tiox); @@ -424,8 +462,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 */ } @@ -460,9 +498,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"); @@ -474,6 +522,7 @@ restore_tty() * setdtr - control the DTR line on the serial port. * This is called from die(), so it shouldn't call die(). */ +void setdtr(fd, on) int fd, on; { @@ -492,26 +541,32 @@ 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 "); + log_packet(p, len, "sent ", LOG_DEBUG); 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 */ } } /* * wait_input - wait for input, for a length of time specified in *timo. */ +void wait_input(timo) struct timeval *timo; { @@ -519,7 +574,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"); @@ -543,12 +598,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) @@ -586,19 +641,19 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) quit(); } - if(ioctl(fd, SIOCSIFASYNCMAP, asyncmap) < 0) { + if(ioctl(ttyfd, SIOCSIFASYNCMAP, asyncmap) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFASYNCMAP): %m"); quit(); } c = (pcomp? 1: 0); - if(ioctl(fd, SIOCSIFCOMPPROT, c) < 0) { + if(ioctl(ttyfd, SIOCSIFCOMPPROT, c) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m"); quit(); } c = (accomp? 1: 0); - if(ioctl(fd, SIOCSIFCOMPAC, c) < 0) { + if(ioctl(ttyfd, SIOCSIFCOMPAC, c) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m"); quit(); } @@ -613,7 +668,7 @@ ppp_set_xaccm(unit, accm) int unit; ext_accm accm; { - if (ioctl(fd, SIOCSIFXASYNCMAP, accm) < 0 && errno != ENOTTY) + if (ioctl(ttyfd, SIOCSIFXASYNCMAP, accm) < 0 && errno != ENOTTY) syslog(LOG_WARNING, "ioctl(set extended ACCM): %m"); } @@ -630,21 +685,21 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) { char c; - if (ioctl(fd, SIOCSIFMRU, mru) < 0) { + if (ioctl(ttyfd, SIOCSIFMRU, mru) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFMRU): %m"); } - if (ioctl(fd, SIOCSIFRASYNCMAP, (caddr_t) asyncmap) < 0) { + if (ioctl(ttyfd, SIOCSIFRASYNCMAP, (caddr_t) asyncmap) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFRASYNCMAP): %m"); } c = 2 + (pcomp? 1: 0); - if(ioctl(fd, SIOCSIFCOMPPROT, c) < 0) { + if(ioctl(ttyfd, SIOCSIFCOMPPROT, c) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m"); } c = 2 + (accomp? 1: 0); - if (ioctl(fd, SIOCSIFCOMPAC, c) < 0) { + if (ioctl(ttyfd, SIOCSIFCOMPAC, c) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m"); } } @@ -653,6 +708,7 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) * ccp_test - ask kernel whether a given compression method * is acceptable for use. */ +int ccp_test(unit, opt_ptr, opt_len, for_transmit) int unit, opt_len, for_transmit; u_char *opt_ptr; @@ -664,7 +720,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, SIOCSCOMPRESS, &data) >= 0; + if (ioctl(ttyfd, SIOCSCOMPRESS, &data) >= 0) + return 1; + return (errno == ENOSR)? 0: -1; } /* @@ -677,7 +735,7 @@ ccp_flags_set(unit, isopen, isup) int x; x = (isopen? 1: 0) + (isup? 2: 0); - if (ioctl(fd, SIOCSIFCOMP, x) < 0 && errno != ENOTTY) + if (ioctl(ttyfd, SIOCSIFCOMP, x) < 0 && errno != ENOTTY) syslog(LOG_ERR, "ioctl (SIOCSIFCOMP): %m"); } @@ -692,7 +750,7 @@ ccp_fatal_error(unit) { int x; - if (ioctl(fd, SIOCGIFCOMP, &x) < 0) { + if (ioctl(ttyfd, SIOCGIFCOMP, &x) < 0) { syslog(LOG_ERR, "ioctl(SIOCGIFCOMP): %m"); return 0; } @@ -709,7 +767,7 @@ sifvjcomp(u, vjcomp, cidcomp, maxcid) int x; x = (vjcomp? 1: 0) + (cidcomp? 0: 2) + (maxcid << 4); - if (ioctl(fd, SIOCSIFVJCOMP, x) < 0) { + if (ioctl(ttyfd, SIOCSIFVJCOMP, x) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFVJCOMP): %m"); return 0; } @@ -724,7 +782,6 @@ sifup(u) int u; { struct ifreq ifr; - struct npioctl npi; strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { @@ -736,15 +793,28 @@ 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; - } - } + if_is_up = 1; + return 1; +} + +/* + * sifnpmode - Set the mode for handling packets for a given NP. + */ +int +sifnpmode(u, proto, mode) + int u; + int proto; + enum NPmode mode; +{ + struct npioctl npi; + + npi.protocol = proto; + npi.mode = mode; + if (ioctl(ppp_fd, PPPIOCSNPMODE, &npi) < 0) { + syslog(LOG_ERR, "ioctl(set NP %d mode to %d): %m", proto, mode); + return 0; + } return 1; } @@ -762,12 +832,8 @@ sifdown(u) rv = 1; npi.protocol = PPP_IP; npi.mode = NPMODE_ERROR; - if (ioctl(fd, SIOCSETNPMODE, &npi) < 0) { - if (errno != ENOTTY) { - syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m"); - rv = 0; - } - } + ioctl(ttyfd, SIOCSETNPMODE, &npi); + /* ignore errors, because ttyfd might have been closed by now. */ strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { @@ -778,7 +844,8 @@ sifdown(u) if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); rv = 0; - } + } else + if_is_up = 0; } return rv; } @@ -825,11 +892,16 @@ sifaddr(u, o, h, m) syslog(LOG_ERR, "ioctl(SIOCSIFDSTADDR): %m"); ret = 0; } + + /* XXX is this necessary? */ ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = o; if (ioctl(sockfd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { syslog(LOG_ERR, "ioctl(SIOCSIFADDR): %m"); ret = 0; } + + ifaddrs[0] = o; + ifaddrs[1] = h; return ret; } @@ -844,6 +916,8 @@ cifaddr(u, o, h) { struct ortentry rt; + ifaddrs[0] = 0; + BZERO(&rt, sizeof(rt)); SET_SA_FAMILY(rt.rt_dst, AF_INET); ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = h; SET_SA_FAMILY(rt.rt_gateway, AF_INET); @@ -860,12 +934,13 @@ cifaddr(u, o, h) * sifdefaultroute - assign a default route through the address given. */ int -sifdefaultroute(u, g) +sifdefaultroute(u, l, g) int u; - u_int32_t g; + u_int32_t l, g; { struct ortentry rt; + BZERO(&rt, sizeof(rt)); SET_SA_FAMILY(rt.rt_dst, AF_INET); SET_SA_FAMILY(rt.rt_gateway, AF_INET); ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g; @@ -874,6 +949,7 @@ sifdefaultroute(u, g) syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m"); return 0; } + default_route_gateway = g; return 1; } @@ -881,12 +957,13 @@ sifdefaultroute(u, g) * cifdefaultroute - delete a default route through the address given. */ int -cifdefaultroute(u, g) +cifdefaultroute(u, l, g) int u; - u_int32_t g; + u_int32_t l, g; { struct ortentry rt; + BZERO(&rt, sizeof(rt)); SET_SA_FAMILY(rt.rt_dst, AF_INET); SET_SA_FAMILY(rt.rt_gateway, AF_INET); ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g; @@ -895,6 +972,7 @@ cifdefaultroute(u, g) syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m"); return 0; } + default_route_gateway = 0; return 1; } @@ -927,6 +1005,7 @@ sifproxyarp(unit, hisaddr) return 0; } + proxy_arp_addr = hisaddr; return 1; } @@ -947,6 +1026,7 @@ cifproxyarp(unit, hisaddr) syslog(LOG_ERR, "ioctl(SIOCDARP): %m"); return 0; } + proxy_arp_addr = 0; return 1; } @@ -1106,11 +1186,79 @@ get_ether_addr(ipaddr, hwaddr) return(found); } +/* + * Return user specified netmask, modified by any mask we might determine + * for address `addr' (in network byte order). + * Here we scan through the system's list of interfaces, looking for + * any non-point-to-point interfaces which might appear to be on the same + * network as `addr'. If we find any, we OR in their netmask to the + * user-specified netmask. + */ +#define MAX_IFS 32 + +u_int32_t +GetMask(addr) + u_int32_t addr; +{ + u_int32_t mask, nmask, ina; + struct ifreq *ifr, *ifend, ifreq; + struct ifconf ifc; + struct ifreq ifs[MAX_IFS]; + + addr = ntohl(addr); + if (IN_CLASSA(addr)) /* determine network mask for address class */ + nmask = IN_CLASSA_NET; + else if (IN_CLASSB(addr)) + nmask = IN_CLASSB_NET; + else + nmask = IN_CLASSC_NET; + /* class D nets are disallowed by bad_ip_adrs */ + mask = netmask | htonl(nmask); + + /* + * Scan through the system's network interfaces. + */ + ifc.ifc_len = sizeof(ifs); + ifc.ifc_req = ifs; + if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) { + syslog(LOG_WARNING, "ioctl(SIOCGIFCONF): %m"); + return mask; + } + ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); + for (ifr = ifc.ifc_req; ifr < ifend; ++ifr) { + /* + * Check the interface's internet address. + */ + if (ifr->ifr_addr.sa_family != AF_INET) + continue; + ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr; + if ((ntohl(ina) & nmask) != (addr & nmask)) + continue; + /* + * Check that the interface is up, and not point-to-point or loopback. + */ + strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); + if (ioctl(sockfd, SIOCGIFFLAGS, &ifreq) < 0) + continue; + if ((ifreq.ifr_flags & (IFF_UP|IFF_POINTOPOINT|IFF_LOOPBACK)) + != IFF_UP) + continue; + /* + * Get its netmask and OR it into our mask. + */ + if (ioctl(sockfd, SIOCGIFNETMASK, &ifreq) < 0) + continue; + mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr; + } + + return mask; +} + #define WTMPFILE "/var/adm/wtmp" -int +void logwtmp(line, name, host) - char *line, *name, *host; + const char *line, *name, *host; { int fd; struct stat buf;