old DLPI doesn't have dl_sap_length

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

diff --git a/pppd/sys-aix4.c b/pppd/sys-aix4.c
index ca3144d35a8bf7d6fe8ed4f5318e9207e09f4e06..11e88b49b786ea3947cb6a657d2a178fce5dbdcd 100644 (file)
--- a/pppd/sys-aix4.c
+++ b/pppd/sys-aix4.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: sys-aix4.c,v 1.2 1995/04/24 05:33:43 paulus Exp $";
+static char rcsid[] = "$Id: sys-aix4.c,v 1.7 1995/10/27 03:45:34 paulus Exp $";

 #endif
 
 /*
 #endif
 
 /*


@@ -27,7 +27,9 @@ static char rcsid[] = "$Id: sys-aix4.c,v 1.2 1995/04/24 05:33:43 paulus Exp $";
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

+/*

 #include <stdlib.h>
 #include <stdlib.h>

+*/

 #include <errno.h>
 #include <syslog.h>
 #include <termios.h>
 #include <errno.h>
 #include <syslog.h>
 #include <termios.h>


@@ -66,8 +68,19 @@ static int   closed_stdio;
 
 static int     restore_term;   /* 1 => we've munged the terminal */
 static struct termios inittermios; /* Initial TTY termios */
 
 static int     restore_term;   /* 1 => we've munged the terminal */
 static struct termios inittermios; /* Initial TTY termios */

+static int     initfdflags = -1; /* Initial file descriptor flags for fd */
+
+static int sockfd;             /* socket for doing interface ioctls */
+
+static int     if_is_up;       /* Interface has been marked up */
+static u_int32_t default_route_gateway;        /* Gateway for default route added */
+static u_int32_t proxy_arp_addr;       /* Addr for proxy arp entry added */
+
+/* Prototypes for procedures local to this file. */
+static int translate_speed __P((int));
+static int baud_rate_of __P((int));
+static int get_ether_addr __P((u_int32_t, struct sockaddr *));

 
 

-int sockfd;                    /* socket for doing interface ioctls */

 
 /*
  * sys_init - System-dependent initialization.
 
 /*
  * sys_init - System-dependent initialization.


@@ -87,6 +100,31 @@ sys_init()
     }
 }
 
     }
 }
 

+/*
+ * sys_cleanup - restore any system state we modified before exiting:
+ * mark the interface down, delete default route and/or proxy arp entry.
+ * This should call die() because it's called from die().
+ */
+void
+sys_cleanup()
+{
+    struct ifreq ifr;
+
+    if (if_is_up) {
+       strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+       if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) >= 0
+           && ((ifr.ifr_flags & IFF_UP) != 0)) {
+           ifr.ifr_flags &= ~IFF_UP;
+           ioctl(sockfd, SIOCSIFFLAGS, &ifr);
+       }
+    }
+
+    if (default_route_gateway)
+       cifdefaultroute(0, default_route_gateway);
+    if (proxy_arp_addr)
+       cifproxyarp(0, proxy_arp_addr);
+}
+

 /*
  * note_debug_level - note a change in the debug level.
  */
 /*
  * note_debug_level - note a change in the debug level.
  */


@@ -200,10 +238,18 @@ establish_ppp()
        int i;
 
        for (i = 0; i <= 2; ++i)
        int i;
 
        for (i = 0; i <= 2; ++i)

-           if (i != fd && i != s)
+           if (i != fd && i != sockfd)

                close(i);
        closed_stdio = 1;
     }
                close(i);
        closed_stdio = 1;
     }

