moved protos here from ipcp.h; print reason on terminate-request;

[ppp.git] / pppd / sys-linux.c

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index 455d74a7e764eeadf17f007b0a892b4ec2b6b693..f790b8cdbe089698e11112e1ca59b66b3fd04b32 100644 (file)
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -38,12 +38,13 @@
 #include <mntent.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <mntent.h>
 #include <signal.h>
 #include <fcntl.h>

+#include <ctype.h>

 
 #include <net/if.h>
 #include <net/ppp_defs.h>
 #include <net/if_arp.h>
 #include <net/if_ppp.h>
 
 #include <net/if.h>
 #include <net/ppp_defs.h>
 #include <net/if_arp.h>
 #include <net/if_ppp.h>

-#include <net/if_route.h>
+#include <net/route.h>

 #include <linux/if_ether.h>
 #include <netinet/in.h>
 
 #include <linux/if_ether.h>
 #include <netinet/in.h>
 


@@ -52,25 +53,45 @@
 #include "ipcp.h"
 
 static int initdisc = -1;      /* Initial TTY discipline */
 #include "ipcp.h"
 
 static int initdisc = -1;      /* Initial TTY discipline */

-static int prev_kdebugflag = 0;
-
-static int restore_term;               /* 1 => we've munged the terminal */
-static struct termios inittermios;     /* Initial TTY termios */
-
-int sockfd;                    /* socket for doing interface ioctls */
-
+static int initfdflags = -1;   /* Initial file descriptor flags for fd */
+static int prev_kdebugflag     = 0;
+static int has_default_route   = 0;
+static int has_proxy_arp       = 0;

 static int driver_version      = 0;
 static int driver_modification = 0;
 static int driver_patch        = 0;
 static int driver_version      = 0;
 static int driver_modification = 0;
 static int driver_patch        = 0;

+static int restore_term        = 0;    /* 1 => we've munged the terminal */
+static struct termios inittermios;     /* Initial TTY termios */
+
+static int sockfd;             /* socket for doing interface ioctls */
+
+static int     if_is_up;       /* Interface has been marked up */
+static u_int32_t ipaddrs[2];   /* Local and remote addrs we've set */
+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 */

 
 static char *lock_file;
 
 
 static char *lock_file;
 

-#define MAX_IFS                32
+#define MAX_IFS                100

 
 #define FLAGS_GOOD (IFF_UP          | IFF_BROADCAST)
 #define FLAGS_MASK (IFF_UP          | IFF_BROADCAST | \
                    IFF_POINTOPOINT | IFF_LOOPBACK  | IFF_NOARP)
 
 
 #define FLAGS_GOOD (IFF_UP          | IFF_BROADCAST)
 #define FLAGS_MASK (IFF_UP          | IFF_BROADCAST | \
                    IFF_POINTOPOINT | IFF_LOOPBACK  | IFF_NOARP)
 

+/* Prototypes for procedures local to this file. */
+static int get_flags (void);
+static void set_flags (int flags);
+static int translate_speed (int bps);
+static int baud_rate_of (int speed);
+static char *path_to_route (void);
+static void close_route_table (void);
+static int open_route_table (void);
+static int read_route_table (struct rtentry *rt);
+static int defaultroute_exists (void);
+static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr);
+static void decode_version (char *buf, int *version, int *mod, int *patch);
+
+

 /*
  * SET_SA_FAMILY - set the sa_family field of a struct sockaddr,
  * if it exists.
 /*
  * SET_SA_FAMILY - set the sa_family field of a struct sockaddr,
  * if it exists.


@@ -80,15 +101,22 @@ static char *lock_file;
     memset ((char *) &(addr), '\0', sizeof(addr));     \
     addr.sa_family = (family);
 
     memset ((char *) &(addr), '\0', sizeof(addr));     \
     addr.sa_family = (family);
 

+/*
+ * Determine if the PPP connection should still be present.
+ */
+
+extern int hungup;
+#define still_ppp() (hungup == 0)
+

 /*
  * Functions to read and set the flags value in the device driver
  */
 
 /*
  * Functions to read and set the flags value in the device driver
  */
 

-int get_flags (void)
+static int get_flags (void)

   {    
     int flags;
 
   {    
     int flags;
 

-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &flags) < 0)
+    if (ioctl(ttyfd, PPPIOCGFLAGS, (caddr_t) &flags) < 0)

       {
        syslog(LOG_ERR, "ioctl(PPPIOCGFLAGS): %m");
        quit();
       {
        syslog(LOG_ERR, "ioctl(PPPIOCGFLAGS): %m");
        quit();


@@ -98,10 +126,11 @@ int get_flags (void)
     return flags;
   }
 
     return flags;
   }
 

