X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-str.c;h=689bb8701b648aed7672cd2f34b604c6c3475617;hp=aed7c8ee47d96844e719a04c9116da883094a4ee;hb=38946351eee506e06c35286c53f1ee24874d0e0c;hpb=3fc0348f0ba4f38c5aecd96b7dccef4684bd53aa

diff --git a/pppd/sys-str.c b/pppd/sys-str.c
index aed7c8e..689bb87 100644
--- a/pppd/sys-str.c
+++ b/pppd/sys-str.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: sys-str.c,v 1.12 1994/09/16 02:18:01 paulus Exp $";
+static char rcsid[] = "$Id: sys-str.c,v 1.17 1995/04/24 05:36:14 paulus Exp $";
 #endif
 
 /*
@@ -27,6 +27,7 @@ static char rcsid[] = "$Id: sys-str.c,v 1.12 1994/09/16 02:18:01 paulus Exp $";
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <syslog.h>
 #include <termios.h>
@@ -42,14 +43,15 @@ static char rcsid[] = "$Id: sys-str.c,v 1.12 1994/09/16 02:18:01 paulus Exp $";
 #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/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
@@ -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 */
 
+int sockfd;			/* socket for doing interface ioctls */
+static char *lock_file;		/* lock file created for serial port */
+
 /*
  * sys_init - System-dependent initialization.
  */
@@ -76,6 +81,12 @@ sys_init()
     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)
-	    if (i != fd && i != s)
+	    if (i != fd && i != sockfd)
 		close(i);
 	closed_stdio = 1;
     }
@@ -239,21 +250,21 @@ disestablish_ppp()
 		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;
     }
 }
 
@@ -387,9 +398,11 @@ set_up_tty(fd, local)
     if (!restore_term)
 	inittermios = tios;
 
-    tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL | CRTSCTS);
-    if (crtscts == 1)
+    tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL);
+    if (crtscts > 0)
 	tios.c_cflag |= CRTSCTS;
+    else if (crtscts < 0)
+	tios.c_cflag &= ~CRTSCTS;
 
     tios.c_cflag |= CS8 | CREAD | HUPCL;
     if (local || !modem)
@@ -514,14 +527,14 @@ read_packet(buf)
     int len, i;
     unsigned char ctlbuf[16];
 
-    str.maxlen = MTU+DLLHEADERLEN;
+    str.maxlen = PPP_MTU + PPP_HDRLEN;
     str.buf = (caddr_t) buf;
     ctl.maxlen = sizeof(ctlbuf);
     ctl.buf = (caddr_t) ctlbuf;
     i = 0;
     len = getmsg(fd, &ctl, &str, &i);
     if (len < 0) {
-	if (errno == EAGAIN || errno == EWOULDBLOCK) {
+	if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
 	    return -1;
 	}
 	syslog(LOG_ERR, "getmsg(fd) %m");
@@ -549,7 +562,7 @@ read_packet(buf)
 void
 ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
     int unit, mtu;
-    uint32 asyncmap;
+    u_int32_t asyncmap;
     int pcomp, accomp;
 {
     char c;
@@ -557,7 +570,7 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
 
     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();
     }
@@ -601,7 +614,7 @@ ppp_set_xaccm(unit, accm)
 void
 ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
     int unit, mru;
-    uint32 asyncmap;
+    u_int32_t asyncmap;
     int pcomp, accomp;
 {
     char c;
@@ -693,24 +706,33 @@ sifvjcomp(u, vjcomp, cidcomp, maxcid)
 }
 
 /*
- * sifup - Config the interface up.
+ * sifup - Config the interface up and enable IP packets to pass.
  */
 int
 sifup(u)
     int u;
 {
     struct ifreq ifr;
+    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;
-    if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
+    if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
 	syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
 	return 0;
     }
+    npi.protocol = PPP_IP;
+    npi.mode = NPMODE_PASS;
+    if (ioctl(fd, SIOCSETNPMODE, &npi) < 0) {
+	if (errno != ENOTTY) {
+	    syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m");
+	    return 0;
+	}
+    }
     return 1;
 }
 
@@ -722,17 +744,31 @@ sifdown(u)
     int u;
 {
     struct ifreq ifr;
+    int rv;
+    struct npioctl npi;
+
+    rv = 1;
+    npi.protocol = PPP_IP;
+    npi.mode = NPMODE_ERROR;
+    if (ioctl(fd, SIOCSETNPMODE, (caddr_t) &npi) < 0) {
+	if (errno != ENOTTY) {
+	    syslog(LOG_ERR, "ioctl(SIOCSETNPMODE): %m");
+	    rv = 0;
+	}
+    }
+
     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;
-    if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
-	return 0;
+	rv = 0;
+    } else {
+	ifr.ifr_flags &= ~IFF_UP;
+	if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
+	    syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
+	    rv = 0;
+	}
     }
