X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-svr4.c;h=db70a15a9bc0ec4bf92dbfd81a8ab3dd628cee6e;hp=716c2bd9d3e787472a6fb287c032a62aafb5a3ee;hb=96dad36e1d37716004171559280613739e7df29e;hpb=dee72905271845128ad26cff5cf770c433f3f4a7 diff --git a/pppd/sys-svr4.c b/pppd/sys-svr4.c index 716c2bd..db70a15 100644 --- a/pppd/sys-svr4.c +++ b/pppd/sys-svr4.c @@ -26,14 +26,13 @@ */ #ifndef lint -static char rcsid[] = "$Id: sys-svr4.c,v 1.8 1995/12/11 05:18:39 paulus Exp $"; +static char rcsid[] = "$Id: sys-svr4.c,v 1.16 1997/04/30 05:59:25 paulus Exp $"; #endif #include #include #include #include -#include #include #include #include @@ -74,10 +73,13 @@ 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 */ + static int link_mtu, link_mru; #define NMODULES 32 @@ -98,98 +100,14 @@ 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)); - - ipfd = open("/dev/ip", O_RDWR, 0); - if (ipfd < 0) { - syslog(LOG_ERR, "Couldn't open IP device: %m"); - die(1); - } -} - -/* - * 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); - if (proxy_arp_addr) - cifproxyarp(0, proxy_arp_addr); -} - -/* - * daemon - Detach us from controlling terminal session. - */ -int -daemon(nochdir, noclose) - int nochdir, noclose; -{ - int pid; - - if ((pid = fork()) < 0) - return -1; - if (pid != 0) - exit(0); /* parent dies */ - setsid(); - if (!nochdir) - chdir("/"); - if (!noclose) { - fclose(stdin); /* don't need stdin, stdout, stderr */ - fclose(stdout); - fclose(stderr); - } - 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 - */ -int -ppp_available() -{ - struct stat buf; - - return stat("/dev/ppp", &buf) >= 0; -} - -/* - * establish_ppp - Turn the serial port into a ppp interface. - */ -void -establish_ppp() -{ - int i, ifd, x; + int ifd, x; #ifndef sun struct ifreq ifr; struct { @@ -198,6 +116,12 @@ establish_ppp() } 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); @@ -206,7 +130,7 @@ establish_ppp() syslog(LOG_ERR, "Can't open /dev/ppp: %m"); die(1); } - if (kdebugflag) { + if (kdebugflag & 1) { x = PPPDBG_LOG + PPPDBG_DRIVER; strioctl(pppfd, PPPIO_DEBUG, &x, sizeof(int), 0); } @@ -227,7 +151,7 @@ establish_ppp() syslog(LOG_ERR, "Can't open /dev/ppp (2): %m"); die(1); } - if (kdebugflag) { + if (kdebugflag & 1) { x = PPPDBG_LOG + PPPDBG_DRIVER; strioctl(ifd, PPPIO_DEBUG, &x, sizeof(int), 0); } @@ -261,6 +185,89 @@ establish_ppp() 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. + */ +int +daemon(nochdir, noclose) + int nochdir, noclose; +{ + int pid; + + if ((pid = fork()) < 0) + return -1; + if (pid != 0) + exit(0); /* parent dies */ + setsid(); + if (!nochdir) + chdir("/"); + if (!noclose) { + fclose(stdin); /* don't need stdin, stdout, stderr */ + fclose(stdout); + fclose(stderr); + } + return 0; +} + +/* + * ppp_available - check whether the system has any ppp interfaces + */ +int +ppp_available() +{ + struct stat buf; + + return stat("/dev/ppp", &buf) >= 0; +} + +/* + * establish_ppp - Turn the serial port into a ppp interface. + */ +void +establish_ppp(fd) + int fd; +{ + int i; /* Pop any existing modules off the tty stream. */ for (i = 0;; ++i) @@ -274,10 +281,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) { @@ -286,22 +301,26 @@ 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; - if (ipmuxid > 0) { - if (ioctl(ipfd, I_UNLINK, ipmuxid) < 0) { - if (!hungup) - syslog(LOG_ERR, "Can't unlink PPP from IP: %m"); - } - } - if (fdmuxid >= 0) { if (ioctl(pppfd, I_UNLINK, fdmuxid) < 0) { if (!hungup) @@ -330,6 +349,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. */ @@ -461,9 +512,11 @@ set_up_tty(fd, local) } #ifndef CRTSCTS + termiox_ok = 1; if (ioctl (fd, TCGETX, &tiox) < 0) { - syslog (LOG_ERR, "TCGETX: %m"); - die (1); + termiox_ok = 0; + if (errno != ENOTTY) + syslog (LOG_ERR, "TCGETX: %m"); } #endif @@ -482,10 +535,11 @@ set_up_tty(fd, local) else if (crtscts < 0) tios.c_cflag &= ~CRTSCTS; #else - if (crtscts > 0) { + if (crtscts != 0 && !termiox_ok) { + syslog(LOG_ERR, "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 @@ -528,9 +582,8 @@ set_up_tty(fd, local) } #ifndef CRTSCTS - if (ioctl (fd, TCSETXF, &tiox) < 0){ + if (termiox_ok && ioctl (fd, TCSETXF, &tiox) < 0){ syslog (LOG_ERR, "TCSETXF: %m"); - die (1); } #endif @@ -542,7 +595,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) { @@ -581,6 +635,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. */ @@ -595,7 +659,7 @@ output(unit, p, len) struct pollfd pfd; if (debug) - log_packet(p, len, "sent "); + log_packet(p, len, "sent ", LOG_DEBUG); data.len = len; data.buf = (caddr_t) p; @@ -606,12 +670,13 @@ output(unit, p, len) syslog(LOG_ERR, "Couldn't send packet: %m"); break; } - pfd.fd = fd; + 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 @@ -633,6 +698,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. */ @@ -663,7 +758,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", @@ -672,6 +767,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. @@ -683,6 +796,7 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) int pcomp, accomp; { int cf[2]; + struct ifreq ifr; link_mtu = mtu; if (strioctl(pppfd, PPPIO_MTU, &mtu, sizeof(mtu), 0) < 0) { @@ -690,13 +804,24 @@ 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"); + 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"); + } } - 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)); + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + ifr.ifr_metric = link_mtu; + if (ioctl(ipfd, SIOCSIFMTU, &ifr) < 0) { + syslog(LOG_ERR, "Couldn't set IP MTU: %m"); } } @@ -708,7 +833,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"); } @@ -732,13 +858,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"); + } } } @@ -774,6 +903,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, @@ -871,6 +1039,26 @@ sifdown(u) 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; +} + #define INET_ADDR(x) (((struct sockaddr_in *) &(x))->sin_addr.s_addr) /* @@ -882,30 +1070,49 @@ 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)); 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"); + 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"); + 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) { + syslog(LOG_ERR, "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"); + ret = 0; } - 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"); - } +#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"); } +#endif - return 1; + return ret; } /* @@ -917,8 +1124,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; @@ -933,12 +1142,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; @@ -958,12 +1171,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; @@ -1051,11 +1268,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"); + free(ifc.ifc_buf); return 0; } ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); @@ -1085,15 +1303,18 @@ get_ether_addr(ipaddr, hwaddr) if (ifr >= ifend) { syslog(LOG_WARNING, "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); + free(ifc.ifc_buf); return 0; } + free(ifc.ifc_buf); return 1; } @@ -1269,11 +1490,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"); + free(ifc.ifc_buf); return mask; } ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); @@ -1303,15 +1525,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; @@ -1327,7 +1550,6 @@ logwtmp(line, name, host) } gettimeofday(&utmpx.ut_tv, NULL); updwtmpx("/var/adm/wtmpx", &utmpx); - return 0; } /* @@ -1440,3 +1662,29 @@ unlock() 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; +}