X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-str.c;h=774c86a4f49b4dcfee4b3dac2e6bed426c339d16;hp=6bd2fc91b6cb5be54d43f7ec622834763bd61ffb;hb=f97ca9765d35deddd325ba7b82b437fab22112dd;hpb=828173483886990474f217910ebe02583674f0e8

diff --git a/pppd/sys-str.c b/pppd/sys-str.c
index 6bd2fc9..774c86a 100644
--- a/pppd/sys-str.c
+++ b/pppd/sys-str.c
@@ -40,7 +40,8 @@
 
 #include "pppd.h"
 #include "ppp.h"
-#include "ppp_str.h"
+#include <net/if_ppp.h>
+#include <net/ppp_str.h>
 
 #ifndef ifr_mtu
 #define ifr_mtu		ifr_metric
@@ -51,8 +52,16 @@ static struct	modlist {
     char	modname[FMNAMESZ+1];
 } str_modules[MAXMODULES];
 static int	str_module_count = 0;
+static int	pushed_ppp;
 
 extern int hungup;		/* has the physical layer been disconnected? */
+extern int kdebugflag;
+
+#define PAI_FLAGS_B7_0		0x100
+#define PAI_FLAGS_B7_1		0x200
+#define PAI_FLAGS_PAR_EVEN	0x400
+#define PAI_FLAGS_PAR_ODD	0x800
+#define PAI_FLAGS_HIBITS	0xF00
 
 /*
  * ppp_available - check if this kernel supports PPP.
@@ -87,8 +96,6 @@ establish_ppp()
 	str_module_count++;
     }
 
-    MAINDEBUG((LOG_INFO, "about to push modules..."));
-
     /* now push the async/fcs module */
     if (ioctl(fd, I_PUSH, "pppasync") < 0) {
 	syslog(LOG_ERR, "ioctl(I_PUSH, ppp_async): %m");
@@ -100,6 +107,7 @@ establish_ppp()
 	syslog(LOG_ERR, "ioctl(I_PUSH, ppp_if): %m");
 	die(1);
     }
+    pushed_ppp = 1;
     if (ioctl(fd, I_SETSIG, S_INPUT) < 0) {
 	syslog(LOG_ERR, "ioctl(I_SETSIG, S_INPUT): %m");
 	die(1);
@@ -123,15 +131,10 @@ establish_ppp()
 	die(1);
     }
 
-    /* if debug, set debug flags in driver */
-    {
-	int flags = debug ? 0x3 : 0;
-	if (ioctl(fd, SIOCSIFDEBUG, &flags) < 0) {
-	    syslog(LOG_ERR, "ioctl(SIOCSIFDEBUG): %m");
-	}
+    /* Set debug flags in driver */
+    if (ioctl(fd, SIOCSIFDEBUG, &kdebugflag) < 0) {
+	syslog(LOG_ERR, "ioctl(SIOCSIFDEBUG): %m");
     }
-
-    MAINDEBUG((LOG_INFO, "done pushing modules, ifunit %d", ifunit));
 }
 
 /*
@@ -142,7 +145,8 @@ establish_ppp()
 void
 disestablish_ppp()
 {
-    /*EMPTY*/
+    int flags;
+    char *s;
 
     if (hungup) {
 	/* we can't push or pop modules after the stream has hung up */
@@ -150,12 +154,40 @@ disestablish_ppp()
 	return;
     }
 
+    if (pushed_ppp) {
+	/*
+	 * Check whether the link seems not to be 8-bit clean.
+	 */
+	if (ioctl(fd, SIOCGIFDEBUG, (caddr_t) &flags) == 0) {
+	    s = NULL;
+	    switch (~flags & PAI_FLAGS_HIBITS) {
+	    case PAI_FLAGS_B7_0:
+		s = "bit 7 set to 1";
+		break;
+	    case PAI_FLAGS_B7_1:
+		s = "bit 7 set to 0";
+		break;
+	    case PAI_FLAGS_PAR_EVEN:
+		s = "odd parity";
+		break;
+	    case PAI_FLAGS_PAR_ODD:
+		s = "even parity";
+		break;
+	    }
+	    if (s != NULL) {
+		syslog(LOG_WARNING, "Serial link is not 8-bit clean:");
+		syslog(LOG_WARNING, "All received characters had %s", s);
+	    }
+	}
+    }
+
     while (ioctl(fd, I_POP, 0) == 0)	/* pop any we pushed */
 	;
