reorganization to move ufsmount ops to be vnode ops;

[unix-history] / usr / src / sys / netinet / if_ether.c

diff --git a/usr/src/sys/netinet/if_ether.c b/usr/src/sys/netinet/if_ether.c
index 28dd53d..f2e2838 100644 (file)
--- a/usr/src/sys/netinet/if_ether.c
+++ b/usr/src/sys/netinet/if_ether.c
@@ -2,19 +2,9 @@
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1988 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.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)if_ether.c  7.10 (Berkeley) %G%
+ *     @(#)if_ether.c  7.15 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -37,22 +27,18 @@
 #include "syslog.h"
 
 #include "../net/if.h"
 #include "syslog.h"
 
 #include "../net/if.h"

+#include "../net/if_dl.h"
+#include "../net/route.h"
+

 #include "in.h"
 #include "in_systm.h"
 #include "in_var.h"
 #include "ip.h"
 #include "if_ether.h"
 
 #include "in.h"
 #include "in_systm.h"
 #include "in_var.h"
 #include "ip.h"
 #include "if_ether.h"
 

-#ifdef GATEWAY
-#define        ARPTAB_BSIZ     16              /* bucket size */
-#define        ARPTAB_NB       37              /* number of buckets */
-#else
-#define        ARPTAB_BSIZ     9               /* bucket size */
-#define        ARPTAB_NB       19              /* number of buckets */
-#endif
-#define        ARPTAB_SIZE     (ARPTAB_BSIZ * ARPTAB_NB)
-struct arptab arptab[ARPTAB_SIZE];
-int    arptab_size = ARPTAB_SIZE;      /* for arp command */
+#define SIN(s) ((struct sockaddr_in *)s)
+#define SDL(s) ((struct sockaddr_dl *)s)
+#define SRP(s) ((struct sockaddr_inarp *)s)

 
 /*
  * ARP trailer negotiation.  Trailer protocol is not IP specific,
 
 /*
  * ARP trailer negotiation.  Trailer protocol is not IP specific,


@@ -60,44 +46,128 @@ int        arptab_size = ARPTAB_SIZE;      /* for arp command */
  */
 #define ETHERTYPE_IPTRAILERS ETHERTYPE_TRAIL
 
  */
 #define ETHERTYPE_IPTRAILERS ETHERTYPE_TRAIL
 

-#define        ARPTAB_HASH(a) \
-       ((u_long)(a) % ARPTAB_NB)
-
-#define        ARPTAB_LOOK(at,addr) { \
-       register n; \
-       at = &arptab[ARPTAB_HASH(addr) * ARPTAB_BSIZ]; \
-       for (n = 0 ; n < ARPTAB_BSIZ ; n++,at++) \
-               if (at->at_iaddr.s_addr == addr) \
-                       break; \
-       if (n >= ARPTAB_BSIZ) \
-               at = 0; \
-}

 
 /* timer values */
 
 /* timer values */

-#define        ARPT_AGE        (60*1)  /* aging timer, 1 min. */
-#define        ARPT_KILLC      20      /* kill completed entry in 20 mins. */
-#define        ARPT_KILLI      3       /* kill incomplete entry in 3 minutes */
+int    arpt_prune = (5*60*1);  /* walk list every 5 minutes */
+int    arpt_keep = (20*60);    /* once resolved, good for 20 more minutes */
+int    arpt_down = 20;         /* once declared down, don't send for 20 secs */
+#define RTF_USETRAILERS        RTF_PROTO1
+#define rt_expire rt_rmx.rmx_expire

 
 extern struct ifnet loif;
 
 extern struct ifnet loif;

