kill the undead

3 files changed, 0 insertions, 2223 deletions

diff --git a/usr.sbin/pppd/sys-linux.c b/usr.sbin/pppd/sys-linux.c
deleted file mode 100644
index 306ae4a..0000000
--- a/usr.sbin/pppd/sys-linux.c
+++ /dev/null
@@ -1,830 +0,0 @@
-/*
- * sys-linux.c - System-dependent procedures for setting up
- * PPP interfaces on Linux systems
- *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
- * TODO:
- */
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#include <time.h>
-#include <memory.h>
-#include <utmp.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/errno.h>
-#include <mntent.h>
-
-#include <net/if.h>
-#include <linux/ppp.h>
-#include <linux/route.h>
-#include <linux/if_ether.h>
-#include <netinet/in.h>
-#include <signal.h>
-
-#include "pppd.h"
-#include "ppp.h"
-#include "fsm.h"
-#include "ipcp.h"
-
-static int initdisc = -1;	/* Initial TTY discipline */
-static int prev_kdebugflag = 0;
-extern int kdebugflag;
-extern u_long netmask;
-
-#define MAX_IFS		32
-
-/* prototypes */
-void die         __ARGS((int));
-
-/*
- * SET_SA_FAMILY - set the sa_family field of a struct sockaddr,
- * if it exists.
- */
-
-#define SET_SA_FAMILY(addr, family)			\
-    memset ((char *) &(addr), '\0', sizeof(addr));	\
-    addr.sa_family = (family);
-
-/*
- * set_kdebugflag - Define the debugging level for the kernel
- */
-
-int set_kdebugflag (int requested_level)
-{
-    if (ioctl(fd, PPPIOCGDEBUG, &prev_kdebugflag) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCGDEBUG): %m");
-	return (0);
-    }
-
-    if (prev_kdebugflag != requested_level) {
-	if (ioctl(fd, PPPIOCSDEBUG, &requested_level) < 0) {
-	    syslog (LOG_ERR, "ioctl(PPPIOCSDEBUG): %m");
-	    return (0);
-	}
-        syslog(LOG_INFO, "set kernel debugging level to %d", requested_level);
-    }
-    return (1);
-}
-
-/*
- * establish_ppp - Turn the serial port into a ppp interface.
- */
-
-void establish_ppp (void)
-{
-    int pppdisc = N_PPP;
-    int sig	= SIGIO;
-
-    if (ioctl(fd, PPPIOCSINPSIG, &sig) == -1) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSINPSIG): %m");
-	die(1);
-    }
-
-    if (ioctl(fd, TIOCEXCL, 0) < 0) {
-	syslog (LOG_WARNING, "ioctl(TIOCEXCL): %m");
-    }
-
-    if (ioctl(fd, TIOCGETD, &initdisc) < 0) {
-	syslog(LOG_ERR, "ioctl(TIOCGETD): %m");
-	die (1);
-    }
-    
-    if (ioctl(fd, TIOCSETD, &pppdisc) < 0) {
-	syslog(LOG_ERR, "ioctl(TIOCSETD): %m");
-	die (1);
-    }
-
-    if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m");
-	die (1);
-    }
-
-    set_kdebugflag (kdebugflag);
-}
-
-/*
- * disestablish_ppp - Restore the serial port to normal operation.
- * This shouldn't call die() because it's called from die().
- */
-
-void disestablish_ppp(void)
-{
-    int x;
-    char *s;
-
-    if (initdisc >= 0) {
-        set_kdebugflag (prev_kdebugflag);
-	/*
-	 * Check whether the link seems not to be 8-bit clean.
-	 */
-	if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) == 0) {
-	    s = NULL;
-	    switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP)) {
-	    case SC_RCV_B7_0:
-		s = "bit 7 set to 1";
-		break;
-	    case SC_RCV_B7_1:
-		s = "bit 7 set to 0";
-		break;
-	    case SC_RCV_EVNP:
-		s = "odd parity";
-		break;
-	    case SC_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);
-	    }
-	}
-
-    if (ioctl(fd, TIOCSETD, &initdisc) < 0)
-        syslog(LOG_ERR, "ioctl(TIOCSETD): %m");
-
-    if (ioctl(fd, TIOCNXCL, 0) < 0)
-        syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m");
-
-    initdisc = -1;
-    }
-}
-
-/*
- * output - Output PPP packet.
- */
-
-void output (int unit, unsigned char *p, int len)
-{
-    if (unit != 0)
-	MAINDEBUG((LOG_WARNING, "output: unit != 0!"));
-
-    if (debug)
-        log_packet(p, len, "sent ");
-    
-    if (write(fd, p, len) < 0) {
-        syslog(LOG_ERR, "write: %m");
-	die(1);
-    }
-}
-
-/*
- * read_packet - get a PPP packet from the serial device.
- */
-
-int read_packet (unsigned char *buf)
-{
-    int len;
-  
-    len = read(fd, buf, MTU + DLLHEADERLEN);
-    if (len < 0) {
-	if (errno == EWOULDBLOCK) {
-#if 0
-	    MAINDEBUG((LOG_DEBUG, "read(fd): EWOULDBLOCK"));
-#endif
-	    return -1;
-	}
-	syslog(LOG_ERR, "read(fd): %m");
-	die(1);
-    }
-    return len;
-}
-
-/*
- * ppp_send_config - configure the transmit characteristics of
- * the ppp interface.
- */
-void ppp_send_config (int unit,int mtu,u_long asyncmap,int pcomp,int accomp)
-{
-    u_int x;
-    struct ifreq ifr;
-  
-    MAINDEBUG ((LOG_DEBUG, "send_config: mtu = %d\n", mtu));
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    ifr.ifr_mtu = mtu;
-    if (ioctl(s, SIOCSIFMTU, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m");
-	quit();
-    }
-
-    MAINDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap));
-    if (ioctl(fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) {
-        syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %m");
-	quit();
-    }
-    
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	quit();
-    }
-
-    x = pcomp  ? x | SC_COMP_PROT : x & ~SC_COMP_PROT;
-    x = accomp ? x | SC_COMP_AC   : x & ~SC_COMP_AC;
-
-    MAINDEBUG ((LOG_DEBUG, "send_config: flags = %x\n", x));
-    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	quit();
-    }
-}
-
-/*
- * ppp_set_xaccm - set the extended transmit ACCM for the interface.
- */
-void
-ppp_set_xaccm(unit, accm)
-    int unit;
-    ext_accm accm;
-{
-    MAINDEBUG ((LOG_DEBUG, "set_xaccm: %08lx %08lx %08lx %08lx\n",
-		accm[0], accm[1], accm[2], accm[3]));
-    if (ioctl(fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY)
-	syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
-}
-
-/*
- * ppp_recv_config - configure the receive-side characteristics of
- * the ppp interface.
- */
-void ppp_recv_config (int unit,int mru,u_long asyncmap,int pcomp,int accomp)
-{
-    u_int x;
-
-    MAINDEBUG ((LOG_DEBUG, "recv_config: mru = %d\n", mru));
-    if (ioctl(fd, PPPIOCSMRU, (caddr_t) &mru) < 0)
-	syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m");
-
-    MAINDEBUG ((LOG_DEBUG, "recv_config: asyncmap = %lx\n", asyncmap));
-    if (ioctl(fd, PPPIOCRASYNCMAP, (caddr_t) &asyncmap) < 0) {
-        syslog(LOG_ERR, "ioctl(PPPIOCRASYNCMAP): %m");
-	quit();
-    }
-  
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	quit();
-    }
-
-    x = !accomp? x | SC_REJ_COMP_AC: x &~ SC_REJ_COMP_AC;
-    MAINDEBUG ((LOG_DEBUG, "recv_config: flags = %x\n", x));
-    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	quit();
-    }
-}
-
-/*
- * sifvjcomp - config tcp header compression
- */
-
-int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid)
-{
-    u_int x;
-
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	return 0;
-    }
-
-    x = vjcomp  ? x | SC_COMP_TCP     : x &~ SC_COMP_TCP;
-    x = cidcomp ? x & ~SC_NO_TCP_CCID : x | SC_NO_TCP_CCID;
-
-    if(ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	return 0;
-    }
-
-    if (vjcomp) {
-        if (ioctl (fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) {
-	    syslog (LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	    return 0;
-        }
-    }
-
-    return 1;
-}
-
-/*
- * sifup - Config the interface up and enable IP packets to pass.
- */
-
-int sifup (int u)
-{
-    struct ifreq ifr;
-
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
-	return 0;
-    }
-
-    ifr.ifr_flags |= (IFF_UP | IFF_POINTOPOINT);
-    if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * sifdown - Config the interface down and disable IP.
- */
-
-int sifdown (int u)
-{
-    struct ifreq ifr;
-
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
-	return 0;
-    }
-
-    ifr.ifr_flags &= ~IFF_UP;
-    ifr.ifr_flags |= IFF_POINTOPOINT;
-    if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * sifaddr - Config the interface IP addresses and netmask.
- */
-
-int sifaddr (int unit, int our_adr, int his_adr, int net_mask)
-{
-    struct ifreq   ifr; 
-    struct rtentry rt;
-    
-    SET_SA_FAMILY (ifr.ifr_addr,    AF_INET); 
-    SET_SA_FAMILY (ifr.ifr_dstaddr, AF_INET); 
-    SET_SA_FAMILY (ifr.ifr_netmask, AF_INET); 
-
-    strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-/*
- *  Set our IP address
- */
-    ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = our_adr;
-    if (ioctl(s, SIOCSIFADDR, (caddr_t) &ifr) < 0) {
-	if (errno != EEXIST)
-	    syslog (LOG_ERR, "ioctl(SIOCAIFADDR): %m");
-        else
-	    syslog (LOG_WARNING, "ioctl(SIOCAIFADDR): Address already exists");
-        return (0);
-    } 
-/*
- *  Set the gateway address
- */
-    ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = his_adr;
-    if (ioctl(s, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) {
-	syslog (LOG_ERR, "ioctl(SIOCSIFDSTADDR): %m"); 
-	return (0);
-    } 
-/*
- *  Set the netmask
- */
-    if (net_mask != 0) {
-	((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = net_mask;
-	if (ioctl(s, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) {
-	    syslog (LOG_ERR, "ioctl(SIOCSIFNETMASK): %m"); 
-	    return (0);
-        } 
-    }
-/*
- *  Add the device route
- */
-    memset (&rt, '\0', sizeof (rt));
-
-    SET_SA_FAMILY (rt.rt_dst,     AF_INET);
-    SET_SA_FAMILY (rt.rt_gateway, AF_INET);
-    rt.rt_dev = ifname;  /* MJC */
-
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0;
-    ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr     = his_adr;
-    rt.rt_flags = RTF_UP | RTF_HOST;
-
-    if (ioctl(s, SIOCADDRT, &rt) < 0) {
-        syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m");
-        return (0);
-    }
-    return 1;
-}
-
-/*
- * cifaddr - Clear the interface IP addresses, and delete routes
- * through the interface if possible.
- */
-
-int cifaddr (int unit, int our_adr, int his_adr)
-{
-    struct rtentry rt;
-/*
- *  Delete the route through the device
- */
-    memset (&rt, '\0', sizeof (rt));
-
-    SET_SA_FAMILY (rt.rt_dst,     AF_INET);
-    SET_SA_FAMILY (rt.rt_gateway, AF_INET);
-    rt.rt_dev = ifname;  /* MJC */
-
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0;
-    ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr     = his_adr;
-    rt.rt_flags = RTF_UP | RTF_HOST;
-
-    if (ioctl(s, SIOCDELRT, &rt) < 0) {
-        syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m");
-        return (0);
-    }
-    return 1;
-}
-
-/*
- * path_to_route - determine the path to the proc file system data
- */
-
-FILE *route_fd = (FILE *) 0;
-static char route_buffer [100];
-
-static char *path_to_route (void);
-static int open_route_table (void);
-static void close_route_table (void);
-static int read_route_table (struct rtentry *rt);
-static int defaultroute_exists (void);
-
-/*
- * path_to_route - find the path to the route tables in the proc file system
- */
-
-static char *path_to_route (void)
-{
-    struct mntent *mntent;
-    FILE *fp;
-
-    fp = fopen (MOUNTED, "r");
-    if (fp != 0) {
-        while ((mntent = getmntent (fp)) != 0) {
-	    if (strcmp (mntent->mnt_type, MNTTYPE_IGNORE) == 0)
-	        continue;
-
-	    if (strcmp (mntent->mnt_type, "proc") == 0) {
-	        strncpy (route_buffer, mntent->mnt_dir,
-			 sizeof (route_buffer)-10);
-		route_buffer [sizeof (route_buffer)-10] = '\0';
-		strcat (route_buffer, "/net/route");
-
-		fclose (fp);
-		return (route_buffer);
-	    }
-	}
-	fclose (fp);
-    }
-    syslog (LOG_ERR, "proc file system not mounted");
-    return 0;
-}
-
-/*
- * open_route_table - open the interface to the route table
- */
-
-static int open_route_table (void)
-{
-    char *path;
-
-    if (route_fd != (FILE *) 0)
-        close_route_table();
-
-    path = path_to_route();
-    if (path == NULL)
-        return 0;
-
-    route_fd = fopen (path, "r");
-    if (route_fd == (FILE *) 0) {
-        syslog (LOG_ERR, "can not open %s: %m", path);
-        return 0;
-    }
-
-    /* read and discard the header line. */
-    if (fgets (route_buffer, sizeof (route_buffer), route_fd) == (char *) 0) {
-        close_route_table();
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * close_route_table - close the interface to the route table
- */
-
-static void close_route_table (void)
-{
-    if (route_fd != (FILE *) 0) {
-        fclose (route_fd);
-        route_fd = (FILE *) 0;
-    }
-}
-
-/*
- * read_route_table - read the next entry from the route table
- */
-
-static int read_route_table (struct rtentry *rt)
-{
-    static char delims[] = " \t\n";
-    char *dev_ptr, *ptr, *dst_ptr, *gw_ptr, *flag_ptr;
-
-    if (fgets (route_buffer, sizeof (route_buffer), route_fd) == (char *) 0)
-        return 0;
-
-    memset (rt, '\0', sizeof (struct rtentry));
-
-    dev_ptr  = strtok (route_buffer, delims); /* interface name */
-    dst_ptr  = strtok (NULL,         delims); /* destination address */
-    gw_ptr   = strtok (NULL,         delims); /* gateway */
-    flag_ptr = strtok (NULL,         delims); /* flags */
-#if 0
-    ptr      = strtok (NULL,         delims); /* reference count */
-    ptr      = strtok (NULL,         delims); /* useage count */
-    ptr      = strtok (NULL,         delims); /* metric */
-    ptr      = strtok (NULL,         delims); /* mask */
-#endif
-
-    ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr =
-      strtoul (dst_ptr, NULL, 16);
-
-    ((struct sockaddr_in *) &rt->rt_gateway)->sin_addr.s_addr =
-      strtoul (gw_ptr, NULL, 16);
-
-    rt->rt_flags = (short) strtoul (flag_ptr, NULL, 16);
-    rt->rt_dev   = dev_ptr;
-
-    return 1;
-}
-
-/*
- * defaultroute_exists - determine if there is a default route
- */
-
-static int defaultroute_exists (void)
-{
-    struct rtentry rt;
-    int    result = 0;
-
-    if (!open_route_table())
-        return 0;
-
-    while (read_route_table(&rt) != 0) {
-        if (rt.rt_flags & RTF_UP == 0)
-	    continue;
-
-        if (((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr == 0L) {
-	    syslog (LOG_ERR,
-		    "ppp not replacing existing default route to %s[%s]",
-		    rt.rt_dev,
-		    inet_ntoa (((struct sockaddr_in *) &rt.rt_gateway)->
-			       sin_addr.s_addr));
-	    result = 1;
-	    break;
-	}
-    }
-    close_route_table();
-    return result;
-}
-
-/*
- * sifdefaultroute - assign a default route through the address given.
- */
-
-int sifdefaultroute (int unit, int gateway)
-{
-    struct rtentry rt;
-
-    if (defaultroute_exists())
-        return 0;
-
-    memset (&rt, '\0', sizeof (rt));
-    SET_SA_FAMILY (rt.rt_dst,     AF_INET);
-    SET_SA_FAMILY (rt.rt_gateway, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway;
-    
-    rt.rt_flags = RTF_UP | RTF_GATEWAY;
-    if (ioctl(s, SIOCADDRT, &rt) < 0) {
-	syslog (LOG_ERR, "default route ioctl(SIOCADDRT): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * cifdefaultroute - delete a default route through the address given.
- */
-
-int cifdefaultroute (int unit, int gateway)
-{
-    struct rtentry rt;
-  
-    SET_SA_FAMILY (rt.rt_dst,     AF_INET);
-    SET_SA_FAMILY (rt.rt_gateway, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway;
-    
-    rt.rt_flags = RTF_UP | RTF_GATEWAY;
-    if (ioctl(s, SIOCDELRT, &rt) < 0) {
-	syslog (LOG_ERR, "default route ioctl(SIOCDELRT): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * sifproxyarp - Make a proxy ARP entry for the peer.
- */
-
-int sifproxyarp (int unit, u_long his_adr)
-{
-    struct arpreq arpreq;
-
-    memset (&arpreq, '\0', sizeof(arpreq));
-/*
- * Get the hardware address of an interface on the same subnet
- * as our local address.
- */
-    if (!get_ether_addr(his_adr, &arpreq.arp_ha)) {
-	syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP");
-	return 0;
-    }
-    
-    SET_SA_FAMILY(arpreq.arp_pa, AF_INET);
-    ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = his_adr;
-    arpreq.arp_flags = ATF_PERM | ATF_PUBL;
-    
-    if (ioctl(s, SIOCSARP, (caddr_t)&arpreq) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSARP): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * cifproxyarp - Delete the proxy ARP entry for the peer.
- */
-
-int cifproxyarp (int unit, u_long his_adr)
-{
-    struct arpreq arpreq;
-  
-    memset (&arpreq, '\0', sizeof(arpreq));
-    SET_SA_FAMILY(arpreq.arp_pa, AF_INET);
-    
-    ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = his_adr;
-    if (ioctl(s, SIOCDARP, (caddr_t)&arpreq) < 0) {
-	syslog(LOG_WARNING, "ioctl(SIOCDARP): %m");
-	return 0;
-    }
-    return 1;
-}
-     
-/*
- * get_ether_addr - get the hardware address of an interface on the
- * the same subnet as ipaddr.
- */
-
-int get_ether_addr (u_long ipaddr, struct sockaddr *hwaddr)
-{
-    struct ifreq *ifr, *ifend, *ifp;
-    int i;
-    u_long ina, mask;
-    struct sockaddr_dl *dla;
-    struct ifreq ifreq;
-    struct ifconf ifc;
-    struct ifreq ifs[MAX_IFS];
-    
-    ifc.ifc_len = sizeof(ifs);
-    ifc.ifc_req = ifs;
-    if (ioctl(s, SIOCGIFCONF, &ifc) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCGIFCONF): %m");
-	return 0;
-    }
-    MAINDEBUG ((LOG_DEBUG, "proxy arp: scanning %d interfaces for IP %s",
-		ifc.ifc_len / sizeof(struct ifreq), ip_ntoa(ipaddr)));
-/*
- * Scan through looking for an interface with an Internet
- * address on the same subnet as `ipaddr'.
- */
-    ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq));
-    for (ifr = ifc.ifc_req; ifr < ifend; ifr++) {
-	if (ifr->ifr_addr.sa_family == AF_INET) {
-	    ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr;
-	    strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name));
-            MAINDEBUG ((LOG_DEBUG, "proxy arp: examining interface %s",
-			ifreq.ifr_name));
-/*
- * Check that the interface is up, and not point-to-point
- * or loopback.
- */
-	    if (ioctl(s, SIOCGIFFLAGS, &ifreq) < 0)
-		continue;
-	    if ((ifreq.ifr_flags &
-		 (IFF_UP|IFF_BROADCAST|IFF_POINTOPOINT|IFF_LOOPBACK|IFF_NOARP))
-		!= (IFF_UP|IFF_BROADCAST))
-		continue;
-/*
- * Get its netmask and check that it's on the right subnet.
- */
-	    if (ioctl(s, SIOCGIFNETMASK, &ifreq) < 0)
-	        continue;
-	    mask = ((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr.s_addr;
-	    MAINDEBUG ((LOG_DEBUG, "proxy arp: interface addr %s mask %lx",
-			ip_ntoa(ina), ntohl(mask)));
-	    if (((ipaddr ^ ina) & mask) != 0)
-	        continue;
-	    break;
-	}
-    }
-    
-    if (ifr >= ifend)
-        return 0;
-
-    syslog(LOG_INFO, "found interface %s for proxy arp", ifreq.ifr_name);
-/*
- * Now get the hardware address.
- */
-    if (ioctl (s, SIOCGIFHWADDR, &ifreq) < 0) {
-        syslog(LOG_ERR, "SIOCGIFHWADDR(%s): %m", ifreq.ifr_name);
-        return 0;
-    }
-
-    hwaddr->sa_family = ARPHRD_ETHER;
-#ifndef old_ifr_hwaddr
-    memcpy (&hwaddr->sa_data, &ifreq.ifr_hwaddr, ETH_ALEN);
-#else
-    memcpy (&hwaddr->sa_data, &ifreq.ifr_hwaddr.sa_data, ETH_ALEN);
-#endif
-
-    MAINDEBUG ((LOG_DEBUG,
-		"proxy arp: found hwaddr %02x:%02x:%02x:%02x:%02x:%02x",
-		(int) ((unsigned char *) &hwaddr->sa_data)[0],
-		(int) ((unsigned char *) &hwaddr->sa_data)[1],
-		(int) ((unsigned char *) &hwaddr->sa_data)[2],
-		(int) ((unsigned char *) &hwaddr->sa_data)[3],
-		(int) ((unsigned char *) &hwaddr->sa_data)[4],
-		(int) ((unsigned char *) &hwaddr->sa_data)[5]));
-    return 1;
-}
-
-/*
- * ppp_available - check whether the system has any ppp interfaces
- * (in fact we check whether we can do an ioctl on ppp0).
- */
-
-int ppp_available(void)
-{
-    int s, ok;
-    struct ifreq ifr;
-    
-    s = socket(AF_INET, SOCK_DGRAM, 0);
-    if (s < 0)
-	return 1;		/* can't tell - maybe we're not root */
-    
-    strncpy(ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name));
-    ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0;
-    close(s);
-    
-    return ok;
-}
-
-int
-logwtmp(line, name, host)
-	char *line, *name, *host;
-{
-    struct utmp ut;
-
-    memset (&ut, 0, sizeof (ut));
-    (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
-    (void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
-    (void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-    (void)time(&ut.ut_time);
-	
-    pututline (&ut);		/* Write the line to the proper place */
-    endutent();			/* Indicate operation is complete */
-}
diff --git a/usr.sbin/pppd/sys-str.c b/usr.sbin/pppd/sys-str.c
deleted file mode 100644
index c197d4b..0000000
--- a/usr.sbin/pppd/sys-str.c
+++ /dev/null
@@ -1,730 +0,0 @@
-/*
- * sys-str.c - System-dependent procedures for setting up
- * PPP interfaces on systems which use the STREAMS ppp interface.
- *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
- * TODO:
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <string.h>
-#include <time.h>
-#include <utmp.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/stream.h>
-#include <sys/stropts.h>
-
-#include <net/if.h>
-#include <net/route.h>
-#include <net/if_arp.h>
-#include <netinet/in.h>
-
-#include "pppd.h"
-#include "ppp.h"
-#include <net/ppp_str.h>
-
-#ifndef ifr_mtu
-#define ifr_mtu		ifr_metric
-#endif
-
-#define	MAXMODULES	10	/* max number of module names to save */
-static struct	modlist {
-    char	modname[FMNAMESZ+1];
-} str_modules[MAXMODULES];
-static int	str_module_count = 0;
-static int	pushed_ppp;
-
-extern int hungup;		/* has the physical layer been disconnected? */
-extern int kdebugflag;
-
-#define PAI_FLAGS_B7_0		0x100
-#define PAI_FLAGS_B7_1		0x200
-#define PAI_FLAGS_PAR_EVEN	0x400
-#define PAI_FLAGS_PAR_ODD	0x800
-#define PAI_FLAGS_HIBITS	0xF00
-
-/*
- * ppp_available - check if this kernel supports PPP.
- */
-int
-ppp_available()
-{
-    int fd, ret;
-
-    fd = open("/dev/tty", O_RDONLY, 0);
-    if (fd < 0)
-	return 1;		/* can't find out - assume we have ppp */
-    ret = ioctl(fd, I_FIND, "pppasync") >= 0;
-    close(fd);
-    return ret;
-}
-
-
-/*
- * establish_ppp - Turn the serial port into a ppp interface.
- */
-void
-establish_ppp()
-{
-    /* go through and save the name of all the modules, then pop em */
-    for (;;) { 
-	if (ioctl(fd, I_LOOK, str_modules[str_module_count].modname) < 0 ||
-	    ioctl(fd, I_POP, 0) < 0)
-	    break;
-	MAINDEBUG((LOG_DEBUG, "popped stream module : %s",
-		   str_modules[str_module_count].modname));
-	str_module_count++;
-    }
-
-    /* now push the async/fcs module */
-    if (ioctl(fd, I_PUSH, "pppasync") < 0) {
-	syslog(LOG_ERR, "ioctl(I_PUSH, ppp_async): %m");
-	die(1);
-    }
-    /* finally, push the ppp_if module that actually handles the */
-    /* network interface */ 
-    if (ioctl(fd, I_PUSH, "pppif") < 0) {
-	syslog(LOG_ERR, "ioctl(I_PUSH, ppp_if): %m");
-	die(1);
-    }
-    pushed_ppp = 1;
-    if (ioctl(fd, I_SETSIG, S_INPUT) < 0) {
-	syslog(LOG_ERR, "ioctl(I_SETSIG, S_INPUT): %m");
-	die(1);
-    }
-    /* read mode, message non-discard mode */
-    if (ioctl(fd, I_SRDOPT, RMSGN) < 0) {
-	syslog(LOG_ERR, "ioctl(I_SRDOPT, RMSGN): %m");
-	die(1);
-    }
-    /* Flush any waiting messages, or we'll never get SIGPOLL */
-    if (ioctl(fd, I_FLUSH, FLUSHRW) < 0) {
-	syslog(LOG_ERR, "ioctl(I_FLUSH, FLUSHRW): %m");
-	die(1);
-    }
-    /*
-     * Find out which interface we were given.
-     * (ppp_if handles this ioctl)
-     */
-    if (ioctl(fd, SIOCGETU, &ifunit) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCGETU): %m");
-	die(1);
-    }
-
-    /* Set debug flags in driver */
-    if (ioctl(fd, SIOCSIFDEBUG, &kdebugflag) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFDEBUG): %m");
-    }
-}
-
-/*
- * disestablish_ppp - Restore the serial port to normal operation.
- * 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()
-{
-    int flags;
-    char *s;
-
-    if (hungup) {
-	/* we can't push or pop modules after the stream has hung up */
-	str_module_count = 0;
-	return;
-    }
-
-    if (pushed_ppp) {
-	/*
-	 * Check whether the link seems not to be 8-bit clean.
-	 */
-	if (ioctl(fd, SIOCGIFDEBUG, (caddr_t) &flags) == 0) {
-	    s = NULL;
-	    switch (~flags & PAI_FLAGS_HIBITS) {
-	    case PAI_FLAGS_B7_0:
-		s = "bit 7 set to 1";
-		break;
-	    case PAI_FLAGS_B7_1:
-		s = "bit 7 set to 0";
-		break;
-	    case PAI_FLAGS_PAR_EVEN:
-		s = "odd parity";
-		break;
-	    case PAI_FLAGS_PAR_ODD:
-		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);
-	    }
-	}
-    }
-
-    while (ioctl(fd, I_POP, 0) == 0)	/* pop any we pushed */
-	;
-    pushed_ppp = 0;
-  
-    for (; str_module_count > 0; str_module_count--) {
-	if (ioctl(fd, I_PUSH, str_modules[str_module_count-1].modname)) {
-	    syslog(LOG_WARNING, "str_restore: couldn't push module %s: %m",
-		   str_modules[str_module_count-1].modname);
-	} else {
-	    MAINDEBUG((LOG_INFO, "str_restore: pushed module %s",
-		       str_modules[str_module_count-1].modname));
-	}
-    }
-}
-
-
-/*
- * output - Output PPP packet.
- */
-void
-output(unit, p, len)
-    int unit;
-    u_char *p;
-    int len;
-{
-    struct strbuf	str;
-
-    if (unit != 0)
-	MAINDEBUG((LOG_WARNING, "output: unit != 0!"));
-    if (debug)
-	log_packet(p, len, "sent ");
-
-    str.len = len;
-    str.buf = (caddr_t) p;
-    if(putmsg(fd, NULL, &str, 0) < 0) {
-	syslog(LOG_ERR, "putmsg: %m");
-	die(1);
-    }
-}
-
-
-/*
- * read_packet - get a PPP packet from the serial device.
- */
-int
-read_packet(buf)
-    u_char *buf;
-{
-    struct strbuf str;
-    int len, i;
-
-    str.maxlen = MTU+DLLHEADERLEN;
-    str.buf = (caddr_t) buf;
-    i = 0;
-    len = getmsg(fd, NULL, &str, &i);
-    if (len < 0) {
-	if (errno == EAGAIN || errno == EWOULDBLOCK) {
-	    return -1;
-	}
-	syslog(LOG_ERR, "getmsg(fd) %m");
-	die(1);
-    }
-    if (len) 
-	MAINDEBUG((LOG_DEBUG, "getmsg returned 0x%x",len));
-
-    if (str.len < 0) {
-	MAINDEBUG((LOG_DEBUG, "getmsg short return length %d", str.len));
-	return -1;
-    }
-
-    return str.len;
-}
-
-
-/*
- * ppp_send_config - configure the transmit characteristics of
- * the ppp interface.
- */
-void
-ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
-    int unit, mtu;
-    u_long asyncmap;
-    int pcomp, accomp;
-{
-    char c;
-    struct ifreq ifr;
-
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    ifr.ifr_mtu = mtu;
-    if (ioctl(s, SIOCSIFMTU, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m");
-	quit();
-    }
-
-    if(ioctl(fd, SIOCSIFASYNCMAP, (caddr_t) &asyncmap) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFASYNCMAP): %m");
-	quit();
-    }
-
-    c = (pcomp? 1: 0);
-    if(ioctl(fd, SIOCSIFCOMPPROT, &c) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m");
-	quit();
-    }
-
-    c = (accomp? 1: 0);
-    if(ioctl(fd, SIOCSIFCOMPAC, &c) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m");
-	quit();
-    }
-}
-
-
-/*
- * ppp_set_xaccm - set the extended transmit ACCM for the interface.
- */
-void
-ppp_set_xaccm(unit, accm)
-    int unit;
-    ext_accm accm;
-{
-    if (ioctl(fd, SIOCSIFXASYNCMAP, accm) < 0 && errno != ENOTTY)
-	syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
-}
-
-
-/*
- * ppp_recv_config - configure the receive-side characteristics of
- * the ppp interface.
- */
-void
-ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
-    int unit, mru;
-    u_long asyncmap;
-    int pcomp, accomp;
-{
-    char c;
-
-    if (ioctl(fd, SIOCSIFMRU, &mru) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFMRU): %m");
-    }
-
-    if (ioctl(fd, SIOCSIFRASYNCMAP, (caddr_t) &asyncmap) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFRASYNCMAP): %m");
-    }
-
-    c = 2 + (pcomp? 1: 0);
-    if(ioctl(fd, SIOCSIFCOMPPROT, &c) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m");
-    }
-
-    c = 2 + (accomp? 1: 0);
-    if (ioctl(fd, SIOCSIFCOMPAC, &c) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m");
-    }
-}
-
-/*
- * sifvjcomp - config tcp header compression
- */
-int
-sifvjcomp(u, vjcomp, cidcomp, maxcid)
-    int u, vjcomp, cidcomp, maxcid;
-{
-    char x;
-
-    x = (vjcomp? 1: 0) + (cidcomp? 0: 2) + (maxcid << 4);
-    if (ioctl(fd, SIOCSIFVJCOMP, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFVJCOMP): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * sifup - Config the interface up.
- */
-int
-sifup(u)
-    int u;
-{
-    struct ifreq ifr;
-
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
-	return 0;
-    }
-    ifr.ifr_flags |= IFF_UP;
-    if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * sifdown - Config the interface down.
- */
-int
-sifdown(u)
-    int u;
-{
-    struct ifreq ifr;
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
-	return 0;
-    }
-    ifr.ifr_flags &= ~IFF_UP;
-    if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * SET_SA_FAMILY - initialize a struct sockaddr, setting the sa_family field.
- */
-#define SET_SA_FAMILY(addr, family)		\
-    BZERO((char *) &(addr), sizeof(addr));	\
-    addr.sa_family = (family);
-
-/*
- * sifaddr - Config the interface IP addresses and netmask.
- */
-int
-sifaddr(u, o, h, m)
-    int u;
-    u_long o, h, m;
-{
-    int ret;
-    struct ifreq ifr;
-
-    ret = 1;
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    SET_SA_FAMILY(ifr.ifr_addr, AF_INET);
-    ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = o;
-    if (ioctl(s, SIOCSIFADDR, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFADDR): %m");
-	ret = 0;
-    }
-    ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = h;
-    if (ioctl(s, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFDSTADDR): %m");
-	ret = 0;
-    }
-    if (m != 0) {
-	((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = m;
-	syslog(LOG_INFO, "Setting interface mask to %s\n", ip_ntoa(m));
-	if (ioctl(s, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) {
-	    syslog(LOG_ERR, "ioctl(SIOCSIFNETMASK): %m");
-	    ret = 0;
-	}
-    }
-    return ret;
-}
-
-/*
- * cifaddr - Clear the interface IP addresses, and delete routes
- * through the interface if possible.
- */
-int
-cifaddr(u, o, h)
-    int u;
-    u_long o, h;
-{
-    struct rtentry rt;
-
-    SET_SA_FAMILY(rt.rt_dst, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = h;
-    SET_SA_FAMILY(rt.rt_gateway, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = o;
-    rt.rt_flags = RTF_HOST;
-    if (ioctl(s, SIOCDELRT, (caddr_t) &rt) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCDELRT): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * sifdefaultroute - assign a default route through the address given.
- */
-int
-sifdefaultroute(u, g)
-    int u;
-    u_long g;
-{
-    struct rtentry rt;
-
-    SET_SA_FAMILY(rt.rt_dst, AF_INET);
-    SET_SA_FAMILY(rt.rt_gateway, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g;
-    rt.rt_flags = RTF_GATEWAY;
-    if (ioctl(s, SIOCADDRT, &rt) < 0) {
-	syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * cifdefaultroute - delete a default route through the address given.
- */
-int
-cifdefaultroute(u, g)
-    int u;
-    u_long g;
-{
-    struct rtentry rt;
-
-    SET_SA_FAMILY(rt.rt_dst, AF_INET);
-    SET_SA_FAMILY(rt.rt_gateway, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g;
-    rt.rt_flags = RTF_GATEWAY;
-    if (ioctl(s, SIOCDELRT, &rt) < 0) {
-	syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * sifproxyarp - Make a proxy ARP entry for the peer.
- */
-int
-sifproxyarp(unit, hisaddr)
-    int unit;
-    u_long hisaddr;
-{
-    struct arpreq arpreq;
-
-    BZERO(&arpreq, sizeof(arpreq));
-
-    /*
-     * Get the hardware address of an interface on the same subnet
-     * as our local address.
-     */
-    if (!get_ether_addr(hisaddr, &arpreq.arp_ha)) {
-	syslog(LOG_WARNING, "Cannot determine ethernet address for proxy ARP");
-	return 0;
-    }
-
-    SET_SA_FAMILY(arpreq.arp_pa, AF_INET);
-    ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr;
-    arpreq.arp_flags = ATF_PERM | ATF_PUBL;
-    if (ioctl(s, SIOCSARP, (caddr_t)&arpreq) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSARP): %m");
-	return 0;
-    }
-
-    return 1;
-}
-
-/*
- * cifproxyarp - Delete the proxy ARP entry for the peer.
- */
-int
-cifproxyarp(unit, hisaddr)
-    int unit;
-    u_long hisaddr;
-{
-    struct arpreq arpreq;
-
-    BZERO(&arpreq, sizeof(arpreq));
-    SET_SA_FAMILY(arpreq.arp_pa, AF_INET);
-    ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr;
-    if (ioctl(s, SIOCDARP, (caddr_t)&arpreq) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCDARP): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * get_ether_addr - get the hardware address of an interface on the
- * the same subnet as ipaddr.  Code borrowed from myetheraddr.c
- * in the cslip-2.6 distribution, which is subject to the following
- * copyright notice (which also applies to logwtmp below):
- *
- * Copyright (c) 1990, 1992 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <fcntl.h>
-#include <nlist.h>
-#include <kvm.h>
-#include <arpa/inet.h>
-
-/* XXX SunOS 4.1 defines this and 3.5 doesn't... */
-#ifdef _nlist_h
-#define SUNOS4
-#endif
-
-#ifdef SUNOS4
-#include <netinet/in_var.h>
-#endif
-#include <netinet/if_ether.h>
-
-/* Cast a struct sockaddr to a structaddr_in */
-#define SATOSIN(sa) ((struct sockaddr_in *)(sa))
-
-/* Determine if "bits" is set in "flag" */
-#define ALLSET(flag, bits) (((flag) & (bits)) == (bits))
-
-static struct nlist nl[] = {
-#define N_IFNET 0
-	{ "_ifnet" },
-	{ 0 }
-};
-
-static void kread();
-
-int
-get_ether_addr(ipaddr, hwaddr)
-    u_long ipaddr;
-    struct sockaddr *hwaddr;
-{
-    register kvm_t *kd;
-    register struct ifnet *ifp;
-    register struct arpcom *ac;
-    struct arpcom arpcom;
-    struct in_addr *inp;
-#ifdef SUNOS4
-    register struct ifaddr *ifa;
-    register struct in_ifaddr *in;
-    union {
-	struct ifaddr ifa;
-	struct in_ifaddr in;
-    } ifaddr;
-#endif
-    u_long addr, mask;
-
-    /* Open kernel memory for reading */
-    kd = kvm_open(0, 0, 0, O_RDONLY, NULL);
-    if (kd == 0) {
-	syslog(LOG_ERR, "kvm_open: %m");
-	return 0;
-    }
-
-    /* Fetch namelist */
-    if (kvm_nlist(kd, nl) != 0) {
-	syslog(LOG_ERR, "kvm_nlist failed");
-	return 0;
-    }
-
-    ac = &arpcom;
-    ifp = &arpcom.ac_if;
-#ifdef SUNOS4
-    ifa = &ifaddr.ifa;
-    in = &ifaddr.in;
-#endif
-
-    if (kvm_read(kd, nl[N_IFNET].n_value, (char *)&addr, sizeof(addr))
-	!= sizeof(addr)) {
-	syslog(LOG_ERR, "error reading ifnet addr");
-	return 0;
-    }
-    for ( ; addr; addr = (u_long)ifp->if_next) {
-	if (kvm_read(kd, addr, (char *)ac, sizeof(*ac)) != sizeof(*ac)) {
-	    syslog(LOG_ERR, "error reading ifnet");
-	    return 0;
-	}
-
-	/* Only look at configured, broadcast interfaces */
-	if (!ALLSET(ifp->if_flags, IFF_UP | IFF_BROADCAST))
-	    continue;
-#ifdef SUNOS4
-	/* This probably can't happen... */
-	if (ifp->if_addrlist == 0)
-	    continue;
-#endif
-
-	/* Get interface ip address */
-#ifdef SUNOS4
-	if (kvm_read(kd, (u_long)ifp->if_addrlist, (char *)&ifaddr,
-		     sizeof(ifaddr)) != sizeof(ifaddr)) {
-	    syslog(LOG_ERR, "error reading ifaddr");
-	    return 0;
-	}
-	inp = &SATOSIN(&ifa->ifa_addr)->sin_addr;
-#else
-	inp = &SATOSIN(&ifp->if_addr)->sin_addr;
-#endif
-
-	/* Check if this interface on the right subnet */
-#ifdef SUNOS4
-	mask = in->ia_subnetmask;
-#else
-	mask = ifp->if_subnetmask;
-#endif
-	if ((ipaddr & mask) != (inp->s_addr & mask))
-	    continue;
-
-	/* Copy out the local ethernet address */
-	hwaddr->sa_family = AF_UNSPEC;
-	BCOPY((caddr_t) &arpcom.ac_enaddr, hwaddr->sa_data,
-	      sizeof(arpcom.ac_enaddr));
-	return 1;		/* success! */
-    }
-
-    /* couldn't find one */
-    return 0;
-}
-
-#define	WTMPFILE	"/usr/adm/wtmp"
-
-int
-logwtmp(line, name, host)
-    char *line, *name, *host;
-{
-    int fd;
-    struct stat buf;
-    struct utmp ut;
-
-    if ((fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0)
-	return;
-    if (!fstat(fd, &buf)) {
-	(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
-	(void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
-	(void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-	(void)time(&ut.ut_time);
-	if (write(fd, (char *)&ut, sizeof(struct utmp)) != sizeof(struct utmp))
-	    (void)ftruncate(fd, buf.st_size);
-    }
-    close(fd);
-}
diff --git a/usr.sbin/pppd/sys-ultrix.c b/usr.sbin/pppd/sys-ultrix.c
deleted file mode 100644
index ca8f2a4..0000000
--- a/usr.sbin/pppd/sys-ultrix.c
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
- * sys-ultrix.c - System-dependent procedures for setting up
- * PPP interfaces on Ultrix systems.
- *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-static char rcsid[] = "$Id: sys-ultrix.c,v 1.4 1994/05/25 06:30:49 paulus Exp $";
-#endif
-
-/*
- * TODO:
- */
-
-#include <syslog.h>
-#include <utmp.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
-
-#include <net/if.h>
-
-#include <net/if_ppp.h>
-#include <net/route.h>
-#include <netinet/in.h>
-
-#include "pppd.h"
-#include "ppp.h"
-
-static int initdisc = -1;		/* Initial TTY discipline */
-extern int kdebugflag;
-
-/*
- * establish_ppp - Turn the serial port into a ppp interface.
- */
-void
-establish_ppp()
-{
-    int pppdisc = PPPDISC;
-    int x;
-
-    if (ioctl(fd, TIOCGETD, &initdisc) < 0) {
-	syslog(LOG_ERR, "ioctl(TIOCGETD): %m");
-	die(1);
-    }
-    if (ioctl(fd, TIOCSETD, &pppdisc) < 0) {
-	syslog(LOG_ERR, "ioctl(TIOCSETD): %m");
-	die(1);
-    }
-
-    /*
-     * Find out which interface we were given.
-     */
-    if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) {	
-	syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m");
-	die(1);
-    }
-
-    /*
-     * Enable debug in the driver if requested.
-     */
-    if (kdebugflag) {
-	if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	    syslog(LOG_WARNING, "ioctl (PPPIOCGFLAGS): %m");
-	} else {
-	    x |= (kdebugflag & 0xFF) * SC_DEBUG;
-	    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0)
-		syslog(LOG_WARNING, "ioctl(PPPIOCSFLAGS): %m");
-	}
-    }
-}
-
-
-/*
- * disestablish_ppp - Restore the serial port to normal operation.
- * This shouldn't call die() because it's called from die().
- */
-void
-disestablish_ppp()
-{
-    int x;
-    char *s;
-
-    if (initdisc >= 0) {
-	/*
-	 * Check whether the link seems not to be 8-bit clean.
-	 */
-	if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) == 0) {
-	    s = NULL;
-	    switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP)) {
-	    case SC_RCV_B7_0:
-		s = "bit 7 set to 1";
-		break;
-	    case SC_RCV_B7_1:
-		s = "bit 7 set to 0";
-		break;
-	    case SC_RCV_EVNP:
-		s = "odd parity";
-		break;
-	    case SC_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);
-	    }
-	}
-	if (ioctl(fd, TIOCSETD, &initdisc) < 0)
-	    syslog(LOG_ERR, "ioctl(TIOCSETD): %m");
-    }
-}
-
-
-/*
- * output - Output PPP packet.
- */
-void
-output(unit, p, len)
-    int unit;
-    u_char *p;
-    int len;
-{
-    if (unit != 0)
-	MAINDEBUG((LOG_WARNING, "output: unit != 0!"));
-    if (debug)
-	log_packet(p, len, "sent ");
-
-    if (write(fd, p, len) < 0) {
-	syslog(LOG_ERR, "write: %m");
-	die(1);
-    }
-}
-
-
-/*
- * read_packet - get a PPP packet from the serial device.
- */
-int
-read_packet(buf)
-    u_char *buf;
-{
-    int len;
-
-    if ((len = read(fd, buf, MTU + DLLHEADERLEN)) < 0) {
-	if (errno == EWOULDBLOCK) {
-	    MAINDEBUG((LOG_DEBUG, "read(fd): EWOULDBLOCK"));
-	    return -1;
-	}
-	syslog(LOG_ERR, "read(fd): %m");
-	die(1);
-    }
-    return len;
-}
-
-
-/*
- * ppp_send_config - configure the transmit characteristics of
- * the ppp interface.
- */
-void
-ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
-    int unit, mtu;
-    u_long asyncmap;
-    int pcomp, accomp;
-{
-    u_int x;
-    struct ifreq ifr;
-
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    ifr.ifr_mtu = mtu;
-    if (ioctl(s, SIOCSIFMTU, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m");
-	quit();
-    }
-
-    if (ioctl(fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %m");
-	quit();
-    }
-
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	quit();
-    }
-    x = pcomp? x | SC_COMP_PROT: x &~ SC_COMP_PROT;
-    x = accomp? x | SC_COMP_AC: x &~ SC_COMP_AC;
-    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	quit();
-    }
-}
-
-
-/*
- * ppp_set_xaccm - set the extended transmit ACCM for the interface.
- */
-void
-ppp_set_xaccm(unit, accm)
-    int unit;
-    ext_accm accm;
-{
-    if (ioctl(fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY)
-	syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
-}
-
-
-/*
- * ppp_recv_config - configure the receive-side characteristics of
- * the ppp interface.
- */
-void
-ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
-    int unit, mru;
-    u_long asyncmap;
-    int pcomp, accomp;
-{
-    int x;
-
-    if (ioctl(fd, PPPIOCSMRU, (caddr_t) &mru) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m");
-	quit();
-    }
-    if (ioctl(fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSRASYNCMAP): %m");
-	quit();
-    }
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	quit();
-    }
-    x = !accomp? x | SC_REJ_COMP_AC: x &~ SC_REJ_COMP_AC;
-    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	quit();
-    }
-}
-
-/*
- * sifvjcomp - config tcp header compression
- */
-int
-sifvjcomp(u, vjcomp, cidcomp, maxcid)
-    int u, vjcomp, cidcomp, maxcid;
-{
-    u_int x;
-
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	return 0;
-    }
-    x = vjcomp ? x | SC_COMP_TCP: x &~ SC_COMP_TCP;
-    x = cidcomp? x & ~SC_NO_TCP_CCID: x | SC_NO_TCP_CCID;
-    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	return 0;
-    }
-    if (ioctl(fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * sifup - Config the interface up and enable IP packets to pass.
- */
-int
-sifup(u)
-{
-    struct ifreq ifr;
-    u_int x;
-
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
-	return 0;
-    }
-    ifr.ifr_flags |= IFF_UP;
-    if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
-	return 0;
-    }
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	return 0;
-    }
-    x |= SC_ENABLE_IP;
-    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * sifdown - Config the interface down and disable IP.
- */
-int
-sifdown(u)
-{
-    struct ifreq ifr;
-    u_int x;
-    int rv;
-
-    rv = 1;
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	rv = 0;
-    } else {
-	x &= ~SC_ENABLE_IP;
-	if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	    syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	    rv = 0;
-	}
-    }
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
-	rv = 0;
-    } else {
-	ifr.ifr_flags &= ~IFF_UP;
-	if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
-	    syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
-	    rv = 0;
-	}
-    }
-    return rv;
-}
-
-/*
- * SET_SA_FAMILY - set the sa_family field of a struct sockaddr,
- * if it exists.
- */
-#define SET_SA_FAMILY(addr, family)             \
-    BZERO((char *) &(addr), sizeof(addr));      \
-    addr.sa_family = (family); 
-
-/*
- * sifaddr - Config the interface IP addresses and netmask.
- */
-int
-sifaddr(u, o, h, m)
-{
-    int ret;
-    struct ifreq ifr;
-
-    ret = 1;
-    strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-    SET_SA_FAMILY(ifr.ifr_addr, AF_INET);
-    ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = o;
-    if (ioctl(s, SIOCSIFADDR, (caddr_t) &ifr) < 0) {
-        syslog(LOG_ERR, "ioctl(SIOCSIFADDR): %m");
-        ret = 0;
-    }
-    ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = h;
-    if (ioctl(s, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) {
-        syslog(LOG_ERR, "ioctl(SIOCSIFDSTADDR): %m");
-        ret = 0;
-    }
-    if (m != 0) {
-        ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = m;
-        syslog(LOG_INFO, "Setting interface mask to %s\n", ip_ntoa(m));
-        if (ioctl(s, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) {
-            syslog(LOG_ERR, "ioctl(SIOCSIFNETMASK): %m");
-            ret = 0;
-        }
-    }
-    return ret;
-}
-
-/*
- * cifaddr - Clear the interface IP addresses, and delete routes
- * through the interface if possible.
- */
-int
-cifaddr(u, o, h)
-{
-    struct rtentry rt;
-
-    SET_SA_FAMILY(rt.rt_dst, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = h;
-    SET_SA_FAMILY(rt.rt_gateway, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = o;
-    rt.rt_flags = RTF_HOST;
-    if (ioctl(s, SIOCDELRT, (caddr_t) &rt) < 0) {
-        syslog(LOG_ERR, "ioctl(SIOCDELRT): %m");
-        return 0;
-    }
-    return 1;
-}
-
-/*
- * sifdefaultroute - assign a default route through the address given.
- */
-int
-sifdefaultroute(u, g)
-{
-    struct rtentry rt;
-
-    SET_SA_FAMILY(rt.rt_dst, AF_INET);
-    SET_SA_FAMILY(rt.rt_gateway, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g;
-    rt.rt_flags = RTF_GATEWAY;
-    if (ioctl(s, SIOCADDRT, &rt) < 0) {
-        syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m");
-        return 0;
-    }
-    return 1;
-}
-
-/*
- * cifdefaultroute - delete a default route through the address given.
- */
-int
-cifdefaultroute(u, g)
-{
-    struct rtentry rt;
-
-    SET_SA_FAMILY(rt.rt_dst, AF_INET);
-    SET_SA_FAMILY(rt.rt_gateway, AF_INET);
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g;
-    rt.rt_flags = RTF_GATEWAY;
-    if (ioctl(s, SIOCDELRT, &rt) < 0)
-        syslog(LOG_WARNING, "default route ioctl(SIOCDELRT): %m");
-}
-
-/*
- * sifproxyarp - Make a proxy ARP entry for the peer.
- */
-int
-sifproxyarp(unit, hisaddr)
-    int unit;
-    u_long hisaddr;
-{
-    struct arpreq arpreq;
-
-    BZERO(&arpreq, sizeof(arpreq));
-
-    /*
-     * Get the hardware address of an interface on the same subnet
-     * as our local address.
-     */
-    if (!get_ether_addr(hisaddr, &arpreq.arp_ha)) {
-	syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP");
-	return 0;
-    }
-
-    SET_SA_FAMILY(arpreq.arp_pa, AF_INET);
-    ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr;
-    arpreq.arp_flags = ATF_PERM | ATF_PUBL;
-    if (ioctl(s, SIOCSARP, (caddr_t)&arpreq) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSARP): %m");
-	return 0;
-    }
-
-    return 1;
-}
-
-/*
- * cifproxyarp - Delete the proxy ARP entry for the peer.
- */
-int
-cifproxyarp(unit, hisaddr)
-    int unit;
-    u_long hisaddr;
-{
-    struct arpreq arpreq;
-
-    BZERO(&arpreq, sizeof(arpreq));
-    SET_SA_FAMILY(arpreq.arp_pa, AF_INET);
-    ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr;
-    if (ioctl(s, SIOCDARP, (caddr_t)&arpreq) < 0) {
-	syslog(LOG_WARNING, "ioctl(SIOCDARP): %m");
-	return 0;
-    }
-    return 1;
-}
-
-/*
- * get_ether_addr - get the hardware address of an interface on the
- * the same subnet as ipaddr.
- */
-#define MAX_IFS		32
-
-int
-get_ether_addr(ipaddr, hwaddr)
-    u_long ipaddr;
-    struct sockaddr *hwaddr;
-{
-    struct ifreq *ifr, *ifend, *ifp;
-    u_long ina, mask;
-    struct sockaddr_dl *dla;
-    struct ifreq ifreq;
-    struct ifconf ifc;
-    struct ifreq ifs[MAX_IFS];
-
-    ifc.ifc_len = sizeof(ifs);
-    ifc.ifc_req = ifs;
-    if (ioctl(s, SIOCGIFCONF, &ifc) < 0) {
-        syslog(LOG_ERR, "ioctl(SIOCGIFCONF): %m");
-        return 0;
-    }
-
-    /*
-     * Scan through looking for an interface with an Internet
-     * address on the same subnet as `ipaddr'.
-     */
-    ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
-    for (ifr = ifc.ifc_req; ifr < ifend; ) {
-        if (ifr->ifr_addr.sa_family == AF_INET) {
-            ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr;
-            strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name));
-            /*
-             * Check that the interface is up, and not point-to-point
-             * or loopback.
-             */
-            if (ioctl(s, SIOCGIFFLAGS, &ifreq) < 0)
-                continue;
-            if ((ifreq.ifr_flags &
-                 (IFF_UP|IFF_BROADCAST|IFF_POINTOPOINT|IFF_LOOPBACK|IFF_NOARP))
-                 != (IFF_UP|IFF_BROADCAST))
-                continue;
-            /*
-             * Get its netmask and check that it's on the right subnet.
-             */
-            if (ioctl(s, SIOCGIFNETMASK, &ifreq) < 0)
-                continue;
-            mask = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr;
-            if ((ipaddr & mask) != (ina & mask))
-                continue;
-
-            break;
-        }
-        ifr = (struct ifreq *) ((char *)&ifr->ifr_addr + sizeof(struct sockaddr)
-);
-    }
-
-    if (ifr >= ifend)
-        return 0;
-    syslog(LOG_DEBUG, "found interface %s for proxy arp", ifr->ifr_name);
-
-    /*
-     * Now scan through again looking for a link-level address
-     * for this interface.
-     */
-    ifp = ifr;
-    for (ifr = ifc.ifc_req; ifr < ifend; ) {
-        if (strcmp(ifp->ifr_name, ifr->ifr_name) == 0
-            && ifr->ifr_addr.sa_family == AF_DLI) {
-/*          && ifr->ifr_addr.sa_family == AF_LINK) { Per! Kolla !!! ROHACK */
-            /*
-             * Found the link-level address - copy it out
-             */
-            dla = (struct sockaddr_dl *)&ifr->ifr_addr;
-            hwaddr->sa_family = AF_UNSPEC;
-            BCOPY(dla, hwaddr->sa_data, sizeof(hwaddr->sa_data));
-            return 1;
-        }
-        ifr = (struct ifreq *) ((char *)&ifr->ifr_addr + sizeof(struct sockaddr)
-);
-    }
-
-    return 0;
-}
-
-
-/*
- * ppp_available - check whether the system has any ppp interfaces
- * (in fact we check whether we can do an ioctl on ppp0).
- */
-
-int
-ppp_available()
-{
-    int s, ok;
-    struct ifreq ifr;
-
-    if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-	return 1;		/* can't tell - maybe we're not root */
-
-    strncpy(ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name));
-    ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0;
-    close(s);
-
-    return ok;
-}
-
-
-/*
-  Seems like strdup() is not part of string package in Ultrix.
-  If I understood the man-page on the sun this should work.
-
-  Robert Olsson
-*/
-
-char *strdup( in ) char *in;
-{
-  char* dup;
-  if(! (dup = (char *) malloc( strlen( in ) +1 ))) return NULL;
-  (void) strcpy( dup, in );
-  return dup;
-}
-
-/*
- * This logwtmp() implementation is subject to the following copyright:
- *
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#define	WTMPFILE	"/usr/adm/wtmp"
-
-int
-logwtmp(line, name, host)
-    char *line, *name, *host;
-{
-    int fd;
-    struct stat buf;
-    struct utmp ut;
-
-    if ((fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0)
-	return;
-    if (!fstat(fd, &buf)) {
-	(void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
-	(void)strncpy(ut.ut_name, name, sizeof(ut.ut_name));
-	(void)strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-	(void)time(&ut.ut_time);
-	if (write(fd, (char *)&ut, sizeof(struct utmp)) != sizeof(struct utmp))
-	    (void)ftruncate(fd, buf.st_size);
-    }
-    close(fd);
-}