X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-svr4.c;h=5357aebfeb91bcb45aac7f6c7abc069068534cb9;hp=d5c83b3b47c6e244728d7ddf1dad3c0ab2ae729c;hb=6a53c48e7fe9a14bc21750afdf5d309e6720bba0;hpb=180cae5bdf14b18322742e60ff5cda13651a8d05 diff --git a/pppd/sys-svr4.c b/pppd/sys-svr4.c index d5c83b3..5357aeb 100644 --- a/pppd/sys-svr4.c +++ b/pppd/sys-svr4.c @@ -25,15 +25,12 @@ * OR MODIFICATIONS. */ -#ifndef lint -static char rcsid[] = "$Id: sys-svr4.c,v 1.10 1996/04/04 04:07:30 paulus Exp $"; -#endif +#define RCSID "$Id: sys-svr4.c,v 1.35 1999/09/30 19:59:06 masputra Exp $" #include #include #include #include -#include #include #include #include @@ -50,7 +47,6 @@ static char rcsid[] = "$Id: sys-svr4.c,v 1.10 1996/04/04 04:07:30 paulus Exp $"; #include #include #include -#include #include #include #include @@ -62,31 +58,69 @@ static char rcsid[] = "$Id: sys-svr4.c,v 1.10 1996/04/04 04:07:30 paulus Exp $"; #include #include #include +#ifdef SOL2 +#include +#include +#include +#include +#include +#endif #include "pppd.h" +static const char rcsid[] = RCSID; + static int pppfd; static int fdmuxid = -1; static int ipfd; static int ipmuxid = -1; +#if defined(INET6) && defined(SOL2) +static int ip6fd; /* IP file descriptor */ +static int ip6muxid = -1; /* Multiplexer file descriptor */ +static int if6_is_up = 0; /* IPv6 interface has been marked up */ + +#define _IN6_LLX_FROM_EUI64(l, s, eui64, as) do { \ + s->sin6_addr.s6_addr32[0] = htonl(as); \ + eui64_copy(eui64, s->sin6_addr.s6_addr32[2]); \ + s->sin6_family = AF_INET6; \ + l.lifr_addr.ss_family = AF_INET6; \ + l.lifr_addrlen = 10; \ + l.lifr_addr = laddr; \ + } while (0) + +#define IN6_LLADDR_FROM_EUI64(l, s, eui64) \ + _IN6_LLX_FROM_EUI64(l, s, eui64, 0xfe800000) + +#define IN6_LLTOKEN_FROM_EUI64(l, s, eui64) \ + _IN6_LLX_FROM_EUI64(l, s, eui64, 0) + +#endif /* defined(INET6) && defined(SOL2) */ + static int restore_term; static struct termios inittermios; #ifndef CRTSCTS static struct termiox inittermiox; +static int termiox_ok; #endif static struct winsize wsinfo; /* Initial window size info */ static pid_t tty_sid; /* original session ID for terminal */ extern u_char inpacket_buf[]; /* borrowed from main.c */ +#define MAX_POLLFDS 32 +static struct pollfd pollfds[MAX_POLLFDS]; +static int n_pollfds; + static int link_mtu, link_mru; #define NMODULES 32 static int tty_nmodules; static char tty_modules[NMODULES][FMNAMESZ+1]; +static int tty_npushed; static int if_is_up; /* Interface has been marked up */ +static u_int32_t remote_addr; /* IP address of peer */ 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 */ @@ -94,12 +128,194 @@ static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ static int translate_speed __P((int)); static int baud_rate_of __P((int)); static int get_ether_addr __P((u_int32_t, struct sockaddr *)); -static int get_hw_addr __P((char *, struct sockaddr *)); +static int get_hw_addr __P((char *, u_int32_t, struct sockaddr *)); +static int get_hw_addr_dlpi __P((char *, struct sockaddr *)); static int dlpi_attach __P((int, int)); static int dlpi_info_req __P((int)); static int dlpi_get_reply __P((int, union DL_primitives *, int, int)); static int strioctl __P((int, int, void *, int, int)); +#ifdef SOL2 +/* + * sifppa - Sets interface ppa + * + * without setting the ppa, ip module will return EINVAL upon setting the + * interface UP (SIOCSxIFFLAGS). This is because ip module in 2.8 expects + * two DLPI_INFO_REQ to be sent down to the driver (below ip) before + * IFF_UP can be set. Plumbing the device causes one DLPI_INFO_REQ to + * be sent down, and the second DLPI_INFO_REQ is sent upon receiving + * IF_UNITSEL (old) or SIOCSLIFNAME (new) ioctls. Such setting of the ppa + * is required because the ppp DLPI provider advertises itself as + * a DLPI style 2 type, which requires a point of attachment to be + * specified. The only way the user can specify a point of attachment + * is via SIOCSLIFNAME or IF_UNITSEL. + * + * Such changes in the behavior of ip module was made to meet new or + * evolving standards requirements. + * + */ +static int +sifppa(fd, ppa) + int fd; + int ppa; +{ + return (int)ioctl(fd, IF_UNITSEL, (char *)&ppa); +} +#endif /* SOL2 */ + +#if defined(SOL2) && defined(INET6) +/* + * slifname - Sets interface ppa and flags + * + * in addition to the comments stated in sifppa(), IFF_IPV6 bit must + * be set in order to declare this as an IPv6 interface + */ +static int +slifname(fd, ppa) + int fd; + int ppa; +{ + struct lifreq lifr; + int ret; + + memset(&lifr, 0, sizeof(lifr)); + ret = ioctl(fd, SIOCGLIFFLAGS, &lifr); + if (ret < 0) + goto slifname_done; + + lifr.lifr_flags |= IFF_IPV6; + lifr.lifr_flags &= ~(IFF_BROADCAST | IFF_IPV4); + lifr.lifr_ppa = ppa; + strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name)); + + ret = ioctl(fd, SIOCSLIFNAME, &lifr); + +slifname_done: + return ret; + + +} + +/* + * ether_to_eui64 - Convert 48-bit Ethernet address into 64-bit EUI + * + * walks the list of valid ethernet interfaces, and convert the first + * found 48-bit MAC address into EUI 64. caller also assumes that + * the system has a properly configured Ethernet interface for this + * function to return non-zero. + */ +int +ether_to_eui64(eui64_t *p_eui64) +{ + struct lifnum lifn; + struct lifconf lifc; + struct lifreq *plifreq; + struct lifreq lifr; + int fd, num_ifs, i, found; + uint_t fl, req_size; + char *req; + struct sockaddr s_eth_addr; + struct ether_addr *eth_addr = (struct ether_addr *)&s_eth_addr.sa_data; + + fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) { + return 0; + } + + /* + * Find out how many interfaces are running + */ + lifn.lifn_family = AF_UNSPEC; + lifn.lifn_flags = LIFC_NOXMIT; + if (ioctl(fd, SIOCGLIFNUM, &lifn) < 0) { + close(fd); + error("could not determine number of interfaces: %m"); + return 0; + } + + num_ifs = lifn.lifn_count; + req_size = num_ifs * sizeof(struct lifreq); + req = malloc(req_size); + if (req == NULL) { + close(fd); + error("out of memory"); + return 0; + } + + /* + * Get interface configuration info for all interfaces + */ + lifc.lifc_family = AF_UNSPEC; + lifc.lifc_flags = LIFC_NOXMIT; + lifc.lifc_len = req_size; + lifc.lifc_buf = req; + if (ioctl(fd, SIOCGLIFCONF, &lifc) < 0) { + close(fd); + free(req); + error("SIOCGLIFCONF: %m"); + return 0; + } + + /* + * And traverse each interface to look specifically for the first + * occurence of an Ethernet interface which has been marked up + */ + plifreq = lifc.lifc_req; + found = 0; + for (i = lifc.lifc_len / sizeof(struct lifreq); i>0; i--, plifreq++) { + + if (strchr(plifreq->lifr_name, ':') != NULL) + continue; + + memset(&lifr, 0, sizeof(lifr)); + strncpy(lifr.lifr_name, plifreq->lifr_name, sizeof(lifr.lifr_name)); + if (ioctl(fd, SIOCGLIFFLAGS, &lifr) < 0) { + close(fd); + free(req); + error("SIOCGLIFFLAGS: %m"); + return 0; + } + fl = lifr.lifr_flags; + + if ((fl & (IFF_UP|IFF_BROADCAST|IFF_POINTOPOINT|IFF_LOOPBACK|IFF_NOARP)) + != (IFF_UP | IFF_BROADCAST)) + continue; + + found = 1; + break; + } + free(req); + close(fd); + + if (!found) { + error("no persistent id can be found"); + return 0; + } + + /* + * Send DL_INFO_REQ to the driver to solicit its MAC address + */ + if (!get_hw_addr_dlpi(plifreq->lifr_name, &s_eth_addr)) { + error("could not obtain hardware address for %s", plifreq->lifr_name); + return 0; + } + + /* + * And convert the EUI-48 into EUI-64, per RFC 2472 [sec 4.1] + */ + p_eui64->e8[0] = (eth_addr->ether_addr_octet[0] & 0xFF) | 0x02; + p_eui64->e8[1] = (eth_addr->ether_addr_octet[1] & 0xFF); + p_eui64->e8[2] = (eth_addr->ether_addr_octet[2] & 0xFF); + p_eui64->e8[3] = 0xFF; + p_eui64->e8[4] = 0xFE; + p_eui64->e8[5] = (eth_addr->ether_addr_octet[3] & 0xFF); + p_eui64->e8[6] = (eth_addr->ether_addr_octet[4] & 0xFF); + p_eui64->e8[7] = (eth_addr->ether_addr_octet[5] & 0xFF); + + return 1; +} +#endif /* defined(SOL2) && defined(INET6) */ + /* * sys_init - System-dependent initialization. */ @@ -107,43 +323,41 @@ void sys_init() { int ifd, x; -#ifndef sun +#if defined(INET6) && defined(SOL2) + int i6fd; +#endif /* defined(INET6) && defined(SOL2) */ +#if !defined(SOL2) struct ifreq ifr; struct { union DL_primitives prim; char space[64]; } reply; -#endif - - openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); - setlogmask(LOG_UPTO(LOG_INFO)); - if (debug) - setlogmask(LOG_UPTO(LOG_DEBUG)); +#endif /* !defined(SOL2) */ ipfd = open("/dev/ip", O_RDWR, 0); - if (ipfd < 0) { - syslog(LOG_ERR, "Couldn't open IP device: %m"); - die(1); - } + if (ipfd < 0) + fatal("Couldn't open IP device: %m"); + +#if defined(INET6) && defined(SOL2) + ip6fd = open("/dev/ip", O_RDWR, 0); + if (ip6fd < 0) + fatal("Couldn't open IP device (2): %m"); +#endif /* defined(INET6) && defined(SOL2) */ - if (default_device) + if (default_device && !notty) tty_sid = getsid((pid_t)0); pppfd = open("/dev/ppp", O_RDWR | O_NONBLOCK, 0); - if (pppfd < 0) { - syslog(LOG_ERR, "Can't open /dev/ppp: %m"); - die(1); - } - if (kdebugflag) { + if (pppfd < 0) + fatal("Can't open /dev/ppp: %m"); + if (kdebugflag & 1) { x = PPPDBG_LOG + PPPDBG_DRIVER; strioctl(pppfd, PPPIO_DEBUG, &x, sizeof(int), 0); } /* Assign a new PPA and get its unit number. */ - if (strioctl(pppfd, PPPIO_NEWPPA, &ifunit, 0, sizeof(int)) < 0) { - syslog(LOG_ERR, "Can't create new PPP interface: %m"); - die(1); - } + if (strioctl(pppfd, PPPIO_NEWPPA, &ifunit, 0, sizeof(int)) < 0) + fatal("Can't create new PPP interface: %m"); /* * Open the ppp device again and link it under the ip multiplexor. @@ -151,44 +365,107 @@ sys_init() * I don't know any way to be certain they will be the same. :-( */ ifd = open("/dev/ppp", O_RDWR, 0); - if (ifd < 0) { - syslog(LOG_ERR, "Can't open /dev/ppp (2): %m"); - die(1); - } - if (kdebugflag) { + if (ifd < 0) + fatal("Can't open /dev/ppp (2): %m"); + if (kdebugflag & 1) { x = PPPDBG_LOG + PPPDBG_DRIVER; strioctl(ifd, PPPIO_DEBUG, &x, sizeof(int), 0); } -#ifdef sun + +#if defined(INET6) && defined(SOL2) + /* + * Since sys_init() is called prior to ifname being set in main(), + * we need to get the ifname now, otherwise slifname() will fail, + * or maybe, I should move slifname() to a later point ? + */ + sprintf(ifname, "ppp%d", ifunit); + + i6fd = open("/dev/ppp", O_RDWR, 0); + if (i6fd < 0) { + close(ifd); + fatal("Can't open /dev/ppp (3): %m"); + } + if (kdebugflag & 1) { + x = PPPDBG_LOG + PPPDBG_DRIVER; + strioctl(i6fd, PPPIO_DEBUG, &x, sizeof(int), 0); + } +#endif /* defined(INET6) && defined(SOL2) */ + +#if defined(SOL2) if (ioctl(ifd, I_PUSH, "ip") < 0) { - syslog(LOG_ERR, "Can't push IP module: %m"); close(ifd); - die(1); +#if defined(INET6) + close(i6fd); +#endif /* defined(INET6) */ + fatal("Can't push IP module: %m"); } -#else + + /* + * Assign ppa according to the unit number returned by ppp device + * after plumbing is completed above. + */ + if (sifppa(ifd, ifunit) < 0) { + close (ifd); +#if defined(INET6) + close(i6fd); +#endif /* defined(INET6) */ + fatal("Can't set ppa for unit %d: %m", ifunit); + } + +#if defined(INET6) + /* + * An IPv6 interface is created anyway, even when the user does not + * explicitly enable it. Note that the interface will be marked + * IPv6 during slifname(). + */ + if (ioctl(i6fd, I_PUSH, "ip") < 0) { + close(ifd); + close(i6fd); + fatal("Can't push IP module (2): %m"); + } + + /* + * Assign ppa according to the unit number returned by ppp device + * after plumbing is completed above. In addition, mark the interface + * as an IPv6 interface. + */ + if (slifname(i6fd, ifunit) < 0) { + close(ifd); + close(i6fd); + fatal("Can't set ifname for unit %d: %m", ifunit); + } +#endif /* defined(INET6) */ + +#else /* else if !defined(SOL2) */ + if (dlpi_attach(ifd, ifunit) < 0 || dlpi_get_reply(ifd, &reply.prim, DL_OK_ACK, sizeof(reply)) < 0) { - syslog(LOG_ERR, "Can't attach to ppp%d: %m", ifunit); close(ifd); - die(1); + fatal("Can't attach to ppp%d: %m", ifunit); } -#endif +#endif /* defined(SOL2) */ + ipmuxid = ioctl(ipfd, I_LINK, ifd); close(ifd); - if (ipmuxid < 0) { - syslog(LOG_ERR, "Can't link PPP device to IP: %m"); - die(1); - } + if (ipmuxid < 0) + fatal("Can't link PPP device to IP: %m"); + +#if defined(INET6) && defined(SOL2) + ip6muxid = ioctl(ip6fd, I_LINK, i6fd); + close(i6fd); + if (ip6muxid < 0) + fatal("Can't link PPP device to IP (2): %m"); +#endif /* defined(INET6) && defined(SOL2) */ -#ifndef sun +#if !defined(SOL2) /* Set the interface name for the link. */ - (void) sprintf (ifr.ifr_name, "ppp%d", ifunit); + slprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "ppp%d", ifunit); ifr.ifr_metric = ipmuxid; - if (strioctl(ipfd, SIOCSIFNAME, (char *)&ifr, sizeof ifr, 0) < 0) { - syslog(LOG_ERR, "Can't set interface name %s: %m", ifr.ifr_name); - die(1); - } -#endif + if (strioctl(ipfd, SIOCSIFNAME, (char *)&ifr, sizeof ifr, 0) < 0) + fatal("Can't set interface name %s: %m", ifr.ifr_name); +#endif /* !defined(SOL2) */ + + n_pollfds = 0; } /* @@ -201,10 +478,14 @@ sys_cleanup() { struct ifreq ifr; +#if defined(SOL2) && defined(INET6) + if (if6_is_up) + sif6down(0); +#endif /* defined(SOL2) && defined(INET6) */ if (if_is_up) sifdown(0); if (default_route_gateway) - cifdefaultroute(0, default_route_gateway); + cifdefaultroute(0, default_route_gateway, default_route_gateway); if (proxy_arp_addr) cifproxyarp(0, proxy_arp_addr); } @@ -216,20 +497,23 @@ void sys_close() { close(ipfd); +#if defined(INET6) && defined(SOL2) + close(ip6fd); +#endif /* defined(INET6) && defined(SOL2) */ if (pppfd >= 0) close(pppfd); - closelog(); } /* * sys_check_options - check the options that the user specified */ -void +int sys_check_options() { + return 1; } - +#if 0 /* * daemon - Detach us from controlling terminal session. */ @@ -253,19 +537,7 @@ daemon(nochdir, noclose) } return 0; } - -/* - * note_debug_level - note a change in the debug level. - */ -void -note_debug_level() -{ - if (debug) { - setlogmask(LOG_UPTO(LOG_DEBUG)); - } else { - setlogmask(LOG_UPTO(LOG_WARNING)); - } -} +#endif /* * ppp_available - check whether the system has any ppp interfaces @@ -281,7 +553,7 @@ ppp_available() /* * establish_ppp - Turn the serial port into a ppp interface. */ -void +int establish_ppp(fd) int fd; { @@ -290,25 +562,41 @@ establish_ppp(fd) /* Pop any existing modules off the tty stream. */ for (i = 0;; ++i) if (ioctl(fd, I_LOOK, tty_modules[i]) < 0 + || strcmp(tty_modules[i], "ptem") == 0 || ioctl(fd, I_POP, 0) < 0) break; tty_nmodules = i; /* Push the async hdlc module and the compressor module. */ - if (ioctl(fd, I_PUSH, "ppp_ahdl") < 0) { - syslog(LOG_ERR, "Couldn't push PPP Async HDLC module: %m"); - die(1); + tty_npushed = 0; + + if(!sync_serial) { + if (ioctl(fd, I_PUSH, "ppp_ahdl") < 0) { + error("Couldn't push PPP Async HDLC module: %m"); + return -1; + } + ++tty_npushed; } - if (ioctl(fd, I_PUSH, "ppp_comp") < 0) { - syslog(LOG_ERR, "Couldn't push PPP compression module: %m"); -/* die(1); */ + if (kdebugflag & 4) { + i = PPPDBG_LOG + PPPDBG_AHDLC; + strioctl(pppfd, PPPIO_DEBUG, &i, sizeof(int), 0); + } + if (ioctl(fd, I_PUSH, "ppp_comp") < 0) + error("Couldn't push PPP compression module: %m"); + else + ++tty_npushed; + if (kdebugflag & 2) { + i = PPPDBG_LOG + PPPDBG_COMP; + strioctl(pppfd, PPPIO_DEBUG, &i, sizeof(int), 0); } /* Link the serial port under the PPP multiplexor. */ if ((fdmuxid = ioctl(pppfd, I_LINK, fd)) < 0) { - syslog(LOG_ERR, "Can't link tty to PPP mux: %m"); - die(1); + error("Can't link tty to PPP mux: %m"); + return -1; } + + return pppfd; } /* @@ -334,16 +622,16 @@ disestablish_ppp(fd) if (fdmuxid >= 0) { if (ioctl(pppfd, I_UNLINK, fdmuxid) < 0) { if (!hungup) - syslog(LOG_ERR, "Can't unlink tty from PPP mux: %m"); + error("Can't unlink tty from PPP mux: %m"); } fdmuxid = -1; if (!hungup) { - while (ioctl(fd, I_POP, 0) >= 0) - ; + while (tty_npushed > 0 && ioctl(fd, I_POP, 0) >= 0) + --tty_npushed; for (i = tty_nmodules - 1; i >= 0; --i) if (ioctl(fd, I_PUSH, tty_modules[i]) < 0) - syslog(LOG_ERR, "Couldn't restore tty module %s: %m", + error("Couldn't restore tty module %s: %m", tty_modules[i]); } if (hungup && default_device && tty_sid > 0) { @@ -386,8 +674,8 @@ clean_check() 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); } } @@ -460,6 +748,9 @@ struct speed { #ifdef B57600 { 57600, B57600 }, #endif +#ifdef B76800 + { 76800, B76800 }, +#endif #ifdef B115200 { 115200, B115200 }, #endif @@ -480,7 +771,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; } @@ -516,15 +807,15 @@ set_up_tty(fd, local) struct termiox tiox; #endif - if (tcgetattr(fd, &tios) < 0) { - syslog(LOG_ERR, "tcgetattr: %m"); - die(1); - } + if (!sync_serial && tcgetattr(fd, &tios) < 0) + fatal("tcgetattr: %m"); #ifndef CRTSCTS + termiox_ok = 1; if (ioctl (fd, TCGETX, &tiox) < 0) { - syslog (LOG_ERR, "TCGETX: %m"); - die (1); + termiox_ok = 0; + if (errno != ENOTTY) + error("TCGETX: %m"); } #endif @@ -543,10 +834,11 @@ set_up_tty(fd, local) else if (crtscts < 0) tios.c_cflag &= ~CRTSCTS; #else - if (crtscts > 0) { + if (crtscts != 0 && !termiox_ok) { + error("Can't set RTS/CTS flow control"); + } else if (crtscts > 0) { tiox.x_hflag |= RTSXOFF|CTSXON; - } - else if (crtscts < 0) { + } else if (crtscts < 0) { tiox.x_hflag &= ~(RTSXOFF|CTSXON); } #endif @@ -576,22 +868,16 @@ set_up_tty(fd, local) * We can't proceed if the serial port speed is 0, * 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 (!sync_serial && tcsetattr(fd, TCSAFLUSH, &tios) < 0) + fatal("tcsetattr: %m"); #ifndef CRTSCTS - if (ioctl (fd, TCSETXF, &tiox) < 0){ - syslog (LOG_ERR, "TCSETXF: %m"); - die (1); + if (termiox_ok && ioctl (fd, TCSETXF, &tiox) < 0){ + error("TCSETXF: %m"); } #endif @@ -618,11 +904,11 @@ restore_tty(fd) } if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) if (!hungup && errno != ENXIO) - syslog(LOG_WARNING, "tcsetattr: %m"); + warn("tcsetattr: %m"); #ifndef CRTSCTS if (ioctl (fd, TCSETXF, &inittermiox) < 0){ if (!hungup && errno != ENXIO) - syslog (LOG_ERR, "TCSETXF: %m"); + error("TCSETXF: %m"); } #endif ioctl(fd, TIOCSWINSZ, &wsinfo); @@ -648,9 +934,10 @@ int fd, on; * in demand mode. Under Solaris 2, we use our existing fd * to the ppp driver. */ -void +int open_ppp_loopback() { + return pppfd; } /* @@ -667,7 +954,7 @@ output(unit, p, len) struct pollfd pfd; if (debug) - log_packet(p, len, "sent "); + dbglog("sent %P", p, len); data.len = len; data.buf = (caddr_t) p; @@ -675,7 +962,7 @@ output(unit, p, len) while (putmsg(pppfd, NULL, &data, 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 = pppfd; @@ -686,7 +973,7 @@ output(unit, p, len) /* - * wait_input - wait until there is data available on fd, + * wait_input - wait until there is data available, * for the length of time specified by *timo (indefinite * if timo is NULL). */ @@ -695,17 +982,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 = pppfd; - 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; + } } } +#if 0 /* * wait_loop_output - wait until there is data available on the * loopback, for the length of time specified by *timo (indefinite @@ -729,11 +1049,10 @@ wait_time(timo) int n; n = select(0, NULL, NULL, NULL, timo); - if (n < 0 && errno != EINTR) { - syslog(LOG_ERR, "select: %m"); - die(1); - } + if (n < 0 && errno != EINTR) + fatal("select: %m"); } +#endif /* @@ -755,10 +1074,9 @@ read_packet(buf) flags = 0; len = getmsg(pppfd, &ctrl, &data, &flags); if (len < 0) { - if (errno = EAGAIN || errno == EINTR) + if (errno == EAGAIN || errno == EINTR) return -1; - syslog(LOG_ERR, "Error reading packet: %m"); - die(1); + fatal("Error reading packet: %m"); } if (ctrl.len <= 0) @@ -769,7 +1087,7 @@ read_packet(buf) * as a DLPI primitive?? */ if (debug) - syslog(LOG_DEBUG, "got dlpi prim 0x%x, len=%d", + dbglog("got dlpi prim 0x%x, len=%d", ((union DL_primitives *)ctrlbuf)->dl_primitive, ctrl.len); } @@ -804,21 +1122,52 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) int pcomp, accomp; { int cf[2]; + struct ifreq ifr; +#if defined(INET6) && defined(SOL2) + struct lifreq lifr; + int fd; +#endif /* defined(INET6) && defined(SOL2) */ link_mtu = mtu; if (strioctl(pppfd, PPPIO_MTU, &mtu, sizeof(mtu), 0) < 0) { if (hungup && errno == ENXIO) return; - syslog(LOG_ERR, "Couldn't set MTU: %m"); + error("Couldn't set MTU: %m"); } - if (strioctl(pppfd, PPPIO_XACCM, &asyncmap, sizeof(asyncmap), 0) < 0) { - syslog(LOG_ERR, "Couldn't set transmit ACCM: %m"); + if (fdmuxid >= 0) { + /* can't set these if we don't have a stream attached below /dev/ppp */ + if (strioctl(pppfd, PPPIO_XACCM, &asyncmap, sizeof(asyncmap), 0) < 0) { + error("Couldn't set transmit ACCM: %m"); + } + cf[0] = (pcomp? COMP_PROT: 0) + (accomp? COMP_AC: 0); + cf[1] = COMP_PROT | COMP_AC; + if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) { + error("Couldn't set prot/AC compression: %m"); + } } - cf[0] = (pcomp? COMP_PROT: 0) + (accomp? COMP_AC: 0); - cf[1] = COMP_PROT | COMP_AC; - if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) { - syslog(LOG_ERR, "Couldn't set prot/AC compression: %m"); + + /* set the MTU for IP as well */ + memset(&ifr, 0, sizeof(ifr)); + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + ifr.ifr_metric = link_mtu; + if (ioctl(ipfd, SIOCSIFMTU, &ifr) < 0) { + error("Couldn't set IP MTU: %m"); } + +#if defined(INET6) && defined(SOL2) + fd = socket(AF_INET6, SOCK_DGRAM, 0); + if (fd < 0) + error("Couldn't open IPv6 socket: %m"); + + memset(&lifr, 0, sizeof(lifr)); + strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name)); + lifr.lifr_mtu = link_mtu; + if (ioctl(fd, SIOCSLIFMTU, &lifr) < 0) { + close(fd); + error("Couldn't set IPv6 MTU: %m"); + } + close(fd); +#endif /* defined(INET6) && defined(SOL2) */ } /* @@ -829,9 +1178,10 @@ ppp_set_xaccm(unit, accm) int unit; ext_accm accm; { - if (strioctl(pppfd, PPPIO_XACCM, accm, sizeof(ext_accm), 0) < 0) { + if (fdmuxid >= 0 + && strioctl(pppfd, PPPIO_XACCM, accm, sizeof(ext_accm), 0) < 0) { if (!hungup || errno != ENXIO) - syslog(LOG_WARNING, "Couldn't set extended ACCM: %m"); + warn("Couldn't set extended ACCM: %m"); } } @@ -851,15 +1201,18 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) if (strioctl(pppfd, PPPIO_MRU, &mru, sizeof(mru), 0) < 0) { if (hungup && errno == ENXIO) return; - syslog(LOG_ERR, "Couldn't set MRU: %m"); - } - if (strioctl(pppfd, PPPIO_RACCM, &asyncmap, sizeof(asyncmap), 0) < 0) { - syslog(LOG_ERR, "Couldn't set receive ACCM: %m"); + error("Couldn't set MRU: %m"); } - cf[0] = (pcomp? DECOMP_PROT: 0) + (accomp? DECOMP_AC: 0); - cf[1] = DECOMP_PROT | DECOMP_AC; - if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) { - syslog(LOG_ERR, "Couldn't set prot/AC decompression: %m"); + if (fdmuxid >= 0) { + /* can't set these if we don't have a stream attached below /dev/ppp */ + if (strioctl(pppfd, PPPIO_RACCM, &asyncmap, sizeof(asyncmap), 0) < 0) { + error("Couldn't set receive ACCM: %m"); + } + cf[0] = (pcomp? DECOMP_PROT: 0) + (accomp? DECOMP_AC: 0); + cf[1] = DECOMP_PROT | DECOMP_AC; + if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) { + error("Couldn't set prot/AC decompression: %m"); + } } } @@ -891,7 +1244,7 @@ ccp_flags_set(unit, isopen, isup) cf[1] = CCP_ISOPEN | CCP_ISUP | CCP_ERROR | CCP_FATALERROR; if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) { if (!hungup || errno != ENXIO) - syslog(LOG_ERR, "Couldn't set kernel CCP state: %m"); + error("Couldn't set kernel CCP state: %m"); } } @@ -906,7 +1259,26 @@ get_idle_time(u, ip) return strioctl(pppfd, PPPIO_GIDLE, ip, 0, sizeof(struct ppp_idle)) >= 0; } +/* + * get_ppp_stats - return statistics for the link. + */ +int +get_ppp_stats(u, stats) + int u; + struct pppd_stats *stats; +{ + struct ppp_stats s; + + if (strioctl(pppfd, PPPIO_GETSTAT, &s, 0, sizeof(s)) < 0) { + error("Couldn't get link statistics: %m"); + return 0; + } + stats->bytes_in = s.p.ppp_ibytes; + stats->bytes_out = s.p.ppp_obytes; + return 1; +} +#if 0 /* * set_filters - transfer the pass and active filters to the kernel. */ @@ -919,20 +1291,20 @@ set_filters(pass, active) if (pass->bf_len > 0) { if (strioctl(pppfd, PPPIO_PASSFILT, pass, sizeof(struct bpf_program), 0) < 0) { - syslog(LOG_ERR, "Couldn't set pass-filter in kernel: %m"); + error("Couldn't set pass-filter in kernel: %m"); ret = 0; } } if (active->bf_len > 0) { if (strioctl(pppfd, PPPIO_ACTIVEFILT, active, sizeof(struct bpf_program), 0) < 0) { - syslog(LOG_ERR, "Couldn't set active-filter in kernel: %m"); + error("Couldn't set active-filter in kernel: %m"); ret = 0; } } return ret; } - +#endif /* * ccp_fatal_error - returns 1 if decompression was disabled as a @@ -948,7 +1320,7 @@ ccp_fatal_error(unit) cf[0] = cf[1] = 0; if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) { if (errno != ENXIO && errno != EINVAL) - syslog(LOG_ERR, "Couldn't get compression flags: %m"); + error("Couldn't get compression flags: %m"); return 0; } return cf[0] & CCP_FATALERROR; @@ -968,7 +1340,7 @@ sifvjcomp(u, vjcomp, xcidcomp, xmaxcid) maxcid[0] = xcidcomp; maxcid[1] = 15; /* XXX should be rmaxcid */ if (strioctl(pppfd, PPPIO_VJINIT, maxcid, sizeof(maxcid), 0) < 0) { - syslog(LOG_ERR, "Couldn't initialize VJ compression: %m"); + error("Couldn't initialize VJ compression: %m"); } } @@ -977,7 +1349,7 @@ sifvjcomp(u, vjcomp, xcidcomp, xmaxcid) cf[1] = COMP_VJC + DECOMP_VJC + COMP_VJCCID + DECOMP_VJCCID; if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) { if (vjcomp) - syslog(LOG_ERR, "Couldn't enable VJ compression: %m"); + error("Couldn't enable VJ compression: %m"); } return 1; @@ -992,14 +1364,14 @@ sifup(u) { struct ifreq ifr; - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); if (ioctl(ipfd, SIOCGIFFLAGS, &ifr) < 0) { - syslog(LOG_ERR, "Couldn't mark interface up (get): %m"); + error("Couldn't mark interface up (get): %m"); return 0; } ifr.ifr_flags |= IFF_UP; if (ioctl(ipfd, SIOCSIFFLAGS, &ifr) < 0) { - syslog(LOG_ERR, "Couldn't mark interface up (set): %m"); + error("Couldn't mark interface up (set): %m"); return 0; } if_is_up = 1; @@ -1017,14 +1389,14 @@ sifdown(u) if (ipmuxid < 0) return 1; - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); if (ioctl(ipfd, SIOCGIFFLAGS, &ifr) < 0) { - syslog(LOG_ERR, "Couldn't mark interface down (get): %m"); + error("Couldn't mark interface down (get): %m"); return 0; } ifr.ifr_flags &= ~IFF_UP; if (ioctl(ipfd, SIOCSIFFLAGS, &ifr) < 0) { - syslog(LOG_ERR, "Couldn't mark interface down (set): %m"); + error("Couldn't mark interface down (set): %m"); return 0; } if_is_up = 0; @@ -1045,12 +1417,145 @@ sifnpmode(u, proto, mode) npi[0] = proto; npi[1] = (int) mode; if (strioctl(pppfd, PPPIO_NPMODE, &npi, 2 * sizeof(int), 0) < 0) { - syslog(LOG_ERR, "ioctl(set NP %d mode to %d): %m", proto, mode); + error("ioctl(set NP %d mode to %d): %m", proto, mode); + return 0; + } + return 1; +} + +#if defined(SOL2) && defined(INET6) +/* + * sif6up - Config the IPv6 interface up and enable IPv6 packets to pass. + */ +int +sif6up(u) + int u; +{ + struct lifreq lifr; + int fd; + + fd = socket(AF_INET6, SOCK_DGRAM, 0); + if (fd < 0) { + return 0; + } + + memset(&lifr, 0, sizeof(lifr)); + strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name)); + if (ioctl(fd, SIOCGLIFFLAGS, &lifr) < 0) { + close(fd); + return 0; + } + + lifr.lifr_flags |= IFF_UP; + strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name)); + if (ioctl(fd, SIOCSLIFFLAGS, &lifr) < 0) { + close(fd); + return 0; + } + + if6_is_up = 1; + close(fd); + return 1; +} + +/* + * sifdown - Config the IPv6 interface down and disable IPv6. + */ +int +sif6down(u) + int u; +{ + struct lifreq lifr; + int fd; + + fd = socket(AF_INET6, SOCK_DGRAM, 0); + if (fd < 0) + return 0; + + memset(&lifr, 0, sizeof(lifr)); + strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name)); + if (ioctl(fd, SIOCGLIFFLAGS, &lifr) < 0) { + close(fd); + return 0; + } + + lifr.lifr_flags &= ~IFF_UP; + strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name)); + if (ioctl(fd, SIOCGLIFFLAGS, &lifr) < 0) { + close(fd); + return 0; + } + + if6_is_up = 0; + close(fd); + return 1; +} + +/* + * sif6addr - Config the interface with an IPv6 link-local address + */ +int +sif6addr(u, o, h) + int u; + eui64_t o, h; +{ + struct lifreq lifr; + struct sockaddr_storage laddr; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&laddr; + int fd; + + fd = socket(AF_INET6, SOCK_DGRAM, 0); + if (fd < 0) + return 0; + + memset(&lifr, 0, sizeof(lifr)); + strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name)); + + /* + * Do this because /dev/ppp responds to DL_PHYS_ADDR_REQ with + * zero values, hence the interface token came to be zero too, + * and without this, in.ndpd will complain + */ + IN6_LLTOKEN_FROM_EUI64(lifr, sin6, o); + if (ioctl(fd, SIOCSLIFTOKEN, &lifr) < 0) { + close(fd); + return 0; + } + + /* + * Set the interface address and destination address + */ + IN6_LLADDR_FROM_EUI64(lifr, sin6, o); + if (ioctl(fd, SIOCSLIFADDR, &lifr) < 0) { + close(fd); + return 0; + } + + memset(&lifr, 0, sizeof(lifr)); + strlcpy(lifr.lifr_name, ifname, sizeof(lifr.lifr_name)); + IN6_LLADDR_FROM_EUI64(lifr, sin6, h); + if (ioctl(fd, SIOCSLIFDSTADDR, &lifr) < 0) { + close(fd); return 0; } + + return 1; +} + +/* + * cif6addr - Remove the IPv6 address from interface + */ +int +cif6addr(u, o, h) + int u; + eui64_t o, h; +{ return 1; } +#endif /* defined(SOL2) && defined(INET6) */ + + #define INET_ADDR(x) (((struct sockaddr_in *) &(x))->sin_addr.s_addr) /* @@ -1062,30 +1567,50 @@ sifaddr(u, o, h, m) u_int32_t o, h, m; { struct ifreq ifr; + int ret = 1; memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); ifr.ifr_addr.sa_family = AF_INET; INET_ADDR(ifr.ifr_addr) = m; if (ioctl(ipfd, SIOCSIFNETMASK, &ifr) < 0) { - syslog(LOG_ERR, "Couldn't set IP netmask: %m"); + error("Couldn't set IP netmask: %m"); + ret = 0; } ifr.ifr_addr.sa_family = AF_INET; INET_ADDR(ifr.ifr_addr) = o; if (ioctl(ipfd, SIOCSIFADDR, &ifr) < 0) { - syslog(LOG_ERR, "Couldn't set local IP address: %m"); + error("Couldn't set local IP address: %m"); + ret = 0; + } + + /* + * On some systems, we have to explicitly set the point-to-point + * flag bit before we can set a destination address. + */ + if (ioctl(ipfd, SIOCGIFFLAGS, &ifr) >= 0 + && (ifr.ifr_flags & IFF_POINTOPOINT) == 0) { + ifr.ifr_flags |= IFF_POINTOPOINT; + if (ioctl(ipfd, SIOCSIFFLAGS, &ifr) < 0) { + error("Couldn't mark interface pt-to-pt: %m"); + ret = 0; + } } ifr.ifr_dstaddr.sa_family = AF_INET; INET_ADDR(ifr.ifr_dstaddr) = h; if (ioctl(ipfd, SIOCSIFDSTADDR, &ifr) < 0) { - syslog(LOG_ERR, "Couldn't set remote IP address: %m"); + error("Couldn't set remote IP address: %m"); + ret = 0; } +#if 0 /* now done in ppp_send_config */ ifr.ifr_metric = link_mtu; if (ioctl(ipfd, SIOCSIFMTU, &ifr) < 0) { - syslog(LOG_ERR, "Couldn't set IP MTU: %m"); + error("Couldn't set IP MTU: %m"); } +#endif - return 1; + remote_addr = h; + return ret; } /* @@ -1097,15 +1622,18 @@ cifaddr(u, o, h) int u; u_int32_t o, h; { -#if 0 +#if defined(__USLC__) /* was: #if 0 */ + cifroute(unit, ouraddr, hisaddr); if (ipmuxid >= 0) { + notice("Removing ppp interface unit"); if (ioctl(ipfd, I_UNLINK, ipmuxid) < 0) { - syslog(LOG_ERR, "Can't remove ppp interface unit: %m"); + error("Can't remove ppp interface unit: %m"); return 0; } ipmuxid = -1; } #endif + remote_addr = 0; return 1; } @@ -1113,12 +1641,15 @@ 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 rtentry rt; +#if defined(__USLC__) + g = l; /* use the local address as gateway */ +#endif memset(&rt, 0, sizeof(rt)); rt.rt_dst.sa_family = AF_INET; INET_ADDR(rt.rt_dst) = 0; @@ -1127,7 +1658,7 @@ sifdefaultroute(u, g) rt.rt_flags = RTF_GATEWAY; if (ioctl(ipfd, SIOCADDRT, &rt) < 0) { - syslog(LOG_ERR, "Can't add default route: %m"); + error("Can't add default route: %m"); return 0; } @@ -1139,12 +1670,15 @@ 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 rtentry rt; +#if defined(__USLC__) + g = l; /* use the local address as gateway */ +#endif memset(&rt, 0, sizeof(rt)); rt.rt_dst.sa_family = AF_INET; INET_ADDR(rt.rt_dst) = 0; @@ -1153,7 +1687,7 @@ cifdefaultroute(u, g) rt.rt_flags = RTF_GATEWAY; if (ioctl(ipfd, SIOCDELRT, &rt) < 0) { - syslog(LOG_ERR, "Can't delete default route: %m"); + error("Can't delete default route: %m"); return 0; } @@ -1179,7 +1713,7 @@ sifproxyarp(unit, hisaddr) INET_ADDR(arpreq.arp_pa) = hisaddr; arpreq.arp_flags = ATF_PERM | ATF_PUBL; if (ioctl(ipfd, SIOCSARP, (caddr_t) &arpreq) < 0) { - syslog(LOG_ERR, "Couldn't set proxy ARP entry: %m"); + error("Couldn't set proxy ARP entry: %m"); return 0; } @@ -1201,7 +1735,7 @@ cifproxyarp(unit, hisaddr) arpreq.arp_pa.sa_family = AF_INET; INET_ADDR(arpreq.arp_pa) = hisaddr; if (ioctl(ipfd, SIOCDARP, (caddr_t)&arpreq) < 0) { - syslog(LOG_ERR, "Couldn't delete proxy ARP entry: %m"); + error("Couldn't delete proxy ARP entry: %m"); return 0; } @@ -1233,11 +1767,12 @@ get_ether_addr(ipaddr, hwaddr) #endif nif = MAX_IFS; ifc.ifc_len = nif * sizeof(struct ifreq); - ifc.ifc_buf = (caddr_t) alloca(ifc.ifc_len); - if (ifc.ifc_req == 0) + ifc.ifc_buf = (caddr_t) malloc(ifc.ifc_len); + if (ifc.ifc_buf == 0) return 0; if (ioctl(ipfd, SIOCGIFCONF, &ifc) < 0) { - syslog(LOG_WARNING, "Couldn't get system interface list: %m"); + warn("Couldn't get system interface list: %m"); + free(ifc.ifc_buf); return 0; } ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); @@ -1247,7 +1782,7 @@ get_ether_addr(ipaddr, hwaddr) /* * 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(ipfd, SIOCGIFFLAGS, &ifreq) < 0) continue; if ((ifreq.ifr_flags & @@ -1266,24 +1801,27 @@ get_ether_addr(ipaddr, hwaddr) } if (ifr >= ifend) { - syslog(LOG_WARNING, "No suitable interface found for proxy ARP"); + warn("No suitable interface found for proxy ARP"); + free(ifc.ifc_buf); return 0; } - syslog(LOG_INFO, "found interface %s for proxy ARP", ifr->ifr_name); - if (!get_hw_addr(ifr->ifr_name, hwaddr)) { - syslog(LOG_ERR, "Couldn't get hardware address for %s", ifr->ifr_name); + info("found interface %s for proxy ARP", ifr->ifr_name); + if (!get_hw_addr(ifr->ifr_name, ina, hwaddr)) { + error("Couldn't get hardware address for %s", ifr->ifr_name); + free(ifc.ifc_buf); return 0; } + free(ifc.ifc_buf); return 1; } /* - * get_hw_addr - obtain the hardware address for a named interface. + * get_hw_addr_dlpi - obtain the hardware address using DLPI */ static int -get_hw_addr(name, hwaddr) +get_hw_addr_dlpi(name, hwaddr) char *name; struct sockaddr *hwaddr; { @@ -1300,19 +1838,19 @@ get_hw_addr(name, hwaddr) * We have to open the device and ask it for its hardware address. * First split apart the device name and unit. */ - strcpy(ifdev, "/dev/"); - q = ifdev + 5; /* strlen("/dev/") */ - while (*name != 0 && !isdigit(*name)) - *q++ = *name++; - *q = 0; - unit = atoi(name); + slprintf(ifdev, sizeof(ifdev), "/dev/%s", name); + for (q = ifdev + strlen(ifdev); --q >= ifdev; ) + if (!isdigit(*q)) + break; + unit = atoi(q+1); + q[1] = 0; /* * Open the device and do a DLPI attach and phys_addr_req. */ iffd = open(ifdev, O_RDWR); if (iffd < 0) { - syslog(LOG_ERR, "Can't open %s: %m", ifdev); + error("Can't open %s: %m", ifdev); return 0; } if (dlpi_attach(iffd, unit) < 0 @@ -1325,17 +1863,47 @@ get_hw_addr(name, hwaddr) adrlen = reply.prim.info_ack.dl_addr_length; adrp = (unsigned char *)&reply + reply.prim.info_ack.dl_addr_offset; + #if DL_CURRENT_VERSION >= 2 if (reply.prim.info_ack.dl_sap_length < 0) adrlen += reply.prim.info_ack.dl_sap_length; else adrp += reply.prim.info_ack.dl_sap_length; #endif + hwaddr->sa_family = AF_UNSPEC; memcpy(hwaddr->sa_data, adrp, adrlen); return 1; } +/* + * get_hw_addr - obtain the hardware address for a named interface. + */ +static int +get_hw_addr(name, ina, hwaddr) + char *name; + u_int32_t ina; + struct sockaddr *hwaddr; +{ + /* New way - get the address by doing an arp request. */ + int s; + struct arpreq req; + + s = socket(AF_INET, SOCK_DGRAM, 0); + if (s < 0) + return 0; + memset(&req, 0, sizeof(req)); + req.arp_pa.sa_family = AF_INET; + INET_ADDR(req.arp_pa) = ina; + if (ioctl(s, SIOCGARP, &req) < 0) { + error("Couldn't get ARP entry for %s: %m", ip_ntoa(ina)); + return 0; + } + *hwaddr = req.arp_ha; + hwaddr->sa_family = AF_UNSPEC; + + return 1; +} static int dlpi_attach(fd, ppa) @@ -1395,7 +1963,7 @@ dlpi_get_reply(fd, reply, expected_prim, maxlen) if (buf.len < sizeof(ulong)) { if (debug) - syslog(LOG_DEBUG, "dlpi response short (len=%d)\n", buf.len); + dbglog("dlpi response short (len=%d)\n", buf.len); return -1; } @@ -1404,11 +1972,11 @@ dlpi_get_reply(fd, reply, expected_prim, maxlen) if (debug) { if (reply->dl_primitive == DL_ERROR_ACK) { - syslog(LOG_DEBUG, "dlpi error %d (unix errno %d) for prim %x\n", + dbglog("dlpi error %d (unix errno %d) for prim %x\n", reply->error_ack.dl_errno, reply->error_ack.dl_unix_errno, reply->error_ack.dl_error_primitive); } else { - syslog(LOG_DEBUG, "dlpi unexpected response prim %x\n", + dbglog("dlpi unexpected response prim %x\n", reply->dl_primitive); } } @@ -1451,11 +2019,12 @@ GetMask(addr) #endif nif = MAX_IFS; ifc.ifc_len = nif * sizeof(struct ifreq); - ifc.ifc_buf = (caddr_t) alloca(ifc.ifc_len); - if (ifc.ifc_req == 0) + ifc.ifc_buf = (caddr_t) malloc(ifc.ifc_len); + if (ifc.ifc_buf == 0) return mask; if (ioctl(ipfd, SIOCGIFCONF, &ifc) < 0) { - syslog(LOG_WARNING, "Couldn't get system interface list: %m"); + warn("Couldn't get system interface list: %m"); + free(ifc.ifc_buf); return mask; } ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); @@ -1471,7 +2040,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(ipfd, SIOCGIFFLAGS, &ifreq) < 0) continue; if ((ifreq.ifr_flags & (IFF_UP|IFF_POINTOPOINT|IFF_LOOPBACK)) @@ -1485,15 +2054,16 @@ GetMask(addr) mask |= INET_ADDR(ifreq.ifr_addr); } + free(ifc.ifc_buf); return mask; } /* * logwtmp - write an accounting record to the /var/adm/wtmp file. */ -int +void logwtmp(line, name, host) - char *line, *name, *host; + const char *line, *name, *host; { static struct utmpx utmpx; @@ -1509,19 +2079,18 @@ logwtmp(line, name, host) } gettimeofday(&utmpx.ut_tv, NULL); updwtmpx("/var/adm/wtmpx", &utmpx); - return 0; } /* - * gethostid - return the serial number of this machine. + * get_host_seed - return the serial number of this machine. */ int -gethostid() +get_host_seed() { char buf[32]; if (sysinfo(SI_HW_SERIAL, buf, sizeof(buf)) < 0) { - syslog(LOG_ERR, "sysinfo: %m"); + error("sysinfo: %m"); return 0; } return (int) strtoul(buf, NULL, 16); @@ -1541,11 +2110,12 @@ strioctl(fd, cmd, ptr, ilen, olen) if (ioctl(fd, I_STR, &str) == -1) return -1; if (str.ic_len != olen) - syslog(LOG_DEBUG, "strioctl: expected %d bytes, got %d for cmd %x\n", + dbglog("strioctl: expected %d bytes, got %d for cmd %x\n", olen, str.ic_len, cmd); return 0; } +#if 0 /* * lock - create a lock file for the named lock device */ @@ -1562,15 +2132,16 @@ lock(dev) char ascii_pid[12]; if (stat(dev, &sbuf) < 0) { - syslog(LOG_ERR, "Can't get device number for %s: %m", dev); + error("Can't get device number for %s: %m", dev); return -1; } if ((sbuf.st_mode & S_IFMT) != S_IFCHR) { - syslog(LOG_ERR, "Can't lock %s: not a character device", dev); + error("Can't lock %s: not a character device", dev); return -1; } - sprintf(lock_file, "%s%03d.%03d.%03d", LOCK_PREFIX, major(sbuf.st_dev), - major(sbuf.st_rdev), minor(sbuf.st_rdev)); + slprintf(lock_file, sizeof(lock_file), "%s%03d.%03d.%03d", + LOCK_PREFIX, major(sbuf.st_dev), + major(sbuf.st_rdev), minor(sbuf.st_rdev)); while ((fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644)) < 0) { if (errno == EEXIST @@ -1578,7 +2149,7 @@ lock(dev) /* Read the lock file to find out who has the device locked */ n = read(fd, ascii_pid, 11); if (n <= 0) { - syslog(LOG_ERR, "Can't read pid from lock file %s", lock_file); + error("Can't read pid from lock file %s", lock_file); close(fd); } else { ascii_pid[n] = 0; @@ -1587,24 +2158,24 @@ lock(dev) /* pid no longer exists - remove the lock file */ if (unlink(lock_file) == 0) { close(fd); - syslog(LOG_NOTICE, "Removed stale lock on %s (pid %d)", + notice("Removed stale lock on %s (pid %d)", dev, pid); continue; } else - syslog(LOG_WARNING, "Couldn't remove stale lock on %s", + warn("Couldn't remove stale lock on %s", dev); } else - syslog(LOG_NOTICE, "Device %s is locked by pid %d", + notice("Device %s is locked by pid %d", dev, pid); } close(fd); } else - syslog(LOG_ERR, "Can't create lock file %s: %m", lock_file); + error("Can't create lock file %s: %m", lock_file); lock_file[0] = 0; return -1; } - sprintf(ascii_pid, "%10d\n", getpid()); + slprintf(ascii_pid, sizeof(ascii_pid), "%10d\n", getpid()); write(fd, ascii_pid, 11); close(fd); @@ -1622,3 +2193,191 @@ unlock() lock_file[0] = 0; } } +#endif + +/* + * cifroute - delete a route through the addresses given. + */ +int +cifroute(u, our, his) + int u; + u_int32_t our, his; +{ + struct rtentry rt; + + memset(&rt, 0, sizeof(rt)); + rt.rt_dst.sa_family = AF_INET; + INET_ADDR(rt.rt_dst) = his; + rt.rt_gateway.sa_family = AF_INET; + INET_ADDR(rt.rt_gateway) = our; + rt.rt_flags = RTF_HOST; + + if (ioctl(ipfd, SIOCDELRT, &rt) < 0) { + error("Can't delete route: %m"); + return 0; + } + + return 1; +} + +/* + * have_route_to - determine if the system has a route to the specified + * IP address. Returns 0 if not, 1 if so, -1 if we can't tell. + * `addr' is in network byte order. + * For demand mode to work properly, we have to ignore routes + * through our own interface. + */ +#ifndef T_CURRENT /* needed for Solaris 2.5 */ +#define T_CURRENT MI_T_CURRENT +#endif + +int +have_route_to(addr) + u_int32_t addr; +{ +#ifdef SOL2 + int fd, r, flags, i; + struct { + struct T_optmgmt_req req; + struct opthdr hdr; + } req; + union { + struct T_optmgmt_ack ack; + unsigned char space[64]; + } ack; + struct opthdr *rh; + struct strbuf cbuf, dbuf; + int nroutes; + mib2_ipRouteEntry_t routes[8]; + mib2_ipRouteEntry_t *rp; + + fd = open("/dev/ip", O_RDWR); + if (fd < 0) { + warn("have_route_to: couldn't open /dev/ip: %m"); + return -1; + } + + req.req.PRIM_type = T_OPTMGMT_REQ; + req.req.OPT_offset = (char *) &req.hdr - (char *) &req; + req.req.OPT_length = sizeof(req.hdr); + req.req.MGMT_flags = T_CURRENT; + + req.hdr.level = MIB2_IP; + req.hdr.name = 0; + req.hdr.len = 0; + + cbuf.buf = (char *) &req; + cbuf.len = sizeof(req); + + if (putmsg(fd, &cbuf, NULL, 0) == -1) { + warn("have_route_to: putmsg: %m"); + close(fd); + return -1; + } + + for (;;) { + cbuf.buf = (char *) &ack; + cbuf.maxlen = sizeof(ack); + dbuf.buf = (char *) routes; + dbuf.maxlen = sizeof(routes); + flags = 0; + r = getmsg(fd, &cbuf, &dbuf, &flags); + if (r == -1) { + warn("have_route_to: getmsg: %m"); + close(fd); + return -1; + } + + if (cbuf.len < sizeof(struct T_optmgmt_ack) + || ack.ack.PRIM_type != T_OPTMGMT_ACK + || ack.ack.MGMT_flags != T_SUCCESS + || ack.ack.OPT_length < sizeof(struct opthdr)) { + dbglog("have_route_to: bad message len=%d prim=%d", + cbuf.len, ack.ack.PRIM_type); + close(fd); + return -1; + } + + rh = (struct opthdr *) ((char *)&ack + ack.ack.OPT_offset); + if (rh->level == 0 && rh->name == 0) + break; + if (rh->level != MIB2_IP || rh->name != MIB2_IP_21) { + while (r == MOREDATA) + r = getmsg(fd, NULL, &dbuf, &flags); + continue; + } + + for (;;) { + nroutes = dbuf.len / sizeof(mib2_ipRouteEntry_t); + for (rp = routes, i = 0; i < nroutes; ++i, ++rp) { + if (rp->ipRouteMask != ~0) { + dbglog("have_route_to: dest=%x gw=%x mask=%x\n", + rp->ipRouteDest, rp->ipRouteNextHop, + rp->ipRouteMask); + if (((addr ^ rp->ipRouteDest) & rp->ipRouteMask) == 0 + && rp->ipRouteNextHop != remote_addr) + return 1; + } + } + if (r == 0) + break; + r = getmsg(fd, NULL, &dbuf, &flags); + } + } + close(fd); + return 0; +#else + return -1; +#endif /* SOL2 */ +} + +/* + * get_pty - get a pty master/slave pair and chown the slave side to + * the uid given. Assumes slave_name points to MAXPATHLEN bytes of space. + */ +int +get_pty(master_fdp, slave_fdp, slave_name, uid) + int *master_fdp; + int *slave_fdp; + char *slave_name; + int uid; +{ + int mfd, sfd; + char *pty_name; + struct termios tios; + + mfd = open("/dev/ptmx", O_RDWR); + if (mfd < 0) { + error("Couldn't open pty master: %m"); + return 0; + } + + pty_name = ptsname(mfd); + if (pty_name == NULL) { + error("Couldn't get name of pty slave"); + close(mfd); + return 0; + } + if (chown(pty_name, uid, -1) < 0) + warn("Couldn't change owner of pty slave: %m"); + if (chmod(pty_name, S_IRUSR | S_IWUSR) < 0) + warn("Couldn't change permissions on pty slave: %m"); + if (unlockpt(mfd) < 0) + warn("Couldn't unlock pty slave: %m"); + + sfd = open(pty_name, O_RDWR); + if (sfd < 0) { + error("Couldn't open pty slave %s: %m", pty_name); + close(mfd); + return 0; + } + if (ioctl(sfd, I_PUSH, "ptem") < 0) + warn("Couldn't push ptem module on pty slave: %m"); + + dbglog("Using %s", pty_name); + strlcpy(slave_name, pty_name, MAXPATHLEN); + *master_fdp = mfd; + *slave_fdp = sfd; + + return 1; +}