-void set_flags (int flags)
+static void set_flags (int flags)

   {    
     MAINDEBUG ((LOG_DEBUG, "set flags = %x\n", flags));
   {    
     MAINDEBUG ((LOG_DEBUG, "set flags = %x\n", flags));

-    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0)
+
+    if (ioctl(ttyfd, PPPIOCSFLAGS, (caddr_t) &flags) < 0)

       {
        syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS, %x): %m", flags);
        quit();
       {
        syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS, %x): %m", flags);
        quit();


@@ -114,13 +143,6 @@ void set_flags (int flags)
 
 void sys_init(void)
   {
 
 void sys_init(void)
   {

-    openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP);
-    setlogmask(LOG_UPTO(LOG_INFO));
-    if (debug)
-      {
-       setlogmask(LOG_UPTO(LOG_DEBUG));
-      }
-    

     /* Get an internet socket for doing socket ioctls. */
     sockfd = socket(AF_INET, SOCK_DGRAM, 0);
     if (sockfd < 0)
     /* Get an internet socket for doing socket ioctls. */
     sockfd = socket(AF_INET, SOCK_DGRAM, 0);
     if (sockfd < 0)


@@ -131,21 +153,24 @@ void sys_init(void)
   }
 
 /*
   }
 
 /*

- * note_debug_level - note a change in the debug level.
+ * 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;

 
 

-void note_debug_level (void)
-  {
-    if (debug)
-      {
-       MAINDEBUG ((LOG_INFO, "Debug turned ON, Level %d", debug));
-       setlogmask(LOG_UPTO(LOG_DEBUG));
-      }
-    else
-      {
-       setlogmask(LOG_UPTO(LOG_WARNING));
-      }
-  }
+    if (if_is_up)
+       sifdown(0);
+    if (ipaddrs[0])
+       cifaddr(0, ipaddrs[0], ipaddrs[1]);
+    /* XXX maybe we need to delete the route through the interface */
+    if (has_default_route)
+       cifdefaultroute(0, default_route_gateway);
+    if (has_proxy_arp)
+       cifproxyarp(0, proxy_arp_addr);
+}

 
 /*
  * set_kdebugflag - Define the debugging level for the kernel
 
 /*
  * set_kdebugflag - Define the debugging level for the kernel


@@ -153,7 +178,7 @@ void note_debug_level (void)
 
 int set_kdebugflag (int requested_level)
   {
 
 int set_kdebugflag (int requested_level)
   {

-    if (ioctl(fd, PPPIOCGDEBUG, &prev_kdebugflag) < 0)
+    if (ioctl(ttyfd, PPPIOCGDEBUG, &prev_kdebugflag) < 0)

       {
        syslog(LOG_ERR, "ioctl(PPPIOCGDEBUG): %m");
        return (0);
       {
        syslog(LOG_ERR, "ioctl(PPPIOCGDEBUG): %m");
        return (0);


@@ -161,12 +186,13 @@ int set_kdebugflag (int requested_level)
     
     if (prev_kdebugflag != requested_level)
       {
     
     if (prev_kdebugflag != requested_level)
       {

-       if (ioctl(fd, PPPIOCSDEBUG, &requested_level) < 0)
+       if (ioctl(ttyfd, PPPIOCSDEBUG, &requested_level) < 0)

          {
            syslog (LOG_ERR, "ioctl(PPPIOCSDEBUG): %m");
            return (0);
          }
          {
            syslog (LOG_ERR, "ioctl(PPPIOCSDEBUG): %m");
            return (0);
          }

-        MAINDEBUG ((LOG_INFO, "set kernel debugging level to %d", requested_level));
+        MAINDEBUG ((LOG_INFO, "set kernel debugging level to %d",
+                   requested_level));

       }
     return (1);
   }
       }
     return (1);
   }


@@ -175,7 +201,7 @@ int set_kdebugflag (int requested_level)
  * establish_ppp - Turn the serial port into a ppp interface.
  */
 
  * establish_ppp - Turn the serial port into a ppp interface.
  */
 

-void establish_ppp (void)
+void establish_ppp (int fd)

   {
     int pppdisc = N_PPP;
     int sig    = SIGIO;
   {
     int pppdisc = N_PPP;
     int sig    = SIGIO;


@@ -210,6 +236,15 @@ void establish_ppp (void)
 
     MAINDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver",
            driver_version, driver_modification, driver_patch));
 
     MAINDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver",
            driver_version, driver_modification, driver_patch));

