X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=ultrix%2Fif_ppp.c;h=63e99d34761d2648b6a91729085f932d9058b1cb;hp=f8d8058680c4662333244d190631801d3b89ae4a;hb=614af03b75ed9bdca2b5fcc4761842ba345cd260;hpb=cc9cdaef42f38bd22700c2bea8368afcd05b305d diff --git a/ultrix/if_ppp.c b/ultrix/if_ppp.c index f8d8058..63e99d3 100644 --- a/ultrix/if_ppp.c +++ b/ultrix/if_ppp.c @@ -72,7 +72,7 @@ * Robert Olsson and Paul Mackerras. */ -/* $Id: if_ppp.c,v 1.2 1994/11/21 04:50:36 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" @@ -101,12 +101,17 @@ #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 @@ -122,6 +127,7 @@ int pppoutput __P((struct ifnet *ifp, struct mbuf *m0, int pppsioctl __P((struct ifnet *ifp, int cmd, caddr_t data)); void pppintr __P((void)); +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 void ppp_ccp_closed __P((struct ppp_softc *)); @@ -163,7 +169,9 @@ static u_short interactive_ports[8] = { extern struct compressor ppp_bsd_compress; struct compressor *ppp_compressors[] = { +#if DO_BSD_COMPRESS &ppp_bsd_compress, +#endif NULL }; #endif /* PPP_COMPRESS */ @@ -209,17 +217,17 @@ pppalloc(pid) 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 @@ -229,13 +237,14 @@ pppalloc(pid) #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) @@ -265,6 +274,10 @@ pppdealloc(sc) 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; @@ -286,7 +299,7 @@ pppioctl(sc, cmd, data, flag) int cmd, flag; { 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; @@ -329,6 +342,27 @@ pppioctl(sc, cmd, data, flag) *(int *)data = sc->sc_mru; break; + /* + * 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; + mtu = *(int *) data; + if (mtu < PPP_MRU || mtu > PPP_MAXMRU) + return EINVAL; + s = splimp(); + sc->sc_if.if_mtu = mtu; + splx(s); + break; + + case PPPIOCGMTU: + *(int *) data = sc->sc_if.if_mtu; + break; + #ifdef VJC case PPPIOCSMAXCID: if (!suser()) @@ -420,8 +454,10 @@ pppioctl(sc, cmd, data, flag) 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); } } @@ -457,15 +493,21 @@ pppsioctl(ifp, cmd, data) break; case SIOCSIFADDR: - if (ifa->ifa_addr->sa_family != AF_INET) + if (ifa->ifa_addr.sa_family != AF_INET) error = EAFNOSUPPORT; break; case SIOCSIFDSTADDR: - if (ifa->ifa_addr->sa_family != AF_INET) + if (ifa->ifa_addr.sa_family != AF_INET) error = EAFNOSUPPORT; break; +/* + * Ioctls other than the above don't get through until the + * interface has its IP addresses set :-( + */ + +#if 0 case SIOCSIFMTU: if (!suser()) return EPERM; @@ -475,6 +517,7 @@ pppsioctl(ifp, cmd, data) case SIOCGIFMTU: ifr->ifr_mtu = sc->sc_if.if_mtu; break; +#endif case SIOCGPPPSTATS: psp = &((struct ifpppstatsreq *) data)->stats; @@ -542,8 +585,10 @@ pppoutput(ifp, m0, dst) /* * 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: @@ -559,7 +604,7 @@ pppoutput(ifp, m0, dst) 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 @@ -628,20 +673,23 @@ pppoutput(ifp, m0, dst) * Put the packet on the appropriate queue. */ s = splimp(); /* splnet should be OK now */ - 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) + 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); @@ -651,6 +699,57 @@ bad: return (error); } +/* + * 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). + */ +static void +ppp_requeue(sc) + struct ppp_softc *sc; +{ + struct mbuf *m, **mpp; + struct ifqueue *ifq; + enum NPmode mode; + + 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; + } + + 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; + + case NPMODE_DROP: + case NPMODE_ERROR: + *mpp = m->m_act; + m_freem(m); + break; + + case NPMODE_QUEUE: + mpp = &m->m_act; + break; + } + } + sc->sc_npqtail = mpp; +} + /* * Get a packet to send. This procedure is intended to be called * at spltty()/splimp(), so it takes little time. If there isn't @@ -663,6 +762,7 @@ ppp_dequeue(sc) struct ppp_softc *sc; { struct mbuf *m; + int s = splimp(); m = sc->sc_togo; if (m) { @@ -671,6 +771,7 @@ ppp_dequeue(sc) */ sc->sc_togo = NULL; sc->sc_flags |= SC_TBUSY; + splx(s); return m; } /* @@ -678,6 +779,7 @@ ppp_dequeue(sc) */ sc->sc_flags &= ~SC_TBUSY; schednetisr(NETISR_PPP); + splx(s); return NULL; } @@ -691,6 +793,7 @@ pppintr() 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 @@ -703,6 +806,7 @@ pppintr() ppp_inproc(sc, m); } } + splx(s); } /* @@ -715,60 +819,21 @@ ppp_outpkt(sc) struct ppp_softc *sc; { int s; - struct mbuf *m, *mp, **mpp; + struct mbuf *m, *mp; u_char *cp; int address, control, protocol; - struct ifqueue *ifq; enum NPmode mode; /* - * Scan through the send queues looking for a packet - * which can be sent: first the fast queue, then the normal queue. + * Grab a packet to send: first try 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; - --ifq->ifq_len; - m_freem(m); - break; - case NPMODE_QUEUE: - mpp = &m->m_nextpkt; - mp = m; - break; - } - } - if (m != NULL) - break; - - if (ifq == &sc->sc_if.if_snd) - break; - /* Finished the fast queue; do the normal queue. */ - ifq = &sc->sc_if.if_snd; - } - + IF_DEQUEUE(&sc->sc_fastq, m); + if (m == NULL) + IF_DEQUEUE(&sc->sc_if.if_snd, m); if (m == NULL) return; - if ((*mpp = m->m_nextpkt) == NULL) - ifq->ifq_tail = mp; - m->m_nextpkt = NULL; - --ifq->ifq_len; - /* * Extract the ppp header of the new packet. * The ppp header will be in one mbuf. @@ -933,7 +998,7 @@ ppp_ccp(sc, m, rcvd) 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); @@ -943,7 +1008,7 @@ ppp_ccp(sc, m, rcvd) 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; @@ -994,20 +1059,20 @@ ppp_ccp_closed(sc) * 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. Should be called at splimp/spltty. + * were omitted. */ -#define M_ERRMARK 0x4000 /* steal a bit in mbuf m_flags */ - void ppppktin(sc, m, lost) struct ppp_softc *sc; struct mbuf *m; int lost; { - if (lost) - m->m_flags |= M_ERRMARK; + int s = splimp(); + + m->m_context = lost; IF_ENQUEUE(&sc->sc_rawq, m); schednetisr(NETISR_PPP); + splx(s); } /* @@ -1040,8 +1105,7 @@ ppp_inproc(sc, m) ctrl = PPP_CONTROL(cp); proto = PPP_PROTOCOL(cp); - if (m->m_flags & M_ERRMARK) { - m->m_flags &= ~M_ERRMARK; + if (m->m_context) { s = splimp(); sc->sc_flags |= SC_VJ_RESET; splx(s); @@ -1135,7 +1199,7 @@ ppp_inproc(sc, m) 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); @@ -1193,7 +1257,7 @@ ppp_inproc(sc, m) 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; @@ -1206,6 +1270,7 @@ ppp_inproc(sc, m) bpf_mtap(sc->sc_bpf, m); #endif + rv = 0; switch (proto) { #ifdef INET case PPP_IP: