Deleted Added
full compact
in6_proto.c (148917) in6_proto.c (148921)
1/* $FreeBSD: head/sys/netinet6/in6_proto.c 148917 2005-08-10 06:38:46Z obrien $ */
1/* $FreeBSD: head/sys/netinet6/in6_proto.c 148921 2005-08-10 09:13:35Z suz $ */
2/* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */
3
4/*-
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

59 * SUCH DAMAGE.
60 *
61 * @(#)in_proto.c 8.1 (Berkeley) 6/10/93
62 */
63
64#include "opt_inet.h"
65#include "opt_inet6.h"
66#include "opt_ipsec.h"
2/* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */
3
4/*-
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

59 * SUCH DAMAGE.
60 *
61 * @(#)in_proto.c 8.1 (Berkeley) 6/10/93
62 */
63
64#include "opt_inet.h"
65#include "opt_inet6.h"
66#include "opt_ipsec.h"
67#include "opt_ipstealth.h"
67#include "opt_carp.h"
68
69#include <sys/param.h>
70#include <sys/socket.h>
71#include <sys/socketvar.h>
72#include <sys/protosw.h>
73#include <sys/kernel.h>
74#include <sys/domain.h>

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

305int ip6_gif_hlim = 0;
306int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
307int ip6_rr_prune = 5; /* router renumbering prefix
308 * walk list every 5 sec. */
309int ip6_v6only = 1;
310
311int ip6_keepfaith = 0;
312time_t ip6_log_time = (time_t)0L;
68#include "opt_carp.h"
69
70#include <sys/param.h>
71#include <sys/socket.h>
72#include <sys/socketvar.h>
73#include <sys/protosw.h>
74#include <sys/kernel.h>
75#include <sys/domain.h>

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

306int ip6_gif_hlim = 0;
307int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
308int ip6_rr_prune = 5; /* router renumbering prefix
309 * walk list every 5 sec. */
310int ip6_v6only = 1;
311
312int ip6_keepfaith = 0;
313time_t ip6_log_time = (time_t)0L;
314#ifdef IPSTEALTH
315int ip6stealth = 0;
316#endif
313
314/* icmp6 */
315/*
316 * BSDI4 defines these variables in in_proto.c...
317 * XXX: what if we don't define INET? Should we define pmtu6_expire
318 * or so? (jinmei@kame.net 19990310)
319 */
320int pmtu_expire = 60*10;

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

441SYSCTL_STRUCT(_net_inet6_ip6, IPV6CTL_RIP6STATS, rip6stats, CTLFLAG_RD,
442 &rip6stat, rip6stat, "");
443SYSCTL_INT(_net_inet6_ip6, IPV6CTL_PREFER_TEMPADDR,
444 prefer_tempaddr, CTLFLAG_RW, &ip6_prefer_tempaddr, 0, "");
445SYSCTL_INT(_net_inet6_ip6, IPV6CTL_USE_DEFAULTZONE,
446 use_defaultzone, CTLFLAG_RW, &ip6_use_defzone, 0,"");
447SYSCTL_INT(_net_inet6_ip6, IPV6CTL_MAXFRAGS,
448 maxfrags, CTLFLAG_RW, &ip6_maxfrags, 0, "");
317
318/* icmp6 */
319/*
320 * BSDI4 defines these variables in in_proto.c...
321 * XXX: what if we don't define INET? Should we define pmtu6_expire
322 * or so? (jinmei@kame.net 19990310)
323 */
324int pmtu_expire = 60*10;

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

445SYSCTL_STRUCT(_net_inet6_ip6, IPV6CTL_RIP6STATS, rip6stats, CTLFLAG_RD,
446 &rip6stat, rip6stat, "");
447SYSCTL_INT(_net_inet6_ip6, IPV6CTL_PREFER_TEMPADDR,
448 prefer_tempaddr, CTLFLAG_RW, &ip6_prefer_tempaddr, 0, "");
449SYSCTL_INT(_net_inet6_ip6, IPV6CTL_USE_DEFAULTZONE,
450 use_defaultzone, CTLFLAG_RW, &ip6_use_defzone, 0,"");
451SYSCTL_INT(_net_inet6_ip6, IPV6CTL_MAXFRAGS,
452 maxfrags, CTLFLAG_RW, &ip6_maxfrags, 0, "");
453#ifdef IPSTEALTH
454SYSCTL_INT(_net_inet6_ip6, IPV6CTL_STEALTH, stealth, CTLFLAG_RW,
455 &ip6stealth, 0, "");
456#endif
449
450/* net.inet6.icmp6 */
451SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT,
452 rediraccept, CTLFLAG_RW, &icmp6_rediraccept, 0, "");
453SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRTIMEOUT,
454 redirtimeout, CTLFLAG_RW, &icmp6_redirtimeout, 0, "");
455SYSCTL_STRUCT(_net_inet6_icmp6, ICMPV6CTL_STATS, stats, CTLFLAG_RD,
456 &icmp6stat, icmp6stat, "");

--- 18 unchanged lines hidden ---
457
458/* net.inet6.icmp6 */
459SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT,
460 rediraccept, CTLFLAG_RW, &icmp6_rediraccept, 0, "");
461SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRTIMEOUT,
462 redirtimeout, CTLFLAG_RW, &icmp6_redirtimeout, 0, "");
463SYSCTL_STRUCT(_net_inet6_icmp6, ICMPV6CTL_STATS, stats, CTLFLAG_RD,
464 &icmp6stat, icmp6stat, "");

--- 18 unchanged lines hidden ---