+extern struct timeval time;
+struct llinfo_arp *arplookup(), llinfo_arp = {&llinfo_arp, &llinfo_arp};
+struct ifqueue arpintrq = {0, 0, 0, 50};
+int    arp_inuse, arp_allocated, arp_intimer;
+int    arp_maxtries = 5;
+int    useloopback = 1;        /* use loopback interface for local traffic */
+int    arpinit_done = 0;

 
 /*
 
 /*

- * Timeout routine.  Age arp_tab entries once a minute.
+ * Timeout routine.  Age arp_tab entries periodically.

  */
 arptimer()
 {
  */
 arptimer()
 {

-       register struct arptab *at;
-       register i;
-
-       timeout(arptimer, (caddr_t)0, ARPT_AGE * hz);
-       at = &arptab[0];
-       for (i = 0; i < ARPTAB_SIZE; i++, at++) {
-               if (at->at_flags == 0 || (at->at_flags & ATF_PERM))
-                       continue;
-               if (++at->at_timer < ((at->at_flags&ATF_COM) ?
-                   ARPT_KILLC : ARPT_KILLI))
-                       continue;
-               /* timer has expired, clear entry */
-               arptfree(at);
+       int s = splnet();
+       register struct llinfo_arp *la = llinfo_arp.la_next;
+
+       timeout(arptimer, (caddr_t)0, arpt_prune * hz);
+       while (la != &llinfo_arp) {
+               register struct rtentry *rt = la->la_rt;
+               la = la->la_next;
+               if (rt->rt_expire && rt->rt_expire <= time.tv_sec)
+                       arptfree(la->la_prev); /* timer has expired, clear */
+       }
+       splx(s);
+}
+
+/*
+ * Parallel to llc_rtrequest. 
+ */
+arp_rtrequest(req, rt, sa)
+       int req;
+       register struct rtentry *rt;
+       struct sockaddr *sa;
+{
+       register struct sockaddr *gate = rt->rt_gateway;
+       register struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo;
+       static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK};
+
+       if (!arpinit_done) {
+               arpinit_done = 1;
+               timeout(arptimer, (caddr_t)0, hz);
+       }
+       if (rt->rt_flags & RTF_GATEWAY)
+               return;
+       switch (req) {
+       case RTM_ADD:
+       case RTM_RESOLVE:
+               if (rt->rt_flags & RTF_CLONING) {
+                       /*
+                        * Case 1: This route should come from a route to iface.
+                        */
+                       rt_setgate(rt, rt_key(rt), &null_sdl);
+                       gate = rt->rt_gateway;
+                       SDL(gate)->sdl_type = rt->rt_ifp->if_type;
+                       SDL(gate)->sdl_index = rt->rt_ifp->if_index;
+                       rt->rt_expire = time.tv_sec;
+                       break;
+               }
+               if (gate->sa_family != AF_LINK ||
+                   gate->sa_len < sizeof(null_sdl)) {
+                       log(LOG_DEBUG, "arp_rtrequest: bad gateway value");
+                       break;
+               }
+               SDL(gate)->sdl_type = rt->rt_ifp->if_type;
+               SDL(gate)->sdl_index = rt->rt_ifp->if_index;
+               if (la != 0)
+                       break; /* This happens on a route change */
+               /*
+                * Case 2:  This route may come from cloning, or a manual route
+                * add with a LL address.
+                */
+               R_Malloc(la, struct llinfo_arp *, sizeof(*la));
+               rt->rt_llinfo = (caddr_t)la;
+               if (la == 0) {
+                       log(LOG_DEBUG, "arp_rtrequest: malloc failed\n");
+                       break;
+               }
+               arp_inuse++, arp_allocated++;
+               Bzero(la, sizeof(*la));
+               la->la_rt = rt;
+               rt->rt_flags |= RTF_LLINFO;
+               insque(la, &llinfo_arp);
+               if (SIN(rt_key(rt))->sin_addr.s_addr ==
+                   (IA_SIN(rt->rt_ifa))->sin_addr.s_addr) {
+                   /*
+                    * This test used to be
+                    *  if (loif.if_flags & IFF_UP)
+                    * It allowed local traffic to be forced
+                    * through the hardware by configuring the loopback down.
+                    * However, it causes problems during network configuration
+                    * for boards that can't receive packets they send.
+                    * It is now necessary to clear "useloopback" and remove
+                    * the route to force traffic out to the hardware.
+                    */
+                       rt->rt_expire = 0;
+                       Bcopy(((struct arpcom *)rt->rt_ifp)->ac_enaddr,
+                               LLADDR(SDL(gate)), SDL(gate)->sdl_alen = 6);
+                       if (useloopback)
+                               rt->rt_ifp = &loif;
+                               
+               }
+               break;
+
+       case RTM_DELETE:
+               if (la == 0)
+                       break;
+               arp_inuse--;
+               remque(la);
+               rt->rt_llinfo = 0;
+               rt->rt_flags &= ~RTF_LLINFO;
+               if (la->la_hold)
+                       m_freem(la->la_hold);
+               Free((caddr_t)la);

        }
 }
 
        }
 }
 