+
+    /*
+     * 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,6 +263,11 @@ disestablish_ppp()
     int flags;
     char *s;
 
     int flags;
     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 (hungup) {
        /* we can't push or pop modules after the stream has hung up */
        str_module_count = 0;
     if (hungup) {
        /* we can't push or pop modules after the stream has hung up */
        str_module_count = 0;


@@ -346,7 +397,7 @@ struct speed {
 /*
  * Translate from bits/second to a speed_t.
  */
 /*
  * Translate from bits/second to a speed_t.
  */

-int
+static int

 translate_speed(bps)
     int bps;
 {
 translate_speed(bps)
     int bps;
 {


@@ -364,7 +415,7 @@ translate_speed(bps)
 /*
  * Translate from a speed_t to bits/second.
  */
 /*
  * Translate from a speed_t to bits/second.
  */

-int
+static int

 baud_rate_of(speed)
     int speed;
 {
 baud_rate_of(speed)
     int speed;
 {


@@ -383,6 +434,7 @@ baud_rate_of(speed)
  * at the requested speed, etc.  If `local' is true, set CLOCAL
  * regardless of whether the modem option was specified.
  */
  * at the requested speed, etc.  If `local' is true, set CLOCAL
  * regardless of whether the modem option was specified.
  */

+void

 set_up_tty(fd, local)
     int fd, local;
 {
 set_up_tty(fd, local)
     int fd, local;
 {


@@ -399,12 +451,12 @@ set_up_tty(fd, local)
        inittermios = tios;
 
     tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL);
        inittermios = tios;
 
     tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL);

-    if (crtscts == 1) {
+    if (crtscts > 0) {

         bzero(&tiox, sizeof(tiox));
         ioctl(fd, TCGETX, &tiox);
         tiox.x_hflag = RTSXOFF;
         ioctl(fd, TCSETX, &tiox);
         bzero(&tiox, sizeof(tiox));
         ioctl(fd, TCGETX, &tiox);
         tiox.x_hflag = RTSXOFF;
         ioctl(fd, TCSETX, &tiox);

-        tios.c_cflag &= ~(IXOFF);
+        tios.c_cflag &= ~(IXON | IXOFF);

     } else if (crtscts < 0) {
         bzero(&tiox, sizeof(tiox));
         ioctl(fd, TCGETX, &tiox);
     } else if (crtscts < 0) {
         bzero(&tiox, sizeof(tiox));
         ioctl(fd, TCGETX, &tiox);


@@ -422,8 +474,8 @@ set_up_tty(fd, local)
     tios.c_cc[VMIN] = 1;
     tios.c_cc[VTIME] = 0;
 
     tios.c_cc[VMIN] = 1;
     tios.c_cc[VTIME] = 0;
 

-    if (crtscts == 2) {
-       tios.c_iflag |= IXOFF;
+    if (crtscts == -2) {
+       tios.c_iflag |= IXON | IXOFF;

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


@@ -461,6 +513,15 @@ void
 restore_tty()
 {
     if (restore_term) {
 restore_tty()
 {
     if (restore_term) {

+       if (!default_device) {
+           /*
+            * Turn off echoing, because otherwise we can get into
+            * a loop with the tty and the modem echoing to each other.
+            * We presume we are the sole user of this tty device, so
+            * when we close it, it will revert to its defaults anyway.
+            */
+           inittermios.c_lflag &= ~(ECHO | ECHONL);
+       }

        if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0)
            if (errno != ENXIO)
                syslog(LOG_WARNING, "tcsetattr: %m");
        if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0)
            if (errno != ENXIO)
                syslog(LOG_WARNING, "tcsetattr: %m");


@@ -472,6 +533,7 @@ restore_tty()
  * setdtr - control the DTR line on the serial port.
  * This is called from die(), so it shouldn't call die().
  */
  * setdtr - control the DTR line on the serial port.
  * This is called from die(), so it shouldn't call die().
  */

+void

 setdtr(fd, on)
 int fd, on;
 {
 setdtr(fd, on)
 int fd, on;
 {


@@ -490,26 +552,32 @@ output(unit, p, len)
     u_char *p;
     int len;
 {
     u_char *p;
     int len;
 {

-    struct strbuf      str;
+    struct strbuf str;
+    int retries;
+    struct pollfd pfd;

 
 

-    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 (debug)
        log_packet(p, len, "sent ");
 
     str.len = len;
     str.buf = (caddr_t) p;

-    if (putmsg(fd, NULL, &str, 0) < 0) {
-       if (errno != ENXIO) {
-           syslog(LOG_ERR, "putmsg: %m");
-           die(1);
+    retries = 4;
+    while (putmsg(fd, NULL, &str, 0) < 0) {
+       if (--retries < 0 || (errno != EWOULDBLOCK && errno != EAGAIN)) {
+           if (errno != ENXIO)
+               syslog(LOG_ERR, "Couldn't send packet: %m");
+           break;

        }
        }

+       pfd.fd = fd;
+       pfd.events = POLLOUT;
+       poll(&pfd, 1, 250);     /* wait for up to 0.25 seconds */

     }
 }
 
 /*
  * wait_input - wait for input, for a length of time specified in *timo.
  */
     }
 }
 
 /*
  * wait_input - wait for input, for a length of time specified in *timo.
  */

+void

 wait_input(timo)
     struct timeval *timo;
 {
 wait_input(timo)
     struct timeval *timo;
 {


@@ -651,6 +719,7 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
  * ccp_test - ask kernel whether a given compression method
  * is acceptable for use.
  */
  * ccp_test - ask kernel whether a given compression method
  * is acceptable for use.
  */

+int

 ccp_test(unit, opt_ptr, opt_len, for_transmit)
     int unit, opt_len, for_transmit;
     u_char *opt_ptr;
 ccp_test(unit, opt_ptr, opt_len, for_transmit)
     int unit, opt_len, for_transmit;
     u_char *opt_ptr;


@@ -662,7 +731,9 @@ ccp_test(unit, opt_ptr, opt_len, for_transmit)
     data.length = opt_len;
     data.transmit = for_transmit;
     BCOPY(opt_ptr, data.opt_data, opt_len);
     data.length = opt_len;
     data.transmit = for_transmit;
     BCOPY(opt_ptr, data.opt_data, opt_len);

-    return ioctl(fd, SIOCSCOMPRESS, &data) >= 0;
+    if (ioctl(fd, SIOCSCOMPRESS, &data) >= 0)
+       return 1;
+    return (errno == ENOSR)? 0: -1;

 }
 
 /*
 }
 
 /*


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

+    if_is_up = 1;

     npi.protocol = PPP_IP;
     npi.mode = NPMODE_PASS;
     if (ioctl(fd, SIOCSETNPMODE, &npi) < 0) {
     npi.protocol = PPP_IP;
     npi.mode = NPMODE_PASS;
     if (ioctl(fd, SIOCSETNPMODE, &npi) < 0) {


@@ -776,7 +848,8 @@ sifdown(u)
         if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
             syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
             rv = 0;
         if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
             syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
             rv = 0;

-        }
+        } else
+           if_is_up = 0;

     }
     return rv;
 }
     }
     return rv;
 }


@@ -872,6 +945,7 @@ sifdefaultroute(u, g)
        syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m");
        return 0;
     }
        syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m");
        return 0;
     }

+    default_route_gateway = g;

     return 1;
 }
 
     return 1;
 }
 


@@ -893,6 +967,7 @@ cifdefaultroute(u, g)
        syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m");
        return 0;
     }
        syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m");
        return 0;
     }

+    default_route_gateway = 0;

     return 1;
 }
 
     return 1;
 }
 


@@ -925,6 +1000,7 @@ sifproxyarp(unit, hisaddr)
        return 0;
     }
 
        return 0;
     }
 

+    proxy_arp_addr = hisaddr;

     return 1;
 }
 
     return 1;
 }
 


@@ -945,6 +1021,7 @@ cifproxyarp(unit, hisaddr)
        syslog(LOG_ERR, "ioctl(SIOCDARP): %m");
        return 0;
     }
        syslog(LOG_ERR, "ioctl(SIOCDARP): %m");
        return 0;
     }

+    proxy_arp_addr = 0;

     return 1;
 }
 
     return 1;
 }
 


@@ -1104,6 +1181,74 @@ get_ether_addr(ipaddr, hwaddr)
     return(found);
 }
 
     return(found);
 }
 

+/*
+ * Return user specified netmask, modified by any mask we might determine
+ * for address `addr' (in network byte order).
+ * Here we scan through the system's list of interfaces, looking for
+ * any non-point-to-point interfaces which might appear to be on the same
+ * network as `addr'.  If we find any, we OR in their netmask to the
+ * user-specified netmask.
+ */
+#define MAX_IFS                32
+
+u_int32_t
+GetMask(addr)
+    u_int32_t addr;
+{
+    u_int32_t mask, nmask, ina;
+    struct ifreq *ifr, *ifend, ifreq;
+    struct ifconf ifc;
+    struct ifreq ifs[MAX_IFS];
+
+    addr = ntohl(addr);
+    if (IN_CLASSA(addr))       /* determine network mask for address class */
+       nmask = IN_CLASSA_NET;
+    else if (IN_CLASSB(addr))
+       nmask = IN_CLASSB_NET;
+    else
+       nmask = IN_CLASSC_NET;
+    /* class D nets are disallowed by bad_ip_adrs */
+    mask = netmask | htonl(nmask);
+
+    /*
+     * Scan through the system's network interfaces.
+     */
+    ifc.ifc_len = sizeof(ifs);
+    ifc.ifc_req = ifs;
+    if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) {
+       syslog(LOG_WARNING, "ioctl(SIOCGIFCONF): %m");
+       return mask;
+    }
+    ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
+    for (ifr = ifc.ifc_req; ifr < ifend; ++ifr) {
+       /*
+        * Check the interface's internet address.
+        */
+       if (ifr->ifr_addr.sa_family != AF_INET)
+           continue;
+       ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr;
+       if ((ntohl(ina) & nmask) != (addr & nmask))
+           continue;
+       /*
+        * Check that the interface is up, and not point-to-point or loopback.
+        */
+       strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name));
+       if (ioctl(sockfd, SIOCGIFFLAGS, &ifreq) < 0)
+           continue;
+       if ((ifreq.ifr_flags & (IFF_UP|IFF_POINTOPOINT|IFF_LOOPBACK))
+           != IFF_UP)
+           continue;
+       /*
+        * Get its netmask and OR it into our mask.
+        */
+       if (ioctl(sockfd, SIOCGIFNETMASK, &ifreq) < 0)
+           continue;
+       mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr;
+    }
+
+    return mask;
+}
+

 #define        WTMPFILE        "/var/adm/wtmp"
 
 int
 #define        WTMPFILE        "/var/adm/wtmp"
 
 int


@@ -1129,95 +1274,38 @@ logwtmp(line, name, host)
 
 /*
  * Code for locking/unlocking the serial device.
 
 /*
  * Code for locking/unlocking the serial device.

- * This code is derived from chat.c.

  */
 
  */
 

-#ifndef LOCK_DIR
-# ifdef HDB
-#  define      PIDSTRING
-#  define      LOCK_PREFIX     "/usr/spool/locks/LCK.."
-# else /* HDB */
-#  define      LOCK_PREFIX     "/usr/spool/uucp/LCK.."
-# endif /* HDB */
-#endif /* LOCK_DIR */
+static char *devlocked = (char *) 0;

 
 

-/*
- * lock - create a lock file for the named device.
- */
-int
-lock(dev)
-    char *dev;
+int lock(char *device)

 {
 {

-    char hdb_lock_buffer[12];
-    int fd, pid, n;
-    char *p;
-
-    if ((p = strrchr(dev, '/')) != NULL)
-       dev = p + 1;
-    lock_file = malloc(strlen(LOCK_PREFIX) + strlen(dev) + 1);
-    if (lock_file == NULL)
-       novm("lock file name");
-    strcat(strcpy(lock_file, LOCK_PREFIX), dev);
-
-    while ((fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644)) < 0) {
-       if (errno == EEXIST
-           && (fd = open(lock_file, O_RDONLY, 0)) >= 0) {
-           /* Read the lock file to find out who has the device locked */
-#ifdef PIDSTRING
-           n = read(fd, hdb_lock_buffer, 11);
-           if (n > 0) {
-               hdb_lock_buffer[n] = 0;
-               pid = atoi(hdb_lock_buffer);
-           }
-#else
-           n = read(fd, &pid, sizeof(pid));
-#endif
-           if (n <= 0) {
-               syslog(LOG_ERR, "Can't read pid from lock file %s", lock_file);
-               close(fd);
-           } else {
-               if (kill(pid, 0) == -1 && errno == ESRCH) {
-                   /* pid no longer exists - remove the lock file */
-                   if (unlink(lock_file) == 0) {
-                       close(fd);
-                       syslog(LOG_NOTICE, "Removed stale lock on %s (pid %d)",
-                              dev, pid);
-                       continue;
-                   } else
-                       syslog(LOG_WARNING, "Couldn't remove stale lock on %s",
-                              dev);
-               } else
-                   syslog(LOG_NOTICE, "Device %s is locked by pid %d",
-                          dev, pid);
-           }
-           close(fd);
-       } else
-           syslog(LOG_ERR, "Can't create lock file %s: %m", lock_file);
-       free(lock_file);
-       lock_file = NULL;
-       return -1;
-    }
+    char       *devname;
+    int                rc;

 
 

-#ifdef PIDSTRING
-    sprintf(hdb_lock_buffer, "%10d\n", getpid());
-    write(fd, hdb_lock_buffer, 11);
-#else
-    pid = getpid();
-    write(fd, &pid, sizeof pid);
-#endif
+    if (devname = strrchr(device,'/'))
+       ++devname;
+    else
+       devname = device;

 
 

-    close(fd);
-    return 0;
+    if ((rc = ttylock(devname)) == 0) {
+       devlocked = (char *) malloc(strlen(devname) + 1);
+       sprintf(devlocked,"%s",devname);
+    } else
+       devlocked = (char *) 0;
+
+    return(rc);

 }
 
 }
 

-/*
- *     Remove our lockfile
- */
-unlock()
+int unlock()

 {
 {

-    if (lock_file) {
-       unlink(lock_file);
-       free(lock_file);
-       lock_file = NULL;
+    int rc = 0;
+
+    if (devlocked) {
+       rc = ttyunlock(devlocked);
+       free(devlocked);
+       devlocked = (char *) 0;

     }
     }

+    return(rc);

 }
 }

+