X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-str.c;h=0754553d6c96df77e8dc668628b6f3769755e264;hp=04a8816a8d0a95695cba86d206f127f3697b486a;hb=b0dd1694b5dce80f9b03adf0d418e5e73dd65f2d;hpb=a3396b002507d72b3e1f1169bd02ae018539654b

diff --git a/pppd/sys-str.c b/pppd/sys-str.c
index 04a8816..0754553 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.14 1994/09/21 06:47:37 paulus Exp $";
+static char rcsid[] = "$Id: sys-str.c,v 1.16 1994/10/24 04:30:35 paulus Exp $";
 #endif
 
 /*
@@ -523,7 +523,7 @@ read_packet(buf)
     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");
@@ -695,13 +695,14 @@ 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) {
@@ -713,6 +714,14 @@ sifup(u)
 	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;
 }
 
@@ -724,17 +733,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) {
 	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(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
+	    syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
+	    rv = 0;
+	}
     }
-    return 1;
+    return rv;
 }
 
 /*