@@ -106,7 +176,7 @@ arptimer()
  */
 arpwhohas(ac, addr)
        register struct arpcom *ac;
  */
 arpwhohas(ac, addr)
        register struct arpcom *ac;

-       struct in_addr *addr;
+       struct inaddr *addr;

 {
        register struct mbuf *m;
        register struct ether_header *eh;
 {
        register struct mbuf *m;
        register struct ether_header *eh;


@@ -136,13 +206,11 @@ arpwhohas(ac, addr)
        bcopy((caddr_t)addr, (caddr_t)ea->arp_tpa, sizeof(ea->arp_tpa));
        sa.sa_family = AF_UNSPEC;
        sa.sa_len = sizeof(sa);
        bcopy((caddr_t)addr, (caddr_t)ea->arp_tpa, sizeof(ea->arp_tpa));
        sa.sa_family = AF_UNSPEC;
        sa.sa_len = sizeof(sa);

-       (*ac->ac_if.if_output)(&ac->ac_if, m, &sa);
+       (*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);

 }
 
 int    useloopback = 1;        /* use loopback interface for local traffic */
 
 }
 
 int    useloopback = 1;        /* use loopback interface for local traffic */
 

-int    useloopback = 1;        /* use loopback interface for local traffic */
-

 /*
  * Resolve an IP address into an ethernet address.  If success, 
  * desten is filled in.  If there is no entry in arptab,
 /*
  * Resolve an IP address into an ethernet address.  If success, 
  * desten is filled in.  If there is no entry in arptab,


@@ -152,23 +220,18 @@ int       useloopback = 1;        /* use loopback interface for local traffic */
  * that desten has been filled in and the packet should be sent
  * normally; a 0 return indicates that the packet has been
  * taken over here, either now or for later transmission.
  * that desten has been filled in and the packet should be sent
  * normally; a 0 return indicates that the packet has been
  * taken over here, either now or for later transmission.

- *
- * We do some (conservative) locking here at splimp, since
- * arptab is also altered from input interrupt service (ecintr/ilintr
- * calls arpinput when ETHERTYPE_ARP packets come in).

  */
  */

-arpresolve(ac, m, destip, desten, usetrailers)
+arpresolve(ac, rt, m, dst, desten, usetrailers)

        register struct arpcom *ac;
        register struct arpcom *ac;

+       register struct rtentry *rt;

        struct mbuf *m;
        struct mbuf *m;

-       register struct in_addr *destip;
+       register struct sockaddr *dst;

        register u_char *desten;
        int *usetrailers;
 {
        register u_char *desten;
        int *usetrailers;
 {

-       register struct arptab *at;
-       struct sockaddr_in sin;
+       register struct llinfo_arp *la;

        register struct in_ifaddr *ia;
        register struct in_ifaddr *ia;

-       u_long lna;
-       int s;
+       struct sockaddr_dl *sdl;

 
        *usetrailers = 0;
        if (m->m_flags & M_BCAST) {     /* broadcast */
 
        *usetrailers = 0;
        if (m->m_flags & M_BCAST) {     /* broadcast */


@@ -176,111 +239,84 @@ arpresolve(ac, m, destip, desten, usetrailers)
                    sizeof(etherbroadcastaddr));
                return (1);
        }
                    sizeof(etherbroadcastaddr));
                return (1);
        }

-       lna = in_lnaof(*destip);
-       /* if for us, use software loopback driver if up */
-       for (ia = in_ifaddr; ia; ia = ia->ia_next)
-           if ((ia->ia_ifp == &ac->ac_if) &&
-               (destip->s_addr == ia->ia_addr.sin_addr.s_addr)) {
-               /*
-                * This test used to be
-                *      if (loif.if_flags & IFF_UP)
-                * It allowed local traffic to be forced
-                * through the hardware by configuring the loopback down.
-                * However, it causes problems during network configuration
-                * for boards that can't receive packets they send.
-                * It is now necessary to clear "useloopback"
-                * to force traffic out to the hardware.
-                */
-               if (useloopback) {
-                       sin.sin_family = AF_INET;
-                       sin.sin_addr = *destip;
-                       (void) looutput(&loif, m, (struct sockaddr *)&sin);
-                       /*
-                        * The packet has already been sent and freed.
-                        */
-                       return (0);
-               } else {
-                       bcopy((caddr_t)ac->ac_enaddr, (caddr_t)desten,
-                           sizeof(ac->ac_enaddr));
-                       return (1);
-               }
+       if (rt)
+               la = (struct llinfo_arp *)rt->rt_llinfo;
+       else {
+               if (la = arplookup(SIN(dst)->sin_addr.s_addr, 1, 0)) 
+                       rt = la->la_rt;

        }
        }

