Deleted Added
full compact
nd6.h (197138) nd6.h (207369)
1/*-
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
3 * 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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $
1/*-
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
3 * 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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $
30 * $FreeBSD: head/sys/netinet6/nd6.h 197138 2009-09-12 22:08:20Z hrs $
30 * $FreeBSD: head/sys/netinet6/nd6.h 207369 2010-04-29 11:52:42Z bz $
31 */
32
33#ifndef _NETINET6_ND6_H_
34#define _NETINET6_ND6_H_
35
36/* see net/route.h, or net/if_inarp.h */
37#ifndef RTF_ANNOUNCE
38#define RTF_ANNOUNCE RTF_PROTO2

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

325VNET_DECLARE(int, nd6_mmaxtries);
326VNET_DECLARE(int, nd6_useloopback);
327VNET_DECLARE(int, nd6_maxnudhint);
328VNET_DECLARE(int, nd6_gctimer);
329VNET_DECLARE(struct nd_drhead, nd_defrouter);
330VNET_DECLARE(struct nd_prhead, nd_prefix);
331VNET_DECLARE(int, nd6_debug);
332VNET_DECLARE(int, nd6_onlink_ns_rfc4861);
31 */
32
33#ifndef _NETINET6_ND6_H_
34#define _NETINET6_ND6_H_
35
36/* see net/route.h, or net/if_inarp.h */
37#ifndef RTF_ANNOUNCE
38#define RTF_ANNOUNCE RTF_PROTO2

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

325VNET_DECLARE(int, nd6_mmaxtries);
326VNET_DECLARE(int, nd6_useloopback);
327VNET_DECLARE(int, nd6_maxnudhint);
328VNET_DECLARE(int, nd6_gctimer);
329VNET_DECLARE(struct nd_drhead, nd_defrouter);
330VNET_DECLARE(struct nd_prhead, nd_prefix);
331VNET_DECLARE(int, nd6_debug);
332VNET_DECLARE(int, nd6_onlink_ns_rfc4861);
333VNET_DECLARE(struct callout, nd6_timer_ch);
334
335#define V_nd6_prune VNET(nd6_prune)
336#define V_nd6_delay VNET(nd6_delay)
337#define V_nd6_umaxtries VNET(nd6_umaxtries)
338#define V_nd6_mmaxtries VNET(nd6_mmaxtries)
339#define V_nd6_useloopback VNET(nd6_useloopback)
340#define V_nd6_maxnudhint VNET(nd6_maxnudhint)
341#define V_nd6_gctimer VNET(nd6_gctimer)
342#define V_nd_defrouter VNET(nd_defrouter)
343#define V_nd_prefix VNET(nd_prefix)
344#define V_nd6_debug VNET(nd6_debug)
345#define V_nd6_onlink_ns_rfc4861 VNET(nd6_onlink_ns_rfc4861)
333#define V_nd6_prune VNET(nd6_prune)
334#define V_nd6_delay VNET(nd6_delay)
335#define V_nd6_umaxtries VNET(nd6_umaxtries)
336#define V_nd6_mmaxtries VNET(nd6_mmaxtries)
337#define V_nd6_useloopback VNET(nd6_useloopback)
338#define V_nd6_maxnudhint VNET(nd6_maxnudhint)
339#define V_nd6_gctimer VNET(nd6_gctimer)
340#define V_nd_defrouter VNET(nd_defrouter)
341#define V_nd_prefix VNET(nd_prefix)
342#define V_nd6_debug VNET(nd6_debug)
343#define V_nd6_onlink_ns_rfc4861 VNET(nd6_onlink_ns_rfc4861)
344
345#define nd6log(x) do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0)
346
347VNET_DECLARE(struct callout, nd6_timer_ch);
346#define V_nd6_timer_ch VNET(nd6_timer_ch)
347
348/* nd6_rtr.c */
349VNET_DECLARE(int, nd6_defifindex);
350VNET_DECLARE(int, ip6_desync_factor); /* seconds */
351VNET_DECLARE(u_int32_t, ip6_temp_preferred_lifetime); /* seconds */
352VNET_DECLARE(u_int32_t, ip6_temp_valid_lifetime); /* seconds */
353VNET_DECLARE(int, ip6_temp_regen_advance); /* seconds */
348#define V_nd6_timer_ch VNET(nd6_timer_ch)
349
350/* nd6_rtr.c */
351VNET_DECLARE(int, nd6_defifindex);
352VNET_DECLARE(int, ip6_desync_factor); /* seconds */
353VNET_DECLARE(u_int32_t, ip6_temp_preferred_lifetime); /* seconds */
354VNET_DECLARE(u_int32_t, ip6_temp_valid_lifetime); /* seconds */
355VNET_DECLARE(int, ip6_temp_regen_advance); /* seconds */
354
355#define V_nd6_defifindex VNET(nd6_defifindex)
356#define V_ip6_desync_factor VNET(ip6_desync_factor)
357#define V_ip6_temp_preferred_lifetime VNET(ip6_temp_preferred_lifetime)
358#define V_ip6_temp_valid_lifetime VNET(ip6_temp_valid_lifetime)
359#define V_ip6_temp_regen_advance VNET(ip6_temp_regen_advance)
360
356#define V_nd6_defifindex VNET(nd6_defifindex)
357#define V_ip6_desync_factor VNET(ip6_desync_factor)
358#define V_ip6_temp_preferred_lifetime VNET(ip6_temp_preferred_lifetime)
359#define V_ip6_temp_valid_lifetime VNET(ip6_temp_valid_lifetime)
360#define V_ip6_temp_regen_advance VNET(ip6_temp_regen_advance)
361
361#define nd6log(x) do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0)
362
363union nd_opts {
364 struct nd_opt_hdr *nd_opt_array[8]; /* max = target address list */
365 struct {
366 struct nd_opt_hdr *zero;
367 struct nd_opt_hdr *src_lladdr;
368 struct nd_opt_hdr *tgt_lladdr;
369 struct nd_opt_prefix_info *pi_beg; /* multiple opts, start */
370 struct nd_opt_rd_hdr *rh;

--- 87 unchanged lines hidden ---
362union nd_opts {
363 struct nd_opt_hdr *nd_opt_array[8]; /* max = target address list */
364 struct {
365 struct nd_opt_hdr *zero;
366 struct nd_opt_hdr *src_lladdr;
367 struct nd_opt_hdr *tgt_lladdr;
368 struct nd_opt_prefix_info *pi_beg; /* multiple opts, start */
369 struct nd_opt_rd_hdr *rh;

--- 87 unchanged lines hidden ---