X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=modules%2Fif_ppp.c;h=4a0dcb4a3b62552ef0b15ff77425a60f6ae9d3c1;hp=c0b3ef53a4c444e163a75954102b068101d4b40d;hb=745f1b59d38e294452a502e4df4149902946f18d;hpb=085e79cde8746864a7207802165f5d3f4069baea diff --git a/modules/if_ppp.c b/modules/if_ppp.c index c0b3ef5..4a0dcb4 100644 --- a/modules/if_ppp.c +++ b/modules/if_ppp.c @@ -24,7 +24,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id: if_ppp.c,v 1.1 1996/07/01 01:01:30 paulus Exp $ + * $Id: if_ppp.c,v 1.15 1999/07/23 07:07:34 paulus Exp $ */ /* @@ -37,7 +37,6 @@ #include #include -#include #include #include #include @@ -50,10 +49,17 @@ #ifdef __osf__ #include #include -#include "ppp_mod.h" #else #include -#include +#endif +#include "ppp_mod.h" + +#include + +#ifdef SNIT_SUPPORT +#include +#include +#include #endif #ifdef __osf__ @@ -66,9 +72,6 @@ #define ifr_mtu ifr_metric -#define PPP_MINMTU 64 -#define PPP_MAXMTU 65536 - static int if_ppp_open __P((queue_t *, int, int, int)); static int if_ppp_close __P((queue_t *, int)); static int if_ppp_wput __P((queue_t *, mblk_t *)); @@ -112,6 +115,11 @@ static int if_ppp_ioctl __P((struct ifnet *, u_int, caddr_t)); static struct mbuf *make_mbufs __P((mblk_t *, int)); static mblk_t *make_message __P((struct mbuf *, int)); +#ifdef SNIT_SUPPORT +/* Fake ether header for SNIT */ +static struct ether_header snit_ehdr = {{0}, {0}, ETHERTYPE_IP}; +#endif + #ifndef __osf__ static void ppp_if_detach __P((struct ifnet *)); @@ -129,8 +137,10 @@ if_ppp_unload() for (i = 0; i < ppp_nalloc; ++i) if (ifs[i] != 0) ppp_if_detach(ifs[i]); - FREE(ifs, ppp_nalloc * sizeof (struct ifnet *)); - FREE(states, ppp_nalloc * sizeof (struct if_ppp_t *)); + if (ifs) { + FREE(ifs, ppp_nalloc * sizeof (struct ifnet *)); + FREE(states, ppp_nalloc * sizeof (struct if_ppp_t *)); + } ppp_nalloc = 0; return 0; } @@ -259,6 +269,10 @@ if_ppp_wput(q, mp) bzero(newstates, newn * sizeof (struct if_ppp_t *)); bcopy(ifs, newifs, ppp_nalloc * sizeof(struct ifnet *)); bcopy(states, newstates, ppp_nalloc * sizeof(if_ppp_t *)); + if (ifs) { + FREE(ifs, ppp_nalloc * sizeof(struct ifnet *)); + FREE(states, ppp_nalloc * sizeof(if_ppp_t *)); + } ifs = newifs; states = newstates; ppp_nalloc = newn; @@ -274,18 +288,24 @@ if_ppp_wput(q, mp) ifs[unit] = ifp; ifp->if_name = "ppp"; ifp->if_unit = unit; - ifp->if_mtu = PPP_MRU; + ifp->if_mtu = PPP_MTU; ifp->if_flags = IFF_POINTOPOINT | IFF_RUNNING; +#ifndef __osf__ #ifdef IFF_MULTICAST ifp->if_flags |= IFF_MULTICAST; #endif +#endif /* __osf__ */ ifp->if_output = if_ppp_output; #ifdef __osf__ - ifp->if_version = "Point-to-Point Protocol, version 2.3"; - ifp->if_mediamtu = 1500; + ifp->if_version = "Point-to-Point Protocol, version 2.3.9"; + ifp->if_mediamtu = PPP_MTU; ifp->if_type = IFT_PPP; ifp->if_hdrlen = PPP_HDRLEN; ifp->if_addrlen = 0; + ifp->if_flags |= IFF_NOARP | IFF_SIMPLEX | IFF_NOTRAILERS; +#ifdef IFF_VAR_MTU + ifp->if_flags |= IFF_VAR_MTU; +#endif #ifdef NETMASTERCPU ifp->if_affinity = NETMASTERCPU; #endif @@ -296,7 +316,7 @@ if_ppp_wput(q, mp) if (sp->flags & DBGLOG) printf("if_ppp: created unit %d\n", unit); } else { - ifp->if_mtu = PPP_MRU; + ifp->if_mtu = PPP_MTU; ifp->if_flags |= IFF_RUNNING; } @@ -403,10 +423,23 @@ if_ppp_rput(q, mp) break; } -/* For Digital UNIX, there's space set aside in the header mbuf +#ifdef SNIT_SUPPORT + if (proto == PPP_IP && (ifp->if_flags & IFF_PROMISC)) { + struct nit_if nif; + + nif.nif_header = (caddr_t) &snit_ehdr; + nif.nif_hdrlen = sizeof(snit_ehdr); + nif.nif_bodylen = len; + nif.nif_promisc = 0; + snit_intr(ifp, mb, &nif); + } +#endif + +/* + * For Digital UNIX, there's space set aside in the header mbuf * for the interface info. * - * For Sun it's smuggled around via a pointer at the front of the mbuf + * For Sun it's smuggled around via a pointer at the front of the mbuf. */ #ifdef __osf__ mb->m_pkthdr.rcvif = ifp; @@ -496,7 +529,23 @@ if_ppp_output(ifp, m0, dst) switch (dst->sa_family) { case AF_INET: proto = PPP_IP; +#ifdef SNIT_SUPPORT + if (ifp->if_flags & IFF_PROMISC) { + struct nit_if nif; + struct mbuf *m; + int len; + + for (len = 0, m = m0; m != NULL; m = m->m_next) + len += m->m_len; + nif.nif_header = (caddr_t) &snit_ehdr; + nif.nif_hdrlen = sizeof(snit_ehdr); + nif.nif_bodylen = len; + nif.nif_promisc = 0; + snit_intr(ifp, m0, &nif); + } +#endif break; + default: m_freem(m0); return EAFNOSUPPORT; @@ -537,6 +586,7 @@ if_ppp_ioctl(ifp, cmd, data) int s, error; struct ifreq *ifr = (struct ifreq *) data; struct ifaddr *ifa = (struct ifaddr *) data; + u_short mtu; error = 0; s = splimp(); @@ -559,6 +609,15 @@ if_ppp_ioctl(ifp, cmd, data) case SIOCSIFMTU: if ((error = NOTSUSER()) != 0) break; +#ifdef __osf__ + /* this hack is necessary because ifioctl checks ifr_data + * in 4.0 and 5.0, but ifr_data and ifr_metric overlay each + * other in the definition of struct ifreq so pppd can't set both. + */ + bcopy(ifr->ifr_data, &mtu, sizeof (u_short)); + ifr->ifr_mtu = mtu; +#endif + if (ifr->ifr_mtu < PPP_MINMTU || ifr->ifr_mtu > PPP_MAXMTU) { error = EINVAL; break; @@ -722,10 +781,14 @@ make_message(m, off) } } -/* Digital UNIX doesn't allow for removing ifnet structures - * from the list. Taking the i/f down from pppd will take - * care of most of the stuff that this code intends to do - * anyhow +/* + * Digital UNIX doesn't allow for removing ifnet structures + * from the list. But then we're not using this as a loadable + * module anyway, so that's OK. + * + * Under SunOS, this should allow the module to be unloaded. + * Unfortunately, it doesn't seem to detach all the references, + * so your system may well crash after you unload this module :-( */ #ifndef __osf__