X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/e3631d0610b4a2d85a5b228a5648eb49d08b0e00..4c073c48266aa8f4044b3109a87d22308600b1e1:/usr/src/sys/vax/if/if_en.c diff --git a/usr/src/sys/vax/if/if_en.c b/usr/src/sys/vax/if/if_en.c index 4b59e35234..5d7d0db524 100644 --- a/usr/src/sys/vax/if/if_en.c +++ b/usr/src/sys/vax/if/if_en.c @@ -1,4 +1,4 @@ -/* if_en.c 4.49 82/04/01 */ +/* if_en.c 4.62 82/05/27 */ #include "en.h" #include "imp.h" @@ -29,8 +29,10 @@ #include "../net/ip_var.h" #include "../net/pup.h" #include "../net/route.h" +#include #define ENMTU (1024+512) +#define ENMRU (1024+512+16) /* 16 is enough to receive trailer */ int enprobe(), enattach(), enrint(), enxint(), encollide(); struct uba_device *eninfo[NEN]; @@ -58,7 +60,7 @@ struct en_softc { struct ifuba es_ifuba; /* UNIBUS resources */ short es_delay; /* current output delay */ short es_mask; /* mask for current output delay */ - u_char es_lastx; /* host last transmitted to */ + short es_lastx; /* host last transmitted to */ short es_oactive; /* is output active? */ short es_olen; /* length of last output */ } en_softc[NEN]; @@ -84,6 +86,9 @@ COUNT(ENPROBE); addr->en_ostat = EN_IEN|EN_GO; DELAY(100000); addr->en_ostat = 0; +#ifdef ECHACK + br = 0x16; +#endif return (1); } @@ -115,11 +120,12 @@ COUNT(ENATTACH); es->es_if.if_init = eninit; es->es_if.if_output = enoutput; es->es_if.if_ubareset = enreset; - es->es_ifuba.ifu_flags = UBA_NEEDBDP | UBA_NEED16; + es->es_ifuba.ifu_flags = UBA_NEEDBDP | UBA_NEED16 | UBA_CANTWAIT; if_attach(&es->es_if); #if NIMP == 0 /* here's one for you john baby.... */ - enlhinit((ui->ui_flags &~ 0xff) | 0x0a); + if (ui->ui_flags &~ 0xff) + enlhinit(&es->es_if, (ui->ui_flags &~ 0xff) | 0x0a); #endif } @@ -153,7 +159,7 @@ eninit(unit) int s; if (if_ubainit(&es->es_ifuba, ui->ui_ubanum, - sizeof (struct en_header), (int)btoc(ENMTU)) == 0) { + sizeof (struct en_header), (int)btoc(ENMRU)) == 0) { printf("en%d: can't initialize\n", unit); es->es_if.if_flags &= ~IFF_UP; return; @@ -167,7 +173,7 @@ eninit(unit) */ s = splimp(); addr->en_iba = es->es_ifuba.ifu_r.ifrw_info; - addr->en_iwc = -(sizeof (struct en_header) + ENMTU) >> 1; + addr->en_iwc = -(sizeof (struct en_header) + ENMRU) >> 1; addr->en_istat = EN_IEN|EN_GO; es->es_oactive = 1; es->es_if.if_flags |= IFF_UP; @@ -176,7 +182,9 @@ eninit(unit) if_rtinit(&es->es_if, RTF_DIRECT|RTF_UP); } -int enlastdel = 25; +int enalldelay = 0; +int enlastdel = 50; +int enlastmask = (~0) << 5; /* * Start or restart output on interface. @@ -215,14 +223,17 @@ COUNT(ENSTART); /* * Ethernet cannot take back-to-back packets (no - * buffering in interface. To avoid overrunning - * receiver, enforce a small delay (about 1ms) in interface - * on successive packets sent to same host. + * buffering in interface. To help avoid overrunning + * receivers, enforce a small delay (about 1ms) in interface: + * * between all packets when enalldelay + * * whenever last packet was broadcast + * * whenever this packet is to same host as last packet */ - if (es->es_lastx && es->es_lastx == dest) + if (enalldelay || es->es_lastx == 0 || es->es_lastx == dest) { es->es_delay = enlastdel; - else - es->es_lastx = dest; + es->es_mask = enlastmask; + } + es->es_lastx = dest; restart: /* @@ -269,7 +280,7 @@ COUNT(ENXINT); es->es_ifuba.ifu_xtofree = 0; } if (es->es_if.if_snd.ifq_head == 0) { - es->es_lastx = 0; + es->es_lastx = 256; /* putatively illegal */ return; } enstart(unit); @@ -335,7 +346,7 @@ enrint(unit) struct endevice *addr = (struct endevice *)eninfo[unit]->ui_addr; register struct en_header *en; struct mbuf *m; - int len; + int len, plen; short resid; register struct ifqueue *inq; int off; COUNT(ENRINT); @@ -355,62 +366,47 @@ COUNT(ENRINT); } /* + * Calculate input data length. * Get pointer to ethernet header (in input buffer). * Deal with trailer protocol: if type is PUP trailer * get true type from first 16-bit word past data. * Remember that type was trailer by setting off. */ + resid = addr->en_iwc; + if (resid) + resid |= 0176000; + len = (((sizeof (struct en_header) + ENMRU) >> 1) + resid) << 1; + len -= sizeof (struct en_header); + if (len > ENMRU) + goto setup; /* sanity */ en = (struct en_header *)(es->es_ifuba.ifu_r.ifrw_addr); #define endataaddr(en, off, type) ((type)(((caddr_t)((en)+1)+(off)))) if (en->en_type >= ENPUP_TRAIL && en->en_type < ENPUP_TRAIL+ENPUP_NTRAILER) { off = (en->en_type - ENPUP_TRAIL) * 512; - if (off >= ENMTU) + if (off > ENMTU) goto setup; /* sanity */ en->en_type = *endataaddr(en, off, u_short *); + resid = *(endataaddr(en, off+2, u_short *)); + if (off + resid > len) + goto setup; /* sanity */ + len = off + resid; } else off = 0; - - /* - * Attempt to infer packet length from type; - * can't deal with packet if can't infer length. - */ - switch (en->en_type) { - -#ifdef INET - case ENPUP_IPTYPE: - len = htons((u_short)endataaddr(en, - off ? off + sizeof (u_short) : 0, struct ip *)->ip_len); - break; -#endif -#ifdef PUP - case ENPUP_PUPTYPE: - len = endataaddr(en, off ? off + sizeof (u_short) : 0, - struct pup_header *)->pup_length; - break; -#endif - - default: - printf("en%d: unknown pkt type 0x%x\n", unit, en->en_type); - goto setup; - } - if (off) - len += sizeof (u_short); if (len == 0) goto setup; - /* * Pull packet off interface. Off is nonzero if packet * has trailing header; if_rubaget will then force this header * information to be at the front, but we still have to drop - * the two-byte type which is at the front of any trailer data. + * the type and length which are at the front of any trailer data. */ m = if_rubaget(&es->es_ifuba, len, off); if (m == 0) goto setup; if (off) { - m->m_off += sizeof (u_short); - m->m_len -= sizeof (u_short); + m->m_off += 2 * sizeof (u_short); + m->m_len -= 2 * sizeof (u_short); } switch (en->en_type) { @@ -427,11 +423,14 @@ COUNT(ENRINT); pupproto.sp_protocol = pup->pup_type; pupdst.spup_addr = pup->pup_dport; pupsrc.spup_addr = pup->pup_sport; - raw_input(m, &pupproto, (struct sockaddr *)&pupdst, - (struct sockaddr *)&pupsrc); + raw_input(m, &pupproto, (struct sockaddr *)&pupsrc, + (struct sockaddr *)&pupdst); goto setup; } #endif + default: + m_freem(m); + goto setup; } if (IF_QFULL(inq)) { @@ -445,7 +444,7 @@ setup: * Reset for next packet. */ addr->en_iba = es->es_ifuba.ifu_r.ifrw_info; - addr->en_iwc = -(sizeof (struct en_header) + ENMTU) >> 1; + addr->en_iwc = -(sizeof (struct en_header) + ENMRU) >> 1; addr->en_istat = EN_IEN|EN_GO; } @@ -460,7 +459,7 @@ enoutput(ifp, m0, dst) struct mbuf *m0; struct sockaddr *dst; { - int type, dest, s; + int type, dest, s, error; register struct mbuf *m = m0; register struct en_header *en; register int off; @@ -470,14 +469,20 @@ COUNT(ENOUTPUT); #ifdef INET case AF_INET: - dest = ((struct sockaddr_in *)dst)->sin_addr.s_addr >> 24; + dest = ((struct sockaddr_in *)dst)->sin_addr.s_addr; + if (dest & 0x00ffff00) { + error = EPERM; /* ??? */ + goto bad; + } + dest = (dest >> 24) & 0xff; off = ntohs((u_short)mtod(m, struct ip *)->ip_len) - m->m_len; if (off > 0 && (off & 0x1ff) == 0 && - m->m_off >= MMINOFF + sizeof (u_short)) { + m->m_off >= MMINOFF + 2 * sizeof (u_short)) { type = ENPUP_TRAIL + (off>>9); - m->m_off -= sizeof (u_short); - m->m_len += sizeof (u_short); + m->m_off -= 2 * sizeof (u_short); + m->m_len += 2 * sizeof (u_short); *mtod(m, u_short *) = ENPUP_IPTYPE; + *(mtod(m, u_short *) + 1) = m->m_len; goto gottrailertype; } type = ENPUP_IPTYPE; @@ -487,15 +492,6 @@ COUNT(ENOUTPUT); #ifdef PUP case AF_PUP: dest = ((struct sockaddr_pup *)dst)->spup_addr.pp_host; - off = mtod(m, struct pup_header *)->pup_length - m->m_len; - if (off > 0 && (off & 0x1ff) == 0 && - m->m_off >= MMINOFF + sizeof (u_short)) { - type = ENPUP_TRAIL + (off>>9); - m->m_off -= sizeof (u_short); - m->m_len += sizeof (u_short); - *mtod(m, u_short *) = ENPUP_PUPTYPE; - goto gottrailertype; - } type = ENPUP_PUPTYPE; off = 0; goto gottype; @@ -504,8 +500,8 @@ COUNT(ENOUTPUT); default: printf("en%d: can't handle af%d\n", ifp->if_unit, dst->sa_family); - m_freem(m0); - return (0); + error = EAFNOSUPPORT; + goto bad; } gottrailertype: @@ -529,8 +525,8 @@ gottype: MMINOFF + sizeof (struct en_header) > m->m_off) { m = m_get(M_DONTWAIT); if (m == 0) { - m_freem(m0); - return (0); + error = ENOBUFS; + goto bad; } m->m_next = m0; m->m_off = MMINOFF; @@ -551,15 +547,20 @@ gottype: s = splimp(); if (IF_QFULL(&ifp->if_snd)) { IF_DROP(&ifp->if_snd); - m_freem(m); - splx(s); - return (0); + error = ENOBUFS; + goto qfull; } IF_ENQUEUE(&ifp->if_snd, m); if (en_softc[ifp->if_unit].es_oactive == 0) enstart(ifp->if_unit); splx(s); - return (1); + return (0); +qfull: + m0 = m; + splx(s); +bad: + m_freem(m0); + return (error); } #if NIMP == 0 && NEN > 0 @@ -572,15 +573,15 @@ gottype: */ struct ifnet enlhif; -int enlhoutput(); +int looutput(); /* * Called by localnet interface to allow logical - * host interface to "attach". Nothing should ever - * be sent locally to this interface, it's purpose + * host interface to "attach", it's purpose * is simply to establish the host's arpanet address. */ -enlhinit(addr) +enlhinit(esifp, addr) + struct ifnet *esifp; int addr; { register struct ifnet *ifp = &enlhif; @@ -593,19 +594,10 @@ COUNT(ENLHINIT); sin->sin_family = AF_INET; sin->sin_addr.s_addr = addr; ifp->if_net = sin->sin_addr.s_net; - ifp->if_flags = IFF_UP; - ifp->if_output = enlhoutput; /* should never be used */ + ifp->if_flags = IFF_UP|IFF_POINTOPOINT; + ifp->if_dstaddr = esifp->if_addr; + ifp->if_output = looutput; if_attach(ifp); -} - -enlhoutput(ifp, m0, dst) - struct ifnet *ifp; - struct mbuf *m0; - struct sockaddr *dst; -{ -COUNT(ENLHOUTPUT); - ifp->if_oerrors++; - m_freem(m0); - return (0); + rtinit(&ifp->if_addr, &ifp->if_addr, RTF_UP|RTF_DIRECT|RTF_HOST); } #endif