-       s = splimp();
-       ARPTAB_LOOK(at, destip->s_addr);
-       if (at == 0) {                  /* not found */
-               if (ac->ac_if.if_flags & IFF_NOARP) {
-                       bcopy((caddr_t)ac->ac_enaddr, (caddr_t)desten, 3);
-                       desten[3] = (lna >> 16) & 0x7f;
-                       desten[4] = (lna >> 8) & 0xff;
-                       desten[5] = lna & 0xff;
-                       splx(s);
-                       return (1);
-               } else {
-                       at = arptnew(destip);
-                       if (at == 0)
-                               panic("arpresolve: no free entry");
-                       at->at_hold = m;
-                       arpwhohas(ac, destip);
-                       splx(s);
-                       return (0);
-               }
+       if (la == 0 || rt == 0) {
+               log(LOG_DEBUG, "arpresolve: can't allocate llinfo");
+               m_freem(m);
+               return (0);

        }
        }

-       at->at_timer = 0;               /* restart the timer */
-       if (at->at_flags & ATF_COM) {   /* entry IS complete */
-               bcopy((caddr_t)at->at_enaddr, (caddr_t)desten,
-                   sizeof(at->at_enaddr));
-               if (at->at_flags & ATF_USETRAILERS)
-                       *usetrailers = 1;
-               splx(s);
-               return (1);
+       sdl = SDL(rt->rt_gateway);
+       /*
+        * Check the address family and length is valid, the address
+        * is resolved; otherwise, try to resolve.
+        */
+       if ((rt->rt_expire == 0 || rt->rt_expire > time.tv_sec) &&
+           sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) {
+               bcopy(LLADDR(sdl), desten, sdl->sdl_alen);
+               *usetrailers = rt->rt_flags & RTF_USETRAILERS;
+               return 1;

        }
        /*
         * There is an arptab entry, but no ethernet address
         * response yet.  Replace the held mbuf with this
         * latest one.
         */
        }
        /*
         * There is an arptab entry, but no ethernet address
         * response yet.  Replace the held mbuf with this
         * latest one.
         */

-       if (at->at_hold)
-               m_freem(at->at_hold);
-       at->at_hold = m;
-       arpwhohas(ac, destip);          /* ask again */
-       splx(s);
+       if (la->la_hold)
+               m_freem(la->la_hold);
+       la->la_hold = m;
+       if (rt->rt_expire) {
+               rt->rt_flags &= ~RTF_REJECT;
+               if (la->la_asked == 0 || rt->rt_expire != time.tv_sec) {
+                       rt->rt_expire = time.tv_sec;
+                       if (la->la_asked++ < arp_maxtries)
+                               arpwhohas(ac, &(SIN(dst)->sin_addr));
+                       else {
+                               rt->rt_flags |= RTF_REJECT;
+                               rt->rt_expire += arpt_down;
+                               la->la_asked = 0;
+                       }
+
+               }
+       }

        return (0);
 }
 
 /*
        return (0);
 }
 
 /*

- * Called from 10 Mb/s Ethernet interrupt handlers
- * when ether packet type ETHERTYPE_ARP
- * is received.  Common length and type checks are done here,
+ * Common length and type checks are done here,

  * then the protocol-specific routine is called.
  */
  * then the protocol-specific routine is called.
  */

