Deleted Added
full compact
in.c (186150) in.c (186500)
1/*-
2 * Copyright (c) 1982, 1986, 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 * Copyright (C) 2001 WIDE Project. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * @(#)in.c 8.4 (Berkeley) 1/9/95
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1982, 1986, 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 * Copyright (C) 2001 WIDE Project. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * @(#)in.c 8.4 (Berkeley) 1/9/95
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/netinet/in.c 186150 2008-12-16 00:20:49Z kmacy $");
34__FBSDID("$FreeBSD: head/sys/netinet/in.c 186500 2008-12-26 19:45:24Z qingli $");
35
36#include "opt_carp.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/sockio.h>
41#include <sys/malloc.h>
42#include <sys/priv.h>

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

1217 sdl->sdl_len = sizeof(*sdl);
1218 sdl->sdl_alen = ifp->if_addrlen;
1219 sdl->sdl_index = ifp->if_index;
1220 sdl->sdl_type = ifp->if_type;
1221 bcopy(&lle->ll_addr, LLADDR(sdl), ifp->if_addrlen);
1222
1223 arpc.rtm.rtm_rmx.rmx_expire =
1224 lle->la_flags & LLE_STATIC ? 0 : lle->la_expire;
35
36#include "opt_carp.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/sockio.h>
41#include <sys/malloc.h>
42#include <sys/priv.h>

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

1217 sdl->sdl_len = sizeof(*sdl);
1218 sdl->sdl_alen = ifp->if_addrlen;
1219 sdl->sdl_index = ifp->if_index;
1220 sdl->sdl_type = ifp->if_type;
1221 bcopy(&lle->ll_addr, LLADDR(sdl), ifp->if_addrlen);
1222
1223 arpc.rtm.rtm_rmx.rmx_expire =
1224 lle->la_flags & LLE_STATIC ? 0 : lle->la_expire;
1225 arpc.rtm.rtm_flags |= RTF_HOST;
1225 arpc.rtm.rtm_flags |= (RTF_HOST | RTF_LLDATA);
1226 if (lle->la_flags & LLE_STATIC)
1227 arpc.rtm.rtm_flags |= RTF_STATIC;
1228 arpc.rtm.rtm_index = ifp->if_index;
1229 error = SYSCTL_OUT(wr, &arpc, sizeof(arpc));
1230 if (error)
1231 break;
1232 }
1233 }

--- 26 unchanged lines hidden ---
1226 if (lle->la_flags & LLE_STATIC)
1227 arpc.rtm.rtm_flags |= RTF_STATIC;
1228 arpc.rtm.rtm_index = ifp->if_index;
1229 error = SYSCTL_OUT(wr, &arpc, sizeof(arpc));
1230 if (error)
1231 break;
1232 }
1233 }

--- 26 unchanged lines hidden ---