+
+    /*
+     * Set device for non-blocking reads.
+     */
+    if ((initfdflags = fcntl(fd, F_GETFL)) == -1
+       || fcntl(fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) {
+      {
+       syslog(LOG_WARNING, "Couldn't set device to non-blocking mode: %m");
+      }

   }
 
 /*
   }
 
 /*


@@ -217,69 +252,83 @@ void establish_ppp (void)
  * This shouldn't call die() because it's called from die().
  */
 
  * This shouldn't call die() because it's called from die().
  */
 

-void disestablish_ppp(void)
+void disestablish_ppp(int fd)

   {
     int x;
     char *s;
   {
     int x;
     char *s;

+
+    /* Reset non-blocking mode on the file descriptor. */
+    if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0)
+       syslog(LOG_WARNING, "Couldn't restore device fd flags: %m");
+    initfdflags = -1;
+
+    if (still_ppp() && initdisc >= 0)
+      {
+       set_kdebugflag (prev_kdebugflag);
+       
+       if (ioctl(fd, TIOCSETD, &initdisc) < 0)
+         {
+           syslog(LOG_WARNING, "ioctl(TIOCSETD): %m");
+         }
+       
+       if (ioctl(fd, TIOCNXCL, 0) < 0)
+         {
+           syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m");
+         }
+      }
+    initdisc = -1;
+  }
+

 /*
 /*

- * Check whether the link seems not to be 8-bit clean.
+ * clean_check - Fetch the flags for the device and generate
+ * appropriate error messages.

  */
  */

-    if (initdisc >= 0)
+void clean_check(void)
+  {
+    if (still_ppp() && initdisc >= 0)

       {
       {

-       if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) == 0)
+       if (ioctl(ttyfd, PPPIOCGFLAGS, (caddr_t) &x) == 0)

          {
            s = NULL;
            switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP))
              {
          {
            s = NULL;
            switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP))
              {

-           case SC_RCV_B7_0 | SC_RCV_B7_1 | SC_RCV_EVNP | SC_RCV_ODDP:
+             case SC_RCV_B7_0 | SC_RCV_B7_1 | SC_RCV_EVNP | SC_RCV_ODDP:

                s = "nothing was received";
                break;
                s = "nothing was received";
                break;

-
-           case SC_RCV_B7_0:
-           case SC_RCV_B7_0 | SC_RCV_EVNP:
-           case SC_RCV_B7_0 | SC_RCV_ODDP:
-           case SC_RCV_B7_0 | SC_RCV_ODDP | SC_RCV_EVNP:
+               
+             case SC_RCV_B7_0:
+             case SC_RCV_B7_0 | SC_RCV_EVNP:
+             case SC_RCV_B7_0 | SC_RCV_ODDP:
+             case SC_RCV_B7_0 | SC_RCV_ODDP | SC_RCV_EVNP:

                s = "all had bit 7 set to 1";
                break;
                s = "all had bit 7 set to 1";
                break;

-
-           case SC_RCV_B7_1:
-           case SC_RCV_B7_1 | SC_RCV_EVNP:
-           case SC_RCV_B7_1 | SC_RCV_ODDP:
-           case SC_RCV_B7_1 | SC_RCV_ODDP | SC_RCV_EVNP:
+               
+             case SC_RCV_B7_1:
+             case SC_RCV_B7_1 | SC_RCV_EVNP:
+             case SC_RCV_B7_1 | SC_RCV_ODDP:
+             case SC_RCV_B7_1 | SC_RCV_ODDP | SC_RCV_EVNP:

                s = "all had bit 7 set to 0";
                break;
                s = "all had bit 7 set to 0";
                break;

-
-           case SC_RCV_EVNP:
+               
+             case SC_RCV_EVNP:

                s = "all had odd parity";
                break;
                s = "all had odd parity";
                break;

-
-           case SC_RCV_ODDP:
+               
+             case SC_RCV_ODDP:

                s = "all had even parity";
                break;
              }
                s = "all had even parity";
                break;
              }

-
+           

            if (s != NULL)
              {
            if (s != NULL)
              {

-               syslog(LOG_WARNING, "Receive serial link is not 8-bit clean:");
+               syslog(LOG_WARNING, "Receive serial link is not"
+                      " 8-bit clean:");

                syslog(LOG_WARNING, "Problem: %s", s);
              }
          }
                syslog(LOG_WARNING, "Problem: %s", s);
              }
          }

-
-        set_kdebugflag (prev_kdebugflag);
-       
-       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;

       }
   }
       }
   }

+       

 
 /*
  * List of valid speeds.
 
 /*
  * List of valid speeds.


@@ -361,11 +410,11 @@ struct speed {
  * Translate from bits/second to a speed_t.
  */
 
  * Translate from bits/second to a speed_t.
  */
 

