X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fplugins%2Frp-pppoe%2Fplugin.c;h=00316ae5050979482e2c8f2925ec8d354f0c2f63;hp=c7c89231303bd8fd772887313a6270ca4afaad15;hb=5d490c4106f4a34864c980b925e183cf3bf575e2;hpb=c336f283d7bd763d960e3113480f6722c158ca3d

diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
index c7c8923..00316ae 100644
--- a/pppd/plugins/rp-pppoe/plugin.c
+++ b/pppd/plugins/rp-pppoe/plugin.c
@@ -22,7 +22,7 @@
 ***********************************************************************/
 
 static char const RCSID[] =
-"$Id: plugin.c,v 1.6 2002/03/14 21:54:06 dfs Exp $";
+"$Id: plugin.c,v 1.10 2004/01/13 04:03:58 paulus Exp $";
 
 #define _GNU_SOURCE 1
 #include "pppoe.h"
@@ -144,7 +144,8 @@ PPPOEConnectDevice(void)
     } else {
 	discovery(conn);
 	if (conn->discoveryState != STATE_SESSION) {
-	    fatal("Unable to complete PPPoE Discovery");
+	    error("Unable to complete PPPoE Discovery");
+	    return -1;
 	}
     }
 
@@ -195,12 +196,14 @@ PPPOESendConfig(int mtu,
     }
     sock = socket(AF_INET, SOCK_DGRAM, 0);
     if (sock < 0) {
-	fatal("Couldn't create IP socket: %m");
+	error("Couldn't create IP socket: %m");
+	return;
     }
     strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
     ifr.ifr_mtu = mtu;
     if (ioctl(sock, SIOCSIFMTU, &ifr) < 0) {
-	fatal("ioctl(SIOCSIFMTU): %m");
+	error("Couldn't set interface MTU to %d: %m", mtu);
+	return;
     }
     (void) close (sock);
 }
@@ -212,9 +215,8 @@ PPPOERecvConfig(int mru,
 		int pcomp,
 		int accomp)
 {
-    if (mru > MAX_PPPOE_MTU) {
-	error("Couldn't increase MRU to %d", mru);
-    }
+    if (mru > MAX_PPPOE_MTU)
+	warn("Couldn't increase MRU to %d", mru);
 }
 
 /**********************************************************************
@@ -275,9 +277,14 @@ PPPoEDevnameHook(char *cmd, char **argv, int doit)
     int fd;
     struct ifreq ifr;
 
-    /* Only do it if name is "ethXXX" */
+    /* Only do it if name is "ethXXX", "nasXXX", "tapXXX" or "nic-XXXX.
+       In latter case strip off the "nic-" */
     /* Thanks to Russ Couturier for this fix */
-    if (strlen(cmd) < 4 || strncmp(cmd, "eth", 3)) {
+    if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
+	/* Strip off "nic-" */
+	cmd += 4;
+    } else if (strlen(cmd) < 4 || (strncmp(cmd, "eth", 3) &&
+		strncmp(cmd, "nas", 3) && strncmp(cmd, "tap", 3))) {
 	if (OldDevnameHook) return OldDevnameHook(cmd, argv, doit);
 	return 0;
     }