-arpinput(ac, m)
-       struct arpcom *ac;
-       struct mbuf *m;
+arpintr()

 {
 {

+       register struct mbuf *m;

        register struct arphdr *ar;
        register struct arphdr *ar;

+       int s;

 
 

-       if (ac->ac_if.if_flags & IFF_NOARP)
-               goto out;
-       if (m->m_len < sizeof(struct arphdr))
-               goto out;
-       ar = mtod(m, struct arphdr *);
-       if (ntohs(ar->ar_hrd) != ARPHRD_ETHER)
-               goto out;
-       if (m->m_len < sizeof(struct arphdr) + 2 * ar->ar_hln + 2 * ar->ar_pln)
-               goto out;
-
-       switch (ntohs(ar->ar_pro)) {
-
-       case ETHERTYPE_IP:
-       case ETHERTYPE_IPTRAILERS:
-               in_arpinput(ac, m);
-               return;
-
-       default:
-               break;
+       while (arpintrq.ifq_head) {
+               s = splimp();
+               IF_DEQUEUE(&arpintrq, m);
+               splx(s);
+               if (m == 0 || (m->m_flags & M_PKTHDR) == 0)
+                       panic("arpintr");
+               if (m->m_len >= sizeof(struct arphdr) &&
+                   (ar = mtod(m, struct arphdr *)) &&
+                   ntohs(ar->ar_hrd) == ARPHRD_ETHER &&
+                   m->m_len >=
+                     sizeof(struct arphdr) + 2 * ar->ar_hln + 2 * ar->ar_pln)
+
+                           switch (ntohs(ar->ar_pro)) {
+
+                           case ETHERTYPE_IP:
+                           case ETHERTYPE_IPTRAILERS:
+                                   in_arpinput(m);
+                                   continue;
+                           }
+               m_freem(m);

        }
        }

-out:
-       m_freem(m);

 }
 
 /*
 }
 
 /*


@@ -297,21 +333,23 @@ out:
  * We reply to requests for ETHERTYPE_TRAIL protocol as well,
  * but don't normally send requests.
  */
  * We reply to requests for ETHERTYPE_TRAIL protocol as well,
  * but don't normally send requests.
  */

-in_arpinput(ac, m)
-       register struct arpcom *ac;
+in_arpinput(m)

        struct mbuf *m;
 {
        register struct ether_arp *ea;
        struct mbuf *m;
 {
        register struct ether_arp *ea;

+       register struct arpcom *ac = (struct arpcom *)m->m_pkthdr.rcvif;

        struct ether_header *eh;
        struct ether_header *eh;

-       register struct arptab *at;  /* same as "merge" flag */
-       register struct in_ifaddr *ia;
-       struct in_ifaddr *maybe_ia = 0;
+       register struct llinfo_arp *la = 0;
+       register struct rtentry *rt;
+       struct in_ifaddr *ia, *maybe_ia = 0;

        struct mbuf *mcopy = 0;
        struct mbuf *mcopy = 0;

-       struct sockaddr_in sin;
+       struct sockaddr_dl *sdl;

        struct sockaddr sa;
        struct in_addr isaddr, itaddr, myaddr;
        struct sockaddr sa;
        struct in_addr isaddr, itaddr, myaddr;

-       int proto, op, s, completed = 0;
+       int proto, op, completed = 0, sendtrailers;

 
 

+       if (ac->ac_if.if_flags & IFF_NOARP)
+               goto out;

        ea = mtod(m, struct ether_arp *);
        proto = ntohs(ea->arp_pro);
        op = ntohs(ea->arp_op);
        ea = mtod(m, struct ether_arp *);
        proto = ntohs(ea->arp_pro);
        op = ntohs(ea->arp_op);


@@ -347,40 +385,32 @@ in_arpinput(ac, m)
                goto out;
        }
        s = splimp();
                goto out;
        }
        s = splimp();

-       s = splimp();
-       ARPTAB_LOOK(at, isaddr.s_addr);
-       if (at) {
-               bcopy((caddr_t)ea->arp_sha, (caddr_t)at->at_enaddr,
-                   sizeof(ea->arp_sha));
-               if ((at->at_flags & ATF_COM) == 0)
-                       completed = 1;
-               at->at_flags |= ATF_COM;
-               if (at->at_hold) {
-                       sin.sin_family = AF_INET;
-                       sin.sin_addr = isaddr;
-                       (*ac->ac_if.if_output)(&ac->ac_if, 
-                           at->at_hold, (struct sockaddr *)&sin);
-                       at->at_hold = 0;
-               }
-       }
-       if (at == 0 && itaddr.s_addr == myaddr.s_addr) {
-               /* ensure we have a table entry */
-               if (at = arptnew(&isaddr)) {
-                       bcopy((caddr_t)ea->arp_sha, (caddr_t)at->at_enaddr,
-                           sizeof(ea->arp_sha));
-                       completed = 1;
-                       at->at_flags |= ATF_COM;
+       la = arplookup(isaddr.s_addr, itaddr.s_addr == myaddr.s_addr, 0);
+       if (la && (rt = la->la_rt) && (sdl = SDL(rt->rt_gateway))) {
+               if (sdl->sdl_alen &&
+                   bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen))
+                       log(LOG_INFO, "arp info overwritten for %x by %s\n",
+                           isaddr.s_addr, ether_sprintf(ea->arp_sha));
+               completed = 1; 
+               bcopy((caddr_t)ea->arp_sha, LLADDR(sdl),
+                           sdl->sdl_alen = sizeof(ea->arp_sha));
+               if (rt->rt_expire)
+                       rt->rt_expire = time.tv_sec + arpt_keep;
+               rt->rt_flags &= ~RTF_REJECT;
+               la->la_asked = 0;
+               if (la->la_hold) {
+                       (*ac->ac_if.if_output)(&ac->ac_if, la->la_hold,
+                               rt_key(rt), rt);
+                       la->la_hold = 0;

                }
        }
                }
        }