-    return 1;
+    return rv;
 }
 
 /*
@@ -748,7 +784,7 @@ sifdown(u)
 int
 sifaddr(u, o, h, m)
     int u;
-    uint32 o, h, m;
+    u_int32_t o, h, m;
 {
     int ret;
     struct ifreq ifr;
@@ -757,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;
-    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;
-    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));
-	if (ioctl(s, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) {
+	if (ioctl(sockfd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) {
 	    syslog(LOG_ERR, "ioctl(SIOCSIFNETMASK): %m");
 	    ret = 0;
 	}
@@ -784,7 +820,7 @@ sifaddr(u, o, h, m)
 int
 cifaddr(u, o, h)
     int u;
-    uint32 o, h;
+    u_int32_t o, h;
 {
     struct rtentry rt;
 
@@ -793,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;
-    if (ioctl(s, SIOCDELRT, (caddr_t) &rt) < 0) {
+    if (ioctl(sockfd, SIOCDELRT, (caddr_t) &rt) < 0) {
 	syslog(LOG_ERR, "ioctl(SIOCDELRT): %m");
 	return 0;
     }
@@ -806,7 +842,7 @@ cifaddr(u, o, h)
 int
 sifdefaultroute(u, g)
     int u;
-    uint32 g;
+    u_int32_t g;
 {
     struct rtentry rt;
 
@@ -814,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;
-    if (ioctl(s, SIOCADDRT, &rt) < 0) {
+    if (ioctl(sockfd, SIOCADDRT, &rt) < 0) {
 	syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m");
 	return 0;
     }
@@ -827,7 +863,7 @@ sifdefaultroute(u, g)
 int
 cifdefaultroute(u, g)
     int u;
-    uint32 g;
+    u_int32_t g;
 {
     struct rtentry rt;
 
@@ -835,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;
-    if (ioctl(s, SIOCDELRT, &rt) < 0) {
+    if (ioctl(sockfd, SIOCDELRT, &rt) < 0) {
 	syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m");
 	return 0;
     }
@@ -848,7 +884,7 @@ cifdefaultroute(u, g)
 int
 sifproxyarp(unit, hisaddr)
     int unit;
-    uint32 hisaddr;
+    u_int32_t hisaddr;
 {
     struct arpreq arpreq;
 
@@ -866,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;
-    if (ioctl(s, SIOCSARP, (caddr_t)&arpreq) < 0) {
+    if (ioctl(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0) {
 	syslog(LOG_ERR, "ioctl(SIOCSARP): %m");
 	return 0;
     }
@@ -880,14 +916,14 @@ sifproxyarp(unit, hisaddr)
 int
 cifproxyarp(unit, hisaddr)
     int unit;
-    uint32 hisaddr;
+    u_int32_t 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) {
+    if (ioctl(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0) {
 	syslog(LOG_ERR, "ioctl(SIOCDARP): %m");
 	return 0;
     }
@@ -923,7 +959,6 @@ cifproxyarp(unit, hisaddr)
 #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
@@ -951,7 +986,7 @@ static void kread();
 
 int
 get_ether_addr(ipaddr, hwaddr)
-    uint32 ipaddr;
+    u_int32_t ipaddr;
     struct sockaddr *hwaddr;
 {
     register kvm_t *kd;
@@ -967,7 +1002,7 @@ get_ether_addr(ipaddr, hwaddr)
 	struct in_ifaddr in;
     } ifaddr;
 #endif
-    uint32 addr, mask;
+    u_int32_t addr, mask;
 
     /* Open kernel memory for reading */
     kd = kvm_open(0, 0, 0, O_RDONLY, NULL);
@@ -994,7 +1029,7 @@ get_ether_addr(ipaddr, hwaddr)
 	syslog(LOG_ERR, "error reading ifnet addr");
 	return 0;
     }
-    for ( ; addr; addr = (uint32)ifp->if_next) {
+    for ( ; addr; addr = (u_int32_t)ifp->if_next) {
 	if (kvm_read(kd, addr, (char *)ac, sizeof(*ac)) != sizeof(*ac)) {
 	    syslog(LOG_ERR, "error reading ifnet");
 	    return 0;
@@ -1011,7 +1046,7 @@ get_ether_addr(ipaddr, hwaddr)
 
 	/* Get interface ip address */
 #ifdef SUNOS4
-	if (kvm_read(kd, (uint32)ifp->if_addrlist, (char *)&ifaddr,
+	if (kvm_read(kd, (u_int32_t)ifp->if_addrlist, (char *)&ifaddr,
 		     sizeof(ifaddr)) != sizeof(ifaddr)) {
 	    syslog(LOG_ERR, "error reading ifaddr");
 	    return 0;
@@ -1063,3 +1098,103 @@ logwtmp(line, name, host)
     }
     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;
+    }
+}