X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/ee7873401e686a0eb45d334385c26708ef8a23f0..038ee561a5e705ef823b48fbe45f9ed7841ddf8d:/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 8324b3ce5a..3b947aecfc 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.44 82/03/28 */ +/* if_en.c 4.70 82/10/17 */ #include "en.h" @@ -13,22 +13,28 @@ #include "../h/buf.h" #include "../h/protosw.h" #include "../h/socket.h" -#include "../h/ubareg.h" -#include "../h/ubavar.h" -#include "../h/enreg.h" -#include "../h/cpu.h" -#include "../h/mtpr.h" #include "../h/vmmac.h" -#include "../net/in.h" -#include "../net/in_systm.h" +#include + #include "../net/if.h" -#include "../net/if_en.h" -#include "../net/if_uba.h" -#include "../net/ip.h" -#include "../net/ip_var.h" -#include "../net/pup.h" +#include "../net/netisr.h" +#include "../net/route.h" +#include "../netinet/in.h" +#include "../netinet/in_systm.h" +#include "../netinet/ip.h" +#include "../netinet/ip_var.h" +#include "../netpup/pup.h" + +#include "../vax/cpu.h" +#include "../vax/mtpr.h" +#include "../vaxif/if_en.h" +#include "../vaxif/if_enreg.h" +#include "../vaxif/if_uba.h" +#include "../vaxuba/ubareg.h" +#include "../vaxuba/ubavar.h" #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]; @@ -56,7 +62,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]; @@ -71,7 +77,6 @@ enprobe(reg) register int br, cvec; /* r11, r10 value-result */ register struct endevice *addr = (struct endevice *)reg; -COUNT(ENPROBE); #ifdef lint br = 0; cvec = br; br = cvec; enrint(0); enxint(0); encollide(0); @@ -82,6 +87,9 @@ COUNT(ENPROBE); addr->en_ostat = EN_IEN|EN_GO; DELAY(100000); addr->en_ostat = 0; +#ifdef ECHACK + br = 0x16; +#endif return (1); } @@ -95,7 +103,6 @@ enattach(ui) { register struct en_softc *es = &en_softc[ui->ui_unit]; register struct sockaddr_in *sin; -COUNT(ENATTACH); es->es_if.if_unit = ui->ui_unit; es->es_if.if_name = "en"; @@ -113,7 +120,7 @@ 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); } @@ -125,7 +132,6 @@ enreset(unit, uban) int unit, uban; { register struct uba_device *ui; -COUNT(ENRESET); if (unit >= NEN || (ui = eninfo[unit]) == 0 || ui->ui_alive == 0 || ui->ui_ubanum != uban) @@ -147,7 +153,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; @@ -161,15 +167,18 @@ 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; enxint(unit); splx(s); + if_rtinit(&es->es_if, RTF_UP); } -int enlastdel = 25; +int enalldelay = 0; +int enlastdel = 50; +int enlastmask = (~0) << 5; /* * Start or restart output on interface. @@ -188,7 +197,6 @@ enstart(dev) register struct endevice *addr; struct mbuf *m; int dest; -COUNT(ENSTART); if (es->es_oactive) goto restart; @@ -208,14 +216,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: /* @@ -242,14 +253,11 @@ enxint(unit) register struct uba_device *ui = eninfo[unit]; register struct en_softc *es = &en_softc[unit]; register struct endevice *addr = (struct endevice *)ui->ui_addr; -COUNT(ENXINT); if (es->es_oactive == 0) return; if (es->es_mask && (addr->en_ostat&EN_OERROR)) { es->es_if.if_oerrors++; - if (es->es_if.if_oerrors % 100 == 0) - printf("en%d: += 100 output errors\n", unit); endocoll(unit); return; } @@ -262,7 +270,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); @@ -277,7 +285,6 @@ encollide(unit) int unit; { struct en_softc *es = &en_softc[unit]; -COUNT(ENCOLLIDE); es->es_if.if_collisions++; if (es->es_oactive == 0) @@ -328,10 +335,9 @@ enrint(unit) struct endevice *addr = (struct endevice *)eninfo[unit]->ui_addr; register struct en_header *en; struct mbuf *m; - int len; + int len; short resid; register struct ifqueue *inq; int off; -COUNT(ENRINT); es->es_if.if_ipackets++; @@ -342,70 +348,51 @@ COUNT(ENRINT); UBAPURGE(es->es_ifuba.ifu_uba, es->es_ifuba.ifu_r.ifrw_bdp); if (addr->en_istat&EN_IERROR) { es->es_if.if_ierrors++; - if (es->es_if.if_ierrors % 100 == 0) - printf("en%d: += 100 input errors\n", unit); goto setup; } /* + * 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); - if (off) - len += sizeof (u_short); - break; -#endif -#ifdef PUP - case ENPUP_PUPTYPE: - len = endataaddr(en, off ? off + sizeof (u_short) : 0, - struct pup_header *)->pup_length; - if (off) - len -= sizeof (u_short); - break; -#endif - - default: - printf("en%d: unknown pkt type 0x%x\n", unit, en->en_type); - goto setup; - } 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) { @@ -422,11 +409,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)) { @@ -440,7 +430,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; } @@ -455,24 +445,29 @@ 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; -COUNT(ENOUTPUT); switch (dst->sa_family) { #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; @@ -482,15 +477,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; @@ -499,8 +485,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: @@ -524,8 +510,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; @@ -546,13 +532,18 @@ 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); }