xnu-517.7.7.tar.gz

[apple/xnu.git] / bsd / netinet / if_ether.c

diff --git a/bsd/netinet/if_ether.c b/bsd/netinet/if_ether.c
index 07e99d6eb2272393aedc49addc9e2f4b11f52df8..499057940cf0a755ffb58e4beeab9680dc7b4fbc 100644 (file)
--- a/bsd/netinet/if_ether.c
+++ b/bsd/netinet/if_ether.c
@@ -402,7 +402,7 @@ arprequest(ac, sip, tip, enaddr)
        (void)memcpy(ea->arp_tpa, tip, sizeof(ea->arp_tpa));
        sa.sa_family = AF_UNSPEC;
        sa.sa_len = sizeof(sa);
-        dlil_output(((struct ifnet *)ac)->if_data.default_proto, m, 0, &sa, 0);
+        dlil_output(ifptodlt(((struct ifnet *)ac), PF_INET), m, 0, &sa, 0);
 }
 
 /*
@@ -642,9 +642,31 @@ in_arpinput(m)
                return;
        }
        if (isaddr.s_addr == myaddr.s_addr) {
+               struct kev_msg        ev_msg;
+               struct kev_in_collision *in_collision;
+               u_char  storage[sizeof(struct kev_in_collision) + 6];
+               in_collision = (struct kev_in_collision*)storage;
+               
                log(LOG_ERR,
                        "duplicate IP address %s sent from ethernet address %s\n",
                        inet_ntoa(isaddr), ether_sprintf(buf, ea->arp_sha));
+               
+               /* Send a kernel event so anyone can learn of the conflict */
+               in_collision->link_data.if_family = ac->ac_if.if_family;
+               in_collision->link_data.if_unit = ac->ac_if.if_unit;
+               strncpy(&in_collision->link_data.if_name[0], ac->ac_if.if_name, IFNAMSIZ);
+               in_collision->ia_ipaddr = isaddr;
+               in_collision->hw_len = ETHER_ADDR_LEN;
+               bcopy((caddr_t)ea->arp_sha, (caddr_t)in_collision->hw_addr, sizeof(ea->arp_sha));
+               ev_msg.vendor_code = KEV_VENDOR_APPLE;
+               ev_msg.kev_class = KEV_NETWORK_CLASS;
+               ev_msg.kev_subclass = KEV_INET_SUBCLASS;
+               ev_msg.event_code = KEV_INET_ARPCOLLISION;
+               ev_msg.dv[0].data_ptr = in_collision;
+               ev_msg.dv[0].data_length = sizeof(struct kev_in_collision) + 6;
+               ev_msg.dv[1].data_length = 0;
+               kev_post_msg(&ev_msg);
+               
                itaddr = myaddr;
                goto reply;
        }
@@ -861,9 +883,18 @@ arplookup(addr, create, proxy)
        if (rt == 0)
                return (0);
        rtunref(rt);
-
-       if (rt->rt_flags & RTF_GATEWAY)
+       
+       if (rt->rt_flags & RTF_GATEWAY) {
                why = "host is not on local network";
+               
+               /* If there are no references to this route, purge it */
+               if (rt->rt_refcnt <= 0 && (rt->rt_flags & RTF_WASCLONED) != 0) {
+                       rtrequest(RTM_DELETE,
+                                       (struct sockaddr *)rt_key(rt),
+                                       rt->rt_gateway, rt_mask(rt),
+                                       rt->rt_flags, 0);
+               }
+       }
        else if ((rt->rt_flags & RTF_LLINFO) == 0)
                why = "could not allocate llinfo";
        else if (rt->rt_gateway->sa_family != AF_LINK)