Deleted Added
full compact
if_ether.c (51320) if_ether.c (52377)
1/*
2 * Copyright (c) 1982, 1986, 1988, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)if_ether.c 8.1 (Berkeley) 6/10/93
1/*
2 * Copyright (c) 1982, 1986, 1988, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)if_ether.c 8.1 (Berkeley) 6/10/93
34 * $FreeBSD: head/sys/netinet/if_ether.c 51320 1999-09-16 00:35:39Z lile $
34 * $FreeBSD: head/sys/netinet/if_ether.c 52377 1999-10-18 11:56:50Z sheldonh $
35 */
36
37/*
38 * Ethernet address resolution protocol.
39 * TODO:
40 * add "inuse/lock" bit (or ref. count) along with valid bit
41 */
42

--- 510 unchanged lines hidden (view full) ---

553 bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen)) {
554 if (rt->rt_expire)
555 log(LOG_INFO, "arp: %s moved from %6D to %6D on %s%d\n",
556 inet_ntoa(isaddr), (u_char *)LLADDR(sdl), ":",
557 ea->arp_sha, ":",
558 ac->ac_if.if_name, ac->ac_if.if_unit);
559 else {
560 log(LOG_ERR,
35 */
36
37/*
38 * Ethernet address resolution protocol.
39 * TODO:
40 * add "inuse/lock" bit (or ref. count) along with valid bit
41 */
42

--- 510 unchanged lines hidden (view full) ---

553 bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen)) {
554 if (rt->rt_expire)
555 log(LOG_INFO, "arp: %s moved from %6D to %6D on %s%d\n",
556 inet_ntoa(isaddr), (u_char *)LLADDR(sdl), ":",
557 ea->arp_sha, ":",
558 ac->ac_if.if_name, ac->ac_if.if_unit);
559 else {
560 log(LOG_ERR,
561 "arp: %6D attempts to modify permanent entry for %s on %s%d",
561 "arp: %6D attempts to modify permanent entry for %s on %s%d\n",
562 ea->arp_sha, ":", inet_ntoa(isaddr),
563 ac->ac_if.if_name, ac->ac_if.if_unit);
564 goto reply;
565 }
566 }
567 (void)memcpy(LLADDR(sdl), ea->arp_sha, sizeof(ea->arp_sha));
568 sdl->sdl_alen = sizeof(ea->arp_sha);
569 sdl->sdl_rcf = NULL;

--- 207 unchanged lines hidden ---
562 ea->arp_sha, ":", inet_ntoa(isaddr),
563 ac->ac_if.if_name, ac->ac_if.if_unit);
564 goto reply;
565 }
566 }
567 (void)memcpy(LLADDR(sdl), ea->arp_sha, sizeof(ea->arp_sha));
568 sdl->sdl_alen = sizeof(ea->arp_sha);
569 sdl->sdl_rcf = NULL;

--- 207 unchanged lines hidden ---