X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-aix4.c;h=93c7c7338ec8c91d0672862d9eb75066fa0049f7;hp=11e88b49b786ea3947cb6a657d2a178fce5dbdcd;hb=7292aba5fee34d251b7caa488e02db1c48e75b2d;hpb=46a48de885209b5982fc8e55efb62ec3c8c9655d diff --git a/pppd/sys-aix4.c b/pppd/sys-aix4.c index 11e88b4..93c7c73 100644 --- a/pppd/sys-aix4.c +++ b/pppd/sys-aix4.c @@ -2,25 +2,79 @@ * sys-aix4.c - System-dependent procedures for setting up * PPP interfaces on AIX systems which use the STREAMS ppp interface. * - * Copyright (c) 1989 Carnegie Mellon University. - * All rights reserved. + * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name(s) of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Paul Mackerras + * ". + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Derived from main.c and pppd.h, which are: + * + * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * 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. - * 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. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name "Carnegie Mellon University" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For permission or any legal + * details, please contact + * Office of Technology Transfer + * Carnegie Mellon University + * 5000 Forbes Avenue + * Pittsburgh, PA 15213-3890 + * (412) 268-4387, fax: (412) 268-7395 + * tech-transfer@andrew.cmu.edu + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Computing Services + * at Carnegie Mellon University (http://www.cmu.edu/computing/)." + * + * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static char rcsid[] = "$Id: sys-aix4.c,v 1.7 1995/10/27 03:45:34 paulus Exp $"; -#endif +#define RCSID "$Id: sys-aix4.c,v 1.23 2002/12/04 23:03:32 paulus Exp $" /* * TODO: @@ -31,7 +85,6 @@ static char rcsid[] = "$Id: sys-aix4.c,v 1.7 1995/10/27 03:45:34 paulus Exp $"; #include */ #include -#include #include #include #include @@ -47,13 +100,14 @@ static char rcsid[] = "$Id: sys-aix4.c,v 1.7 1995/10/27 03:45:34 paulus Exp $"; #include #include -#include #include #include #include #include "pppd.h" +static const char rcsid[] = RCSID; + #ifndef ifr_mtu #define ifr_mtu ifr_metric #endif @@ -73,9 +127,14 @@ 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 */ +#define MAX_POLLFDS 32 +static struct pollfd pollfds[MAX_POLLFDS]; +static int n_pollfds; + /* Prototypes for procedures local to this file. */ static int translate_speed __P((int)); static int baud_rate_of __P((int)); @@ -88,16 +147,11 @@ static int get_ether_addr __P((u_int32_t, struct sockaddr *)); 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"); - die(1); - } + if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) + fatal("Couldn't create IP socket: %m"); + + n_pollfds = 0; } /* @@ -111,34 +165,33 @@ sys_cleanup() struct ifreq ifr; if (if_is_up) { - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strlcpy(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, default_route_gateway); + cifdefaultroute(0, 0, default_route_gateway); if (proxy_arp_addr) cifproxyarp(0, proxy_arp_addr); } /* - * note_debug_level - note a change in the debug level. + * have_route_to - determine if the system has any route to + * a given IP address. + * For demand mode to work properly, we have to ignore routes + * through our own interface. */ -void -note_debug_level() +int have_route_to(u_int32_t addr) { - if (debug) { - syslog(LOG_INFO, "Debug turned ON, Level %d", debug); - setlogmask(LOG_UPTO(LOG_DEBUG)); - } else { - setlogmask(LOG_UPTO(LOG_WARNING)); - } + return -1; } +#if 0 /* * daemon - Detach us from the terminal session. */ @@ -162,7 +215,7 @@ daemon(nochdir, noclose) } return 0; } - +#endif /* * ppp_available - check if this kernel supports PPP. @@ -184,53 +237,46 @@ ppp_available() /* * establish_ppp - Turn the serial port into a ppp interface. */ -void -establish_ppp() +int +establish_ppp(fd) + int fd; { /* go through and save the name of all the modules, then pop em */ for (;;) { if (ioctl(fd, I_LOOK, str_modules[str_module_count].modname) < 0 || ioctl(fd, I_POP, 0) < 0) break; - MAINDEBUG((LOG_DEBUG, "popped stream module : %s", + SYSDEBUG(("popped stream module : %s", str_modules[str_module_count].modname)); str_module_count++; } /* now push the async/fcs module */ - if (ioctl(fd, I_PUSH, "pppasync") < 0) { - syslog(LOG_ERR, "ioctl(I_PUSH, ppp_async): %m"); - die(1); - } + if (ioctl(fd, I_PUSH, "pppasync") < 0) + fatal("ioctl(I_PUSH, ppp_async): %m"); /* push the compress module */ if (ioctl(fd, I_PUSH, "pppcomp") < 0) { - syslog(LOG_WARNING, "ioctl(I_PUSH, ppp_comp): %m"); + warn("ioctl(I_PUSH, ppp_comp): %m"); } /* finally, push the ppp_if module that actually handles the */ /* network interface */ - if (ioctl(fd, I_PUSH, "pppif") < 0) { - syslog(LOG_ERR, "ioctl(I_PUSH, ppp_if): %m"); - die(1); - } + if (ioctl(fd, I_PUSH, "pppif") < 0) + fatal("ioctl(I_PUSH, ppp_if): %m"); pushed_ppp = 1; /* read mode, message non-discard mode - if (ioctl(fd, I_SRDOPT, RMSGN) < 0) { - syslog(LOG_ERR, "ioctl(I_SRDOPT, RMSGN): %m"); - die(1); - } + if (ioctl(fd, I_SRDOPT, RMSGN) < 0) + fatal("ioctl(I_SRDOPT, RMSGN): %m"); */ /* * Find out which interface we were given. * (ppp_if handles this ioctl) */ - if (ioctl(fd, SIOCGETU, &ifunit) < 0) { - syslog(LOG_ERR, "ioctl(SIOCGETU): %m"); - die(1); - } + if (ioctl(fd, SIOCGETU, &ifunit) < 0) + fatal("ioctl(SIOCGETU): %m"); /* Set debug flags in driver */ if (ioctl(fd, SIOCSIFDEBUG, kdebugflag) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFDEBUG): %m"); + error("ioctl(SIOCSIFDEBUG): %m"); } /* close stdin, stdout, stderr if they might refer to the device */ @@ -248,8 +294,10 @@ establish_ppp() */ 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"); + warn("Couldn't set device to non-blocking mode: %m"); } + + return fd; } /* @@ -258,14 +306,15 @@ 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"); + warn("Couldn't restore device fd flags: %m"); initfdflags = -1; if (hungup) { @@ -296,8 +345,8 @@ disestablish_ppp() break; } if (s != NULL) { - syslog(LOG_WARNING, "Serial link is not 8-bit clean:"); - syslog(LOG_WARNING, "All received characters had %s", s); + warn("Serial link is not 8-bit clean:"); + warn("All received characters had %s", s); } } } @@ -309,11 +358,11 @@ disestablish_ppp() 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); + warn("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)); + SYSDEBUG(("str_restore: pushed module %s", + str_modules[str_module_count-1].modname)); } } } @@ -408,7 +457,7 @@ translate_speed(bps) for (speedp = speeds; speedp->speed_int; speedp++) if (bps == speedp->speed_int) return speedp->speed_val; - syslog(LOG_WARNING, "speed %d not supported", bps); + warn("speed %d not supported", bps); return 0; } @@ -442,10 +491,9 @@ set_up_tty(fd, local) struct termios tios; struct termiox tiox; - if (tcgetattr(fd, &tios) < 0) { - syslog(LOG_ERR, "tcgetattr: %m"); - die(1); - } + if (tcgetattr(fd, &tios) < 0) + fatal("tcgetattr: %m"); + if (!restore_term) inittermios = tios; @@ -490,17 +538,12 @@ set_up_tty(fd, local) * 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 (speed == B0) + fatal("Baud rate for %s is 0; need explicit baud rate", devnam); } - if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) { - syslog(LOG_ERR, "tcsetattr: %m"); - die(1); - } + if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) + fatal("tcsetattr: %m"); baud_rate = inspeed = baud_rate_of(speed); restore_term = 1; @@ -510,7 +553,8 @@ 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) { @@ -524,7 +568,7 @@ restore_tty() } if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) if (errno != ENXIO) - syslog(LOG_WARNING, "tcsetattr: %m"); + warn("tcsetattr: %m"); restore_term = 0; } } @@ -557,18 +601,18 @@ output(unit, p, len) struct pollfd pfd; if (debug) - log_packet(p, len, "sent "); + dbglog("sent %P", p, len); str.len = len; str.buf = (caddr_t) p; retries = 4; - while (putmsg(fd, NULL, &str, 0) < 0) { + 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"); + error("Couldn't send packet: %m"); break; } - pfd.fd = fd; + pfd.fd = ttyfd; pfd.events = POLLOUT; poll(&pfd, 1, 250); /* wait for up to 0.25 seconds */ } @@ -582,17 +626,50 @@ wait_input(timo) struct timeval *timo; { int t; - struct pollfd pfd; t = timo == NULL? -1: timo->tv_sec * 1000 + timo->tv_usec / 1000; - pfd.fd = fd; - pfd.events = POLLIN | POLLPRI | POLLHUP; - if (poll(&pfd, 1, t) < 0 && errno != EINTR) { - syslog(LOG_ERR, "poll: %m"); - die(1); + if (poll(pollfds, n_pollfds, t) < 0 && errno != EINTR) + fatal("poll: %m"); +} + +/* + * add_fd - add an fd to the set that wait_input waits for. + */ +void add_fd(fd) + int fd; +{ + int n; + + for (n = 0; n < n_pollfds; ++n) + if (pollfds[n].fd == fd) + return; + if (n_pollfds < MAX_POLLFDS) { + pollfds[n_pollfds].fd = fd; + pollfds[n_pollfds].events = POLLIN | POLLPRI | POLLHUP; + ++n_pollfds; + } else + error("Too many inputs!"); +} + +/* + * remove_fd - remove an fd from the set that wait_input waits for. + */ +void remove_fd(fd) + int fd; +{ + int n; + + for (n = 0; n < n_pollfds; ++n) { + if (pollfds[n].fd == fd) { + while (++n < n_pollfds) + pollfds[n-1] = pollfds[n]; + --n_pollfds; + break; + } } } + /* * read_packet - get a PPP packet from the serial device. */ @@ -609,22 +686,20 @@ 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"); - die(1); + fatal("getmsg %m"); } if (len) - MAINDEBUG((LOG_DEBUG, "getmsg returned 0x%x",len)); + SYSDEBUG(("getmsg returned 0x%x", len)); if (ctl.len > 0) - syslog(LOG_NOTICE, "got ctrl msg len %d %x %x\n", ctl.len, - ctlbuf[0], ctlbuf[1]); + notice("got ctrl msg len %d %x %x\n", ctl.len, ctlbuf[0], ctlbuf[1]); if (str.len < 0) { - MAINDEBUG((LOG_DEBUG, "getmsg short return length %d", str.len)); + SYSDEBUG(("getmsg short return length %d", str.len)); return -1; } @@ -645,29 +720,21 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) int c; struct ifreq ifr; - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); ifr.ifr_mtu = mtu; - if (ioctl(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m"); - quit(); - } + if (ioctl(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0) + fatal("ioctl(SIOCSIFMTU): %m"); - if(ioctl(fd, SIOCSIFASYNCMAP, asyncmap) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFASYNCMAP): %m"); - quit(); - } + if(ioctl(ttyfd, SIOCSIFASYNCMAP, asyncmap) < 0) + fatal("ioctl(SIOCSIFASYNCMAP): %m"); c = (pcomp? 1: 0); - if(ioctl(fd, SIOCSIFCOMPPROT, c) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m"); - quit(); - } + if(ioctl(ttyfd, SIOCSIFCOMPPROT, c) < 0) + fatal("ioctl(SIOCSIFCOMPPROT): %m"); c = (accomp? 1: 0); - if(ioctl(fd, SIOCSIFCOMPAC, c) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m"); - quit(); - } + if(ioctl(ttyfd, SIOCSIFCOMPAC, c) < 0) + fatal("ioctl(SIOCSIFCOMPAC): %m"); } @@ -679,8 +746,8 @@ ppp_set_xaccm(unit, accm) int unit; ext_accm accm; { - if (ioctl(fd, SIOCSIFXASYNCMAP, accm) < 0 && errno != ENOTTY) - syslog(LOG_WARNING, "ioctl(set extended ACCM): %m"); + if (ioctl(ttyfd, SIOCSIFXASYNCMAP, accm) < 0 && errno != ENOTTY) + warn("ioctl(set extended ACCM): %m"); } @@ -696,22 +763,22 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) { char c; - if (ioctl(fd, SIOCSIFMRU, mru) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFMRU): %m"); + if (ioctl(ttyfd, SIOCSIFMRU, mru) < 0) { + error("ioctl(SIOCSIFMRU): %m"); } - if (ioctl(fd, SIOCSIFRASYNCMAP, (caddr_t) asyncmap) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFRASYNCMAP): %m"); + if (ioctl(ttyfd, SIOCSIFRASYNCMAP, (caddr_t) asyncmap) < 0) { + error("ioctl(SIOCSIFRASYNCMAP): %m"); } c = 2 + (pcomp? 1: 0); - if(ioctl(fd, SIOCSIFCOMPPROT, c) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m"); + if(ioctl(ttyfd, SIOCSIFCOMPPROT, c) < 0) { + error("ioctl(SIOCSIFCOMPPROT): %m"); } c = 2 + (accomp? 1: 0); - if (ioctl(fd, SIOCSIFCOMPAC, c) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m"); + if (ioctl(ttyfd, SIOCSIFCOMPAC, c) < 0) { + error("ioctl(SIOCSIFCOMPAC): %m"); } } @@ -731,7 +798,7 @@ 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); - if (ioctl(fd, SIOCSCOMPRESS, &data) >= 0) + if (ioctl(ttyfd, SIOCSCOMPRESS, &data) >= 0) return 1; return (errno == ENOSR)? 0: -1; } @@ -746,8 +813,8 @@ ccp_flags_set(unit, isopen, isup) int x; x = (isopen? 1: 0) + (isup? 2: 0); - if (ioctl(fd, SIOCSIFCOMP, x) < 0 && errno != ENOTTY) - syslog(LOG_ERR, "ioctl (SIOCSIFCOMP): %m"); + if (ioctl(ttyfd, SIOCSIFCOMP, x) < 0 && errno != ENOTTY) + error("ioctl (SIOCSIFCOMP): %m"); } /* @@ -761,8 +828,8 @@ ccp_fatal_error(unit) { int x; - if (ioctl(fd, SIOCGIFCOMP, &x) < 0) { - syslog(LOG_ERR, "ioctl(SIOCGIFCOMP): %m"); + if (ioctl(ttyfd, SIOCGIFCOMP, &x) < 0) { + error("ioctl(SIOCGIFCOMP): %m"); return 0; } return x & CCP_FATALERROR; @@ -778,8 +845,8 @@ sifvjcomp(u, vjcomp, cidcomp, maxcid) int x; x = (vjcomp? 1: 0) + (cidcomp? 0: 2) + (maxcid << 4); - if (ioctl(fd, SIOCSIFVJCOMP, x) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFVJCOMP): %m"); + if (ioctl(ttyfd, SIOCSIFVJCOMP, x) < 0) { + error("ioctl(SIOCSIFVJCOMP): %m"); return 0; } return 1; @@ -793,28 +860,39 @@ sifup(u) int u; { struct ifreq ifr; - struct npioctl npi; - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m"); + error("ioctl (SIOCGIFFLAGS): %m"); return 0; } ifr.ifr_flags |= IFF_UP; if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); + error("ioctl(SIOCSIFFLAGS): %m"); return 0; } + if_is_up = 1; - 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; +} + +/* + * 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) { + error("ioctl(set NP %d mode to %d): %m", proto, mode); + return 0; + } return 1; } @@ -832,21 +910,17 @@ 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)); + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m"); + error("ioctl (SIOCGIFFLAGS): %m"); rv = 0; } else { ifr.ifr_flags &= ~IFF_UP; if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); + error("ioctl(SIOCSIFFLAGS): %m"); rv = 0; } else if_is_up = 0; @@ -873,34 +947,39 @@ sifaddr(u, o, h, m) struct ifreq ifr; ret = 1; - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); SET_SA_FAMILY(ifr.ifr_addr, AF_INET); if (m != 0) { - syslog(LOG_INFO, "Setting interface mask to %s\n", ip_ntoa(m)); + info("Setting interface mask to %s\n", ip_ntoa(m)); ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = m; if (ioctl(sockfd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFNETMASK): %m"); + error("ioctl(SIOCSIFNETMASK): %m"); ret = 0; } } ((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"); + error("ioctl(SIOCSIFADDR): %m"); ret = 0; } SET_SA_FAMILY(ifr.ifr_dstaddr, AF_INET); ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = h; if (ioctl(sockfd, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFDSTADDR): %m"); + error("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"); + error("ioctl(SIOCSIFADDR): %m"); ret = 0; } + + ifaddrs[0] = o; + ifaddrs[1] = h; return ret; } @@ -915,13 +994,15 @@ 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); ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = o; rt.rt_flags = RTF_HOST; if (ioctl(sockfd, SIOCDELRT, (caddr_t) &rt) < 0) { - syslog(LOG_ERR, "ioctl(SIOCDELRT): %m"); + error("ioctl(SIOCDELRT): %m"); return 0; } return 1; @@ -931,18 +1012,19 @@ 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; rt.rt_flags = RTF_GATEWAY; if (ioctl(sockfd, SIOCADDRT, &rt) < 0) { - syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m"); + error("default route ioctl(SIOCADDRT): %m"); return 0; } default_route_gateway = g; @@ -953,18 +1035,19 @@ 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; rt.rt_flags = RTF_GATEWAY; if (ioctl(sockfd, SIOCDELRT, &rt) < 0) { - syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m"); + error("default route ioctl(SIOCDELRT): %m"); return 0; } default_route_gateway = 0; @@ -988,7 +1071,7 @@ sifproxyarp(unit, hisaddr) * as our local address. */ if (!get_ether_addr(hisaddr, &arpreq.arp_ha)) { - syslog(LOG_WARNING, "Cannot determine ethernet address for proxy ARP"); + warn("Cannot determine ethernet address for proxy ARP"); return 0; } @@ -996,7 +1079,7 @@ sifproxyarp(unit, hisaddr) ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr; arpreq.arp_flags = ATF_PERM | ATF_PUBL; if (ioctl(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSARP): %m"); + error("ioctl(SIOCSARP): %m"); return 0; } @@ -1018,7 +1101,7 @@ cifproxyarp(unit, hisaddr) SET_SA_FAMILY(arpreq.arp_pa, AF_INET); ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr; if (ioctl(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0) { - syslog(LOG_ERR, "ioctl(SIOCDARP): %m"); + error("ioctl(SIOCDARP): %m"); return 0; } proxy_arp_addr = 0; @@ -1071,7 +1154,7 @@ static struct nlist nl[] = { int kvm_read(int fd, off_t offset, void *buf, int nbytes) { if (lseek(fd, offset, SEEK_SET) != offset) { - syslog(LOG_ERR,"lseek in kmem: %m"); + error("lseek in kmem: %m"); return(0); } return(read(fd, buf, nbytes)); @@ -1103,13 +1186,13 @@ get_ether_addr(ipaddr, hwaddr) /* Open kernel memory for reading */ if ((kd = open("/dev/kmem", O_RDONLY)) < 0) { - syslog(LOG_ERR, "/dev/kmem: %m"); + error("/dev/kmem: %m"); return 0; } /* Fetch namelist */ if (nlist("/unix", nl) != 0) { - syslog(LOG_ERR, "nlist(): %m"); + error("nlist(): %m"); return 0; } @@ -1120,12 +1203,12 @@ get_ether_addr(ipaddr, hwaddr) if (kvm_read(kd, nl[N_IFNET].n_value, (char *)&addr, sizeof(addr)) != sizeof(addr)) { - syslog(LOG_ERR, "error reading ifnet addr"); + error("error reading ifnet addr"); return 0; } for ( ; addr && !found; addr = (u_long)ifp->if_next) { if (kvm_read(kd, addr, (char *)ac, sizeof(*ac)) != sizeof(*ac)) { - syslog(LOG_ERR, "error reading ifnet"); + error("error reading ifnet"); return 0; } @@ -1140,17 +1223,17 @@ get_ether_addr(ipaddr, hwaddr) for (ifap = ifp->if_addrlist; ifap; ifap=ifaddr.ifa.ifa_next) { if (kvm_read(kd, (u_long)ifap, (char *)&ifaddr, sizeof(ifaddr)) != sizeof(ifaddr)) { - syslog(LOG_ERR, "error reading ifaddr"); + error("error reading ifaddr"); return 0; } if (kvm_read(kd, (u_long)ifaddr.ifa.ifa_addr, &ifaddrsaddr, sizeof(struct sockaddr_in)) != sizeof(struct sockaddr_in)) { - syslog(LOG_ERR, "error reading ifaddrsaddr"); + error("error reading ifaddrsaddr"); return(0); } if (kvm_read(kd, (u_long)ifaddr.ifa.ifa_netmask, &ifmasksaddr, sizeof(struct sockaddr_in)) != sizeof(struct sockaddr_in)) { - syslog(LOG_ERR, "error reading ifmasksaddr"); + error("error reading ifmasksaddr"); return(0); } /* Check if this interface on the right subnet */ @@ -1165,7 +1248,7 @@ get_ether_addr(ipaddr, hwaddr) ifip = ifinetptr->sin_addr.s_addr; if (kvm_read(kd, (u_long)ifaddr.ifa.ifa_netmask, &ifmasksaddr, sizeof(struct sockaddr_in)) != sizeof(struct sockaddr_in)) { - syslog(LOG_ERR, "error reading ifmasksaddr"); + error("error reading ifmasksaddr"); return(0); } mask = ifmasksaddr.sin_addr.s_addr; @@ -1216,7 +1299,7 @@ GetMask(addr) ifc.ifc_len = sizeof(ifs); ifc.ifc_req = ifs; if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) { - syslog(LOG_WARNING, "ioctl(SIOCGIFCONF): %m"); + warn("ioctl(SIOCGIFCONF): %m"); return mask; } ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); @@ -1232,7 +1315,7 @@ GetMask(addr) /* * Check that the interface is up, and not point-to-point or loopback. */ - strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); + strlcpy(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)) @@ -1251,9 +1334,9 @@ GetMask(addr) #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; @@ -1262,9 +1345,9 @@ logwtmp(line, name, host) if ((fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0) return; if (!fstat(fd, &buf)) { - (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line)); - (void)strncpy(ut.ut_name, name, sizeof(ut.ut_name)); - (void)strncpy(ut.ut_host, host, sizeof(ut.ut_host)); + strncpy(ut.ut_line, line, sizeof(ut.ut_line)); + strncpy(ut.ut_name, name, sizeof(ut.ut_name)); + strncpy(ut.ut_host, host, sizeof(ut.ut_host)); (void)time(&ut.ut_time); if (write(fd, (char *)&ut, sizeof(struct utmp)) != sizeof(struct utmp)) (void)ftruncate(fd, buf.st_size); @@ -1272,6 +1355,15 @@ logwtmp(line, name, host) close(fd); } +/* + * Use the hostid as part of the random number seed. + */ +int +get_host_seed() +{ + return gethostid(); +} + /* * Code for locking/unlocking the serial device. */ @@ -1289,8 +1381,7 @@ int lock(char *device) devname = device; if ((rc = ttylock(devname)) == 0) { - devlocked = (char *) malloc(strlen(devname) + 1); - sprintf(devlocked,"%s",devname); + devlocked = strdup(devname); } else devlocked = (char *) 0;