s -> sockfd, added lock and unlock, check pushed_ppp flag

diff --git a/pppd/sys-str.c b/pppd/sys-str.c
index 0754553d6c96df77e8dc668628b6f3769755e264..689bb8701b648aed7672cd2f34b604c6c3475617 100644 (file)
--- a/pppd/sys-str.c
+++ b/pppd/sys-str.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: sys-str.c,v 1.16 1994/10/24 04:30:35 paulus Exp $";
+static char rcsid[] = "$Id: sys-str.c,v 1.17 1995/04/24 05:36:14 paulus Exp $";

 #endif
 
 /*
 #endif
 
 /*


@@ -27,6 +27,7 @@ static char rcsid[] = "$Id: sys-str.c,v 1.16 1994/10/24 04:30:35 paulus Exp $";
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

+#include <stdlib.h>

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


@@ -42,6 +43,7 @@ static char rcsid[] = "$Id: sys-str.c,v 1.16 1994/10/24 04:30:35 paulus Exp $";
 #include <sys/stream.h>
 #include <sys/stropts.h>
 
 #include <sys/stream.h>
 #include <sys/stropts.h>
 

+#include <arpa/inet.h>

 #include <net/if.h>
 #include <net/ppp_defs.h>
 #include <net/ppp_str.h>
 #include <net/if.h>
 #include <net/ppp_defs.h>
 #include <net/ppp_str.h>


@@ -66,6 +68,9 @@ 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 */
 

+int sockfd;                    /* socket for doing interface ioctls */
+static char *lock_file;                /* lock file created for serial port */
+

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


@@ -76,6 +81,12 @@ sys_init()
     setlogmask(LOG_UPTO(LOG_INFO));
     if (debug)
        setlogmask(LOG_UPTO(LOG_DEBUG));
     setlogmask(LOG_UPTO(LOG_INFO));
     if (debug)
        setlogmask(LOG_UPTO(LOG_DEBUG));

+
+    /* Get an internet socket for doing socket ioctl's on. */
+    if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+       syslog(LOG_ERR, "Couldn't create IP socket: %m");
+       die(1);
+    }

 }
 
 /*
 }
 
 /*


@@ -190,7 +201,7 @@ 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;
     }


@@ -239,21 +250,21 @@ disestablish_ppp()
                syslog(LOG_WARNING, "All received characters had %s", s);
            }
        }
                syslog(LOG_WARNING, "All received characters had %s", s);
            }
        }

-    }

 
 

-    while (ioctl(fd, I_POP, 0) == 0)   /* pop any we pushed */
-       ;
-    pushed_ppp = 0;
+       while (ioctl(fd, I_POP, 0) == 0)        /* pop any we pushed */
+           ;

   
   

-    for (; str_module_count > 0; str_module_count--) {
-       if (ioctl(fd, I_PUSH, str_modules[str_module_count-1].modname)) {
-           if (errno != ENXIO)
-               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));
+       for (; str_module_count > 0; str_module_count--) {
+           if (ioctl(fd, I_PUSH, str_modules[str_module_count-1].modname)) {
+               if (errno != ENXIO)
+                   syslog(LOG_WARNING, "Couldn't restore 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));
+           }

        }
        }

+       pushed_ppp = 0;

     }
 }
 
     }
 }
 


@@ -559,7 +570,7 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
 
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     ifr.ifr_mtu = mtu;
 
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     ifr.ifr_mtu = mtu;

-    if (ioctl(s, SIOCSIFMTU, (caddr_t) &ifr) < 0) {
+    if (ioctl(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0) {

        syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m");
        quit();
     }
        syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m");
        quit();
     }


@@ -705,12 +716,12 @@ sifup(u)
     struct npioctl npi;
 
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     struct npioctl npi;
 
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));

-    if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
+    if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {

        syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
        return 0;
     }
     ifr.ifr_flags |= IFF_UP;
        syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
        return 0;
     }
     ifr.ifr_flags |= IFF_UP;