-int translate_speed (int bps)
+static int translate_speed (int bps)

   {
     struct speed *speedp;
 
   {
     struct speed *speedp;
 

-    if (bps == 0)
+    if (bps != 0)

       {
        for (speedp = speeds; speedp->speed_int; speedp++)
          {
       {
        for (speedp = speeds; speedp->speed_int; speedp++)
          {


@@ -383,7 +432,7 @@ int translate_speed (int bps)
  * Translate from a speed_t to bits/second.
  */
 
  * Translate from a speed_t to bits/second.
  */
 

-int baud_rate_of (int speed)
+static int baud_rate_of (int speed)

   {
     struct speed *speedp;
     
   {
     struct speed *speedp;
     


@@ -442,8 +491,8 @@ void set_up_tty (int fd, int local)
        tios.c_cflag |= CRTSCTS;
        break;
 
        tios.c_cflag |= CRTSCTS;
        break;
 

-    case 2:
-       tios.c_iflag     |= IXOFF;
+    case -2:
+       tios.c_iflag     |= IXON | IXOFF;

        tios.c_cc[VSTOP]  = 0x13;       /* DC3 = XOFF = ^S */
        tios.c_cc[VSTART] = 0x11;       /* DC1 = XON  = ^Q */
        break;
        tios.c_cc[VSTOP]  = 0x13;       /* DC3 = XOFF = ^S */
        tios.c_cc[VSTART] = 0x11;       /* DC1 = XON  = ^Q */
        break;


@@ -503,7 +552,7 @@ void setdtr (int fd, int on)
  * restore_tty - restore the terminal to the saved settings.
  */
 
  * restore_tty - restore the terminal to the saved settings.
  */
 

-void restore_tty (void)
+void restore_tty (int fd)

   {
     if (restore_term)
       {
   {
     if (restore_term)
       {


@@ -521,7 +570,7 @@ void restore_tty (void)
        
        if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0)
          {
        
        if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0)
          {

-           if (errno != ENXIO)
+           if (errno != EIO)

              {
                syslog(LOG_WARNING, "tcsetattr: %m");
              }
              {
                syslog(LOG_WARNING, "tcsetattr: %m");
              }


@@ -535,25 +584,28 @@ void restore_tty (void)
 
 void output (int unit, unsigned char *p, int len)
   {
 
 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 (debug)
       {
         log_packet(p, len, "sent ");
       }
     

-    if (write(fd, p, len) < 0)
+    if (write(ttyfd, p, len) < 0)

       {
       {

-        syslog(LOG_ERR, "write: %m");
-       die(1);
+       if (errno == EWOULDBLOCK || errno == ENOBUFS
+           || errno == ENXIO || errno == EIO)
+         {
+           syslog(LOG_WARNING, "write: warning: %m");
+         } 
+       else
+         {
+           syslog(LOG_ERR, "write: %m");
+           die(1);
+         }

       }
   }
 
 /*
       }
   }
 
 /*

- * wait_input - wait until there is data available on fd,
+ * wait_input - wait until there is data available on ttyfd,

  * for the length of time specified by *timo (indefinite
  * if timo is NULL).
  */
  * for the length of time specified by *timo (indefinite
  * if timo is NULL).
  */


@@ -564,9 +616,9 @@ void wait_input (struct timeval *timo)
     int n;
     
     FD_ZERO(&ready);
     int n;
     
     FD_ZERO(&ready);

-    FD_SET(fd, &ready);
+    FD_SET(ttyfd, &ready);

 
 

-    n = select(fd+1, &ready, NULL, &ready, timo);
+    n = select(ttyfd+1, &ready, NULL, &ready, timo);

     if (n < 0 && errno != EINTR)
       {
        syslog(LOG_ERR, "select: %m");
     if (n < 0 && errno != EINTR)
       {
        syslog(LOG_ERR, "select: %m");


@@ -582,14 +634,14 @@ int read_packet (unsigned char *buf)
   {
     int len;
   
   {
     int len;
   

-    len = read(fd, buf, PPP_MTU + PPP_HDRLEN);
+    len = read(ttyfd, buf, PPP_MTU + PPP_HDRLEN);

     if (len < 0)
       {
        if (errno == EWOULDBLOCK)
          {
            return -1;
          }
     if (len < 0)
       {
        if (errno == EWOULDBLOCK)
          {
            return -1;
          }

-       syslog(LOG_ERR, "read(fd): %m");
+       syslog(LOG_ERR, "read: %m");

        die(1);
       }
     return len;
        die(1);
       }
     return len;


@@ -606,26 +658,36 @@ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp)
     struct ifreq ifr;
   
     MAINDEBUG ((LOG_DEBUG, "send_config: mtu = %d\n", mtu));
     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(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0)
+/*
+ * Ensure that the link is still up.
+ */
+    if (still_ppp())

       {
       {

-       syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m");
-       quit();
-      }
+/*
+ * Set the MTU and other parameters for the ppp device
+ */
+       memset (&ifr, '\0', sizeof (ifr));
+       strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
+       ifr.ifr_mtu = mtu;
+       
+       if (ioctl(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0)
+         {
+           syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m");
+           quit();
+         }
+       
+       MAINDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap));
+       if (ioctl(ttyfd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0)
+         {
+           syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %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();
+       x = get_flags();
+       x = pcomp  ? x | SC_COMP_PROT : x & ~SC_COMP_PROT;
+       x = accomp ? x | SC_COMP_AC   : x & ~SC_COMP_AC;
+       set_flags(x);

       }
       }

-    
-    x = get_flags();
-    x = pcomp  ? x | SC_COMP_PROT : x & ~SC_COMP_PROT;
-    x = accomp ? x | SC_COMP_AC   : x & ~SC_COMP_AC;
-    set_flags(x);

   }
 
 /*
   }
 
 /*


@@ -637,7 +699,7 @@ void ppp_set_xaccm (int unit, ext_accm accm)
     MAINDEBUG ((LOG_DEBUG, "set_xaccm: %08lx %08lx %08lx %08lx\n",
                accm[0], accm[1], accm[2], accm[3]));
 
     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)
+    if (ioctl(ttyfd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY)

       {
        syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
       }
       {
        syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
       }


@@ -653,13 +715,24 @@ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp)
     u_int x;
 
     MAINDEBUG ((LOG_DEBUG, "recv_config: mru = %d\n", mru));
     u_int x;
 
     MAINDEBUG ((LOG_DEBUG, "recv_config: mru = %d\n", mru));

-    if (ioctl(fd, PPPIOCSMRU, (caddr_t) &mru) < 0)
+/*
+ * If we were called because the link has gone down then there is nothing
+ * which may be done. Just return without incident.
+ */
+    if (!still_ppp())
+      {
+       return;
+      }
+/*
+ * Set the receiver parameters
+ */
+    if (ioctl(ttyfd, PPPIOCSMRU, (caddr_t) &mru) < 0)

       {
        syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m");
       }
 
     MAINDEBUG ((LOG_DEBUG, "recv_config: asyncmap = %lx\n", asyncmap));
       {
        syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m");
       }
 
     MAINDEBUG ((LOG_DEBUG, "recv_config: asyncmap = %lx\n", asyncmap));

-    if (ioctl(fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0)
+    if (ioctl(ttyfd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0)

       {
         syslog(LOG_ERR, "ioctl(PPPIOCSRASYNCMAP): %m");
        quit();
       {
         syslog(LOG_ERR, "ioctl(PPPIOCSRASYNCMAP): %m");
        quit();


@@ -679,11 +752,17 @@ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit)
   {
     struct ppp_option_data data;
 
   {
     struct ppp_option_data data;
 

+    memset (&data, '\0', sizeof (data));

     data.ptr      = opt_ptr;
     data.length   = opt_len;
     data.transmit = for_transmit;
 
     data.ptr      = opt_ptr;
     data.length   = opt_len;
     data.transmit = for_transmit;
 

-    return ioctl(fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0;
+    if (ioctl(ttyfd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0)
+      {
+       return 1;
+      }
+
+    return (errno == ENOBUFS)? 0: -1;

   }
 
 /*
   }
 
 /*


@@ -692,10 +771,13 @@ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit)
 
 void ccp_flags_set (int unit, int isopen, int isup)
   {
 
 void ccp_flags_set (int unit, int isopen, int isup)
   {

-    int x = get_flags();
-    x = isopen? x | SC_CCP_OPEN : x &~ SC_CCP_OPEN;
-    x = isup?   x | SC_CCP_UP   : x &~ SC_CCP_UP;
-    set_flags (x);
+    if (still_ppp())
+      {
+       int x = get_flags();
+       x = isopen? x | SC_CCP_OPEN : x &~ SC_CCP_OPEN;
+       x = isup?   x | SC_CCP_UP   : x &~ SC_CCP_UP;
+       set_flags (x);
+      }

   }
 
 /*
   }
 
 /*


@@ -721,7 +803,7 @@ int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid)
 
     if (vjcomp)
       {
 
     if (vjcomp)
       {

-        if (ioctl (fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0)
+        if (ioctl (ttyfd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0)

          {
            syslog (LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
            vjcomp = 0;
          {
            syslog (LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
            vjcomp = 0;


@@ -743,6 +825,7 @@ int sifup (int u)
   {
     struct ifreq ifr;
 
   {
     struct ifreq ifr;
 

+    memset (&ifr, '\0', sizeof (ifr));

     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0)
       {
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0)
       {


@@ -756,6 +839,7 @@ int sifup (int u)
        syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
        return 0;
       }
        syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
        return 0;
       }

+    if_is_up = 1;

     return 1;
   }
 
     return 1;
   }
 


@@ -767,6 +851,7 @@ int sifdown (int u)
   {
     struct ifreq ifr;
 
   {
     struct ifreq ifr;
 

+    memset (&ifr, '\0', sizeof (ifr));

     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0)
       {
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0)
       {


@@ -781,6 +866,7 @@ int sifdown (int u)
        syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
        return 0;
       }
        syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
        return 0;
       }

+    if_is_up = 0;

     return 1;
   }
 
     return 1;
   }
 


@@ -793,6 +879,9 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask)
     struct ifreq   ifr; 
     struct rtentry rt;
     
     struct ifreq   ifr; 
     struct rtentry rt;
     

+    memset (&ifr, '\0', sizeof (ifr));
+    memset (&rt,  '\0', sizeof (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); 
     SET_SA_FAMILY (ifr.ifr_addr,    AF_INET); 
     SET_SA_FAMILY (ifr.ifr_dstaddr, AF_INET); 
     SET_SA_FAMILY (ifr.ifr_netmask, AF_INET); 


@@ -838,13 +927,11 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask)
 /*
  *  Add the device route
  */
 /*
  *  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 */
 
     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_gateway)->sin_addr.s_addr = 0L;

     ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr     = his_adr;
     rt.rt_flags = RTF_UP | RTF_HOST;
 
     ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr     = his_adr;
     rt.rt_flags = RTF_UP | RTF_HOST;
 


@@ -853,6 +940,9 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask)
         syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m");
         return (0);
       }
         syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m");
         return (0);
       }

+
+    ipaddrs[0] = our_adr;
+    ipaddrs[1] = his_adr;

     return 1;
   }
 
     return 1;
   }
 


@@ -864,6 +954,8 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask)
 int cifaddr (int unit, int our_adr, int his_adr)
   {
     struct rtentry rt;
 int cifaddr (int unit, int our_adr, int his_adr)
   {
     struct rtentry rt;

+
+    ipaddrs[0] = 0;

 /*
  *  Delete the route through the device
  */
 /*
  *  Delete the route through the device
  */


@@ -877,10 +969,13 @@ int cifaddr (int unit, int our_adr, int his_adr)
     ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr     = his_adr;
     rt.rt_flags = RTF_UP | RTF_HOST;
 
     ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr     = his_adr;
     rt.rt_flags = RTF_UP | RTF_HOST;
 

-    if (ioctl(sockfd, SIOCDELRT, &rt) < 0)
+    if (ioctl(sockfd, SIOCDELRT, &rt) < 0 && errno != ESRCH)

       {
       {

-        syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m");
-        return (0);
+       if (still_ppp())
+         {
+           syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m");
+           return (0);
+         }

       }
     return 1;
   }
       }
     return 1;
   }


@@ -890,7 +985,7 @@ int cifaddr (int unit, int our_adr, int his_adr)
  */
 
 FILE *route_fd = (FILE *) 0;
  */
 
 FILE *route_fd = (FILE *) 0;

-static char route_buffer [100];
+static char route_buffer [512];

 
 static char *path_to_route (void);
 static int open_route_table (void);
 
 static char *path_to_route (void);
 static int open_route_table (void);


@@ -935,6 +1030,19 @@ static char *path_to_route (void)
     return 0;
   }
 
     return 0;
   }
 

+/*
+ * 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;
+      }
+  }
+

 /*
  * open_route_table - open the interface to the route table
  */
 /*
  * open_route_table - open the interface to the route table
  */


@@ -943,10 +1051,7 @@ static int open_route_table (void)
   {
     char *path;
 
   {
     char *path;
 

-    if (route_fd != (FILE *) 0)
-      {
-        close_route_table();
-      }
+    close_route_table();

 
     path = path_to_route();
     if (path == NULL)
 
     path = path_to_route();
     if (path == NULL)


@@ -960,29 +1065,9 @@ static int open_route_table (void)
         syslog (LOG_ERR, "can not open %s: %m", path);
         return 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;
   }
 
     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
  */
 /*
  * read_route_table - read the next entry from the route table
  */


@@ -991,18 +1076,34 @@ static int read_route_table (struct rtentry *rt)
   {
     static char delims[] = " \t\n";
     char *dev_ptr, *ptr, *dst_ptr, *gw_ptr, *flag_ptr;
   {
     static char delims[] = " \t\n";
     char *dev_ptr, *ptr, *dst_ptr, *gw_ptr, *flag_ptr;

+       
+    memset (rt, '\0', sizeof (struct rtentry));

 
 

-    if (fgets (route_buffer, sizeof (route_buffer), route_fd) == (char *) 0)
+    for (;;)

       {
       {

-        return 0;
-      }
-
-    memset (rt, '\0', sizeof (struct rtentry));
+       if (fgets (route_buffer, sizeof (route_buffer), route_fd) ==
+           (char *) 0)
+         {
+           return 0;
+         }

 
 

-    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 */
+       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 (flag_ptr == (char *) 0) /* assume that we failed, somewhere. */
+         {
+           return 0;
+         }
+       
+       /* Discard that stupid header line which should never
+        * have been there in the first place !! */
+       if (isxdigit (*dst_ptr) && isxdigit (*gw_ptr) && isxdigit (*flag_ptr))
+         {
+           break;
+         }
+      }

 
     ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr =
       strtoul (dst_ptr, NULL, 16);
 
     ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr =
       strtoul (dst_ptr, NULL, 16);


@@ -1032,7 +1133,7 @@ static int defaultroute_exists (void)
 
     while (read_route_table(&rt) != 0)
       {
 
     while (read_route_table(&rt) != 0)
       {

-        if (rt.rt_flags & RTF_UP == 0)
+        if ((rt.rt_flags & RTF_UP) == 0)

          {
            continue;
          }
          {
            continue;
          }


@@ -1061,22 +1162,27 @@ int sifdefaultroute (int unit, int gateway)
   {
     struct rtentry rt;
 
   {
     struct rtentry rt;
 

-    if (defaultroute_exists())
+    if (has_default_route == 0)

       {
       {

-        return 0;
-      }
+       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;
+       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(sockfd, SIOCADDRT, &rt) < 0)
-      {
-       syslog (LOG_ERR, "default route ioctl(SIOCADDRT): %m");
-       return 0;
+       rt.rt_flags = RTF_UP | RTF_GATEWAY;
+       if (ioctl(sockfd, SIOCADDRT, &rt) < 0)
+         {
+           syslog (LOG_ERR, "default route ioctl(SIOCADDRT): %m");
+           return 0;
+         }

       }
       }

+    has_default_route = 1;
+    default_route_gateway = g;

     return 1;
   }
 
     return 1;
   }
 


@@ -1087,17 +1193,25 @@ int sifdefaultroute (int unit, int gateway)
 int cifdefaultroute (int unit, int gateway)
   {
     struct rtentry rt;
 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(sockfd, SIOCDELRT, &rt) < 0)
+
+    if (has_default_route)

       {
       {

-       syslog (LOG_ERR, "default route ioctl(SIOCDELRT): %m");
-       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(sockfd, SIOCDELRT, &rt) < 0 && errno != ESRCH)
+         {
+           if (still_ppp())
+             {
+               syslog (LOG_ERR, "default route ioctl(SIOCDELRT): %m");
+               return 0;
+             }
+         }

       }
       }

+    has_default_route = 0;

     return 1;
   }
 
     return 1;
   }
 


@@ -1109,26 +1223,32 @@ int sifproxyarp (int unit, u_int32_t his_adr)
   {
     struct arpreq arpreq;
 
   {
     struct arpreq arpreq;
 

-    memset (&arpreq, '\0', sizeof(arpreq));
+    if (has_proxy_arp == 0)
+      {
+       memset (&arpreq, '\0', sizeof(arpreq));

 /*
  * Get the hardware address of an interface on the same subnet
  * as our local address.
  */
 /*
  * 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 (!get_ether_addr(his_adr, &arpreq.arp_ha))
+         {
+           syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP");
+           return 0;
+         }

     
     

-    if (ioctl(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0)
-      {
-       syslog(LOG_ERR, "ioctl(SIOCSARP): %m");
-       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(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0)
+         {
+           syslog(LOG_ERR, "ioctl(SIOCSARP): %m");
+           return 0;
+         }

       }
       }

+
+    proxy_arp_addr = hisaddr;
+    has_proxy_arp = 1;

     return 1;
   }
 
     return 1;
   }
 


@@ -1139,16 +1259,20 @@ int sifproxyarp (int unit, u_int32_t his_adr)
 int cifproxyarp (int unit, u_int32_t his_adr)
   {
     struct arpreq arpreq;
 int cifproxyarp (int unit, u_int32_t 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(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0)
+
+    if (has_proxy_arp == 1)

       {
       {

-       syslog(LOG_WARNING, "ioctl(SIOCDARP): %m");
-       return 0;
+       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(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0)
+         {
+           syslog(LOG_WARNING, "ioctl(SIOCDARP): %m");
+           return 0;
+         }

       }
       }

+    has_proxy_arp = 0;

     return 1;
   }
      
     return 1;
   }
      


@@ -1157,7 +1281,7 @@ int cifproxyarp (int unit, u_int32_t his_adr)
  * the same subnet as ipaddr.
  */
 
  * the same subnet as ipaddr.
  */
 

-int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr)
+static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr)

   {
     struct ifreq *ifr, *ifend, *ifp;
     int i;
   {
     struct ifreq *ifr, *ifend, *ifp;
     int i;


@@ -1192,7 +1316,7 @@ int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr)
                        ifreq.ifr_name));
 /*
  * Check that the interface is up, and not point-to-point
                        ifreq.ifr_name));
 /*
  * Check that the interface is up, and not point-to-point

- * or loopback.
+ * nor loopback.

  */
            if (ioctl(sockfd, SIOCGIFFLAGS, &ifreq) < 0)
              {
  */
            if (ioctl(sockfd, SIOCGIFFLAGS, &ifreq) < 0)
              {


@@ -1232,23 +1356,27 @@ int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr)
 /*
  * Now get the hardware address.
  */
 /*
  * Now get the hardware address.
  */

+    memset (&ifreq.ifr_hwaddr, 0, sizeof (struct sockaddr));

     if (ioctl (sockfd, SIOCGIFHWADDR, &ifreq) < 0)
       {
         syslog(LOG_ERR, "SIOCGIFHWADDR(%s): %m", ifreq.ifr_name);
         return 0;
       }
 
     if (ioctl (sockfd, SIOCGIFHWADDR, &ifreq) < 0)
       {
         syslog(LOG_ERR, "SIOCGIFHWADDR(%s): %m", ifreq.ifr_name);
         return 0;
       }
 

-    hwaddr->sa_family = ARPHRD_ETHER;
-    memcpy (&hwaddr->sa_data, &ifreq.ifr_hwaddr.sa_data, ETH_ALEN);
+    memcpy (hwaddr,
+           &ifreq.ifr_hwaddr,
+           sizeof (struct sockaddr));

 
     MAINDEBUG ((LOG_DEBUG,
 
     MAINDEBUG ((LOG_DEBUG,

-               "proxy arp: found hwaddr %02x:%02x:%02x:%02x:%02x:%02x",
+          "proxy arp: found hwaddr %02x:%02x:%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)[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]));
+               (int) ((unsigned char *) &hwaddr->sa_data)[5],
+               (int) ((unsigned char *) &hwaddr->sa_data)[6],
+               (int) ((unsigned char *) &hwaddr->sa_data)[7]));

     return 1;
   }
 
     return 1;
   }
 


@@ -1315,7 +1443,7 @@ u_int32_t GetMask (u_int32_t addr)
            continue;
          }
 /*
            continue;
          }
 /*

- * Check that the interface is up, and not point-to-point or loopback.
+ * Check that the interface is up, and not point-to-point nor loopback.

  */
        strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name));
        if (ioctl(sockfd, SIOCGIFFLAGS, &ifreq) < 0)
  */
        strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name));
        if (ioctl(sockfd, SIOCGIFFLAGS, &ifreq) < 0)


@@ -1337,7 +1465,6 @@ u_int32_t GetMask (u_int32_t addr)
        mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr;
        break;
       }
        mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr;
        break;
       }

-

     return mask;
   }
 
     return mask;
   }
 


@@ -1348,7 +1475,6 @@ u_int32_t GetMask (u_int32_t addr)
 static void decode_version (char *buf, int *version,
                            int *modification, int *patch)
   {
 static void decode_version (char *buf, int *version,
                            int *modification, int *patch)
   {

-

     *version      = (int) strtoul (buf, &buf, 10);
     *modification = 0;
     *patch        = 0;
     *version      = (int) strtoul (buf, &buf, 10);
     *modification = 0;
     *patch        = 0;


@@ -1439,7 +1565,9 @@ int ppp_available(void)
   {
     int s, ok;
     struct ifreq ifr;
   {
     int s, ok;
     struct ifreq ifr;

-    int my_version,     my_modification,     my_patch;
+    char   abBuffer [1024];
+    int    size;
+    int    my_version, my_modification, my_patch;

 /*
  * Open a socket for doing the ioctl operations.
  */    
 /*
  * Open a socket for doing the ioctl operations.
  */    


@@ -1472,30 +1600,29 @@ int ppp_available(void)
         ok = ioctl (s, SIOCGIFHWADDR, (caddr_t) &ifr) >= 0;
       }
 
         ok = ioctl (s, SIOCGIFHWADDR, (caddr_t) &ifr) >= 0;
       }
 

-    if (ok && ifr.ifr_hwaddr.sa_family != ARPHRD_PPP)
+    if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP))

       {
         ok = 0;
       }
       {
         ok = 0;
       }

+
+    if (!ok)
+      {
+       return 0;
+      }

 /*
  *  This is the PPP device. Validate the version of the driver at this
  *  point to ensure that this program will work with the driver.
  */
 /*
  *  This is the PPP device. Validate the version of the driver at this
  *  point to ensure that this program will work with the driver.
  */

+    ifr.ifr_data = abBuffer;
+    size = ioctl (s, SIOCGPPPVER, (caddr_t) &ifr);
+    ok   = size >= 0;
+

     if (ok)
       {
     if (ok)
       {

-        char   abBuffer [1024];
-       int    size;
-
-       ifr.ifr_data = abBuffer;
-       size = ioctl (s, SIOCGPPPVER, (caddr_t) &ifr);
-       ok   = size >= 0;
-
-       if (ok)
-         {
-           decode_version (abBuffer,
-                           &driver_version,
-                           &driver_modification,
-                           &driver_patch);
-         }
+       decode_version (abBuffer,
+                       &driver_version,
+                       &driver_modification,
+                       &driver_patch);

       }
     
     if (!ok)
       }
     
     if (!ok)


@@ -1536,6 +1663,10 @@ int ppp_available(void)
     return ok;
   }
 
     return ok;
   }
 

+/*
+ * Update the wtmp file with the appropriate user name and tty device.
+ */
+

 int logwtmp (char *line, char *name, char *host)
   {
     struct utmp ut;
 int logwtmp (char *line, char *name, char *host)
   {
     struct utmp ut;


@@ -1630,25 +1761,23 @@ int lock (char *dev)
                break;
              }
 
                break;
              }
 

-           if (n == 0)
+           /* See the process still exists. */
+           if (n > 0)

              {
              {

-               unlink (lock_file);
-               syslog (LOG_NOTICE, "Removed stale lock on %s", lock_file);
-               continue;
+               hdb_lock_buffer[n] = '\0';
+               sscanf (hdb_lock_buffer, " %d", &pid);
+               if (kill(pid, 0) == -1 && errno == ESRCH)
+                 {
+                   n = 0;
+                 }

              }
 
              }
 

-           hdb_lock_buffer[n] = '\0';
-           sscanf (hdb_lock_buffer, " %d", &pid);
-
-           if (kill(pid, 0) == -1 && errno == ESRCH)
+           /* If the process does not exist then try to remove the lock */
+           if (n == 0 && unlink (lock_file) == 0)

              {
              {

-               /* pid no longer exists - remove the lock file */
-               if (unlink (lock_file) == 0)
-                 {
-                   syslog (LOG_NOTICE, "Removed stale lock on %s (pid %d)",
-                           dev, pid);
-                   continue;
-                 }
+               syslog (LOG_NOTICE, "Removed stale lock on %s (pid %d)",
+                       dev, pid);
+               continue;

              }
 
            syslog (LOG_NOTICE, "Device %s is locked by pid %d", dev, pid);
              }
 
            syslog (LOG_NOTICE, "Device %s is locked by pid %d", dev, pid);