Index: head/sys/net/if_ppp.c =================================================================== --- head/sys/net/if_ppp.c (revision 148982) +++ head/sys/net/if_ppp.c (revision 148983) @@ -1,1697 +1,1681 @@ /* * if_ppp.c - Point-to-Point Protocol (PPP) Asynchronous driver. */ /*- * Copyright (c) 1989 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. * * Drew D. Perkins * Carnegie Mellon University * 4910 Forbes Ave. * Pittsburgh, PA 15213 * (412) 268-8576 * ddp@andrew.cmu.edu * * Based on: * @(#)if_sl.c 7.6.1.2 (Berkeley) 2/15/89 * * Copyright (c) 1987 Regents of the University of California. * 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 the University of California, Berkeley. 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. * * Serial Line interface * * Rick Adams * Center for Seismic Studies * 1300 N 17th Street, Suite 1450 * Arlington, Virginia 22209 * (703)276-7900 * rick@seismo.ARPA * seismo!rick * * Pounded on heavily by Chris Torek (chris@mimsy.umd.edu, umcp-cs!chris). * Converted to 4.3BSD Beta by Chris Torek. * Other changes made at Berkeley, based in part on code by Kirk Smith. * * Converted to 4.3BSD+ 386BSD by Brad Parker (brad@cayman.com) * Added VJ tcp header compression; more unified ioctls * * Extensively modified by Paul Mackerras (paulus@cs.anu.edu.au). * Cleaned up a lot of the mbuf-related code to fix bugs that * caused system crashes and packet corruption. Changed pppstart * so that it doesn't just give up with a collision if the whole * packet doesn't fit in the output ring buffer. * * Added priority queueing for interactive IP packets, following * the model of if_sl.c, plus hooks for bpf. * Paul Mackerras (paulus@cs.anu.edu.au). */ /* $FreeBSD$ */ /* 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 */ #include "opt_inet.h" #include "opt_ipx.h" #include "opt_mac.h" #include "opt_ppp.h" #ifdef INET #define VJC #endif #define PPP_COMPRESS #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #if INET #include #include #include #include #endif #if IPX #include #include #endif #ifdef VJC #include #endif #include #include /* minimise diffs */ #ifndef splsoftnet #define splsoftnet splnet #endif #ifdef PPP_COMPRESS #define PACKETPTR struct mbuf * #include #endif #define PPPNAME "ppp" static MALLOC_DEFINE(M_PPP, PPPNAME, "PPP interface"); static struct mtx ppp_softc_list_mtx; static LIST_HEAD(, ppp_softc) ppp_softc_list; #define PPP_LIST_LOCK_INIT() mtx_init(&ppp_softc_list_mtx, \ "ppp_softc_list_mtx", NULL, MTX_DEF) #define PPP_LIST_LOCK_DESTROY() mtx_destroy(&ppp_softc_list_mtx) #define PPP_LIST_LOCK() mtx_lock(&ppp_softc_list_mtx) #define PPP_LIST_UNLOCK() mtx_unlock(&ppp_softc_list_mtx) /* XXX layering violation */ extern void pppasyncattach(void *); extern void pppasyncdetach(void); static int pppsioctl(struct ifnet *ifp, u_long cmd, caddr_t data); static void pppintr(void); static void ppp_requeue(struct ppp_softc *); static void ppp_ccp(struct ppp_softc *, struct mbuf *m, int rcvd); static void ppp_ccp_closed(struct ppp_softc *); static void ppp_inproc(struct ppp_softc *, struct mbuf *); static void pppdumpm(struct mbuf *m0); static int ppp_clone_create(struct if_clone *, int); static void ppp_clone_destroy(struct ifnet *); -struct ppp_softc * -ppp_for_tty(struct tty *tp) -{ - struct ppp_softc *sc; - - PPP_LIST_LOCK(); - LIST_FOREACH(sc, &ppp_softc_list, sc_list) { - if (sc->sc_devp == (void*)tp) { - PPP_LIST_UNLOCK(); - return (sc); - } - } - PPP_LIST_UNLOCK(); - return (NULL); -} - IFC_SIMPLE_DECLARE(ppp, 0); /* * Some useful mbuf macros not in mbuf.h. */ #define M_IS_CLUSTER(m) ((m)->m_flags & M_EXT) #define M_DATASTART(m) \ (M_IS_CLUSTER(m) ? (m)->m_ext.ext_buf : \ (m)->m_flags & M_PKTHDR ? (m)->m_pktdat : (m)->m_dat) #define M_DATASIZE(m) \ (M_IS_CLUSTER(m) ? (m)->m_ext.ext_size : \ (m)->m_flags & M_PKTHDR ? MHLEN: MLEN) /* * We steal two bits in the mbuf m_flags, to mark high-priority packets * for output, and received packets following lost/corrupted packets. */ #define M_HIGHPRI 0x2000 /* output packet for sc_fastq */ #define M_ERRMARK 0x4000 /* steal a bit in mbuf m_flags */ #ifdef PPP_COMPRESS /* * List of compressors we know about. * We leave some space so maybe we can modload compressors. */ extern struct compressor ppp_bsd_compress; extern struct compressor ppp_deflate, ppp_deflate_draft; static struct compressor *ppp_compressors[8] = { #if DO_BSD_COMPRESS && defined(PPP_BSDCOMP) &ppp_bsd_compress, #endif #if DO_DEFLATE && defined(PPP_DEFLATE) &ppp_deflate, &ppp_deflate_draft, #endif NULL }; #endif /* PPP_COMPRESS */ static int ppp_clone_create(struct if_clone *ifc, int unit) { struct ifnet *ifp; struct ppp_softc *sc; sc = malloc(sizeof(struct ppp_softc), M_PPP, M_WAITOK | M_ZERO); ifp = sc->sc_ifp = if_alloc(IFT_PPP); if (ifp == NULL) { free(sc, M_PPP); return (ENOSPC); } ifp->if_softc = sc; if_initname(ifp, ifc->ifc_name, unit); ifp->if_mtu = PPP_MTU; ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST; ifp->if_hdrlen = PPP_HDRLEN; ifp->if_ioctl = pppsioctl; ifp->if_output = pppoutput; ifp->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; mtx_init(&sc->sc_inq.ifq_mtx, "ppp_inq", NULL, MTX_DEF); mtx_init(&sc->sc_fastq.ifq_mtx, "ppp_fastq", NULL, MTX_DEF); mtx_init(&sc->sc_rawq.ifq_mtx, "ppp_rawq", NULL, MTX_DEF); if_attach(ifp); bpfattach(ifp, DLT_PPP, PPP_HDRLEN); PPP_LIST_LOCK(); LIST_INSERT_HEAD(&ppp_softc_list, sc, sc_list); PPP_LIST_UNLOCK(); return (0); } static void ppp_destroy(struct ppp_softc *sc) { struct ifnet *ifp; ifp = PPP2IFP(sc); bpfdetach(ifp); if_detach(ifp); if_free(ifp); mtx_destroy(&sc->sc_rawq.ifq_mtx); mtx_destroy(&sc->sc_fastq.ifq_mtx); mtx_destroy(&sc->sc_inq.ifq_mtx); free(sc, M_PPP); } static void ppp_clone_destroy(struct ifnet *ifp) { struct ppp_softc *sc; sc = ifp->if_softc; PPP_LIST_LOCK(); LIST_REMOVE(sc, sc_list); PPP_LIST_UNLOCK(); ppp_destroy(sc); } static int ppp_modevent(module_t mod, int type, void *data) { struct ppp_softc *sc; switch (type) { case MOD_LOAD: PPP_LIST_LOCK_INIT(); LIST_INIT(&ppp_softc_list); if_clone_attach(&ppp_cloner); netisr_register(NETISR_PPP, (netisr_t *)pppintr, NULL, 0); /* * XXX layering violation - if_ppp can work over any lower * level transport that cares to attach to it. */ pppasyncattach(NULL); break; case MOD_UNLOAD: /* XXX: layering violation */ pppasyncdetach(); netisr_unregister(NETISR_PPP); if_clone_detach(&ppp_cloner); PPP_LIST_LOCK(); while ((sc = LIST_FIRST(&ppp_softc_list)) != NULL) { LIST_REMOVE(sc, sc_list); PPP_LIST_UNLOCK(); ppp_destroy(sc); PPP_LIST_LOCK(); } PPP_LIST_LOCK_DESTROY(); break; default: return EOPNOTSUPP; } return 0; } static moduledata_t ppp_mod = { "if_ppp", ppp_modevent, 0 }; DECLARE_MODULE(if_ppp, ppp_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); /* * Allocate a ppp interface unit and initialize it. */ struct ppp_softc * pppalloc(pid) pid_t pid; { int i; char tmpname[IFNAMSIZ]; struct ifnet *ifp; struct ppp_softc *sc; PPP_LIST_LOCK(); LIST_FOREACH(sc, &ppp_softc_list, sc_list) { if (sc->sc_xfer == pid) { sc->sc_xfer = 0; PPP_LIST_UNLOCK(); return sc; } } LIST_FOREACH(sc, &ppp_softc_list, sc_list) { if (sc->sc_devp == NULL) break; } PPP_LIST_UNLOCK(); /* Try to clone an interface if we don't have a free one */ if (sc == NULL) { strcpy(tmpname, PPPNAME); if (if_clone_create(tmpname, sizeof(tmpname)) != 0) return NULL; ifp = ifunit(tmpname); if (ifp == NULL) return NULL; sc = ifp->if_softc; } if (sc == NULL || sc->sc_devp != NULL) return NULL; sc->sc_flags = 0; sc->sc_mru = PPP_MRU; sc->sc_relinq = NULL; bzero((char *)&sc->sc_stats, sizeof(sc->sc_stats)); #ifdef VJC MALLOC(sc->sc_comp, struct slcompress *, sizeof(struct slcompress), M_DEVBUF, M_NOWAIT); if (sc->sc_comp) sl_compress_init(sc->sc_comp, -1); #endif #ifdef PPP_COMPRESS sc->sc_xc_state = NULL; sc->sc_rc_state = NULL; #endif /* PPP_COMPRESS */ for (i = 0; i < NUM_NP; ++i) sc->sc_npmode[i] = NPMODE_ERROR; sc->sc_npqueue = NULL; sc->sc_npqtail = &sc->sc_npqueue; sc->sc_last_sent = sc->sc_last_recv = time_second; return sc; } /* * Deallocate a ppp unit. Must be called at splsoftnet or higher. */ void pppdealloc(sc) struct ppp_softc *sc; { struct mbuf *m; if_down(PPP2IFP(sc)); PPP2IFP(sc)->if_flags &= ~IFF_UP; PPP2IFP(sc)->if_drv_flags &= ~IFF_DRV_RUNNING; getmicrotime(&PPP2IFP(sc)->if_lastchange); sc->sc_devp = NULL; sc->sc_xfer = 0; IF_DRAIN(&sc->sc_rawq); IF_DRAIN(&sc->sc_inq); IF_DRAIN(&sc->sc_fastq); while ((m = sc->sc_npqueue) != NULL) { sc->sc_npqueue = m->m_nextpkt; m_freem(m); } #ifdef PPP_COMPRESS ppp_ccp_closed(sc); sc->sc_xc_state = NULL; sc->sc_rc_state = NULL; #endif /* PPP_COMPRESS */ #ifdef PPP_FILTER if (sc->sc_pass_filt.bf_insns != 0) { free(sc->sc_pass_filt.bf_insns, M_DEVBUF); sc->sc_pass_filt.bf_insns = 0; sc->sc_pass_filt.bf_len = 0; } if (sc->sc_active_filt.bf_insns != 0) { free(sc->sc_active_filt.bf_insns, M_DEVBUF); sc->sc_active_filt.bf_insns = 0; sc->sc_active_filt.bf_len = 0; } #endif /* PPP_FILTER */ #ifdef VJC if (sc->sc_comp != 0) { free(sc->sc_comp, M_DEVBUF); sc->sc_comp = 0; } #endif } /* * Ioctl routine for generic ppp devices. */ int pppioctl(sc, cmd, data, flag, td) struct ppp_softc *sc; u_long cmd; caddr_t data; int flag; struct thread *td; { struct proc *p = td->td_proc; int s, flags, mru, npx; u_int nb; int error = 0; struct ppp_option_data *odp; struct compressor **cp; struct npioctl *npi; time_t t; #ifdef PPP_FILTER struct bpf_program *bp, *nbp; struct bpf_insn *newcode, *oldcode; int newcodelen; #endif /* PPP_FILTER */ #ifdef PPP_COMPRESS u_char ccp_option[CCP_MAX_OPTION_LENGTH]; #endif switch (cmd) { case FIONREAD: *(int *)data = sc->sc_inq.ifq_len; break; case PPPIOCGUNIT: *(int *)data = PPP2IFP(sc)->if_dunit; break; case PPPIOCGFLAGS: *(u_int *)data = sc->sc_flags; break; case PPPIOCSFLAGS: if ((error = suser(td)) != 0) break; flags = *(int *)data & SC_MASK; s = splsoftnet(); #ifdef PPP_COMPRESS if (sc->sc_flags & SC_CCP_OPEN && !(flags & SC_CCP_OPEN)) ppp_ccp_closed(sc); #endif splimp(); sc->sc_flags = (sc->sc_flags & ~SC_MASK) | flags; splx(s); break; case PPPIOCSMRU: if ((error = suser(td)) != 0) return (error); mru = *(int *)data; if (mru >= PPP_MRU && mru <= PPP_MAXMRU) sc->sc_mru = mru; break; case PPPIOCGMRU: *(int *)data = sc->sc_mru; break; #ifdef VJC case PPPIOCSMAXCID: if ((error = suser(td)) != 0) break; if (sc->sc_comp) { s = splsoftnet(); sl_compress_init(sc->sc_comp, *(int *)data); splx(s); } break; #endif case PPPIOCXFERUNIT: if ((error = suser(td)) != 0) break; sc->sc_xfer = p->p_pid; break; #ifdef PPP_COMPRESS case PPPIOCSCOMPRESS: if ((error = suser(td)) != 0) break; odp = (struct ppp_option_data *) data; nb = odp->length; if (nb > sizeof(ccp_option)) nb = sizeof(ccp_option); if ((error = copyin(odp->ptr, ccp_option, nb)) != 0) break; if (ccp_option[1] < 2) { /* preliminary check on the length byte */ error = EINVAL; break; } for (cp = ppp_compressors; *cp != NULL; ++cp) if ((*cp)->compress_proto == ccp_option[0]) { /* * Found a handler for the protocol - try to allocate * a compressor or decompressor. */ error = 0; if (odp->transmit) { s = splsoftnet(); if (sc->sc_xc_state != NULL) (*sc->sc_xcomp->comp_free)(sc->sc_xc_state); sc->sc_xcomp = *cp; sc->sc_xc_state = (*cp)->comp_alloc(ccp_option, nb); if (sc->sc_xc_state == NULL) { if (sc->sc_flags & SC_DEBUG) if_printf(PPP2IFP(sc), "comp_alloc failed\n"); error = ENOBUFS; } splimp(); sc->sc_flags &= ~SC_COMP_RUN; splx(s); } else { s = splsoftnet(); if (sc->sc_rc_state != NULL) (*sc->sc_rcomp->decomp_free)(sc->sc_rc_state); sc->sc_rcomp = *cp; sc->sc_rc_state = (*cp)->decomp_alloc(ccp_option, nb); if (sc->sc_rc_state == NULL) { if (sc->sc_flags & SC_DEBUG) if_printf(PPP2IFP(sc), "decomp_alloc failed\n"); error = ENOBUFS; } splimp(); sc->sc_flags &= ~SC_DECOMP_RUN; splx(s); } break; } if (sc->sc_flags & SC_DEBUG) if_printf(PPP2IFP(sc), "no compressor for [%x %x %x], %x\n", ccp_option[0], ccp_option[1], ccp_option[2], nb); error = EINVAL; /* no handler found */ break; #endif /* PPP_COMPRESS */ case PPPIOCGNPMODE: case PPPIOCSNPMODE: npi = (struct npioctl *) data; npx = 0; /* XXX: quiet gcc */ switch (npi->protocol) { case PPP_IP: npx = NP_IP; break; default: error = EINVAL; } if (error) break; if (cmd == PPPIOCGNPMODE) { npi->mode = sc->sc_npmode[npx]; } else { if ((error = suser(td)) != 0) break; if (npi->mode != sc->sc_npmode[npx]) { s = splsoftnet(); sc->sc_npmode[npx] = npi->mode; if (npi->mode != NPMODE_QUEUE) { ppp_requeue(sc); (*sc->sc_start)(sc); } splx(s); } } break; case PPPIOCGIDLE: s = splsoftnet(); t = time_second; ((struct ppp_idle *)data)->xmit_idle = t - sc->sc_last_sent; ((struct ppp_idle *)data)->recv_idle = t - sc->sc_last_recv; splx(s); break; #ifdef PPP_FILTER case PPPIOCSPASS: case PPPIOCSACTIVE: nbp = (struct bpf_program *) data; if ((unsigned) nbp->bf_len > BPF_MAXINSNS) { error = EINVAL; break; } newcodelen = nbp->bf_len * sizeof(struct bpf_insn); if (newcodelen != 0) { MALLOC(newcode, struct bpf_insn *, newcodelen, M_DEVBUF, M_WAITOK); if (newcode == 0) { error = EINVAL; /* or sumpin */ break; } if ((error = copyin((caddr_t)nbp->bf_insns, (caddr_t)newcode, newcodelen)) != 0) { free(newcode, M_DEVBUF); break; } if (!bpf_validate(newcode, nbp->bf_len)) { free(newcode, M_DEVBUF); error = EINVAL; break; } } else newcode = 0; bp = (cmd == PPPIOCSPASS)? &sc->sc_pass_filt: &sc->sc_active_filt; oldcode = bp->bf_insns; s = splimp(); bp->bf_len = nbp->bf_len; bp->bf_insns = newcode; splx(s); if (oldcode != 0) free(oldcode, M_DEVBUF); break; #endif default: error = ENOIOCTL; break; } return (error); } /* * Process an ioctl request to the ppp network interface. */ static int pppsioctl(ifp, cmd, data) register struct ifnet *ifp; u_long cmd; caddr_t data; { struct thread *td = curthread; /* XXX */ register struct ppp_softc *sc = ifp->if_softc; register struct ifaddr *ifa = (struct ifaddr *)data; register struct ifreq *ifr = (struct ifreq *)data; struct ppp_stats *psp; #ifdef PPP_COMPRESS struct ppp_comp_stats *pcp; #endif int s = splimp(), error = 0; switch (cmd) { case SIOCSIFFLAGS: if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) ifp->if_flags &= ~IFF_UP; break; case SIOCSIFADDR: case SIOCAIFADDR: switch(ifa->ifa_addr->sa_family) { #ifdef INET case AF_INET: break; #endif #ifdef IPX case AF_IPX: break; #endif default: error = EAFNOSUPPORT; break; } break; case SIOCSIFDSTADDR: switch(ifa->ifa_addr->sa_family) { #ifdef INET case AF_INET: break; #endif #ifdef IPX case AF_IPX: break; #endif default: error = EAFNOSUPPORT; break; } break; case SIOCSIFMTU: if ((error = suser(td)) != 0) break; if (ifr->ifr_mtu > PPP_MAXMTU) error = EINVAL; else { PPP2IFP(sc)->if_mtu = ifr->ifr_mtu; if (sc->sc_setmtu) (*sc->sc_setmtu)(sc); } break; case SIOCGIFMTU: ifr->ifr_mtu = PPP2IFP(sc)->if_mtu; break; case SIOCADDMULTI: case SIOCDELMULTI: if (ifr == 0) { error = EAFNOSUPPORT; break; } switch(ifr->ifr_addr.sa_family) { #ifdef INET case AF_INET: break; #endif default: error = EAFNOSUPPORT; break; } break; case SIOCGPPPSTATS: psp = &((struct ifpppstatsreq *) data)->stats; bzero(psp, sizeof(*psp)); psp->p = sc->sc_stats; #if defined(VJC) && !defined(SL_NO_STATS) if (sc->sc_comp) { 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 = ENOTTY; } splx(s); return (error); } /* * Queue a packet. Start transmission if not active. * Packet is placed in Information field of PPP frame. * Called at splnet as the if->if_output handler. * Called at splnet from pppwrite(). */ int pppoutput(ifp, m0, dst, rtp) struct ifnet *ifp; struct mbuf *m0; struct sockaddr *dst; struct rtentry *rtp; { register struct ppp_softc *sc = ifp->if_softc; int protocol, address, control; u_char *cp; int s, error; struct ip *ip; struct ifqueue *ifq; enum NPmode mode; int len; #ifdef MAC error = mac_check_ifnet_transmit(ifp, m0); if (error) goto bad; #endif if (sc->sc_devp == NULL || (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || ((ifp->if_flags & IFF_UP) == 0 && dst->sa_family != AF_UNSPEC)) { error = ENETDOWN; /* sort of */ goto bad; } /* * Compute PPP header. */ m0->m_flags &= ~M_HIGHPRI; switch (dst->sa_family) { #ifdef INET case AF_INET: address = PPP_ALLSTATIONS; control = PPP_UI; protocol = PPP_IP; mode = sc->sc_npmode[NP_IP]; /* * If this packet has the "low delay" bit set in the IP header, * put it on the fastq instead. */ ip = mtod(m0, struct ip *); if (ip->ip_tos & IPTOS_LOWDELAY) m0->m_flags |= M_HIGHPRI; break; #endif #ifdef IPX case AF_IPX: /* * This is pretty bogus.. We dont have an ipxcp module in pppd * yet to configure the link parameters. Sigh. I guess a * manual ifconfig would do.... -Peter */ address = PPP_ALLSTATIONS; control = PPP_UI; protocol = PPP_IPX; mode = NPMODE_PASS; break; #endif case AF_UNSPEC: address = PPP_ADDRESS(dst->sa_data); control = PPP_CONTROL(dst->sa_data); protocol = PPP_PROTOCOL(dst->sa_data); mode = NPMODE_PASS; break; default: if_printf(ifp, "af%d not supported\n", dst->sa_family); error = EAFNOSUPPORT; goto bad; } /* * Drop this packet, or return an error, if necessary. */ if (mode == NPMODE_ERROR) { error = ENETDOWN; goto bad; } if (mode == NPMODE_DROP) { error = 0; goto bad; } /* * Add PPP header. If no space in first mbuf, allocate another. * (This assumes M_LEADINGSPACE is always 0 for a cluster mbuf.) */ if (M_LEADINGSPACE(m0) < PPP_HDRLEN) { m0 = m_prepend(m0, PPP_HDRLEN, M_DONTWAIT); if (m0 == 0) { error = ENOBUFS; goto bad; } m0->m_len = 0; } else m0->m_data -= PPP_HDRLEN; cp = mtod(m0, u_char *); *cp++ = address; *cp++ = control; *cp++ = protocol >> 8; *cp++ = protocol & 0xff; m0->m_len += PPP_HDRLEN; len = m_length(m0, NULL); if (sc->sc_flags & SC_LOG_OUTPKT) { printf("%s output: ", ifp->if_xname); pppdumpm(m0); } if ((protocol & 0x8000) == 0) { #ifdef PPP_FILTER /* * Apply the pass and active filters to the packet, * but only if it is a data packet. */ *mtod(m0, u_char *) = 1; /* indicates outbound */ if (sc->sc_pass_filt.bf_insns != 0 && bpf_filter(sc->sc_pass_filt.bf_insns, (u_char *) m0, len, 0) == 0) { error = 0; /* drop this packet */ goto bad; } /* * Update the time we sent the most recent packet. */ if (sc->sc_active_filt.bf_insns == 0 || bpf_filter(sc->sc_active_filt.bf_insns, (u_char *) m0, len, 0)) sc->sc_last_sent = time_second; *mtod(m0, u_char *) = address; #else /* * Update the time we sent the most recent data packet. */ sc->sc_last_sent = time_second; #endif /* PPP_FILTER */ } /* * See if bpf wants to look at the packet. */ BPF_MTAP(ifp, m0); /* * Put the packet on the appropriate queue. */ s = splsoftnet(); /* redundant */ if (mode == NPMODE_QUEUE) { /* XXX we should limit the number of packets on this queue */ *sc->sc_npqtail = m0; m0->m_nextpkt = NULL; sc->sc_npqtail = &m0->m_nextpkt; } else { /* fastq and if_snd are emptied at spl[soft]net now */ ifq = (m0->m_flags & M_HIGHPRI)? &sc->sc_fastq: (struct ifqueue *)&ifp->if_snd; IF_LOCK(ifq); if (_IF_QFULL(ifq) && dst->sa_family != AF_UNSPEC) { _IF_DROP(ifq); IF_UNLOCK(ifq); PPP2IFP(sc)->if_oerrors++; sc->sc_stats.ppp_oerrors++; error = ENOBUFS; goto bad; } _IF_ENQUEUE(ifq, m0); IF_UNLOCK(ifq); (*sc->sc_start)(sc); } getmicrotime(&ifp->if_lastchange); ifp->if_opackets++; ifp->if_obytes += len; splx(s); return (0); bad: m_freem(m0); 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 spl[soft]net. */ 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_nextpkt; m->m_nextpkt = NULL; ifq = (m->m_flags & M_HIGHPRI)? &sc->sc_fastq: (struct ifqueue *)&PPP2IFP(sc)->if_snd; if (! IF_HANDOFF(ifq, m, NULL)) { PPP2IFP(sc)->if_oerrors++; sc->sc_stats.ppp_oerrors++; } break; case NPMODE_DROP: case NPMODE_ERROR: *mpp = m->m_nextpkt; m_freem(m); break; case NPMODE_QUEUE: mpp = &m->m_nextpkt; break; } } sc->sc_npqtail = mpp; } /* * Transmitter has finished outputting some stuff; * remember to call sc->sc_start later at splsoftnet. */ void ppp_restart(sc) struct ppp_softc *sc; { int s = splimp(); sc->sc_flags &= ~SC_TBUSY; schednetisr(NETISR_PPP); splx(s); } /* * Get a packet to send. This procedure is intended to be called at * splsoftnet, since it may involve time-consuming operations such as * applying VJ compression, packet compression, address/control and/or * protocol field compression to the packet. */ struct mbuf * ppp_dequeue(sc) struct ppp_softc *sc; { struct mbuf *m, *mp; u_char *cp; int address, control, protocol; /* * 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(&PPP2IFP(sc)->if_snd, m); if (m == NULL) return NULL; ++sc->sc_stats.ppp_opackets; /* * 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); control = PPP_CONTROL(cp); protocol = PPP_PROTOCOL(cp); switch (protocol) { case PPP_IP: #ifdef VJC /* * If the packet is a TCP/IP packet, see if we can compress it. */ if ((sc->sc_flags & SC_COMP_TCP) && sc->sc_comp != NULL) { struct ip *ip; int type; mp = m; ip = (struct ip *) (cp + PPP_HDRLEN); if (mp->m_len <= PPP_HDRLEN) { mp = mp->m_next; if (mp == NULL) break; ip = mtod(mp, struct ip *); } /* this code assumes the IP/TCP header is in one non-shared mbuf */ if (ip->ip_p == IPPROTO_TCP) { type = sl_compress_tcp(mp, ip, sc->sc_comp, !(sc->sc_flags & SC_NO_TCP_CCID)); switch (type) { case TYPE_UNCOMPRESSED_TCP: protocol = PPP_VJC_UNCOMP; break; case TYPE_COMPRESSED_TCP: protocol = PPP_VJC_COMP; cp = mtod(m, u_char *); cp[0] = address; /* header has moved */ cp[1] = control; cp[2] = 0; break; } cp[3] = protocol; /* update protocol in PPP header */ } } #endif /* VJC */ break; #ifdef PPP_COMPRESS case PPP_CCP: ppp_ccp(sc, m, 0); break; #endif /* PPP_COMPRESS */ } #ifdef PPP_COMPRESS if (protocol != PPP_LCP && protocol != PPP_CCP && sc->sc_xc_state && (sc->sc_flags & SC_COMP_RUN)) { struct mbuf *mcomp = NULL; int slen, clen; slen = m_length(m, NULL); clen = (*sc->sc_xcomp->compress) (sc->sc_xc_state, &mcomp, m, slen, PPP2IFP(sc)->if_mtu + PPP_HDRLEN); if (mcomp != NULL) { 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 */ /* * Compress the address/control and protocol, if possible. */ if (sc->sc_flags & SC_COMP_AC && address == PPP_ALLSTATIONS && control == PPP_UI && protocol != PPP_ALLSTATIONS && protocol != PPP_LCP) { /* can compress address/control */ m->m_data += 2; m->m_len -= 2; } if (sc->sc_flags & SC_COMP_PROT && protocol < 0xFF) { /* can compress protocol */ if (mtod(m, u_char *) == cp) { cp[2] = cp[1]; /* move address/control up */ cp[1] = cp[0]; } ++m->m_data; --m->m_len; } return m; } /* * Software interrupt routine, called at spl[soft]net. */ static void pppintr() { struct ppp_softc *sc; int s; struct mbuf *m; GIANT_REQUIRED; PPP_LIST_LOCK(); LIST_FOREACH(sc, &ppp_softc_list, sc_list) { s = splimp(); if (!(sc->sc_flags & SC_TBUSY) && (PPP2IFP(sc)->if_snd.ifq_head || sc->sc_fastq.ifq_head)) { sc->sc_flags |= SC_TBUSY; splx(s); (*sc->sc_start)(sc); } else splx(s); for (;;) { s = splimp(); IF_DEQUEUE(&sc->sc_rawq, m); splx(s); if (m == NULL) break; #ifdef MAC mac_create_mbuf_from_ifnet(PPP2IFP(sc), m); #endif ppp_inproc(sc, m); } } PPP_LIST_UNLOCK(); } #ifdef PPP_COMPRESS /* * Handle a CCP packet. `rcvd' is 1 if the packet was received, * 0 if it is about to be transmitted. */ static void ppp_ccp(sc, m, rcvd) struct ppp_softc *sc; struct mbuf *m; int rcvd; { u_char *dp, *ep; struct mbuf *mp; int slen, s; /* * Get a pointer to the data after the PPP header. */ if (m->m_len <= PPP_HDRLEN) { mp = m->m_next; if (mp == NULL) return; dp = (mp != NULL)? mtod(mp, u_char *): NULL; } else { mp = m; dp = mtod(mp, u_char *) + PPP_HDRLEN; } ep = mtod(mp, u_char *) + mp->m_len; if (dp + CCP_HDRLEN > ep) return; slen = CCP_LENGTH(dp); if (dp + slen > ep) { if (sc->sc_flags & SC_DEBUG) printf("if_ppp/ccp: not enough data in mbuf (%p+%x > %p+%x)\n", dp, slen, mtod(mp, u_char *), mp->m_len); return; } switch (CCP_CODE(dp)) { case CCP_CONFREQ: case CCP_TERMREQ: case CCP_TERMACK: /* CCP must be going down - disable compression */ 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_flags & SC_CCP_OPEN && !(sc->sc_flags & SC_CCP_UP) && slen >= CCP_HDRLEN + CCP_OPT_MINLEN && slen >= CCP_OPT_LENGTH(dp + CCP_HDRLEN) + CCP_HDRLEN) { if (!rcvd) { /* we're agreeing to send compressed packets. */ if (sc->sc_xc_state != NULL && (*sc->sc_xcomp->comp_init) (sc->sc_xc_state, dp + CCP_HDRLEN, slen - CCP_HDRLEN, PPP2IFP(sc)->if_dunit, 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, PPP2IFP(sc)->if_dunit, 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); } } } break; case CCP_RESETACK: if (sc->sc_flags & SC_CCP_UP) { if (!rcvd) { if (sc->sc_xc_state && (sc->sc_flags & SC_COMP_RUN)) (*sc->sc_xcomp->comp_reset)(sc->sc_xc_state); } 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); } } } break; } } /* * CCP is down; free (de)compressor state if necessary. */ static void ppp_ccp_closed(sc) struct ppp_softc *sc; { if (sc->sc_xc_state) { (*sc->sc_xcomp->comp_free)(sc->sc_xc_state); sc->sc_xc_state = NULL; } if (sc->sc_rc_state) { (*sc->sc_rcomp->decomp_free)(sc->sc_rc_state); sc->sc_rc_state = NULL; } } #endif /* PPP_COMPRESS */ /* * 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. */ void ppppktin(sc, m, lost) struct ppp_softc *sc; struct mbuf *m; int lost; { int s = splimp(); if (lost) m->m_flags |= M_ERRMARK; IF_ENQUEUE(&sc->sc_rawq, m); schednetisr(NETISR_PPP); splx(s); } /* * Process a received PPP packet, doing decompression as necessary. * Should be called at splsoftnet. */ #define COMPTYPE(proto) ((proto) == PPP_VJC_COMP? TYPE_COMPRESSED_TCP: \ TYPE_UNCOMPRESSED_TCP) static void ppp_inproc(sc, m) struct ppp_softc *sc; struct mbuf *m; { struct ifnet *ifp = PPP2IFP(sc); int isr; int s, ilen = 0, xlen, proto, rv; u_char *cp, adrs, ctrl; struct mbuf *mp, *dmp = NULL; u_char *iphdr; u_int hlen; sc->sc_stats.ppp_ipackets++; if (sc->sc_flags & SC_LOG_INPKT) { ilen = m_length(m, NULL); if_printf(ifp, "got %d bytes\n", ilen); pppdumpm(m); } cp = mtod(m, u_char *); adrs = PPP_ADDRESS(cp); ctrl = PPP_CONTROL(cp); proto = PPP_PROTOCOL(cp); if (m->m_flags & M_ERRMARK) { m->m_flags &= ~M_ERRMARK; s = splimp(); sc->sc_flags |= SC_VJ_RESET; splx(s); } #ifdef PPP_COMPRESS /* * Decompress this packet if necessary, update the receiver's * dictionary, or take appropriate action on a CCP packet. */ if (proto == PPP_COMP && sc->sc_rc_state && (sc->sc_flags & SC_DECOMP_RUN) && !(sc->sc_flags & SC_DC_ERROR) && !(sc->sc_flags & SC_DC_FERROR)) { /* decompress this packet */ rv = (*sc->sc_rcomp->decompress)(sc->sc_rc_state, m, &dmp); if (rv == DECOMP_OK) { m_freem(m); if (dmp == NULL) { /* no error, but no decompressed packet produced */ return; } m = dmp; cp = mtod(m, u_char *); proto = PPP_PROTOCOL(cp); } else { /* * An error has occurred in decompression. * Pass the compressed packet up to pppd, which may take * CCP down or issue a Reset-Req. */ if (sc->sc_flags & SC_DEBUG) if_printf(ifp, "decompress failed %d\n", rv); s = splimp(); sc->sc_flags |= SC_VJ_RESET; if (rv == DECOMP_ERROR) sc->sc_flags |= SC_DC_ERROR; else sc->sc_flags |= SC_DC_FERROR; splx(s); } } else { if (sc->sc_rc_state && (sc->sc_flags & SC_DECOMP_RUN)) { (*sc->sc_rcomp->incomp)(sc->sc_rc_state, m); } if (proto == PPP_CCP) { ppp_ccp(sc, m, 1); } } #endif ilen = m_length(m, NULL); #ifdef VJC 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. */ if (sc->sc_comp) sl_uncompress_tcp(NULL, 0, TYPE_ERROR, sc->sc_comp); s = splimp(); sc->sc_flags &= ~SC_VJ_RESET; splx(s); } /* * See if we have a VJ-compressed packet to uncompress. */ if (proto == PPP_VJC_COMP) { if ((sc->sc_flags & SC_REJ_COMP_TCP) || sc->sc_comp == 0) goto bad; xlen = sl_uncompress_tcp_core(cp + PPP_HDRLEN, m->m_len - PPP_HDRLEN, ilen - PPP_HDRLEN, TYPE_COMPRESSED_TCP, sc->sc_comp, &iphdr, &hlen); if (xlen <= 0) { if (sc->sc_flags & SC_DEBUG) if_printf(ifp, "VJ uncompress failed on type comp\n"); goto bad; } /* Copy the PPP and IP headers into a new mbuf. */ MGETHDR(mp, M_DONTWAIT, MT_DATA); if (mp == NULL) goto bad; mp->m_len = 0; mp->m_next = NULL; if (hlen + PPP_HDRLEN > MHLEN) { MCLGET(mp, M_DONTWAIT); if (M_TRAILINGSPACE(mp) < hlen + PPP_HDRLEN) { m_freem(mp); goto bad; /* lose if big headers and no clusters */ } } #ifdef MAC mac_copy_mbuf(m, mp); #endif cp = mtod(mp, u_char *); cp[0] = adrs; cp[1] = ctrl; cp[2] = 0; cp[3] = PPP_IP; proto = PPP_IP; bcopy(iphdr, cp + PPP_HDRLEN, hlen); mp->m_len = hlen + PPP_HDRLEN; /* * Trim the PPP and VJ headers off the old mbuf * and stick the new and old mbufs together. */ m->m_data += PPP_HDRLEN + xlen; m->m_len -= PPP_HDRLEN + xlen; if (m->m_len <= M_TRAILINGSPACE(mp)) { bcopy(mtod(m, u_char *), mtod(mp, u_char *) + mp->m_len, m->m_len); mp->m_len += m->m_len; mp->m_next = m_free(m); } else { mp->m_next = m; } m = mp; ilen += hlen - xlen; } else if (proto == PPP_VJC_UNCOMP) { if ((sc->sc_flags & SC_REJ_COMP_TCP) || sc->sc_comp == 0) goto bad; xlen = sl_uncompress_tcp_core(cp + PPP_HDRLEN, m->m_len - PPP_HDRLEN, ilen - PPP_HDRLEN, TYPE_UNCOMPRESSED_TCP, sc->sc_comp, &iphdr, &hlen); if (xlen < 0) { if (sc->sc_flags & SC_DEBUG) if_printf(ifp, "VJ uncompress failed on type uncomp\n"); goto bad; } proto = PPP_IP; cp[3] = PPP_IP; } #endif /* VJC */ /* * If the packet will fit in a header mbuf, don't waste a * whole cluster on it. */ if (ilen <= MHLEN && M_IS_CLUSTER(m)) { MGETHDR(mp, M_DONTWAIT, MT_DATA); if (mp != NULL) { #ifdef MAC mac_copy_mbuf(m, mp); #endif m_copydata(m, 0, ilen, mtod(mp, caddr_t)); m_freem(m); m = mp; m->m_len = ilen; } } m->m_pkthdr.len = ilen; m->m_pkthdr.rcvif = ifp; if ((proto & 0x8000) == 0) { #ifdef PPP_FILTER /* * See whether we want to pass this packet, and * if it counts as link activity. */ adrs = *mtod(m, u_char *); /* save address field */ *mtod(m, u_char *) = 0; /* indicate inbound */ if (sc->sc_pass_filt.bf_insns != 0 && bpf_filter(sc->sc_pass_filt.bf_insns, (u_char *) m, ilen, 0) == 0) { /* drop this packet */ m_freem(m); return; } if (sc->sc_active_filt.bf_insns == 0 || bpf_filter(sc->sc_active_filt.bf_insns, (u_char *) m, ilen, 0)) sc->sc_last_recv = time_second; *mtod(m, u_char *) = adrs; #else /* * Record the time that we received this packet. */ sc->sc_last_recv = time_second; #endif /* PPP_FILTER */ } /* See if bpf wants to look at the packet. */ BPF_MTAP(PPP2IFP(sc), m); isr = -1; switch (proto) { #ifdef INET case PPP_IP: /* * IP packet - take off the ppp header and pass it up to IP. */ if ((ifp->if_flags & IFF_UP) == 0 || sc->sc_npmode[NP_IP] != NPMODE_PASS) { /* interface is down - drop the packet. */ m_freem(m); return; } m->m_pkthdr.len -= PPP_HDRLEN; m->m_data += PPP_HDRLEN; m->m_len -= PPP_HDRLEN; if (ip_fastforward(m)) return; isr = NETISR_IP; break; #endif #ifdef IPX case PPP_IPX: /* * IPX packet - take off the ppp header and pass it up to IPX. */ if ((PPP2IFP(sc)->if_flags & IFF_UP) == 0 /* XXX: || sc->sc_npmode[NP_IPX] != NPMODE_PASS*/) { /* interface is down - drop the packet. */ m_freem(m); return; } m->m_pkthdr.len -= PPP_HDRLEN; m->m_data += PPP_HDRLEN; m->m_len -= PPP_HDRLEN; isr = NETISR_IPX; sc->sc_last_recv = time_second; /* update time of last pkt rcvd */ break; #endif default: /* * Some other protocol - place on input queue for read(). */ break; } if (isr == -1) rv = IF_HANDOFF(&sc->sc_inq, m, NULL); else rv = netisr_queue(isr, m); /* (0) on success. */ if ((isr == -1 && !rv) || (isr != -1 && rv)) { if (sc->sc_flags & SC_DEBUG) if_printf(ifp, "input queue full\n"); ifp->if_iqdrops++; m = NULL; goto bad; } ifp->if_ipackets++; ifp->if_ibytes += ilen; getmicrotime(&ifp->if_lastchange); if (isr == -1) (*sc->sc_ctlp)(sc); return; bad: if (m) m_freem(m); PPP2IFP(sc)->if_ierrors++; sc->sc_stats.ppp_ierrors++; } #define MAX_DUMP_BYTES 128 static void pppdumpm(m0) struct mbuf *m0; { char buf[3*MAX_DUMP_BYTES+4]; char *bp = buf; struct mbuf *m; for (m = m0; m; m = m->m_next) { int l = m->m_len; u_char *rptr = (u_char *)m->m_data; while (l--) { if (bp > buf + (sizeof(buf) - 4)) goto done; *bp++ = hex2ascii(*rptr >> 4); *bp++ = hex2ascii(*rptr++ & 0xf); } if (m->m_next) { if (bp > buf + (sizeof(buf) - 3)) goto done; *bp++ = '|'; } else *bp++ = ' '; } done: if (m) *bp++ = '>'; *bp = 0; printf("%s\n", buf); } Index: head/sys/net/if_pppvar.h =================================================================== --- head/sys/net/if_pppvar.h (revision 148982) +++ head/sys/net/if_pppvar.h (revision 148983) @@ -1,113 +1,112 @@ /* * if_pppvar.h - private structures and declarations for PPP. */ /*- * Copyright (c) 1994 The Australian National University. * All rights reserved. * * Permission to use, copy, modify, and distribute this software and its * documentation is hereby granted, provided that the above copyright * notice appears in all copies. This software is provided without any * warranty, express or implied. The Australian National University * makes no representations about the suitability of this software for * any purpose. * * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. * * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * * Copyright (c) 1989 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 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD$ */ /* * Supported network protocols. These values are used for * indexing sc_npmode. */ #define NP_IP 0 /* Internet Protocol */ #define NUM_NP 1 /* Number of NPs. */ /* * Structure describing each ppp unit. */ struct ppp_softc { struct ifnet *sc_ifp; /* network-visible interface */ /*hi*/ u_int sc_flags; /* control/status bits; see if_ppp.h */ struct callout_handle sc_ch; /* Used for scheduling timeouts */ void *sc_devp; /* pointer to device-dep structure */ void (*sc_start)(struct ppp_softc *); /* start output proc */ void (*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */ void (*sc_relinq)(struct ppp_softc *); /* relinquish ifunit */ void (*sc_setmtu)(struct ppp_softc *); /* set mtu */ short sc_mru; /* max receive unit */ pid_t sc_xfer; /* used in transferring unit */ /*hi*/ struct ifqueue sc_rawq; /* received packets */ /*net*/ struct ifqueue sc_inq; /* queue of input packets for daemon */ /*net*/ struct ifqueue sc_fastq; /* interactive output packet q */ struct mbuf *sc_npqueue; /* output packets not to be sent yet */ struct mbuf **sc_npqtail; /* ptr to last next ptr in npqueue */ struct pppstat sc_stats; /* count of bytes/pkts sent/rcvd */ enum NPmode sc_npmode[NUM_NP]; /* what to do with each NP */ struct compressor *sc_xcomp; /* transmit compressor */ void *sc_xc_state; /* transmit compressor state */ struct compressor *sc_rcomp; /* receive decompressor */ void *sc_rc_state; /* receive decompressor state */ time_t sc_last_sent; /* time (secs) last NP pkt sent */ time_t sc_last_recv; /* time (secs) last NP pkt rcvd */ #ifdef PPP_FILTER struct bpf_program sc_pass_filt; /* filter for packets to pass */ struct bpf_program sc_active_filt; /* filter for "non-idle" packets */ #endif /* PPP_FILTER */ #ifdef VJC struct slcompress *sc_comp; /* vjc control buffer */ #endif /* Device-dependent part for async lines. */ ext_accm sc_asyncmap; /* async control character map */ u_long sc_rasyncmap; /* receive async control char map */ struct mbuf *sc_outm; /* mbuf chain currently being output */ struct mbuf *sc_m; /* pointer to input mbuf chain */ struct mbuf *sc_mc; /* pointer to current input mbuf */ char *sc_mp; /* ptr to next char in input mbuf */ short sc_ilen; /* length of input packet so far */ u_short sc_fcs; /* FCS so far (input) */ u_short sc_outfcs; /* FCS so far for output packet */ u_char sc_rawin[16]; /* chars as received */ int sc_rawin_count; /* # in sc_rawin */ LIST_ENTRY(ppp_softc) sc_list; }; #define PPP2IFP(sc) ((sc)->sc_ifp) struct ppp_softc *pppalloc(pid_t pid); void pppdealloc(struct ppp_softc *sc); int pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data, int flag, struct thread *td); int pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst, struct rtentry *rtp); void ppp_restart(struct ppp_softc *sc); void ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost); struct mbuf *ppp_dequeue(struct ppp_softc *sc); -struct ppp_softc *ppp_for_tty(struct tty *); Index: head/sys/net/ppp_tty.c =================================================================== --- head/sys/net/ppp_tty.c (revision 148982) +++ head/sys/net/ppp_tty.c (revision 148983) @@ -1,1073 +1,1073 @@ /* * ppp_tty.c - Point-to-Point Protocol (PPP) driver for asynchronous * tty devices. */ /*- * Copyright (c) 1989 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. * * Drew D. Perkins * Carnegie Mellon University * 4910 Forbes Ave. * Pittsburgh, PA 15213 * (412) 268-8576 * ddp@andrew.cmu.edu * * Based on: * @(#)if_sl.c 7.6.1.2 (Berkeley) 2/15/89 * * Copyright (c) 1987 Regents of the University of California. * 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 the University of California, Berkeley. 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. * * Serial Line interface * * Rick Adams * Center for Seismic Studies * 1300 N 17th Street, Suite 1450 * Arlington, Virginia 22209 * (703)276-7900 * rick@seismo.ARPA * seismo!rick * * Pounded on heavily by Chris Torek (chris@mimsy.umd.edu, umcp-cs!chris). * Converted to 4.3BSD Beta by Chris Torek. * Other changes made at Berkeley, based in part on code by Kirk Smith. * * Converted to 4.3BSD+ 386BSD by Brad Parker (brad@cayman.com) * Added VJ tcp header compression; more unified ioctls * * Extensively modified by Paul Mackerras (paulus@cs.anu.edu.au). * Cleaned up a lot of the mbuf-related code to fix bugs that * caused system crashes and packet corruption. Changed pppstart * so that it doesn't just give up with a "collision" if the whole * packet doesn't fit in the output ring buffer. * * Added priority queueing for interactive IP packets, following * the model of if_sl.c, plus hooks for bpf. * Paul Mackerras (paulus@cs.anu.edu.au). */ /* $FreeBSD$ */ #include "opt_ppp.h" /* XXX for ppp_defs.h */ #define VJC /* XXX for ppp_defs.h */ #include #include #include #include #include #include #include #include #include #ifdef PPP_FILTER #include #endif #include #include static int pppopen(struct cdev *dev, struct tty *tp); static int pppclose(struct tty *tp, int flag); static int pppread(struct tty *tp, struct uio *uio, int flag); static int pppwrite(struct tty *tp, struct uio *uio, int flag); static int ppptioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct thread *td); static int pppinput(int c, struct tty *tp); static int pppstart(struct tty *tp); static u_short pppfcs(u_short fcs, u_char *cp, int len); static void pppasyncstart(struct ppp_softc *); static void pppasyncctlp(struct ppp_softc *); static void pppasyncrelinq(struct ppp_softc *); static void pppasyncsetmtu(struct ppp_softc *); static void ppp_timeout(void *); static void pppgetm(struct ppp_softc *sc); static void ppplogchar(struct ppp_softc *, int); /* XXX called from if_ppp.c - layering violation */ void pppasyncattach(void *); void pppasyncdetach(void); /* * Some useful mbuf macros not in mbuf.h. */ #define M_IS_CLUSTER(m) ((m)->m_flags & M_EXT) #define M_DATASTART(m) \ (M_IS_CLUSTER(m) ? (m)->m_ext.ext_buf : \ (m)->m_flags & M_PKTHDR ? (m)->m_pktdat : (m)->m_dat) #define M_DATASIZE(m) \ (M_IS_CLUSTER(m) ? (m)->m_ext.ext_size : \ (m)->m_flags & M_PKTHDR ? MHLEN: MLEN) /* * Does c need to be escaped? */ #define ESCAPE_P(c) (sc->sc_asyncmap[(c) >> 5] & (1 << ((c) & 0x1F))) /* * Procedures for using an async tty interface for PPP. */ /* This is a FreeBSD-2.X kernel. */ #define CCOUNT(q) ((q)->c_cc) #define PPP_LOWAT 100 /* Process more output when < LOWAT on queue */ #define PPP_HIWAT 400 /* Don't start a new packet if HIWAT on que */ /* * Define the PPP line discipline. */ static struct linesw pppdisc = { pppopen, pppclose, pppread, pppwrite, ppptioctl, pppinput, pppstart, ttymodem }; void pppasyncattach(dummy) void *dummy; { ldisc_register(PPPDISC, &pppdisc); } void pppasyncdetach() { ldisc_deregister(PPPDISC); } /* * Line specific open routine for async tty devices. * Attach the given tty to the first available ppp unit. * Called from device open routine or ttioctl() at >= splsofttty() */ /* ARGSUSED */ static int pppopen(dev, tp) struct cdev *dev; register struct tty *tp; { struct thread *td = curthread; /* XXX */ register struct ppp_softc *sc; int error, s; if ((error = suser(td)) != 0) return (error); s = spltty(); tp->t_hotchar = PPP_FLAG; if ((sc = pppalloc(td->td_proc->p_pid)) == NULL) { splx(s); return ENXIO; } if (sc->sc_relinq) (*sc->sc_relinq)(sc); /* get previous owner to relinquish the unit */ sc->sc_ilen = 0; sc->sc_m = NULL; 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; sc->sc_ctlp = pppasyncctlp; sc->sc_relinq = pppasyncrelinq; sc->sc_setmtu = pppasyncsetmtu; sc->sc_outm = NULL; pppgetm(sc); PPP2IFP(sc)->if_drv_flags |= IFF_DRV_RUNNING; getmicrotime(&PPP2IFP(sc)->if_lastchange); PPP2IFP(sc)->if_baudrate = tp->t_ospeed; tp->t_hotchar = PPP_FLAG; + tp->t_lsc = sc; ttyflush(tp, FREAD | FWRITE); /* * Pre-allocate cblocks to the "just right" amount. The 1 byte t_canq * allocation helps avoid the need for select and/or FIONREAD. * We also pass 1 byte tokens through t_canq... */ clist_alloc_cblocks(&tp->t_canq, 1, 1); clist_alloc_cblocks(&tp->t_outq, PPP2IFP(sc)->if_mtu + PPP_HIWAT, PPP2IFP(sc)->if_mtu + PPP_HIWAT); clist_alloc_cblocks(&tp->t_rawq, 0, 0); splx(s); return (0); } /* * Line specific close routine, called from device close routine * and from ttioctl at >= splsofttty(). * Detach the tty from the ppp unit. * Mimics part of tty_close(). */ static int pppclose(tp, flag) struct tty *tp; int flag; { - register struct ppp_softc *sc; + register struct ppp_softc *sc = (struct ppp_softc *)tp->t_lsc; int s; s = spltty(); ttyflush(tp, FREAD | FWRITE); clist_free_cblocks(&tp->t_canq); clist_free_cblocks(&tp->t_outq); - sc = ppp_for_tty(tp); if (sc != NULL) { pppasyncrelinq(sc); pppdealloc(sc); } splx(s); return 0; } /* * Relinquish the interface unit to another device. */ static void pppasyncrelinq(sc) struct ppp_softc *sc; { int s; s = spltty(); if (sc->sc_outm) { m_freem(sc->sc_outm); sc->sc_outm = NULL; } if (sc->sc_m) { m_freem(sc->sc_m); sc->sc_m = NULL; } if (sc->sc_flags & SC_TIMEOUT) { untimeout(ppp_timeout, (void *) sc, sc->sc_ch); sc->sc_flags &= ~SC_TIMEOUT; } splx(s); } /* * This gets called from the upper layer to notify a mtu change */ static void pppasyncsetmtu(sc) register struct ppp_softc *sc; { register struct tty *tp = (struct tty *) sc->sc_devp; int s; s = spltty(); if (tp != NULL) clist_alloc_cblocks(&tp->t_outq, PPP2IFP(sc)->if_mtu + PPP_HIWAT, PPP2IFP(sc)->if_mtu + PPP_HIWAT); splx(s); } /* * Line specific (tty) read routine. * called at zero spl from the device driver in the response to user-level * reads on the tty file descriptor (ie: pppd). */ static int pppread(tp, uio, flag) register struct tty *tp; struct uio *uio; int flag; { - register struct ppp_softc *sc = ppp_for_tty(tp); + register struct ppp_softc *sc = (struct ppp_softc *)tp->t_lsc; struct mbuf *m, *m0; register int s; int error = 0; if (sc == NULL) return 0; /* * Loop waiting for input, checking that nothing disasterous * happens in the meantime. */ s = spltty(); for (;;) { if (tp != (struct tty *) sc->sc_devp || tp->t_line != PPPDISC) { splx(s); return 0; } if (sc->sc_inq.ifq_head != NULL) break; if ((tp->t_state & TS_CONNECTED) == 0) { splx(s); return 0; /* end of file */ } if (tp->t_state & TS_ASYNC || flag & O_NONBLOCK) { splx(s); return (EWOULDBLOCK); } error = ttysleep(tp, TSA_HUP_OR_INPUT(tp), TTIPRI | PCATCH, "pppin", 0); if (error) { splx(s); return error; } } /* 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)) != 0) break; m_freem(m0); return (error); } /* * Line specific (tty) write routine. * called at zero spl from the device driver in the response to user-level * writes on the tty file descriptor (ie: pppd). */ static int pppwrite(tp, uio, flag) register struct tty *tp; struct uio *uio; int flag; { - register struct ppp_softc *sc = ppp_for_tty(tp); + register struct ppp_softc *sc = (struct ppp_softc *)tp->t_lsc; struct mbuf *m; struct sockaddr dst; int error, s; if ((tp->t_state & TS_CONNECTED) == 0) return 0; /* wrote 0 bytes */ if (tp->t_line != PPPDISC) return (EINVAL); if (sc == NULL) return EIO; if (uio->uio_resid > PPP2IFP(sc)->if_mtu + PPP_HDRLEN || uio->uio_resid < PPP_HDRLEN) return (EMSGSIZE); s = spltty(); if ((m = m_uiotombuf(uio, M_DONTWAIT, 0, 0)) == NULL) { splx(s); return (ENOBUFS); } dst.sa_family = AF_UNSPEC; bcopy(mtod(m, u_char *), dst.sa_data, PPP_HDRLEN); m->m_data += PPP_HDRLEN; m->m_len -= PPP_HDRLEN; /* call the upper layer to "transmit" it... */ error = pppoutput(PPP2IFP(sc), m, &dst, NULL); splx(s); return (error); } /* * Line specific (tty) ioctl routine. * This discipline requires that tty device drivers call * the line specific l_ioctl routine from their ioctl routines. */ /* ARGSUSED */ static int ppptioctl(tp, cmd, data, flag, td) struct tty *tp; u_long cmd; caddr_t data; int flag; struct thread *td; { - struct ppp_softc *sc = ppp_for_tty(tp); + struct ppp_softc *sc = (struct ppp_softc *)tp->t_lsc; int error, s; if (sc == NULL || tp != (struct tty *) sc->sc_devp) return (ENOIOCTL); error = 0; switch (cmd) { case PPPIOCSASYNCMAP: if ((error = suser(td)) != 0) break; sc->sc_asyncmap[0] = *(u_int *)data; break; case PPPIOCGASYNCMAP: *(u_int *)data = sc->sc_asyncmap[0]; break; case PPPIOCSRASYNCMAP: if ((error = suser(td)) != 0) break; sc->sc_rasyncmap = *(u_int *)data; break; case PPPIOCGRASYNCMAP: *(u_int *)data = sc->sc_rasyncmap; break; case PPPIOCSXASYNCMAP: if ((error = suser(td)) != 0) break; s = spltty(); 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 */ splx(s); break; case PPPIOCGXASYNCMAP: bcopy(sc->sc_asyncmap, data, sizeof(sc->sc_asyncmap)); break; default: error = pppioctl(sc, cmd, data, flag, td); if (error == 0 && cmd == PPPIOCSMRU) pppgetm(sc); } return error; } /* * FCS lookup table as calculated by genfcstab. */ 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 }; /* * Calculate a new FCS given the current FCS and the new data. */ static u_short pppfcs(u_short fcs, u_char *cp, int len) { while (len--) fcs = PPP_FCS(fcs, *cp++); return (fcs); } /* * This gets called at splsoftnet from if_ppp.c at various times * when there is data ready to be sent. */ static void pppasyncstart(sc) register struct ppp_softc *sc; { register struct tty *tp = (struct tty *) sc->sc_devp; register struct mbuf *m; register int len; register u_char *start, *stop, *cp; int n, ndone, done, idle; int s; idle = 0; /* XXX assumes atomic access to *tp although we're not at spltty(). */ while (CCOUNT(&tp->t_outq) < PPP_HIWAT) { /* * 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) { idle = 1; break; } /* * 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. */ /* XXX as above. */ if (CCOUNT(&tp->t_outq) == 0) { ++sc->sc_stats.ppp_obytes; (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); getmicrotime(&PPP2IFP(sc)->if_lastchange); } 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) { /* NetBSD (0.9 or later), 4.3-Reno or similar. */ ndone = n - b_to_q(start, n, &tp->t_outq); len -= ndone; start += ndone; sc->sc_stats.ppp_obytes += 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) { s = spltty(); if (putc(PPP_ESCAPE, &tp->t_outq)) { splx(s); break; } if (putc(*start ^ PPP_TRANS, &tp->t_outq)) { (void) unputc(&tp->t_outq); splx(s); break; } splx(s); sc->sc_stats.ppp_obytes += 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. */ s = spltty(); for (q = endseq; q < p; ++q) if (putc(*q, &tp->t_outq)) { done = 0; for (; q > endseq; --q) unputc(&tp->t_outq); break; } splx(s); if (done) sc->sc_stats.ppp_obytes += q - endseq; } if (!done) { /* remember where we got to */ m->m_data = start; m->m_len = len; break; } /* Finished with this mbuf; free it and move on. */ m = m_free(m); if (m == NULL) { /* Finished a packet */ break; } sc->sc_outfcs = pppfcs(sc->sc_outfcs, mtod(m, u_char *), m->m_len); } /* * If m == NULL, we have finished a packet. * If m != NULL, we've either done as much work this time * as we need to, or else we've filled up the output queue. */ sc->sc_outm = m; if (m) break; } /* Call pppstart to start output again if necessary. */ s = spltty(); pppstart(tp); /* * This timeout is needed for operation on a pseudo-tty, * because the pty code doesn't call pppstart after it has * drained the t_outq. */ if (!idle && (sc->sc_flags & SC_TIMEOUT) == 0) { sc->sc_ch = timeout(ppp_timeout, (void *) sc, 1); sc->sc_flags |= SC_TIMEOUT; } splx(s); } /* * This gets called when a received packet is placed on * the inq, at splsoftnet. The pppd daemon is to be woken up to do a read(). */ static void pppasyncctlp(sc) struct ppp_softc *sc; { struct tty *tp; int s; /* Put a placeholder byte in canq for ttselect()/ttnread(). */ s = spltty(); tp = (struct tty *) sc->sc_devp; putc(0, &tp->t_canq); ttwakeup(tp); splx(s); } /* * Start output on async tty interface. If the transmit queue * has drained sufficiently, arrange for pppasyncstart to be * called later at splsoftnet. * Called at spltty or higher. */ static int pppstart(tp) register struct tty *tp; { - register struct ppp_softc *sc = ppp_for_tty(tp); + register struct ppp_softc *sc = (struct ppp_softc *)tp->t_lsc; /* * Call output process whether or not there is any output. * We are being called in lieu of ttstart and must do what it would. */ if (tp->t_oproc != NULL) (*tp->t_oproc)(tp); /* * If the transmit queue has drained and the tty has not hung up * or been disconnected from the ppp unit, then tell if_ppp.c that * we need more output. */ if (CCOUNT(&tp->t_outq) < PPP_LOWAT && !((tp->t_state & TS_CONNECTED) == 0) && sc != NULL) { ppp_restart(sc); } return 0; } /* * Timeout routine - try to start some more output. */ static void ppp_timeout(x) void *x; { struct ppp_softc *sc = (struct ppp_softc *) x; struct tty *tp = (struct tty *) sc->sc_devp; int s; s = spltty(); sc->sc_flags &= ~SC_TIMEOUT; pppstart(tp); splx(s); } /* * Allocate enough mbuf to handle current MRU. */ static void pppgetm(sc) register struct ppp_softc *sc; { struct mbuf *m, **mp; int len; mp = &sc->sc_m; for (len = sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN; len > 0; ){ if ((m = *mp) == NULL) { MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) break; *mp = m; MCLGET(m, M_DONTWAIT); } len -= M_DATASIZE(m); mp = &m->m_next; } } /* * tty interface receiver interrupt. */ static unsigned paritytab[8] = { 0x96696996, 0x69969669, 0x69969669, 0x96696996, 0x69969669, 0x96696996, 0x96696996, 0x69969669 }; /* * Called when character is available from device driver. * Only guaranteed to be at splsofttty() or spltty() * This is safe to be called while the upper half's netisr is preempted. */ static int pppinput(c, tp) int c; register struct tty *tp; { register struct ppp_softc *sc; struct mbuf *m; int ilen, s; - sc = ppp_for_tty(tp); + sc = (struct ppp_softc *)tp->t_lsc; if (sc == NULL) return 0; ++tk_nin; ++sc->sc_stats.ppp_ibytes; if ((tp->t_state & TS_CONNECTED) == 0) { if (sc->sc_flags & SC_DEBUG) if_printf(PPP2IFP(sc), "no carrier\n"); goto flush; } if (c & TTY_ERRORMASK) { /* framing error or overrun on this char - abort packet */ if (sc->sc_flags & SC_DEBUG) if_printf(PPP2IFP(sc), "line error %x\n", c & TTY_ERRORMASK); goto flush; } c &= TTY_CHARMASK; /* * Handle software flow control of output. */ if (tp->t_iflag & IXON) { if (c == tp->t_cc[VSTOP] && tp->t_cc[VSTOP] != _POSIX_VDISABLE) { if ((tp->t_state & TS_TTSTOP) == 0) { tp->t_state |= TS_TTSTOP; tp->t_stop(tp, 0); } return 0; } if (c == tp->t_cc[VSTART] && tp->t_cc[VSTART] != _POSIX_VDISABLE) { tp->t_state &= ~TS_TTSTOP; if (tp->t_oproc != NULL) (*tp->t_oproc)(tp); return 0; } } s = spltty(); 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; splx(s); 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)) { s = spltty(); sc->sc_flags |= SC_PKTLOST; /* note the dropped packet */ if ((sc->sc_flags & (SC_FLUSH | SC_ESCAPED)) == 0){ if (sc->sc_flags & SC_DEBUG) if_printf(PPP2IFP(sc), "bad fcs %x, pkt len %d\n", sc->sc_fcs, ilen); PPP2IFP(sc)->if_ierrors++; sc->sc_stats.ppp_ierrors++; } else sc->sc_flags &= ~(SC_FLUSH | SC_ESCAPED); splx(s); return 0; } if (ilen < PPP_HDRLEN + PPP_FCSLEN) { if (ilen) { if (sc->sc_flags & SC_DEBUG) if_printf(PPP2IFP(sc), "too short (%d)\n", ilen); s = spltty(); PPP2IFP(sc)->if_ierrors++; sc->sc_stats.ppp_ierrors++; sc->sc_flags |= SC_PKTLOST; splx(s); } return 0; } /* * 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; ppppktin(sc, m, sc->sc_flags & SC_PKTLOST); if (sc->sc_flags & SC_PKTLOST) { s = spltty(); sc->sc_flags &= ~SC_PKTLOST; splx(s); } pppgetm(sc); return 0; } if (sc->sc_flags & SC_FLUSH) { if (sc->sc_flags & SC_LOG_FLUSH) ppplogchar(sc, c); return 0; } if (c < 0x20 && (sc->sc_rasyncmap & (1 << c))) return 0; s = spltty(); if (sc->sc_flags & SC_ESCAPED) { sc->sc_flags &= ~SC_ESCAPED; c ^= PPP_TRANS; } else if (c == PPP_ESCAPE) { sc->sc_flags |= SC_ESCAPED; splx(s); return 0; } splx(s); /* * 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) if_printf(PPP2IFP(sc), "no input mbufs!\n"); goto flush; } } m = sc->sc_m; m->m_len = 0; m->m_data = M_DATASTART(sc->sc_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) if_printf(PPP2IFP(sc), "garbage received: 0x%x (need 0xFF)\n", 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) if_printf(PPP2IFP(sc), "missing UI (0x3), got 0x%x\n", 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) if_printf(PPP2IFP(sc), "bad protocol %x\n", (sc->sc_mp[-1] << 8) + c); goto flush; } /* packet beyond configured mru? */ if (++sc->sc_ilen > sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN) { if (sc->sc_flags & SC_DEBUG) if_printf(PPP2IFP(sc), "packet too big\n"); 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) if_printf(PPP2IFP(sc), "too few input mbufs!\n"); goto flush; } } sc->sc_mc = m = m->m_next; m->m_len = 0; m->m_data = M_DATASTART(m); sc->sc_mp = mtod(m, char *); } ++m->m_len; *sc->sc_mp++ = c; sc->sc_fcs = PPP_FCS(sc->sc_fcs, c); return 0; flush: if (!(sc->sc_flags & SC_FLUSH)) { s = spltty(); PPP2IFP(sc)->if_ierrors++; sc->sc_stats.ppp_ierrors++; sc->sc_flags |= SC_FLUSH; splx(s); if (sc->sc_flags & SC_LOG_FLUSH) ppplogchar(sc, c); } return 0; } #define MAX_DUMP_BYTES 128 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("%s input: %*D", PPP2IFP(sc)->if_xname, sc->sc_rawin_count, sc->sc_rawin, " "); sc->sc_rawin_count = 0; } }