-       splx(s);
-       splx(s);

 reply:
        switch (proto) {
 
        case ETHERTYPE_IPTRAILERS:
                /* partner says trailers are OK */
 reply:
        switch (proto) {
 
        case ETHERTYPE_IPTRAILERS:
                /* partner says trailers are OK */

-               if (at)
-                       at->at_flags |= ATF_USETRAILERS;
+               if (la)
+                       la->la_rt->rt_flags |= RTF_USETRAILERS;

                /*
                 * Reply to request iff we want trailers.
                 */
                /*
                 * Reply to request iff we want trailers.
                 */


@@ -405,14 +435,16 @@ reply:
                    sizeof(ea->arp_sha));
                bcopy((caddr_t)ac->ac_enaddr, (caddr_t)ea->arp_sha,
                    sizeof(ea->arp_sha));
                    sizeof(ea->arp_sha));
                bcopy((caddr_t)ac->ac_enaddr, (caddr_t)ea->arp_sha,
                    sizeof(ea->arp_sha));

+               sendtrailers = !(ac->ac_if.if_flags & IFF_NOTRAILERS);

        } else {
        } else {

-               ARPTAB_LOOK(at, itaddr.s_addr);
-               if (at == NULL || (at->at_flags & ATF_PUBL) == 0)
+               la = arplookup(itaddr.s_addr, 0, SIN_PROXY);
+               if (la == NULL)

                        goto out;
                bcopy((caddr_t)ea->arp_sha, (caddr_t)ea->arp_tha,
                    sizeof(ea->arp_sha));
                        goto out;
                bcopy((caddr_t)ea->arp_sha, (caddr_t)ea->arp_tha,
                    sizeof(ea->arp_sha));

-               bcopy((caddr_t)at->at_enaddr, (caddr_t)ea->arp_sha,
-                   sizeof(ea->arp_sha));
+               sdl = SDL(la->la_rt->rt_gateway);
+               bcopy(LLADDR(sdl), (caddr_t)ea->arp_sha, sizeof(ea->arp_sha));
+               sendtrailers = rt->rt_flags & RTF_USETRAILERS;

        }
 
        bcopy((caddr_t)ea->arp_spa, (caddr_t)ea->arp_tpa,
        }
 
        bcopy((caddr_t)ea->arp_spa, (caddr_t)ea->arp_tpa,


@@ -429,8 +461,7 @@ reply:
         */
        if (op == ARPOP_REPLY)
                ea->arp_pro = htons(ETHERTYPE_IPTRAILERS);
         */
        if (op == ARPOP_REPLY)
                ea->arp_pro = htons(ETHERTYPE_IPTRAILERS);

-       else if (proto == ETHERTYPE_IP &&
-           (ac->ac_if.if_flags & IFF_NOTRAILERS) == 0)
+       else if (proto == ETHERTYPE_IP && sendtrailers)

                mcopy = m_copy(m, 0, (int)M_COPYALL);
        eh = (struct ether_header *)sa.sa_data;
        bcopy((caddr_t)ea->arp_tha, (caddr_t)eh->ether_dhost,
                mcopy = m_copy(m, 0, (int)M_COPYALL);
        eh = (struct ether_header *)sa.sa_data;
        bcopy((caddr_t)ea->arp_tha, (caddr_t)eh->ether_dhost,


@@ -438,11 +469,12 @@ reply:
        eh->ether_type = ETHERTYPE_ARP;
        sa.sa_family = AF_UNSPEC;
        sa.sa_len = sizeof(sa);
        eh->ether_type = ETHERTYPE_ARP;
        sa.sa_family = AF_UNSPEC;
        sa.sa_len = sizeof(sa);

-       (*ac->ac_if.if_output)(&ac->ac_if, m, &sa);
+       (*ac->ac_if.if_output)(&ac->ac_if, m, &sa, (struct rtentry *)0);

        if (mcopy) {
                ea = mtod(mcopy, struct ether_arp *);
                ea->arp_pro = htons(ETHERTYPE_IPTRAILERS);
        if (mcopy) {
                ea = mtod(mcopy, struct ether_arp *);
                ea->arp_pro = htons(ETHERTYPE_IPTRAILERS);

-               (*ac->ac_if.if_output)(&ac->ac_if, mcopy, &sa);
+               (*ac->ac_if.if_output)(&ac->ac_if,
+                                       mcopy, &sa, (struct rtentry *)0);

        }
        return;
 out:
        }
        return;
 out:


@@ -451,144 +483,57 @@ out:
 }
 
 /*
 }
 
 /*

- * Free an arptab entry.
+ * Free an arp entry.

  */
  */

-arptfree(at)
-       register struct arptab *at;
+arptfree(la)
+       register struct llinfo_arp *la;

 {
 {

-       int s = splimp();
-
-       if (at->at_hold)
-               m_freem(at->at_hold);
-       at->at_hold = 0;
-       at->at_timer = at->at_flags = 0;
-       at->at_iaddr.s_addr = 0;
-       splx(s);
+       register struct rtentry *rt = la->la_rt;
+       register struct sockaddr_dl *sdl;
+       if (rt == 0)
+               panic("arptfree");
+       if (rt->rt_refcnt > 0 && (sdl = SDL(rt->rt_gateway)) &&
+           sdl->sdl_family == AF_LINK) {
+               sdl->sdl_alen = 0;
+               la->la_asked = 0;
+               rt->rt_flags &= ~RTF_REJECT;
+               return;
+       }
+       rtrequest(RTM_DELETE, rt_key(rt), (struct sockaddr *)0, rt_mask(rt),
+                       0, (struct rtentry **)0);

 }
 }

-
+int arpdebug = 0;

 /*
 /*

- * Enter a new address in arptab, pushing out the oldest entry 
- * from the bucket if there is no room.
- * This always succeeds since no bucket can be completely filled
- * with permanent entries (except from arpioctl when testing whether
- * another permanent entry will fit).
- * MUST BE CALLED AT SPLIMP.
+ * Lookup or enter a new address in arptab.

  */
  */

-struct arptab *
-arptnew(addr)
-       struct in_addr *addr;
+struct llinfo_arp *
+arplookup(addr, create, proxy)
+       u_long addr;

 {
 {

-       register n;
-       int oldest = -1;
-       register struct arptab *at, *ato = NULL;
-       static int first = 1;
-
-       if (first) {
-               first = 0;
-               timeout(arptimer, (caddr_t)0, hz);
+       register struct rtentry *rt;
+       static struct sockaddr_inarp sin = {sizeof(sin), AF_INET };
+
+       sin.sin_addr.s_addr = addr;
+       sin.sin_other = proxy ? SIN_PROXY : 0;
+       rt = rtalloc1((struct sockaddr *)&sin, create);
+       if (rt == 0)
+               return (0);
+       rt->rt_refcnt--;
+       if ((rt->rt_flags & RTF_GATEWAY) || !(rt->rt_flags & RTF_LLINFO) ||
+               rt->rt_gateway->sa_family != AF_LINK) {
+               arpcatchme();
+               if (arpdebug)
+                       log(LOG_DEBUG, "arptnew failed on %x\n", ntohl(addr));
+               return (0);

        }
        }

-       at = &arptab[ARPTAB_HASH(addr->s_addr) * ARPTAB_BSIZ];
-       for (n = 0; n < ARPTAB_BSIZ; n++,at++) {
-               if (at->at_flags == 0)
-                       goto out;        /* found an empty entry */
-               if (at->at_flags & ATF_PERM)
-                       continue;
-               if ((int) at->at_timer > oldest) {
-                       oldest = at->at_timer;
-                       ato = at;
-               }
-       }
-       if (ato == NULL)
-               return (NULL);
-       at = ato;
-       arptfree(at);
-out:
-       at->at_iaddr = *addr;
-       at->at_flags = ATF_INUSE;
-       return (at);
+       return ((struct llinfo_arp *)rt->rt_llinfo);

 }
 
 }
 

+arpcatchme(){}
+

 arpioctl(cmd, data)
        int cmd;
        caddr_t data;
 {
 arpioctl(cmd, data)
        int cmd;
        caddr_t data;
 {

-       register struct arpreq *ar = (struct arpreq *)data;
-       register struct arptab *at;
-       register struct sockaddr_in *sin;
-       int s;
-
-       sin = (struct sockaddr_in *)&ar->arp_ha;
-#if defined(COMPAT_43) && BYTE_ORDER != BIG_ENDIAN
-       if (sin->sin_family == 0 && sin->sin_len < 16)
-               sin->sin_family = sin->sin_len;
-#endif
-       sin->sin_len = sizeof(ar->arp_ha);
-       sin = (struct sockaddr_in *)&ar->arp_pa;
-#if defined(COMPAT_43) && BYTE_ORDER != BIG_ENDIAN
-       if (sin->sin_family == 0 && sin->sin_len < 16)
-               sin->sin_family = sin->sin_len;
-#endif
-       sin->sin_len = sizeof(ar->arp_pa);
-       if (ar->arp_pa.sa_family != AF_INET ||
-           ar->arp_ha.sa_family != AF_UNSPEC)
-               return (EAFNOSUPPORT);
-       s = splimp();
-       ARPTAB_LOOK(at, sin->sin_addr.s_addr);
-       if (at == NULL) {               /* not found */
-               if (cmd != SIOCSARP) {
-                       splx(s);
-                       return (ENXIO);
-               }
-               if (ifa_ifwithnet(&ar->arp_pa) == NULL) {
-                       splx(s);
-                       return (ENETUNREACH);
-               }
-       }
-       switch (cmd) {
-
-       case SIOCSARP:          /* set entry */
-               if (at == NULL) {
-                       at = arptnew(&sin->sin_addr);
-                       if (at == NULL) {
-                               splx(s);
-                               return (EADDRNOTAVAIL);
-                       }
-                       if (ar->arp_flags & ATF_PERM) {
-                       /* never make all entries in a bucket permanent */
-                               register struct arptab *tat;
-                               
-                               /* try to re-allocate */
-                               tat = arptnew(&sin->sin_addr);
-                               if (tat == NULL) {
-                                       arptfree(at);
-                                       splx(s);
-                                       return (EADDRNOTAVAIL);
-                               }
-                               arptfree(tat);
-                       }
-               }
-               bcopy((caddr_t)ar->arp_ha.sa_data, (caddr_t)at->at_enaddr,
-                   sizeof(at->at_enaddr));
-               at->at_flags = ATF_COM | ATF_INUSE |
-                       (ar->arp_flags & (ATF_PERM|ATF_PUBL|ATF_USETRAILERS));
-               at->at_timer = 0;
-               break;
-
-       case SIOCDARP:          /* delete entry */
-               arptfree(at);
-               break;
-
-       case SIOCGARP:          /* get entry */
-       case OSIOCGARP:
-               bcopy((caddr_t)at->at_enaddr, (caddr_t)ar->arp_ha.sa_data,
-                   sizeof(at->at_enaddr));
-#ifdef COMPAT_43
-               if (cmd == OSIOCGARP)
-                       *(u_short *)&ar->arp_ha = ar->arp_ha.sa_family;
-#endif
-               ar->arp_flags = at->at_flags;
-               break;
-       }
-       splx(s);
-       return (0);
+       return (EOPNOTSUPP);

 }
 }