X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=modules%2Fppp.c;h=3717afc59b75f1a4af20b212250dbd8923814164;hp=571d95bd3358daf138e97fc24b7586d8e3464ba3;hb=be9ecce3c61067bd22186fc1e2cd4355e0f0747d;hpb=18384c57ab1e2e704ba9c66feeaf1746e2bbe5dc

diff --git a/modules/ppp.c b/modules/ppp.c
index 571d95b..3717afc 100644
--- a/modules/ppp.c
+++ b/modules/ppp.c
@@ -24,11 +24,11 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id: ppp.c,v 1.5 1996/05/28 00:56:18 paulus Exp $
+ * $Id: ppp.c,v 1.7 1996/08/28 06:35:30 paulus Exp $
  */
 
 /*
- * This file is used under Solaris 2, SVR4, and SunOS 4.
+ * This file is used under Solaris 2, SVR4, SunOS 4, and Digital UNIX.
  */
 
 #include <sys/types.h>
@@ -37,7 +37,13 @@
 #include <sys/stream.h>
 #include <sys/stropts.h>
 #include <sys/errno.h>
+#ifdef __osf__
+#include <sys/ioctl.h>
+#include <sys/cmn_err.h>
+#define queclass(mp)	((mp)->b_band & QPCTL)
+#else
 #include <sys/ioccom.h>
+#endif
 #include <sys/time.h>
 #ifdef SVR4
 #include <sys/cmn_err.h>
@@ -154,8 +160,9 @@ static upperstr_t *find_dest __P((upperstr_t *, int));
 static int putctl2 __P((queue_t *, int, int, int));
 static int putctl4 __P((queue_t *, int, int, int));
 
+#define PPP_ID 0xb1a6
 static struct module_info ppp_info = {
-    0xb1a6, "ppp", 0, 512, 512, 128
+    PPP_ID, "ppp", 0, 512, 512, 128
 };
 
 static struct qinit pppurint = {
@@ -387,7 +394,7 @@ pppclose(q, flag)
 	    break;
 	}
     }
-    kmem_free(up, sizeof(upperstr_t));
+    FREE(up, sizeof(upperstr_t));
     --ppp_count;
 
     return 0;
@@ -900,7 +907,6 @@ dlpi_request(q, mp, us)
 	   except that we accept ETHERTYPE_IP in place of PPP_IP. */
 	sap = d->bind_req.dl_sap;
 	us->req_sap = sap;
-	DPRINT1("ppp bind %x\n", sap);
 	if (sap == ETHERTYPE_IP)
 	    sap = PPP_IP;
 	if (sap < 0x21 || sap > 0x3fff || (sap & 0x101) != 1) {
@@ -1117,7 +1123,14 @@ send_data(mp, us)
     if ((q = ppa->lowerq) == 0) {
 	/* try to send it up the control stream */
 	if (canputnext(ppa->q)) {
-	    putnext(ppa->q, mp);
+	    /*
+	     * The message seems to get corrupted for some reason if
+	     * we just send the message up as it is, so we send a copy.
+	     */
+	    mblk_t *np = copymsg(mp);
+	    freemsg(mp);
+	    if (np != 0)
+		putnext(ppa->q, np);
 	    return 1;
 	}
     } else {
@@ -1457,6 +1470,22 @@ ppplrput(q, mp)
 	    putnext(us->q, mp);
 	break;
 
+    case M_HANGUP:
+	/*
+	 * The serial device has hung up.  We don't want to send
+	 * the M_HANGUP message up to pppd because that will stop
+	 * us from using the control stream any more.  Instead we
+	 * send a zero-length message as an end-of-file indication.
+	 */
+	freemsg(mp);
+	mp = allocb(1, BPRI_HI);
+	if (mp == 0) {
+	    DPRINT1("ppp/%d: couldn't allocate eof message!\n", ppa->mn);
+	    break;
+	}
+	putnext(ppa->q, mp);
+	break;
+
     default:
 	if (mp->b_datap->db_type == M_DATA) {
 	    len = msgdsize(mp);