better way of not sending compressed packet when CCP is not up.

[ppp.git] / netbsd-1.1 / if_ppp.c

diff --git a/netbsd-1.1/if_ppp.c b/netbsd-1.1/if_ppp.c
index 4f0072d40958e8cdca78cfd5279f9c8682608e8f..c4f12568e7b968649f7b572c18b777d494ae16bd 100644 (file)
--- a/netbsd-1.1/if_ppp.c
+++ b/netbsd-1.1/if_ppp.c
@@ -1,4 +1,4 @@
-/*     $Id: if_ppp.c,v 1.4 1996/07/01 05:30:45 paulus Exp $    */
+/*     $Id: if_ppp.c,v 1.5 1996/09/26 06:24:14 paulus Exp $    */
 
 /*
  * if_ppp.c - Point-to-Point Protocol (PPP) Asynchronous driver.
@@ -935,13 +935,18 @@ ppp_dequeue(sc)
        for (mp = m; mp != NULL; mp = mp->m_next)
            slen += mp->m_len;
        clen = (*sc->sc_xcomp->compress)
-           (sc->sc_xc_state, &mcomp, m, slen,
-            (sc->sc_flags & SC_CCP_UP? sc->sc_if.if_mtu: 0));
+           (sc->sc_xc_state, &mcomp, m, slen, sc->sc_if.if_mtu + PPP_HDRLEN);
        if (mcomp != NULL) {
-           m_freem(m);
-           m = mcomp;
-           cp = mtod(m, u_char *);
-           protocol = cp[3];
+           if (sc->sc_flags & SC_CCP_UP) {
+               /* Send the compressed packet instead of the original. */
+               m_freem(m);
+               m = mcomp;
+               cp = mtod(m, u_char *);
+               protocol = cp[3];
+           } else {
+               /* Can't transmit compressed packets until CCP is up. */
+               m_freem(mcomp);
+           }
        }
     }
 #endif /* PPP_COMPRESS */