X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-svr4.c;h=f82a2163e1d34707fe6a235f327d0d66943a1a81;hp=08a2a01fd46599a338e7c527e6c91c31f92dcd87;hb=98516bb41580f3d34d750165e9a65289bc5ad248;hpb=cbaae8cca6a6377163a2b3ecbbfde1a0a2620bf7 diff --git a/pppd/sys-svr4.c b/pppd/sys-svr4.c index 08a2a01..f82a216 100644 --- a/pppd/sys-svr4.c +++ b/pppd/sys-svr4.c @@ -26,18 +26,28 @@ */ #ifndef lint -static char rcsid[] = "$Id: sys-svr4.c,v 1.4 1995/08/10 06:53:39 paulus Exp $"; +static char rcsid[] = "$Id: sys-svr4.c,v 1.15 1997/03/04 03:43:54 paulus Exp $"; #endif +#include #include #include #include +#if defined(SNI) || defined(__USLC__) +extern void *alloca(size_t); +#else +#include +#endif #include #include #include #include #include +#ifndef CRTSCTS +#include +#endif #include +#include #include #include #include @@ -45,9 +55,11 @@ static char rcsid[] = "$Id: sys-svr4.c,v 1.4 1995/08/10 06:53:39 paulus Exp $"; #include #include #include +#include #include #include #include +#include #include #include #include @@ -64,32 +76,159 @@ static int ipmuxid = -1; static int restore_term; static struct termios inittermios; +#ifndef CRTSCTS +static struct termiox inittermiox; +#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 */ + static int link_mtu, link_mru; #define NMODULES 32 static int tty_nmodules; static char tty_modules[NMODULES][FMNAMESZ+1]; +static int if_is_up; /* Interface has been marked up */ +static u_int32_t default_route_gateway; /* Gateway for default route added */ +static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ + +/* Prototypes for procedures local to this file. */ +static int translate_speed __P((int)); +static int baud_rate_of __P((int)); +static int get_ether_addr __P((u_int32_t, struct sockaddr *)); +static int get_hw_addr __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)); + + /* * sys_init - System-dependent initialization. */ void sys_init() { - openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); - setlogmask(LOG_UPTO(LOG_INFO)); - if (debug) - setlogmask(LOG_UPTO(LOG_DEBUG)); + int ifd, x; +#ifndef sun + struct ifreq ifr; + struct { + union DL_primitives prim; + char space[64]; + } reply; +#endif ipfd = open("/dev/ip", O_RDWR, 0); if (ipfd < 0) { syslog(LOG_ERR, "Couldn't open IP device: %m"); die(1); } + + if (default_device) + 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 & 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); + } + + /* + * Open the ppp device again and link it under the ip multiplexor. + * IP will assign a unit number which hopefully is the same as ifunit. + * 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 & 1) { + x = PPPDBG_LOG + PPPDBG_DRIVER; + strioctl(ifd, PPPIO_DEBUG, &x, sizeof(int), 0); + } +#ifdef sun + if (ioctl(ifd, I_PUSH, "ip") < 0) { + syslog(LOG_ERR, "Can't push IP module: %m"); + close(ifd); + die(1); + } +#else + 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); + } +#endif + ipmuxid = ioctl(ipfd, I_LINK, ifd); + close(ifd); + if (ipmuxid < 0) { + syslog(LOG_ERR, "Can't link PPP device to IP: %m"); + die(1); + } + +#ifndef sun + /* Set the interface name for the link. */ + (void) sprintf (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 +} + +/* + * sys_cleanup - restore any system state we modified before exiting: + * mark the interface down, delete default route and/or proxy arp entry. + * This should call die() because it's called from die(). + */ +void +sys_cleanup() +{ + struct ifreq ifr; + + if (if_is_up) + sifdown(0); + if (default_route_gateway) + cifdefaultroute(0, default_route_gateway, default_route_gateway); + if (proxy_arp_addr) + cifproxyarp(0, proxy_arp_addr); +} + +/* + * sys_close - Clean up in a child process before execing. + */ +void +sys_close() +{ + close(ipfd); + if (pppfd >= 0) + close(pppfd); +} + +/* + * sys_check_options - check the options that the user specified + */ +void +sys_check_options() +{ } + /* * daemon - Detach us from controlling terminal session. */ @@ -114,20 +253,6 @@ daemon(nochdir, noclose) return 0; } -/* - * note_debug_level - note a change in the debug level. - */ -void -note_debug_level() -{ - if (debug) { - syslog(LOG_INFO, "Debug turned ON, Level %d", debug); - setlogmask(LOG_UPTO(LOG_DEBUG)); - } else { - setlogmask(LOG_UPTO(LOG_WARNING)); - } -} - /* * ppp_available - check whether the system has any ppp interfaces */ @@ -143,46 +268,10 @@ ppp_available() * establish_ppp - Turn the serial port into a ppp interface. */ void -establish_ppp() +establish_ppp(fd) + int fd; { - int i, ifd; - - if (default_device) - 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); - } - - /* 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); - } - - /* - * Open the ppp device again and link it under the ip multiplexor. - * IP will assign a unit number which hopefully is the same as ifunit. - * 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 (ioctl(ifd, I_PUSH, "ip") < 0) { - syslog(LOG_ERR, "Can't push IP module: %m"); - close(ifd); - die(1); - } - ipmuxid = ioctl(ipfd, I_LINK, ifd); - close(ifd); - if (ipmuxid < 0) { - syslog(LOG_ERR, "Can't link PPP device to IP: %m"); - die(1); - } + int i; /* Pop any existing modules off the tty stream. */ for (i = 0;; ++i) @@ -196,10 +285,18 @@ establish_ppp() syslog(LOG_ERR, "Couldn't push PPP Async HDLC 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) { syslog(LOG_ERR, "Couldn't push PPP compression module: %m"); /* die(1); */ } + 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) { @@ -208,12 +305,23 @@ establish_ppp() } } +/* + * restore_loop - reattach the ppp unit to the loopback. + * This doesn't need to do anything because disestablish_ppp does it. + */ +void +restore_loop() +{ +} + /* * disestablish_ppp - Restore the serial port to normal operation. - * This shouldn't call die() because it's called from die(). + * It attempts to reconstruct the stream with the previously popped + * modules. This shouldn't call die() because it's called from die(). */ void -disestablish_ppp() +disestablish_ppp(fd) + int fd; { int i; @@ -245,6 +353,38 @@ disestablish_ppp() } } +/* + * Check whether the link seems not to be 8-bit clean. + */ +void +clean_check() +{ + int x; + char *s; + + if (strioctl(pppfd, PPPIO_GCLEAN, &x, 0, sizeof(x)) < 0) + return; + s = NULL; + switch (~x) { + case RCV_B7_0: + s = "bit 7 set to 1"; + break; + case RCV_B7_1: + s = "bit 7 set to 0"; + break; + case RCV_EVNP: + s = "odd parity"; + break; + case RCV_ODDP: + s = "even parity"; + break; + } + if (s != NULL) { + syslog(LOG_WARNING, "Serial link is not 8-bit clean:"); + syslog(LOG_WARNING, "All received characters had %s", s); + } +} + /* * List of valid speeds. */ @@ -323,7 +463,7 @@ struct speed { /* * Translate from bits/second to a speed_t. */ -int +static int translate_speed(bps) int bps; { @@ -341,7 +481,7 @@ translate_speed(bps) /* * Translate from a speed_t to bits/second. */ -int +static int baud_rate_of(speed) int speed; { @@ -360,25 +500,50 @@ 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; { int speed; struct termios tios; +#if !defined (CRTSCTS) + struct termiox tiox; +#endif if (tcgetattr(fd, &tios) < 0) { syslog(LOG_ERR, "tcgetattr: %m"); die(1); } - if (!restore_term) +#ifndef CRTSCTS + if (ioctl (fd, TCGETX, &tiox) < 0) { + syslog (LOG_ERR, "TCGETX: %m"); + die (1); + } +#endif + + if (!restore_term) { inittermios = tios; +#ifndef CRTSCTS + inittermiox = tiox; +#endif + ioctl(fd, TIOCGWINSZ, &wsinfo); + } tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL); +#ifdef CRTSCTS if (crtscts > 0) tios.c_cflag |= CRTSCTS; else if (crtscts < 0) tios.c_cflag &= ~CRTSCTS; +#else + if (crtscts > 0) { + tiox.x_hflag |= RTSXOFF|CTSXON; + } + else if (crtscts < 0) { + tiox.x_hflag &= ~(RTSXOFF|CTSXON); + } +#endif tios.c_cflag |= CS8 | CREAD | HUPCL; if (local || !modem) @@ -389,8 +554,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 */ } @@ -417,6 +582,13 @@ set_up_tty(fd, local) die(1); } +#ifndef CRTSCTS + if (ioctl (fd, TCSETXF, &tiox) < 0){ + syslog (LOG_ERR, "TCSETXF: %m"); + die (1); + } +#endif + baud_rate = inspeed = baud_rate_of(speed); restore_term = 1; } @@ -425,7 +597,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) { @@ -440,6 +613,13 @@ restore_tty() if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) if (!hungup && errno != ENXIO) syslog(LOG_WARNING, "tcsetattr: %m"); +#ifndef CRTSCTS + if (ioctl (fd, TCSETXF, &inittermiox) < 0){ + if (!hungup && errno != ENXIO) + syslog (LOG_ERR, "TCSETXF: %m"); + } +#endif + ioctl(fd, TIOCSWINSZ, &wsinfo); restore_term = 0; } } @@ -448,6 +628,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; { @@ -456,6 +637,16 @@ int fd, on; ioctl(fd, (on? TIOCMBIS: TIOCMBIC), &modembits); } +/* + * open_loopback - open the device we use for getting packets + * in demand mode. Under Solaris 2, we use our existing fd + * to the ppp driver. + */ +void +open_ppp_loopback() +{ +} + /* * output - Output PPP packet. */ @@ -466,25 +657,34 @@ output(unit, p, len) int len; { struct strbuf data; + int retries; + struct pollfd pfd; if (debug) log_packet(p, len, "sent "); data.len = len; data.buf = (caddr_t) p; - if (putmsg(pppfd, NULL, &data, 0) < 0) { - if (errno != ENXIO) { - syslog(LOG_ERR, "Couldn't send packet: %m"); - die(1); + retries = 4; + 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"); + break; } + pfd.fd = pppfd; + pfd.events = POLLOUT; + poll(&pfd, 1, 250); /* wait for up to 0.25 seconds */ } } + /* * wait_input - wait until there is data available on fd, * for the length of time specified by *timo (indefinite * if timo is NULL). */ +void wait_input(timo) struct timeval *timo; { @@ -500,6 +700,36 @@ wait_input(timo) } } +/* + * wait_loop_output - wait until there is data available on the + * loopback, for the length of time specified by *timo (indefinite + * if timo is NULL). + */ +void +wait_loop_output(timo) + struct timeval *timo; +{ + wait_input(timo); +} + +/* + * wait_time - wait for a given length of time or until a + * signal is received. + */ +void +wait_time(timo) + struct timeval *timo; +{ + int n; + + n = select(0, NULL, NULL, NULL, timo); + if (n < 0 && errno != EINTR) { + syslog(LOG_ERR, "select: %m"); + die(1); + } +} + + /* * read_packet - get a PPP packet from the serial device. */ @@ -530,7 +760,7 @@ read_packet(buf) /* * Got a M_PROTO or M_PCPROTO message. Interpret it - * as a DLPI primitive. + * as a DLPI primitive?? */ if (debug) syslog(LOG_DEBUG, "got dlpi prim 0x%x, len=%d", @@ -539,6 +769,24 @@ read_packet(buf) } } +/* + * get_loop_output - get outgoing packets from the ppp device, + * and detect when we want to bring the real link up. + * Return value is 1 if we need to bring up the link, 0 otherwise. + */ +int +get_loop_output() +{ + int len; + int rv = 0; + + while ((len = read_packet(inpacket_buf)) > 0) { + if (loop_frame(inpacket_buf, len)) + rv = 1; + } + return rv; +} + /* * ppp_send_config - configure the transmit characteristics of * the ppp interface. @@ -557,13 +805,16 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) return; syslog(LOG_ERR, "Couldn't set MTU: %m"); } - if (strioctl(pppfd, PPPIO_XACCM, &asyncmap, sizeof(asyncmap), 0) < 0) { - syslog(LOG_ERR, "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) { - syslog(LOG_ERR, "Couldn't set prot/AC compression: %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) { + syslog(LOG_ERR, "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) { + syslog(LOG_ERR, "Couldn't set prot/AC compression: %m"); + } } } @@ -575,7 +826,8 @@ 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"); } @@ -599,13 +851,16 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) 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"); - } - 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) { + syslog(LOG_ERR, "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) { + syslog(LOG_ERR, "Couldn't set prot/AC decompression: %m"); + } } } @@ -613,12 +868,15 @@ 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; { - return strioctl(pppfd, (for_transmit? PPPIO_XCOMP: PPPIO_RCOMP), - opt_ptr, opt_len, 0) >= 0; + if (strioctl(pppfd, (for_transmit? PPPIO_XCOMP: PPPIO_RCOMP), + opt_ptr, opt_len, 0) >= 0) + return 1; + return (errno == ENOSR)? 0: -1; } /* @@ -638,6 +896,45 @@ ccp_flags_set(unit, isopen, isup) } } +/* + * get_idle_time - return how long the link has been idle. + */ +int +get_idle_time(u, ip) + int u; + struct ppp_idle *ip; +{ + return strioctl(pppfd, PPPIO_GIDLE, ip, 0, sizeof(struct ppp_idle)) >= 0; +} + +#if 0 +/* + * set_filters - transfer the pass and active filters to the kernel. + */ +int +set_filters(pass, active) + struct bpf_program *pass, *active; +{ + int ret = 1; + + 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"); + 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"); + ret = 0; + } + } + return ret; +} +#endif + /* * ccp_fatal_error - returns 1 if decompression was disabled as a * result of an error detected after decompression of a packet, @@ -706,6 +1003,7 @@ sifup(u) syslog(LOG_ERR, "Couldn't mark interface up (set): %m"); return 0; } + if_is_up = 1; return 1; } @@ -730,6 +1028,27 @@ sifdown(u) syslog(LOG_ERR, "Couldn't mark interface down (set): %m"); return 0; } + if_is_up = 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; +{ + int npi[2]; + + 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); + return 0; + } return 1; } @@ -748,6 +1067,11 @@ sifaddr(u, o, h, m) memset(&ifr, 0, sizeof(ifr)); strncpy(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"); + } + 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"); @@ -757,11 +1081,6 @@ sifaddr(u, o, h, m) if (ioctl(ipfd, SIOCSIFDSTADDR, &ifr) < 0) { syslog(LOG_ERR, "Couldn't set remote IP address: %m"); } - 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"); - } ifr.ifr_metric = link_mtu; if (ioctl(ipfd, SIOCSIFMTU, &ifr) < 0) { syslog(LOG_ERR, "Couldn't set IP MTU: %m"); @@ -779,8 +1098,10 @@ 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) { + syslog(LOG_NOTICE, "Removing ppp interface unit"); if (ioctl(ipfd, I_UNLINK, ipmuxid) < 0) { syslog(LOG_ERR, "Can't remove ppp interface unit: %m"); return 0; @@ -795,12 +1116,16 @@ 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; rt.rt_gateway.sa_family = AF_INET; @@ -812,6 +1137,7 @@ sifdefaultroute(u, g) return 0; } + default_route_gateway = g; return 1; } @@ -819,12 +1145,16 @@ 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; rt.rt_gateway.sa_family = AF_INET; @@ -836,6 +1166,7 @@ cifdefaultroute(u, g) return 0; } + default_route_gateway = 0; return 1; } @@ -861,6 +1192,7 @@ sifproxyarp(unit, hisaddr) return 0; } + proxy_arp_addr = hisaddr; return 1; } @@ -882,6 +1214,7 @@ cifproxyarp(unit, hisaddr) return 0; } + proxy_arp_addr = 0; return 1; } @@ -891,7 +1224,7 @@ cifproxyarp(unit, hisaddr) */ #define MAX_IFS 32 -int +static int get_ether_addr(ipaddr, hwaddr) u_int32_t ipaddr; struct sockaddr *hwaddr; @@ -904,10 +1237,12 @@ get_ether_addr(ipaddr, hwaddr) /* * Scan through the system's network interfaces. */ +#ifdef SIOCGIFNUM if (ioctl(ipfd, SIOCGIFNUM, &nif) < 0) +#endif nif = MAX_IFS; ifc.ifc_len = nif * sizeof(struct ifreq); - ifc.ifc_req = alloca(ifc.ifc_len); + ifc.ifc_buf = (caddr_t) alloca(ifc.ifc_len); if (ifc.ifc_req == 0) return 0; if (ioctl(ipfd, SIOCGIFCONF, &ifc) < 0) { @@ -956,7 +1291,7 @@ get_ether_addr(ipaddr, hwaddr) /* * get_hw_addr - obtain the hardware address for a named interface. */ -int +static int get_hw_addr(name, hwaddr) char *name; struct sockaddr *hwaddr; @@ -991,22 +1326,27 @@ get_hw_addr(name, hwaddr) } if (dlpi_attach(iffd, unit) < 0 || dlpi_get_reply(iffd, &reply.prim, DL_OK_ACK, sizeof(reply)) < 0 - || dlpi_phys_addr_req(iffd) < 0 - || dlpi_get_reply(iffd, &reply.prim, DL_PHYS_ADDR_ACK, - sizeof(reply)) < 0) { + || dlpi_info_req(iffd) < 0 + || dlpi_get_reply(iffd, &reply.prim, DL_INFO_ACK, sizeof(reply)) < 0) { close(iffd); return 0; } + 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; - adrlen = reply.prim.physaddr_ack.dl_addr_length; - adrp = (unsigned char *)&reply + reply.prim.physaddr_ack.dl_addr_offset; memcpy(hwaddr->sa_data, adrp, adrlen); return 1; } -int +static int dlpi_attach(fd, ppa) int fd, ppa; { @@ -1020,21 +1360,20 @@ dlpi_attach(fd, ppa) return putmsg(fd, &buf, NULL, RS_HIPRI); } -int -dlpi_phys_addr_req(fd) +static int +dlpi_info_req(fd) int fd; { - dl_phys_addr_req_t req; + dl_info_req_t req; struct strbuf buf; - req.dl_primitive = DL_PHYS_ADDR_REQ; - req.dl_addr_type = DL_CURR_PHYS_ADDR; + req.dl_primitive = DL_INFO_REQ; buf.len = sizeof(req); buf.buf = (void *) &req; return putmsg(fd, &buf, NULL, RS_HIPRI); } -int +static int dlpi_get_reply(fd, reply, expected_prim, maxlen) union DL_primitives *reply; int fd, expected_prim, maxlen; @@ -1116,10 +1455,12 @@ GetMask(addr) /* * Scan through the system's network interfaces. */ +#ifdef SIOCGIFNUM if (ioctl(ipfd, SIOCGIFNUM, &nif) < 0) +#endif nif = MAX_IFS; ifc.ifc_len = nif * sizeof(struct ifreq); - ifc.ifc_req = alloca(ifc.ifc_len); + ifc.ifc_buf = (caddr_t) alloca(ifc.ifc_len); if (ifc.ifc_req == 0) return mask; if (ioctl(ipfd, SIOCGIFCONF, &ifc) < 0) { @@ -1159,10 +1500,24 @@ GetMask(addr) /* * 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; + + if (name[0] != 0) { + /* logging in */ + strncpy(utmpx.ut_user, name, sizeof(utmpx.ut_user)); + strncpy(utmpx.ut_id, ifname, sizeof(utmpx.ut_id)); + strncpy(utmpx.ut_line, line, sizeof(utmpx.ut_line)); + utmpx.ut_pid = getpid(); + utmpx.ut_type = USER_PROCESS; + } else { + utmpx.ut_type = DEAD_PROCESS; + } + gettimeofday(&utmpx.ut_tv, NULL); + updwtmpx("/var/adm/wtmpx", &utmpx); } /* @@ -1180,10 +1535,10 @@ gethostid() return (int) strtoul(buf, NULL, 16); } -int +static int strioctl(fd, cmd, ptr, ilen, olen) int fd, cmd, ilen, olen; - char *ptr; + void *ptr; { struct strioctl str; @@ -1199,15 +1554,105 @@ strioctl(fd, cmd, ptr, ilen, olen) return 0; } +/* + * lock - create a lock file for the named lock device + */ + +#define LOCK_PREFIX "/var/spool/locks/LK." +static char lock_file[40]; /* name of lock file created */ + int lock(dev) char *dev; { + int n, fd, pid; + struct stat sbuf; + char ascii_pid[12]; + + if (stat(dev, &sbuf) < 0) { + syslog(LOG_ERR, "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); + return -1; + } + sprintf(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 + && (fd = open(lock_file, O_RDONLY, 0)) >= 0) { + /* 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); + close(fd); + } else { + ascii_pid[n] = 0; + pid = atoi(ascii_pid); + if (pid > 0 && kill(pid, 0) == -1 && errno == ESRCH) { + /* 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)", + dev, pid); + continue; + } else + syslog(LOG_WARNING, "Couldn't remove stale lock on %s", + dev); + } else + syslog(LOG_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); + lock_file[0] = 0; + return -1; + } + + sprintf(ascii_pid, "%10d\n", getpid()); + write(fd, ascii_pid, 11); + + close(fd); return 1; } -int +/* + * unlock - remove our lockfile + */ +void unlock() { + if (lock_file[0]) { + unlink(lock_file); + lock_file[0] = 0; + } +} + + +/* + * 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) { + syslog(LOG_ERR, "Can't delete route: %m"); + return 0; + } + return 1; }