+    pushed_ppp = 0;
   
     for (; str_module_count > 0; str_module_count--) {
 	if (ioctl(fd, I_PUSH, str_modules[str_module_count-1].modname)) {
-	    syslog(LOG_ERR, "str_restore: couldn't push module %s: %m",
+	    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",
@@ -178,6 +210,8 @@ output(unit, p, len)
 
     if (unit != 0)
 	MAINDEBUG((LOG_WARNING, "output: unit != 0!"));
+    if (debug)
+	log_packet(p, len, "sent ");
 
     str.len = len;
     str.buf = (caddr_t) p;
@@ -246,22 +280,36 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
 	quit();
     }
 
-    c = pcomp;
+    c = (pcomp? 1: 0);
     if(ioctl(fd, SIOCSIFCOMPPROT, &c) < 0) {
 	syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m");
 	quit();
     }
 
-    c = accomp;
+    c = (accomp? 1: 0);
     if(ioctl(fd, SIOCSIFCOMPAC, &c) < 0) {
 	syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m");
 	quit();
     }
 }
 
+
+/*
+ * ppp_set_xaccm - set the extended transmit ACCM for the interface.
+ */
+void
+ppp_set_xaccm(unit, accm)
+    int unit;
+    ext_accm accm;
+{
+    if (ioctl(fd, SIOCSIFXASYNCMAP, accm) < 0 && errno != ENOTTY)
+	syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
+}
+
+
 /*
  * ppp_recv_config - configure the receive-side characteristics of
- * the ppp interface.  At present this just sets the MRU.
+ * the ppp interface.
  */
 void
 ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
@@ -275,28 +323,32 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
 	syslog(LOG_ERR, "ioctl(SIOCSIFMRU): %m");
     }
 
-#ifdef notyet
-    if(ioctl(fd, SIOCSIFRASYNCMAP, (caddr_t) &asyncmap) < 0) {
+    if (ioctl(fd, SIOCSIFRASYNCMAP, (caddr_t) &asyncmap) < 0) {
 	syslog(LOG_ERR, "ioctl(SIOCSIFRASYNCMAP): %m");
     }
 
-    c = accomp;
-    if(ioctl(fd, SIOCSIFRCOMPAC, &c) < 0) {
-	syslog(LOG_ERR, "ioctl(SIOCSIFRCOMPAC): %m");
-	quit();
+    c = 2 + (pcomp? 1: 0);
+    if(ioctl(fd, SIOCSIFCOMPPROT, &c) < 0) {
+	syslog(LOG_ERR, "ioctl(SIOCSIFCOMPPROT): %m");
+    }
+
+    c = 2 + (accomp? 1: 0);
+    if (ioctl(fd, SIOCSIFCOMPAC, &c) < 0) {
+	syslog(LOG_ERR, "ioctl(SIOCSIFCOMPAC): %m");
     }
-#endif	/* notyet */
 }
 
 /*
  * sifvjcomp - config tcp header compression
  */
 int
-sifvjcomp(u, vjcomp, cidcomp)
+sifvjcomp(u, vjcomp, cidcomp, maxcid)
+    int u, vjcomp, cidcomp, maxcid;
 {
-    char x = vjcomp;
+    char x;
 
-    if(ioctl(fd, SIOCSIFVJCOMP, (caddr_t) &x) < 0) {
+    x = (vjcomp? 1: 0) + (cidcomp? 0: 2) + (maxcid << 4);
+    if (ioctl(fd, SIOCSIFVJCOMP, (caddr_t) &x) < 0) {
 	syslog(LOG_ERR, "ioctl(SIOCSIFVJCOMP): %m");
 	return 0;
     }
@@ -460,7 +512,7 @@ sifproxyarp(unit, hisaddr)
      * as our local address.
      */
     if (!get_ether_addr(hisaddr, &arpreq.arp_ha)) {
-	syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP");
+	syslog(LOG_WARNING, "Cannot determine ethernet address for proxy ARP");
 	return 0;
     }