-    if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
+    if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {

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


@@ -747,12 +758,12 @@ sifdown(u)
     }
 
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     }
 
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));

-    if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
+    if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {

        syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
        rv = 0;
     } else {
        ifr.ifr_flags &= ~IFF_UP;
        syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
        rv = 0;
     } else {
        ifr.ifr_flags &= ~IFF_UP;

-       if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
+       if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {

            syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
            rv = 0;
        }
            syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
            rv = 0;
        }


@@ -782,19 +793,19 @@ sifaddr(u, o, h, m)
     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;
     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) {
+    if (ioctl(sockfd, SIOCSIFADDR, (caddr_t) &ifr) < 0) {

        syslog(LOG_ERR, "ioctl(SIOCSIFADDR): %m");
        ret = 0;
     }
     ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = h;
        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) {
+    if (ioctl(sockfd, 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));
        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) {
+       if (ioctl(sockfd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) {

            syslog(LOG_ERR, "ioctl(SIOCSIFNETMASK): %m");
            ret = 0;
        }
            syslog(LOG_ERR, "ioctl(SIOCSIFNETMASK): %m");
            ret = 0;
        }


@@ -818,7 +829,7 @@ cifaddr(u, o, 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;
     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) {
+    if (ioctl(sockfd, SIOCDELRT, (caddr_t) &rt) < 0) {

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


@@ -839,7 +850,7 @@ sifdefaultroute(u, g)
     SET_SA_FAMILY(rt.rt_gateway, AF_INET);
     ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g;
     rt.rt_flags = RTF_GATEWAY;
     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) {
+    if (ioctl(sockfd, SIOCADDRT, &rt) < 0) {

        syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m");
        return 0;
     }
        syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m");
        return 0;
     }


@@ -860,7 +871,7 @@ cifdefaultroute(u, g)
     SET_SA_FAMILY(rt.rt_gateway, AF_INET);
     ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = g;
     rt.rt_flags = RTF_GATEWAY;
     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) {
+    if (ioctl(sockfd, SIOCDELRT, &rt) < 0) {

        syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m");
        return 0;
     }
        syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m");
        return 0;
     }


@@ -891,7 +902,7 @@ sifproxyarp(unit, hisaddr)
     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;
     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) {
+    if (ioctl(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0) {

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


@@ -912,7 +923,7 @@ cifproxyarp(unit, hisaddr)
     BZERO(&arpreq, sizeof(arpreq));
     SET_SA_FAMILY(arpreq.arp_pa, AF_INET);
     ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr;
     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) {
+    if (ioctl(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0) {

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


@@ -948,7 +959,6 @@ cifproxyarp(unit, hisaddr)
 #include <fcntl.h>
 #include <nlist.h>
 #include <kvm.h>
 #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
 
 /* XXX SunOS 4.1 defines this and 3.5 doesn't... */
 #ifdef _nlist_h


@@ -1088,3 +1098,103 @@ logwtmp(line, name, host)
     }
     close(fd);
 }
     }
     close(fd);
 }

+
+/*
+ * Code for locking/unlocking the serial device.
+ * This code is derived from chat.c.
+ */
+
+#if defined(SUNOS) && SUNOS >= 41 && !defined(HDB)
+#define        HDB     1
+#endif
+
+#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 */
+
+/*
+ * lock - create a lock file for the named device.
+ */
+int
+lock(dev)
+    char *dev;
+{
+    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;
+    }
+
+#ifdef PIDSTRING
+    sprintf(hdb_lock_buffer, "%10d\n", getpid());
+    write(fd, hdb_lock_buffer, 11);
+#else
+    pid = getpid();
+    write(fd, &pid, sizeof pid);
+#endif
+
+    close(fd);
+    return 0;
+}
+
+/*
+ * unlock - remove our lockfile
+ */
+void
+unlock()
+{
+    if (lock_file) {
+       unlink(lock_file);
+       free(lock_file);
+       lock_file = NULL;
+    }
+}