* Robert Olsson <robert@robur.slu.se> and Paul Mackerras.
*/
-/* $Id: if_ppp.c,v 1.1 1994/11/21 04:50:03 paulus Exp $ */
+/* $Id: if_ppp.c,v 1.6 1995/05/01 01:39:03 paulus Exp $ */
/* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
#include "ppp.h"
#include "../h/buf.h"
#include "../h/socket.h"
#include "../h/ioctl.h"
-#include "../h/file.h"
-#include "../h/tty.h"
-#include "../h/kernel.h"
-#include "../h/conf.h"
-#include "../h/uio.h"
#include "../h/systm.h"
#include "../net/net/if.h"
#include "../net/net/netisr.h"
#include "../net/net/route.h"
+
#if INET
#include "../net/netinet/in.h"
#include "../net/netinet/in_systm.h"
#include "../net/netinet/ip.h"
#endif
-#ifdef VJC
-#include "slcompress.h"
+#ifdef vax
+#include "../machine/mtpr.h"
#endif
#include "ppp_defs.h"
#include "if_ppp.h"
+
+#ifdef VJC
+#include "slcompress.h"
+#endif
+
#include "if_pppvar.h"
#ifdef PPP_COMPRESS
-#define PACKET struct mbuf
+#define PACKETPTR struct mbuf *
#include "ppp-comp.h"
#endif
-/*
- * This is an Ultrix kernel, we've got clists.
- */
-#define CCOUNT(q) ((q)->c_cc)
-
-#define t_sc T_LINEP
-#define PPP_HIWAT 400 /* Don't start a new packet if HIWAT on que */
-
void pppattach __P((void));
-int pppopen __P((dev_t dev, struct tty *tp));
-int pppclose __P((struct tty *tp, int flag));
-int pppread __P((struct tty *tp, struct uio *uio, int flag));
-int pppwrite __P((struct tty *tp, struct uio *uio, int flag));
-int ppptioctl __P((struct tty *tp, int cmd, caddr_t data, int flag,
- struct proc *));
+int pppioctl __P((struct ppp_softc *sc, int cmd, caddr_t data, int flag,
+ struct proc *));
int pppoutput __P((struct ifnet *ifp, struct mbuf *m0,
struct sockaddr *dst));
-int pppinput __P((int c, struct tty *tp));
-int pppioctl __P((struct ifnet *ifp, int cmd, caddr_t data));
-int pppstart __P((struct tty *tp));
+int pppsioctl __P((struct ifnet *ifp, int cmd, caddr_t data));
+void pppintr __P((void));
-static void ppp_ccp_closed __P((struct ppp_softc *));
+static void ppp_requeue __P((struct ppp_softc *));
+static void ppp_outpkt __P((struct ppp_softc *));
static int ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd));
-static int pppasyncstart __P((struct ppp_softc *));
-static u_short pppfcs __P((u_short fcs, u_char *cp, int len));
-static int pppgetm __P((struct ppp_softc *sc));
-static void pppdumpm __P((struct mbuf *m0, int pktlen));
-static void pppdumpb __P((u_char *b, int l));
-static void ppplogchar __P((struct ppp_softc *, int));
+static void ppp_ccp_closed __P((struct ppp_softc *));
+static void ppp_inproc __P((struct ppp_softc *, struct mbuf *));
+static void pppdumpm __P((struct mbuf *m0));
/*
* Some useful mbuf macros not in mbuf.h.
};
#define INTERACTIVE(p) (interactive_ports[(p) & 7] == (p))
-/*
- * Does c need to be escaped?
- */
-#define ESCAPE_P(c) (sc->sc_asyncmap[(c) >> 5] & (1 << ((c) & 0x1F)))
-
#ifdef PPP_COMPRESS
/*
* List of compressors we know about.
extern struct compressor ppp_bsd_compress;
struct compressor *ppp_compressors[] = {
+#if DO_BSD_COMPRESS
&ppp_bsd_compress,
+#endif
NULL
};
#endif /* PPP_COMPRESS */
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_ioctl = pppioctl;
+ sc->sc_if.if_ioctl = pppsioctl;
sc->sc_if.if_output = pppoutput;
sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN;
sc->sc_inq.ifq_maxlen = IFQ_MAXLEN;
sc->sc_fastq.ifq_maxlen = IFQ_MAXLEN;
+ sc->sc_rawq.ifq_maxlen = IFQ_MAXLEN;
if_attach(&sc->sc_if);
#if NBPFILTER > 0
bpfattach(&sc->sc_bpf, &sc->sc_if, DLT_PPP, PPP_HDRLEN);
for (nppp = 0, sc = ppp_softc; nppp < NPPP; nppp++, sc++)
if (sc->sc_xfer == pid) {
sc->sc_xfer = 0;
- break;
+ return sc;
}
- if (nppp >= NPPP)
- for (nppp = 0, sc = ppp_softc; nppp < NPPP; nppp++, sc++)
- if (sc->sc_devp == NULL)
- break;
+ for (nppp = 0, sc = ppp_softc; nppp < NPPP; nppp++, sc++)
+ if (sc->sc_devp == NULL)
+ break;
if (nppp >= NPPP)
return NULL;
sc->sc_flags = 0;
sc->sc_mru = PPP_MRU;
+ sc->sc_relinq = NULL;
#ifdef VJC
sl_compress_init(&sc->sc_comp);
#endif
#endif /* PPP_COMPRESS */
for (i = 0; i < NUM_NP; ++i)
sc->sc_npmode[i] = NPMODE_ERROR;
- sc->sc_if.if_flags |= IFF_RUNNING;
+ sc->sc_npqueue = NULL;
+ sc->sc_npqtail = &sc->sc_npqueue;
return sc;
}
/*
- * Deallocate a ppp unit.
+ * Deallocate a ppp unit. Must be called at splnet or higher.
*/
+void
pppdealloc(sc)
struct ppp_softc *sc;
{
sc->sc_if.if_flags &= ~(IFF_UP|IFF_RUNNING);
sc->sc_devp = NULL;
sc->sc_xfer = 0;
+ for (;;) {
+ IF_DEQUEUE(&sc->sc_rawq, m);
+ if (m == NULL)
+ break;
+ m_freem(m);
+ }
for (;;) {
IF_DEQUEUE(&sc->sc_inq, m);
if (m == NULL)
break;
m_freem(m);
}
+ while ((m = sc->sc_npqueue) != NULL) {
+ sc->sc_npqueue = m->m_act;
+ m_freem(m);
+ }
+ if (sc->sc_togo != NULL) {
+ m_freem(sc->sc_togo);
+ sc->sc_togo = NULL;
+ }
#ifdef PPP_COMPRESS
ppp_ccp_closed(sc);
sc->sc_xc_state = NULL;
sc->sc_rc_state = NULL;
#endif /* PPP_COMPRESS */
}
-
-/*
- * Line specific open routine for async tty devices.
- * Attach the given tty to the first available ppp unit.
- */
-/* ARGSUSED */
-int
-pppopen(dev, tp)
- dev_t dev;
- register struct tty *tp;
-{
- register struct ppp_softc *sc;
- int error, s, i;
- struct proc *p = u.u_procp;
-
- if (!suser())
- return EPERM;
-
- if (tp->t_line == PPPDISC) {
- sc = (struct ppp_softc *) tp->t_sc;
- if (sc != NULL && sc->sc_devp == (void *) tp)
- return (0);
- }
-
- if ((sc = pppalloc(p->p_pid)) == NULL)
- return ENXIO;
-
- if (sc->sc_outm != NULL) {
- m_freem(sc->sc_outm);
- sc->sc_outm = NULL;
- }
-
- pppgetm(sc);
-
- sc->sc_ilen = 0;
- bzero(sc->sc_asyncmap, sizeof(sc->sc_asyncmap));
- sc->sc_asyncmap[0] = 0xffffffff;
- sc->sc_asyncmap[3] = 0x60000000;
- sc->sc_rasyncmap = 0;
- sc->sc_devp = (void *) tp;
- sc->sc_start = pppasyncstart;
-
- tp->t_sc = (caddr_t) sc;
- ttyflush(tp, FREAD | FWRITE);
-
- return (0);
-}
-
-/*
- * Line specific close routine.
- * Detach the tty from the ppp unit.
- * Mimics part of ttyclose().
- */
-int
-pppclose(tp, flag)
- struct tty *tp;
- int flag;
-{
- register struct ppp_softc *sc;
- struct mbuf *m;
- int s;
-
- ttywflush(tp);
- s = splimp(); /* paranoid; splnet probably ok */
- tp->t_line = 0;
- sc = (struct ppp_softc *)tp->t_sc;
- if (sc != NULL) {
- tp->t_sc = NULL;
- if (tp == (struct tty *) sc->sc_devp) {
- m_freem(sc->sc_outm);
- sc->sc_outm = NULL;
- m_freem(sc->sc_m);
- sc->sc_m = NULL;
- pppdealloc(sc);
- }
- }
- splx(s);
- return 0;
-}
-
-/*
- * Line specific (tty) read routine.
- */
-int
-pppread(tp, uio, flag)
- register struct tty *tp;
- struct uio *uio;
- int flag;
-{
- register struct ppp_softc *sc = (struct ppp_softc *)tp->t_sc;
- struct mbuf *m, *m0;
- register int s;
- int error = 0;
-
- if ((tp->t_state & TS_CARR_ON) == 0 && (tp->t_cflag & CLOCAL) == 0)
- return 0; /* end of file */
- if (sc == NULL || tp != (struct tty *) sc->sc_devp)
- return 0;
- s = splimp();
- while (sc->sc_inq.ifq_head == NULL && tp->t_line == PPPDISC) {
- if (tp->t_state & (TS_ASYNC | TS_NBIO)) {
- splx(s);
- return (EWOULDBLOCK);
- }
- sleep((caddr_t) &tp->t_rawq, TTIPRI);
- }
- if (tp->t_line != PPPDISC) {
- splx(s);
- return (-1);
- }
-
- /* Pull place-holder byte out of canonical queue */
- getc(&tp->t_canq);
-
- /* Get the packet from the input queue */
- IF_DEQUEUE(&sc->sc_inq, m0);
- splx(s);
-
- for (m = m0; m && uio->uio_resid; m = m->m_next)
- if (error = uiomove(mtod(m, u_char *), m->m_len, UIO_READ, uio))
- break;
- m_freem(m0);
- return (error);
-}
-
-/*
- * Line specific (tty) write routine.
- */
-int
-pppwrite(tp, uio, flag)
- register struct tty *tp;
- struct uio *uio;
- int flag;
-{
- register struct ppp_softc *sc = (struct ppp_softc *)tp->t_sc;
- struct mbuf *m, *m0, **mp, *p;
- struct sockaddr dst;
- int len, error;
-
- if ((tp->t_state & TS_CARR_ON) == 0 && (tp->t_cflag & CLOCAL) == 0)
- return 0; /* wrote 0 bytes */
- if (tp->t_line != PPPDISC)
- return (EINVAL);
- if (sc == NULL || tp != (struct tty *) sc->sc_devp)
- return EIO;
- if (uio->uio_resid > sc->sc_if.if_mtu + PPP_HDRLEN ||
- uio->uio_resid < PPP_HDRLEN)
- return (EMSGSIZE);
- for (mp = &m0; uio->uio_resid; mp = &m->m_next) {
- MGET(m, M_WAIT, MT_DATA);
- if ((*mp = m) == NULL) {
- m_freem(m0);
- return (ENOBUFS);
- }
- if (uio->uio_resid >= CLBYTES / 2) {
- MCLGET(m, p);
- } else
- m->m_len = MLEN;
- len = MIN(m->m_len, uio->uio_resid);
- if (error = uiomove(mtod(m, u_char *), len, UIO_WRITE, uio)) {
- m_freem(m0);
- return (error);
- }
- m->m_len = len;
- }
- dst.sa_family = AF_UNSPEC;
- bcopy(mtod(m0, u_char *), dst.sa_data, PPP_HDRLEN);
- m0->m_off += PPP_HDRLEN;
- m0->m_len -= PPP_HDRLEN;
- return (pppoutput(&sc->sc_if, m0, &dst));
-}
/*
- * Line specific (tty) ioctl routine.
- * Provide a way to get the ppp unit number.
- * This discipline requires that tty device drivers call
- * the line specific l_ioctl routine from their ioctl routines.
+ * Ioctl routine for generic ppp devices.
*/
-/* ARGSUSED */
int
-ppptioctl(tp, cmd, data, flag)
- struct tty *tp;
+pppioctl(sc, cmd, data, flag)
+ struct ppp_softc *sc;
caddr_t data;
int cmd, flag;
{
- register struct ppp_softc *sc = (struct ppp_softc *) tp->t_sc;
struct proc *p = u.u_procp;
- int s, error, flags, mru, nb, npx;
+ int s, error, flags, mru, mtu, nb, npx;
struct ppp_option_data *odp;
struct compressor **cp;
struct npioctl *npi;
u_char ccp_option[CCP_MAX_OPTION_LENGTH];
- if (sc == NULL || tp != (struct tty *) sc->sc_devp)
- return -1;
-
switch (cmd) {
case FIONREAD:
*(int *)data = sc->sc_inq.ifq_len;
if (!suser())
return EPERM;
flags = *(int *)data & SC_MASK;
- s = splimp();
+ s = splnet();
if (sc->sc_flags & SC_CCP_OPEN && !(flags & SC_CCP_OPEN))
ppp_ccp_closed(sc);
+ splimp();
sc->sc_flags = (sc->sc_flags & ~SC_MASK) | flags;
splx(s);
break;
- case PPPIOCSASYNCMAP:
- if (!suser())
- return EPERM;
- sc->sc_asyncmap[0] = *(u_int *)data;
- break;
-
- case PPPIOCGASYNCMAP:
- *(u_int *)data = sc->sc_asyncmap[0];
- break;
-
- case PPPIOCSRASYNCMAP:
- if (!suser())
- return EPERM;
- sc->sc_rasyncmap = *(u_int *)data;
- break;
-
- case PPPIOCGRASYNCMAP:
- *(u_int *)data = sc->sc_rasyncmap;
- break;
-
- case PPPIOCSXASYNCMAP:
+ case PPPIOCSMRU:
if (!suser())
return EPERM;
- bcopy(data, sc->sc_asyncmap, sizeof(sc->sc_asyncmap));
- sc->sc_asyncmap[1] = 0; /* mustn't escape 0x20 - 0x3f */
- sc->sc_asyncmap[2] &= ~0x40000000; /* mustn't escape 0x5e */
- sc->sc_asyncmap[3] |= 0x60000000; /* must escape 0x7d, 0x7e */
+ mru = *(int *)data;
+ if (mru >= PPP_MRU && mru <= PPP_MAXMRU)
+ sc->sc_mru = mru;
break;
- case PPPIOCGXASYNCMAP:
- bcopy(sc->sc_asyncmap, data, sizeof(sc->sc_asyncmap));
+ case PPPIOCGMRU:
+ *(int *)data = sc->sc_mru;
break;
- case PPPIOCSMRU:
+ /*
+ * PPPIOC[GS]MTU are implemented here, instead of supporting
+ * SIOC[GS]IFMTU in pppsioctl, because under Ultrix, we can't get an
+ * interface ioctl through to the interface until it has an IP
+ * address set.
+ */
+ case PPPIOCSMTU:
if (!suser())
return EPERM;
- mru = *(int *)data;
- if (mru >= PPP_MRU && mru <= PPP_MAXMRU) {
- sc->sc_mru = mru;
- pppgetm(sc);
- }
+ mtu = *(int *) data;
+ if (mtu < PPP_MRU || mtu > PPP_MAXMRU)
+ return EINVAL;
+ s = splimp();
+ sc->sc_if.if_mtu = mtu;
+ splx(s);
break;
- case PPPIOCGMRU:
- *(int *)data = sc->sc_mru;
+ case PPPIOCGMTU:
+ *(int *) data = sc->sc_if.if_mtu;
break;
#ifdef VJC
case PPPIOCSMAXCID:
if (!suser())
return EPERM;
+ s = splnet();
sl_compress_setup(&sc->sc_comp, *(int *)data);
+ splx(s);
break;
#endif
* a compressor or decompressor.
*/
error = 0;
- s = splimp();
+ s = splnet();
if (odp->transmit) {
if (sc->sc_xc_state != NULL)
(*sc->sc_xcomp->comp_free)(sc->sc_xc_state);
sc->sc_if.if_unit);
error = ENOBUFS;
}
+ splimp();
sc->sc_flags &= ~SC_COMP_RUN;
} else {
if (sc->sc_rc_state != NULL)
sc->sc_if.if_unit);
error = ENOBUFS;
}
+ splimp();
sc->sc_flags &= ~SC_DECOMP_RUN;
}
splx(s);
if (npi->mode != sc->sc_npmode[npx]) {
s = splimp();
sc->sc_npmode[npx] = npi->mode;
- if (npi->mode != NPMODE_QUEUE)
+ if (npi->mode != NPMODE_QUEUE) {
+ ppp_requeue(sc);
(*sc->sc_start)(sc);
+ }
splx(s);
}
}
}
/*
- * FCS lookup table as calculated by genfcstab.
+ * Process an ioctl request to the ppp network interface.
*/
-static u_short fcstab[256] = {
- 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
- 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
- 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
- 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
- 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
- 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
- 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
- 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
- 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
- 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
- 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
- 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
- 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
- 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
- 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
- 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
- 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
- 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
- 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
- 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
- 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
- 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
- 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
- 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
- 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
- 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
- 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
- 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
- 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
- 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
- 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
- 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-};
+int
+pppsioctl(ifp, cmd, data)
+ register struct ifnet *ifp;
+ int cmd;
+ caddr_t data;
+{
+ struct proc *p = u.u_procp;
+ register struct ppp_softc *sc = &ppp_softc[ifp->if_unit];
+ register struct ifaddr *ifa = (struct ifaddr *)data;
+ register struct ifreq *ifr = (struct ifreq *)data;
+ struct ppp_stats *psp;
+ struct ppp_comp_stats *pcp;
+ int s = splimp(), error = 0;
+
+ switch (cmd) {
+ case SIOCSIFFLAGS:
+ if ((ifp->if_flags & IFF_RUNNING) == 0)
+ ifp->if_flags &= ~IFF_UP;
+ break;
+
+ case SIOCSIFADDR:
+ if (ifa->ifa_addr.sa_family != AF_INET)
+ error = EAFNOSUPPORT;
+ break;
+
+ case SIOCSIFDSTADDR:
+ if (ifa->ifa_addr.sa_family != AF_INET)
+ error = EAFNOSUPPORT;
+ break;
/*
- * Calculate a new FCS given the current FCS and the new data.
+ * Ioctls other than the above don't get through until the
+ * interface has its IP addresses set :-(
*/
-static u_short
-pppfcs(fcs, cp, len)
- register u_short fcs;
- register u_char *cp;
- register int len;
-{
- while (len--)
- fcs = PPP_FCS(fcs, *cp++);
- return (fcs);
+
+#if 0
+ case SIOCSIFMTU:
+ if (!suser())
+ return EPERM;
+ sc->sc_if.if_mtu = ifr->ifr_mtu;
+ break;
+
+ case SIOCGIFMTU:
+ ifr->ifr_mtu = sc->sc_if.if_mtu;
+ break;
+#endif
+
+ case SIOCGPPPSTATS:
+ psp = &((struct ifpppstatsreq *) data)->stats;
+ bzero(psp, sizeof(*psp));
+ psp->p.ppp_ibytes = sc->sc_bytesrcvd;
+ psp->p.ppp_ipackets = ifp->if_ipackets;
+ psp->p.ppp_ierrors = ifp->if_ierrors;
+ psp->p.ppp_obytes = sc->sc_bytessent;
+ psp->p.ppp_opackets = ifp->if_opackets;
+ psp->p.ppp_oerrors = ifp->if_oerrors;
+#ifdef VJC
+ psp->vj.vjs_packets = sc->sc_comp.sls_packets;
+ psp->vj.vjs_compressed = sc->sc_comp.sls_compressed;
+ psp->vj.vjs_searches = sc->sc_comp.sls_searches;
+ psp->vj.vjs_misses = sc->sc_comp.sls_misses;
+ psp->vj.vjs_uncompressedin = sc->sc_comp.sls_uncompressedin;
+ psp->vj.vjs_compressedin = sc->sc_comp.sls_compressedin;
+ psp->vj.vjs_errorin = sc->sc_comp.sls_errorin;
+ psp->vj.vjs_tossed = sc->sc_comp.sls_tossed;
+#endif /* VJC */
+ break;
+
+#ifdef PPP_COMPRESS
+ case SIOCGPPPCSTATS:
+ pcp = &((struct ifpppcstatsreq *) data)->stats;
+ bzero(pcp, sizeof(*pcp));
+ if (sc->sc_xc_state != NULL)
+ (*sc->sc_xcomp->comp_stat)(sc->sc_xc_state, &pcp->c);
+ if (sc->sc_rc_state != NULL)
+ (*sc->sc_rcomp->decomp_stat)(sc->sc_rc_state, &pcp->d);
+ break;
+#endif /* PPP_COMPRESS */
+
+ default:
+ error = EINVAL;
+ }
+ splx(s);
+ return (error);
}
/*
/*
* Compute PPP header.
+ * We use the m_context field of the mbuf to indicate whether
+ * the packet should go on the fast queue.
*/
- ifq = &ifp->if_snd;
+ m0->m_context = 0;
switch (dst->sa_family) {
#ifdef INET
case AF_INET:
if ((ip = mtod(m0, struct ip *))->ip_p == IPPROTO_TCP) {
register int p = ntohl(((int *)ip)[ip->ip_hl]);
if (INTERACTIVE(p & 0xffff) || INTERACTIVE(p >> 16))
- ifq = &sc->sc_fastq;
+ m0->m_context = 1;
}
break;
#endif
if (sc->sc_flags & SC_LOG_OUTPKT) {
printf("ppp%d output: ", ifp->if_unit);
- pppdumpm(m0, -1);
+ pppdumpm(m0);
}
#if NBPFILTER > 0
/*
* Put the packet on the appropriate queue.
*/
- s = splimp();
- if (IF_QFULL(ifq)) {
- IF_DROP(ifq);
- splx(s);
- sc->sc_if.if_oerrors++;
- error = ENOBUFS;
- goto bad;
- }
- IF_ENQUEUE(ifq, m0);
-
- /*
- * Tell the device to send it out.
- */
- if (mode == NPMODE_PASS)
+ s = splimp(); /* splnet should be OK now */
+ if (mode == NPMODE_QUEUE) {
+ /* XXX we should limit the number of packets on this queue */
+ *sc->sc_npqtail = m0;
+ m0->m_act = NULL;
+ sc->sc_npqtail = &m0->m_act;
+ } else {
+ ifq = m0->m_context? &sc->sc_fastq: &ifp->if_snd;
+ if (IF_QFULL(ifq)) {
+ IF_DROP(ifq);
+ splx(s);
+ sc->sc_if.if_oerrors++;
+ error = ENOBUFS;
+ goto bad;
+ }
+ IF_ENQUEUE(ifq, m0);
(*sc->sc_start)(sc);
+ }
splx(s);
return (0);
}
/*
- * Grab another packet off a queue and apply VJ compression,
- * packet compression, address/control and/or protocol compression
- * if enabled.
+ * After a change in the NPmode for some NP, move packets from the
+ * npqueue to the send queue or the fast queue as appropriate.
+ * Should be called at splimp (actually splnet would probably suffice).
*/
-struct mbuf *
-ppp_dequeue(sc)
+static void
+ppp_requeue(sc)
struct ppp_softc *sc;
{
- int s;
- struct mbuf *m, *mp, **mpp;
- u_char *cp;
- int address, control, protocol;
+ struct mbuf *m, **mpp;
struct ifqueue *ifq;
enum NPmode mode;
- s = splimp();
-
- /*
- * Scan through the send queues looking for a packet
- * which can be sent: first the fast queue, then the normal queue.
- */
- ifq = &sc->sc_fastq;
- for (;;) {
- mpp = &ifq->ifq_head;
- mp = NULL;
- while ((m = *mpp) != NULL) {
- switch (PPP_PROTOCOL(mtod(m, u_char *))) {
- case PPP_IP:
- mode = sc->sc_npmode[NP_IP];
- break;
- default:
- mode = NPMODE_PASS;
- }
- if (mode == NPMODE_PASS)
- break;
- switch (mode) {
- case NPMODE_DROP:
- case NPMODE_ERROR:
- *mpp = m->m_nextpkt;
- m_freem(m);
- break;
- case NPMODE_QUEUE:
- mpp = &m->m_nextpkt;
- mp = m;
- break;
- }
+ for (mpp = &sc->sc_npqueue; (m = *mpp) != NULL; ) {
+ switch (PPP_PROTOCOL(mtod(m, u_char *))) {
+ case PPP_IP:
+ mode = sc->sc_npmode[NP_IP];
+ break;
+ default:
+ mode = NPMODE_PASS;
}
- if (m != NULL)
+
+ switch (mode) {
+ case NPMODE_PASS:
+ /*
+ * This packet can now go on one of the queues to be sent.
+ */
+ *mpp = m->m_act;
+ m->m_act = NULL;
+ ifq = m->m_context? &sc->sc_fastq: &sc->sc_if.if_snd;
+ if (IF_QFULL(ifq)) {
+ IF_DROP(ifq);
+ sc->sc_if.if_oerrors++;
+ } else
+ IF_ENQUEUE(ifq, m);
break;
- if (ifq == &sc->sc_if.if_snd)
+ case NPMODE_DROP:
+ case NPMODE_ERROR:
+ *mpp = m->m_act;
+ m_freem(m);
break;
- /* Finished the fast queue; do the normal queue. */
- ifq = &sc->sc_if.if_snd;
- }
- if (m == NULL) {
- splx(s);
- return NULL;
+ case NPMODE_QUEUE:
+ mpp = &m->m_act;
+ break;
+ }
}
+ sc->sc_npqtail = mpp;
+}
- if ((*mpp = m->m_nextpkt) == NULL)
- ifq->ifq_tail = mp;
- m->m_nextpkt = NULL;
- --ifq->ifq_len;
-
- splx(s);
-
- /*
- * Extract the ppp header of the new packet.
- * The ppp header will be in one mbuf.
+/*
+ * Get a packet to send. This procedure is intended to be called
+ * at spltty()/splimp(), so it takes little time. If there isn't
+ * a packet waiting to go out, it schedules a software interrupt
+ * to prepare a new packet; the device start routine gets called
+ * again when a packet is ready.
+ */
+struct mbuf *
+ppp_dequeue(sc)
+ struct ppp_softc *sc;
+{
+ struct mbuf *m;
+ int s = splimp();
+
+ m = sc->sc_togo;
+ if (m) {
+ /*
+ * Had a packet waiting - send it.
+ */
+ sc->sc_togo = NULL;
+ sc->sc_flags |= SC_TBUSY;
+ splx(s);
+ return m;
+ }
+ /*
+ * Remember we wanted a packet and schedule a software interrupt.
+ */
+ sc->sc_flags &= ~SC_TBUSY;
+ schednetisr(NETISR_PPP);
+ splx(s);
+ return NULL;
+}
+
+/*
+ * Software interrupt routine, called at splnet().
+ */
+void
+pppintr()
+{
+ struct ppp_softc *sc;
+ int i, s;
+ struct mbuf *m;
+
+ s = splnet();
+ sc = ppp_softc;
+ for (i = 0; i < NPPP; ++i, ++sc) {
+ if (!(sc->sc_flags & SC_TBUSY) && sc->sc_togo == NULL
+ && (sc->sc_if.if_snd.ifq_head || sc->sc_fastq.ifq_head))
+ ppp_outpkt(sc);
+ for (;;) {
+ IF_DEQUEUE(&sc->sc_rawq, m);
+ if (m == NULL)
+ break;
+ ppp_inproc(sc, m);
+ }
+ }
+ splx(s);
+}
+
+/*
+ * Grab another packet off a queue and apply VJ compression,
+ * packet compression, address/control and/or protocol compression
+ * if enabled. Should be called at splnet.
+ */
+static void
+ppp_outpkt(sc)
+ struct ppp_softc *sc;
+{
+ int s;
+ struct mbuf *m, *mp;
+ u_char *cp;
+ int address, control, protocol;
+ enum NPmode mode;
+
+ /*
+ * Grab a packet to send: first try the fast queue, then the
+ * normal queue.
+ */
+ IF_DEQUEUE(&sc->sc_fastq, m);
+ if (m == NULL)
+ IF_DEQUEUE(&sc->sc_if.if_snd, m);
+ if (m == NULL)
+ return;
+
+ /*
+ * Extract the ppp header of the new packet.
+ * The ppp header will be in one mbuf.
*/
cp = mtod(m, u_char *);
address = PPP_ADDRESS(cp);
--m->m_len;
}
- return m;
+ s = splimp();
+ sc->sc_togo = m;
+ (*sc->sc_start)(sc);
+ splx(s);
}
#ifdef PPP_COMPRESS
{
u_char *dp, *ep;
struct mbuf *mp;
- int slen;
+ int slen, s;
struct bsd_db *db;
/*
case CCP_TERMREQ:
case CCP_TERMACK:
/* CCP must be going down - disable compression */
- if (sc->sc_flags & SC_CCP_UP)
+ if (sc->sc_flags & SC_CCP_UP) {
+ s = splimp();
sc->sc_flags &= ~(SC_CCP_UP | SC_COMP_RUN | SC_DECOMP_RUN);
+ splx(s);
+ }
break;
case CCP_CONFACK:
if (sc->sc_xc_state != NULL
&& (*sc->sc_xcomp->comp_init)
(sc->sc_xc_state, dp + CCP_HDRLEN, slen - CCP_HDRLEN,
- sc->sc_if.if_unit, sc->sc_flags & SC_DEBUG)) {
+ sc->sc_if.if_unit, 0, sc->sc_flags & SC_DEBUG)) {
+ s = splimp();
sc->sc_flags |= SC_COMP_RUN;
+ splx(s);
}
} else {
/* peer is agreeing to send compressed packets. */
if (sc->sc_rc_state != NULL
&& (*sc->sc_rcomp->decomp_init)
(sc->sc_rc_state, dp + CCP_HDRLEN, slen - CCP_HDRLEN,
- sc->sc_if.if_unit, sc->sc_mru,
+ sc->sc_if.if_unit, 0, sc->sc_mru,
sc->sc_flags & SC_DEBUG)) {
+ s = splimp();
sc->sc_flags |= SC_DECOMP_RUN;
sc->sc_flags &= ~(SC_DC_ERROR | SC_DC_FERROR);
+ splx(s);
}
}
}
} else {
if (sc->sc_rc_state && (sc->sc_flags & SC_DECOMP_RUN)) {
(*sc->sc_rcomp->decomp_reset)(sc->sc_rc_state);
+ s = splimp();
sc->sc_flags &= ~SC_DC_ERROR;
+ splx(s);
}
}
}
/*
* CCP is down; free (de)compressor state if necessary.
*/
-void
+static void
ppp_ccp_closed(sc)
struct ppp_softc *sc;
{
sc->sc_rc_state = NULL;
}
}
-#endif /* PPP_COMRPESS */
-
-/*
- * This gets called from pppoutput when a new packet is
- * put on a queue.
- */
-static
-pppasyncstart(sc)
- register struct ppp_softc *sc;
-{
- register struct tty *tp = (struct tty *) sc->sc_devp;
-
- pppstart(tp);
-}
-
-/*
- * Start output on async tty interface. Get another datagram
- * to send from the interface queue and start sending it.
- */
-int
-pppstart(tp)
- register struct tty *tp;
-{
- register struct ppp_softc *sc = (struct ppp_softc *) tp->t_sc;
- register struct mbuf *m;
- register int len;
- register u_char *start, *stop, *cp;
- int n, s, ndone, done;
- struct mbuf *m2;
-
- if ((tp->t_state & TS_CARR_ON) == 0 && (tp->t_cflag & CLOCAL) == 0) {
- /* sorry, I can't talk now */
- return;
- }
- if (sc == NULL || tp != (struct tty *) sc->sc_devp) {
- (*tp->t_oproc)(tp);
- return;
- }
-
- for (;;) {
- /*
- * If there is more in the output queue, just send it now.
- * We are being called in lieu of ttstart and must do what
- * it would.
- */
- if (CCOUNT(&tp->t_outq) != 0 && tp->t_oproc != NULL) {
- (*tp->t_oproc)(tp);
- if (CCOUNT(&tp->t_outq) > PPP_HIWAT)
- return;
- }
-
- /*
- * See if we have an existing packet partly sent.
- * If not, get a new packet and start sending it.
- */
- m = sc->sc_outm;
- if (m == NULL) {
- /*
- * Get another packet to be sent.
- */
- m = ppp_dequeue(sc);
- if (m == NULL)
- return;
-
- /*
- * The extra PPP_FLAG will start up a new packet, and thus
- * will flush any accumulated garbage. We do this whenever
- * the line may have been idle for some time.
- */
- if (CCOUNT(&tp->t_outq) == 0) {
- ++sc->sc_bytessent;
- (void) putc(PPP_FLAG, &tp->t_outq);
- }
-
- /* Calculate the FCS for the first mbuf's worth. */
- sc->sc_outfcs = pppfcs(PPP_INITFCS, mtod(m, u_char *), m->m_len);
- }
-
- for (;;) {
- start = mtod(m, u_char *);
- len = m->m_len;
- stop = start + len;
- while (len > 0) {
- /*
- * Find out how many bytes in the string we can
- * handle without doing something special.
- */
- for (cp = start; cp < stop; cp++)
- if (ESCAPE_P(*cp))
- break;
- n = cp - start;
- if (n) {
- ndone = n - b_to_q(start, n, &tp->t_outq);
- len -= ndone;
- start += ndone;
- sc->sc_bytessent += ndone;
-
- if (ndone < n)
- break; /* packet doesn't fit */
- }
- /*
- * If there are characters left in the mbuf,
- * the first one must be special..
- * Put it out in a different form.
- */
- if (len) {
- if (putc(PPP_ESCAPE, &tp->t_outq))
- break;
- if (putc(*start ^ PPP_TRANS, &tp->t_outq)) {
- (void) unputc(&tp->t_outq);
- break;
- }
- sc->sc_bytessent += 2;
- start++;
- len--;
- }
- }
- /*
- * If we didn't empty this mbuf, remember where we're up to.
- * If we emptied the last mbuf, try to add the FCS and closing
- * flag, and if we can't, leave sc_outm pointing to m, but with
- * m->m_len == 0, to remind us to output the FCS and flag later.
- */
- done = len == 0;
- if (done && m->m_next == NULL) {
- u_char *p, *q;
- int c;
- u_char endseq[8];
-
- /*
- * We may have to escape the bytes in the FCS.
- */
- p = endseq;
- c = ~sc->sc_outfcs & 0xFF;
- if (ESCAPE_P(c)) {
- *p++ = PPP_ESCAPE;
- *p++ = c ^ PPP_TRANS;
- } else
- *p++ = c;
- c = (~sc->sc_outfcs >> 8) & 0xFF;
- if (ESCAPE_P(c)) {
- *p++ = PPP_ESCAPE;
- *p++ = c ^ PPP_TRANS;
- } else
- *p++ = c;
- *p++ = PPP_FLAG;
-
- /*
- * Try to output the FCS and flag. If the bytes
- * don't all fit, back out.
- */
- for (q = endseq; q < p; ++q)
- if (putc(*q, &tp->t_outq)) {
- done = 0;
- for (; q > endseq; --q)
- unputc(&tp->t_outq);
- break;
- }
- }
-
- if (!done) {
- m->m_off += m->m_len - len;
- m->m_len = len;
- sc->sc_outm = m;
- if (tp->t_oproc != NULL)
- (*tp->t_oproc)(tp);
- return; /* can't do any more at the moment */
- }
-
- /* Finished with this mbuf; free it and move on. */
- MFREE(m, m2);
- if (m2 == NULL)
- break;
-
- m = m2;
- sc->sc_outfcs = pppfcs(sc->sc_outfcs, mtod(m, u_char *), m->m_len);
- }
-
- /* Finished a packet */
- sc->sc_outm = NULL;
- sc->sc_bytessent++; /* account for closing flag */
- sc->sc_if.if_opackets++;
- }
-}
+#endif /* PPP_COMPRESS */
/*
- * Allocate enough mbuf to handle current MRU.
+ * PPP packet input routine.
+ * The caller has checked and removed the FCS and has inserted
+ * the address/control bytes and the protocol high byte if they
+ * were omitted.
*/
-static int
-pppgetm(sc)
- register struct ppp_softc *sc;
+void
+ppppktin(sc, m, lost)
+ struct ppp_softc *sc;
+ struct mbuf *m;
+ int lost;
{
- struct mbuf *m, **mp, *p;
- int len;
- int s;
+ int s = splimp();
- s = splimp();
- mp = &sc->sc_m;
- for (len = sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN; len > 0; ){
- if ((m = *mp) == NULL) {
- MGET(m, M_DONTWAIT, MT_DATA);
- if (m == NULL)
- break;
- *mp = m;
- MCLGET(m, p);
- }
- len -= M_DATASIZE(m);
- mp = &m->m_next;
- }
+ m->m_context = lost;
+ IF_ENQUEUE(&sc->sc_rawq, m);
+ schednetisr(NETISR_PPP);
splx(s);
- return len <= 0;
}
/*
- * PPP packet input routine.
- * The caller has checked and removed the FCS and has inserted
- * the address/control bytes and the protocol high byte if they
- * were omitted. The return value is 1 if the packet was put on
- * sc->sc_inq, 0 otherwise.
+ * Process a received PPP packet, doing decompression as necessary.
*/
#define COMPTYPE(proto) ((proto) == PPP_VJC_COMP? TYPE_COMPRESSED_TCP: \
TYPE_UNCOMPRESSED_TCP)
-int
-ppppktin(sc, m)
+static void
+ppp_inproc(sc, m)
struct ppp_softc *sc;
struct mbuf *m;
{
u_int hlen;
sc->sc_if.if_ipackets++;
- rv = 0;
+
+ if (sc->sc_flags & SC_LOG_INPKT) {
+ printf("ppp%d: got %d bytes\n", sc->sc_if.if_unit, ilen);
+ pppdumpm(m);
+ }
cp = mtod(m, u_char *);
adrs = PPP_ADDRESS(cp);
ctrl = PPP_CONTROL(cp);
proto = PPP_PROTOCOL(cp);
+ if (m->m_context) {
+ s = splimp();
+ sc->sc_flags |= SC_VJ_RESET;
+ splx(s);
+ }
+
#ifdef PPP_COMPRESS
/*
* Decompress this packet if necessary, update the receiver's
CCP down or issue a Reset-Req. */
if (sc->sc_flags & SC_DEBUG)
printf("ppp%d: decompress failed %d\n", sc->sc_if.if_unit, rv);
+ s = splimp();
sc->sc_flags |= SC_VJ_RESET;
switch (rv) {
case DECOMP_OK:
/* no error, but no decompressed packet produced */
+ splx(s);
m_freem(m);
- return 0;
+ return;
case DECOMP_ERROR:
sc->sc_flags |= SC_DC_ERROR;
break;
sc->sc_flags |= SC_DC_FERROR;
break;
}
+ splx(s);
}
} else {
ilen += mp->m_len;
#ifdef VJC
- /*
- * If we've missed a packet, we must toss subsequent compressed
- * packets which don't have an explicit connection ID.
- */
if (sc->sc_flags & SC_VJ_RESET) {
+ /*
+ * If we've missed a packet, we must toss subsequent compressed
+ * packets which don't have an explicit connection ID.
+ */
sl_uncompress_tcp(NULL, 0, TYPE_ERROR, &sc->sc_comp);
+ s = splimp();
sc->sc_flags &= ~SC_VJ_RESET;
+ splx(s);
}
/*
goto bad;
mp->m_len = 0;
mp->m_next = NULL;
- if (hlen + PPP_HDRLEN > MHLEN) {
+ if (hlen + PPP_HDRLEN > MLEN) {
MCLGET(mp, pc);
if (M_TRAILINGSPACE(mp) < hlen + PPP_HDRLEN) {
m_freem(mp);
if (ilen <= MLEN && M_IS_CLUSTER(m)) {
MGET(mp, M_DONTWAIT, MT_DATA);
if (mp != NULL) {
- m_copydata(m, 0, ilen, mtod(mp, caddr_t));
+ m_copydata(m, mtod(mp, caddr_t), ilen);
m_freem(m);
m = mp;
m->m_len = ilen;
bpf_mtap(sc->sc_bpf, m);
#endif
+ rv = 0;
switch (proto) {
#ifdef INET
case PPP_IP:
|| sc->sc_npmode[NP_IP] != NPMODE_PASS) {
/* interface is down - drop the packet. */
m_freem(m);
- return 0;
+ return;
}
m->m_off += PPP_HDRLEN;
m->m_len -= PPP_HDRLEN;
if (IF_QFULL(inq)) {
IF_DROP(inq);
/* XXX should we unlock here? */
+ splx(s);
if (sc->sc_flags & SC_DEBUG)
- printf("ppp%d: queue full\n", sc->sc_if.if_unit);
- sc->sc_if.if_ierrors++;
- m_freem(m);
- rv = 0;
- } else {
- IF_ENQUEUEIF(inq, m, &sc->sc_if);
- smp_unlock(&lock->lk_ifqueue);
+ printf("ppp%d: input queue full\n", sc->sc_if.if_unit);
+ goto bad;
}
-
+ IF_ENQUEUEIF(inq, m, &sc->sc_if);
+ smp_unlock(&lock->lk_ifqueue);
splx(s);
- return rv;
- bad:
- m_freem(m);
- sc->sc_if.if_ierrors++;
- return 0;
-}
-
-/*
- * tty interface receiver interrupt.
- */
-static unsigned paritytab[8] = {
- 0x96696996, 0x69969669, 0x69969669, 0x96696996,
- 0x69969669, 0x96696996, 0x96696996, 0x69969669
-};
-
-int
-pppinput(c, tp)
- int c;
- register struct tty *tp;
-{
- register struct ppp_softc *sc;
- struct mbuf *m;
- int ilen;
-
- tk_nin++;
- sc = (struct ppp_softc *) tp->t_sc;
- if (sc == NULL || tp != (struct tty *) sc->sc_devp)
- return;
-
- sc->sc_bytesrcvd++;
-
- c &= 0xff;
-
- if (c & 0x80)
- sc->sc_flags |= SC_RCV_B7_1;
- else
- sc->sc_flags |= SC_RCV_B7_0;
- if (paritytab[c >> 5] & (1 << (c & 0x1F)))
- sc->sc_flags |= SC_RCV_ODDP;
- else
- sc->sc_flags |= SC_RCV_EVNP;
-
- if (sc->sc_flags & SC_LOG_RAWIN)
- ppplogchar(sc, c);
-
- if (c == PPP_FLAG) {
- ilen = sc->sc_ilen;
- sc->sc_ilen = 0;
-
- if (sc->sc_rawin_count > 0)
- ppplogchar(sc, -1);
-
- /*
- * If SC_ESCAPED is set, then we've seen the packet
- * abort sequence "}~".
- */
- if (sc->sc_flags & (SC_FLUSH | SC_ESCAPED)
- || ilen > 0 && sc->sc_fcs != PPP_GOODFCS) {
- sc->sc_flags |= SC_VJ_RESET;
- if ((sc->sc_flags & (SC_FLUSH | SC_ESCAPED)) == 0){
- if (sc->sc_flags & SC_DEBUG)
- printf("ppp%d: bad fcs %x\n", sc->sc_if.if_unit,
- sc->sc_fcs);
- sc->sc_if.if_ierrors++;
- } else
- sc->sc_flags &= ~(SC_FLUSH | SC_ESCAPED);
- return;
- }
-
- if (ilen < PPP_HDRLEN + PPP_FCSLEN) {
- if (ilen) {
- if (sc->sc_flags & SC_DEBUG)
- printf("ppp%d: too short (%d)\n", sc->sc_if.if_unit, ilen);
- sc->sc_if.if_ierrors++;
- }
- return;
- }
-
- /*
- * Remove FCS trailer. Somewhat painful...
- */
- ilen -= 2;
- if (--sc->sc_mc->m_len == 0) {
- for (m = sc->sc_m; m->m_next != sc->sc_mc; m = m->m_next)
- ;
- sc->sc_mc = m;
- }
- sc->sc_mc->m_len--;
-
- /* excise this mbuf chain */
- m = sc->sc_m;
- sc->sc_m = sc->sc_mc->m_next;
- sc->sc_mc->m_next = NULL;
-
- if (sc->sc_flags & SC_LOG_INPKT) {
- printf("ppp%d: got %d bytes\n", sc->sc_if.if_unit, ilen);
- pppdumpm(m, ilen);
- }
-
- if (ppppktin(sc, m)) {
- /* Put a placeholder byte in canq for ttselect()/ttnread(). */
- putc(0, &tp->t_canq);
- ttwakeup(tp);
- }
-
- pppgetm(sc);
- return;
- }
-
- if (sc->sc_flags & SC_FLUSH) {
- if (sc->sc_flags & SC_LOG_FLUSH)
- ppplogchar(sc, c);
- return;
- }
-
- if (c < 0x20 && (sc->sc_rasyncmap & (1 << c)))
- return;
-
- if (sc->sc_flags & SC_ESCAPED) {
- sc->sc_flags &= ~SC_ESCAPED;
- c ^= PPP_TRANS;
- } else if (c == PPP_ESCAPE) {
- sc->sc_flags |= SC_ESCAPED;
- return;
- }
-
- /*
- * Initialize buffer on first octet received.
- * First octet could be address or protocol (when compressing
- * address/control).
- * Second octet is control.
- * Third octet is first or second (when compressing protocol)
- * octet of protocol.
- * Fourth octet is second octet of protocol.
- */
- if (sc->sc_ilen == 0) {
- /* reset the first input mbuf */
- if (sc->sc_m == NULL) {
- pppgetm(sc);
- if (sc->sc_m == NULL) {
- if (sc->sc_flags & SC_DEBUG)
- printf("ppp%d: no input mbufs!\n", sc->sc_if.if_unit);
- goto flush;
- }
- }
- m = sc->sc_m;
- m->m_len = 0;
- m->m_off = M_OFFSTART(m);
- sc->sc_mc = m;
- sc->sc_mp = mtod(m, char *);
- sc->sc_fcs = PPP_INITFCS;
- if (c != PPP_ALLSTATIONS) {
- if (sc->sc_flags & SC_REJ_COMP_AC) {
- if (sc->sc_flags & SC_DEBUG)
- printf("ppp%d: garbage received: 0x%x (need 0xFF)\n",
- sc->sc_if.if_unit, c);
- goto flush;
- }
- *sc->sc_mp++ = PPP_ALLSTATIONS;
- *sc->sc_mp++ = PPP_UI;
- sc->sc_ilen += 2;
- m->m_len += 2;
- }
- }
- if (sc->sc_ilen == 1 && c != PPP_UI) {
- if (sc->sc_flags & SC_DEBUG)
- printf("ppp%d: missing UI (0x3), got 0x%x\n",
- sc->sc_if.if_unit, c);
- goto flush;
- }
- if (sc->sc_ilen == 2 && (c & 1) == 1) {
- /* a compressed protocol */
- *sc->sc_mp++ = 0;
- sc->sc_ilen++;
- sc->sc_mc->m_len++;
- }
- if (sc->sc_ilen == 3 && (c & 1) == 0) {
- if (sc->sc_flags & SC_DEBUG)
- printf("ppp%d: bad protocol %x\n", sc->sc_if.if_unit,
- (sc->sc_mp[-1] << 8) + c);
- goto flush;
- }
+ if (rv)
+ (*sc->sc_ctlp)(sc);
- /* packet beyond configured mru? */
- if (++sc->sc_ilen > sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN) {
- if (sc->sc_flags & SC_DEBUG)
- printf("ppp%d: packet too big\n", sc->sc_if.if_unit);
- goto flush;
- }
-
- /* is this mbuf full? */
- m = sc->sc_mc;
- if (M_TRAILINGSPACE(m) <= 0) {
- if (m->m_next == NULL) {
- pppgetm(sc);
- if (m->m_next == NULL) {
- if (sc->sc_flags & SC_DEBUG)
- printf("ppp%d: too few input mbufs!\n", sc->sc_if.if_unit);
- goto flush;
- }
- }
- sc->sc_mc = m = m->m_next;
- m->m_len = 0;
- m->m_off = M_OFFSTART(m);
- sc->sc_mp = mtod(m, char *);
- }
-
- ++m->m_len;
- *sc->sc_mp++ = c;
- sc->sc_fcs = PPP_FCS(sc->sc_fcs, c);
return;
- flush:
- if (!(sc->sc_flags & SC_FLUSH)) {
- sc->sc_if.if_ierrors++;
- sc->sc_flags |= SC_FLUSH;
- if (sc->sc_flags & SC_LOG_FLUSH)
- ppplogchar(sc, c);
- }
-}
-
-/*
- * Process an ioctl request to interface.
- */
-int
-pppioctl(ifp, cmd, data)
- register struct ifnet *ifp;
- int cmd;
- caddr_t data;
-{
- struct proc *p = u.u_procp;
- register struct ppp_softc *sc = &ppp_softc[ifp->if_unit];
- register struct ifaddr *ifa = (struct ifaddr *)data;
- register struct ifreq *ifr = (struct ifreq *)data;
- struct ppp_stats *psp;
- int s = splimp(), error = 0;
-
- switch (cmd) {
- case SIOCSIFFLAGS:
- if ((ifp->if_flags & IFF_RUNNING) == 0)
- ifp->if_flags &= ~IFF_UP;
- break;
-
- case SIOCSIFADDR:
- if (ifa->ifa_addr.sa_family != AF_INET)
- error = EAFNOSUPPORT;
- break;
-
- case SIOCSIFDSTADDR:
- if (ifa->ifa_addr.sa_family != AF_INET)
- error = EAFNOSUPPORT;
- break;
-
- case SIOCSIFMTU:
- if (!suser())
- return EPERM;
- sc->sc_if.if_mtu = ifr->ifr_mtu;
- break;
-
- case SIOCGIFMTU:
- ifr->ifr_mtu = sc->sc_if.if_mtu;
- break;
-
- case SIOCGPPPSTATS:
- psp = &((struct ifpppstatsreq *) data)->stats;
- bzero(psp, sizeof(*psp));
- psp->p.ppp_ibytes = sc->sc_bytesrcvd;
- psp->p.ppp_ipackets = ifp->if_ipackets;
- psp->p.ppp_ierrors = ifp->if_ierrors;
- psp->p.ppp_obytes = sc->sc_bytessent;
- psp->p.ppp_opackets = ifp->if_opackets;
- psp->p.ppp_oerrors = ifp->if_oerrors;
-#ifdef VJC
- psp->vj.vjs_packets = sc->sc_comp.sls_packets;
- psp->vj.vjs_compressed = sc->sc_comp.sls_compressed;
- psp->vj.vjs_searches = sc->sc_comp.sls_searches;
- psp->vj.vjs_misses = sc->sc_comp.sls_misses;
- psp->vj.vjs_uncompressedin = sc->sc_comp.sls_uncompressedin;
- psp->vj.vjs_compressedin = sc->sc_comp.sls_compressedin;
- psp->vj.vjs_errorin = sc->sc_comp.sls_errorin;
- psp->vj.vjs_tossed = sc->sc_comp.sls_tossed;
-#endif /* VJC */
-#ifdef PPP_COMPRESS
- if (sc->sc_xc_state != NULL)
- (*sc->sc_xcomp->comp_stat)(sc->sc_xc_state, &psp->c);
- if (sc->sc_rc_state != NULL)
- (*sc->sc_rcomp->decomp_stat)(sc->sc_rc_state, &psp->d);
-#endif /* PPP_COMPRESS */
- break;
-
- default:
- error = EINVAL;
- }
- splx(s);
- return (error);
+ bad:
+ m_freem(m);
+ sc->sc_if.if_ierrors++;
}
#define MAX_DUMP_BYTES 128
static void
-pppdumpm(m0, pktlen)
+pppdumpm(m0)
struct mbuf *m0;
- int pktlen;
{
char buf[3*MAX_DUMP_BYTES+4];
char *bp = buf;
struct mbuf *m;
static char digits[] = "0123456789abcdef";
- for (m = m0; m && pktlen; m = m->m_next) {
+ for (m = m0; m; m = m->m_next) {
int l = m->m_len;
u_char *rptr = mtod(m, u_char *);
- if (pktlen > 0) {
- if (l > pktlen)
- l = pktlen;
- pktlen -= l;
- }
while (l--) {
if (bp > buf + sizeof(buf) - 4)
goto done;
*bp++ = ' ';
}
done:
- if (m && pktlen)
+ if (m)
*bp++ = '>';
*bp = 0;
printf("%s\n", buf);
}
-static void
-ppplogchar(sc, c)
- struct ppp_softc *sc;
- int c;
-{
- if (c >= 0)
- sc->sc_rawin[sc->sc_rawin_count++] = c;
- if (sc->sc_rawin_count >= sizeof(sc->sc_rawin)
- || c < 0 && sc->sc_rawin_count > 0) {
- printf("ppp%d input: ", sc->sc_if.if_unit);
- pppdumpb(sc->sc_rawin, sc->sc_rawin_count);
- sc->sc_rawin_count = 0;
- }
-}
-
-static void
-pppdumpb(b, l)
- u_char *b;
- int l;
-{
- char buf[3*MAX_DUMP_BYTES+4];
- char *bp = buf;
- static char digits[] = "0123456789abcdef";
-
- while (l--) {
- if (bp >= buf + sizeof(buf) - 3) {
- *bp++ = '>';
- break;
- }
- *bp++ = digits[*b >> 4]; /* convert byte to ascii hex */
- *bp++ = digits[*b++ & 0xf];
- *bp++ = ' ';
- }
-
- *bp = 0;
- printf("%s\n", buf);
-}
-
#endif /* NPPP > 0 */
projects / ppp.git / blobdiff