X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=ultrix%2Fif_ppp.c;h=9a896c65517e0e81a1aea1ad2434f65775094623;hp=1aaf5cd59313a0b137a74f401d1057fde10122d5;hb=c94534ca7dc9122687d1bc4cef38d9a81ff44048;hpb=c5871dbfa014bb554c101e65150c48fc8ba80c7b diff --git a/ultrix/if_ppp.c b/ultrix/if_ppp.c index 1aaf5cd..9a896c6 100644 --- a/ultrix/if_ppp.c +++ b/ultrix/if_ppp.c @@ -1,20 +1,43 @@ /* * if_ppp.c - Point-to-Point Protocol (PPP) Asynchronous driver. * - * Copyright (c) 1989 Carnegie Mellon University. - * All rights reserved. + * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * duplicated in all such forms and that any documentation, - * advertising materials, and other materials related to such - * distribution and use acknowledge that the software was developed - * by Carnegie Mellon University. The name of the - * University may not be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name "Carnegie Mellon University" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For permission or any legal + * details, please contact + * Office of Technology Transfer + * Carnegie Mellon University + * 5000 Forbes Avenue + * Pittsburgh, PA 15213-3890 + * (412) 268-4387, fax: (412) 268-7395 + * tech-transfer@andrew.cmu.edu + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Computing Services + * at Carnegie Mellon University (http://www.cmu.edu/computing/)." + * + * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Drew D. Perkins * Carnegie Mellon University @@ -72,7 +95,7 @@ * Robert Olsson and Paul Mackerras. */ -/* $Id: if_ppp.c,v 1.10 1996/07/01 01:24:25 paulus Exp $ */ +/* $Id: if_ppp.c,v 1.16 2002/12/06 12:03:44 paulus Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -120,6 +143,7 @@ #include "ppp-comp.h" #endif +static int pppsioctl(struct ifnet *, int, caddr_t); static void ppp_requeue __P((struct ppp_softc *)); static void ppp_outpkt __P((struct ppp_softc *)); static void ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd)); @@ -161,6 +185,7 @@ static u_short interactive_ports[8] = { extern struct compressor ppp_bsd_compress; extern struct compressor ppp_deflate; +extern struct compressor ppp_deflate_draft; struct compressor *ppp_compressors[] = { #if DO_BSD_COMPRESS @@ -168,6 +193,7 @@ struct compressor *ppp_compressors[] = { #endif #if DO_DEFLATE &ppp_deflate, + &ppp_deflate_draft, #endif NULL }; @@ -189,7 +215,6 @@ pppattach() sc->sc_if.if_mtu = PPP_MTU; sc->sc_if.if_flags = IFF_POINTOPOINT; sc->sc_if.if_type = IFT_PPP; - sc->sc_if.if_hdrlen = PPP_HDRLEN; sc->sc_if.if_ioctl = pppsioctl; sc->sc_if.if_output = pppoutput; sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN; @@ -232,7 +257,7 @@ pppalloc(pid) KM_ALLOC(sc->sc_comp, struct slcompress *, sizeof(struct slcompress), KM_DEVBUF, KM_NOARG); if (sc->sc_comp) - sl_compress_init(sc->sc_comp, -1); + sl_compress_init(sc->sc_comp); #endif #ifdef PPP_COMPRESS sc->sc_xc_state = NULL; @@ -384,7 +409,7 @@ pppioctl(sc, cmd, data, flag) return EPERM; if (sc->sc_comp) { s = splnet(); - sl_compress_init(sc->sc_comp, *(int *)data); + sl_compress_setup(sc->sc_comp, *(int *)data); splx(s); } break; @@ -601,6 +626,8 @@ pppoutput(ifp, m0, dst) struct ip *ip; struct ifqueue *ifq; enum NPmode mode; + int len; + struct mbuf *m; if (sc->sc_devp == NULL || (ifp->if_flags & IFF_RUNNING) == 0 || ((ifp->if_flags & IFF_UP) == 0 && dst->sa_family != AF_UNSPEC)) { @@ -681,6 +708,10 @@ pppoutput(ifp, m0, dst) *cp++ = protocol & 0xff; m0->m_len += PPP_HDRLEN; + len = 0; + for (m = m0; m != 0; m = m->m_next) + len += m->m_len; + if (sc->sc_flags & SC_LOG_OUTPKT) { printf("ppp%d output: ", ifp->if_unit); pppdumpm(m0); @@ -724,7 +755,6 @@ pppoutput(ifp, m0, dst) (*sc->sc_start)(sc); } ifp->if_opackets++; - ifp->if_obytes += len; splx(s); return (0); @@ -788,7 +818,7 @@ ppp_requeue(sc) /* * Transmitter has finished outputting some stuff; - * remember to call sc->sc_start later at splsoftnet. + * remember to call sc->sc_start later at splnet. */ void ppp_restart(sc) @@ -803,7 +833,7 @@ ppp_restart(sc) /* * Get a packet to send. This procedure is intended to be called at - * splsoftnet, since it may involve time-consuming operations such as + * splnet, since it may involve time-consuming operations such as * applying VJ compression, packet compression, address/control and/or * protocol field compression to the packet. */ @@ -894,13 +924,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 */ @@ -929,7 +964,7 @@ ppp_dequeue(sc) } /* - * Software interrupt routine, called at splsoftnet. + * Software interrupt routine, called at splnet. */ void pppintr() @@ -939,7 +974,7 @@ pppintr() struct mbuf *m; sc = ppp_softc; - s = splsoftnet(); + s = splnet(); for (i = 0; i < NPPP; ++i, ++sc) { if (!(sc->sc_flags & SC_TBUSY) && (sc->sc_if.if_snd.ifq_head || sc->sc_fastq.ifq_head)) { @@ -1350,7 +1385,6 @@ ppp_inproc(sc, m) smp_unlock(&lock->lk_ifqueue); splx(s); ifp->if_ipackets++; - ifp->if_ibytes += ilen; if (rv) (*sc->sc_ctlp)(sc);