diff options
| -rw-r--r-- | sys/netinet/in.h | 6 | ||||
| -rw-r--r-- | sys/netinet/in_gif.c | 8 | ||||
| -rw-r--r-- | sys/netinet/in_gif.h | 6 | ||||
| -rw-r--r-- | sys/netinet6/in6.h | 15 | ||||
| -rw-r--r-- | sys/netinet6/in6_gif.h | 4 | ||||
| -rw-r--r-- | sys/netinet6/in6_proto.c | 7 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/ip6_var.h | 3 |
8 files changed, 19 insertions, 35 deletions
diff --git a/sys/netinet/in.h b/sys/netinet/in.h index a4d3a6dd673..f5d49692ad3 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in.h,v 1.38 2000/02/09 07:37:14 itojun Exp $ */ +/* $OpenBSD: in.h,v 1.39 2000/05/25 01:22:00 itojun Exp $ */ /* $NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $ */ /* @@ -431,7 +431,9 @@ struct ip_mreq { #define IPCTL_IPPORT_HILASTAUTO 10 #define IPCTL_IPPORT_MAXQUEUE 11 #define IPCTL_ENCDEBUG 12 +#ifdef notdef /*obsolete*/ #define IPCTL_GIF_TTL 13 /* default TTL for gif encap packet */ +#endif #define IPCTL_IPSEC_ACL 14 /* ingress IPsec access control */ #define IPCTL_IPSEC_EMBRYONIC_SA_TIMEOUT 15 /* new SA lifetime */ #define IPCTL_IPSEC_REQUIRE_PFS 16 @@ -461,7 +463,7 @@ struct ip_mreq { { "porthilast", CTLTYPE_INT }, \ { "maxqueue", CTLTYPE_INT }, \ { "encdebug", CTLTYPE_INT }, \ - { "gifttl", CTLTYPE_INT }, \ + { 0, 0 }, \ { "ipsec-acl", CTLTYPE_INT }, \ { "ipsec-invalid-life", CTLTYPE_INT }, \ { "ipsec-pfs", CTLTYPE_INT }, \ diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index 5692319b74e..1a6f8682ae6 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_gif.c,v 1.8 2000/02/07 06:18:44 itojun Exp $ */ +/* $OpenBSD: in_gif.c,v 1.9 2000/05/25 01:22:00 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -70,12 +70,6 @@ #include <net/net_osdep.h> -#if NGIF > 0 -int ip_gif_ttl = GIF_TTL; -#else -int ip_gif_ttl = 0; -#endif - #ifndef offsetof #define offsetof(s, e) ((int)&((s *)0)->e) #endif diff --git a/sys/netinet/in_gif.h b/sys/netinet/in_gif.h index a80e6fff158..26a2952a390 100644 --- a/sys/netinet/in_gif.h +++ b/sys/netinet/in_gif.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in_gif.h,v 1.1 1999/12/08 06:50:19 itojun Exp $ */ +/* $OpenBSD: in_gif.h,v 1.2 2000/05/25 01:22:00 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -32,10 +32,6 @@ #ifndef _NETINET_IN_GIF_H_ #define _NETINET_IN_GIF_H_ -#define GIF_TTL 30 - -extern int ip_gif_ttl; - void in_gif_input __P((struct mbuf *, ...)); int in_gif_output __P((struct ifnet *, int, struct mbuf *, struct rtentry *)); diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 6a40d8c50a1..07f7040ecb8 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -1,9 +1,10 @@ -/* $OpenBSD: in6.h,v 1.12 2000/02/28 11:55:22 itojun Exp $ */ +/* $OpenBSD: in6.h,v 1.13 2000/05/25 01:22:00 itojun Exp $ */ +/* $KAME: in6.h,v 1.44 2000/05/24 08:50:17 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -15,7 +16,7 @@ * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -231,10 +232,10 @@ extern const struct in6_addr in6addr_linklocal_allrouters; */ #ifdef _KERNEL #define IN6_ARE_ADDR_EQUAL(a, b) \ - (bcmp((a), (b), sizeof(struct in6_addr)) == 0) + (bcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0) #else #define IN6_ARE_ADDR_EQUAL(a, b) \ - (memcmp((a), (b), sizeof(struct in6_addr)) == 0) + (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0) #endif /* @@ -529,7 +530,9 @@ struct in6_pktinfo { #define IPV6CTL_DAD_COUNT 16 #define IPV6CTL_AUTO_FLOWLABEL 17 #define IPV6CTL_DEFMCASTHLIM 18 +#ifdef notdef /*obsolete*/ #define IPV6CTL_GIF_HLIM 19 /* default HLIM for gif encap packet */ +#endif #define IPV6CTL_KAME_VERSION 20 #define IPV6CTL_USE_DEPRECATED 21 /* use deprecated addr (RFC2462 5.5.4) */ #define IPV6CTL_RR_PRUNE 22 /* walk timer for router renumbering */ @@ -557,7 +560,7 @@ struct in6_pktinfo { { "dad_count", CTLTYPE_INT }, \ { "auto_flowlabel", CTLTYPE_INT }, \ { "defmcasthlim", CTLTYPE_INT }, \ - { "gifhlim", CTLTYPE_INT }, \ + { 0, 0 }, \ { "kame_version", CTLTYPE_STRING }, \ { "use_deprecated", CTLTYPE_INT }, \ { "rr_prune", CTLTYPE_INT }, \ diff --git a/sys/netinet6/in6_gif.h b/sys/netinet6/in6_gif.h index 4779b5c9369..c81d046046d 100644 --- a/sys/netinet6/in6_gif.h +++ b/sys/netinet6/in6_gif.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_gif.h,v 1.1 1999/12/08 06:50:21 itojun Exp $ */ +/* $OpenBSD: in6_gif.h,v 1.2 2000/05/25 01:22:00 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -32,8 +32,6 @@ #ifndef _NETINET6_IN6_GIF_H_ #define _NETINET6_IN6_GIF_H_ -#define GIF_HLIM 30 - int in6_gif_input __P((struct mbuf **, int *, int)); int in6_gif_output __P((struct ifnet *, int, struct mbuf *, struct rtentry *)); diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 8facfbf1d0a..d771bd67761 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.20 2000/05/22 10:32:52 itojun Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.21 2000/05/25 01:22:00 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -270,11 +270,6 @@ int ip6_hdrnestlimit = 50; /* appropriate? */ int ip6_dad_count = 1; /* DupAddrDetectionTransmits */ u_int32_t ip6_flow_seq; int ip6_auto_flowlabel = 1; -#if NGIF > 0 -int ip6_gif_hlim = GIF_HLIM; -#else -int ip6_gif_hlim = 0; -#endif int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */ int ip6_rr_prune = 5; /* router renumbering prefix * walk list every 5 sec. */ diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 2db6e9851f3..ae711d41b62 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.11 2000/05/19 20:12:10 itojun Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.12 2000/05/25 01:22:00 itojun Exp $ */ /* $KAME: ip6_input.c,v 1.89 2000/05/19 19:59:05 itojun Exp $ */ /* @@ -1285,9 +1285,6 @@ ip6_sysctl(name, namelen, oldp, oldlenp, newp, newlen) case IPV6CTL_DEFMCASTHLIM: return sysctl_int(oldp, oldlenp, newp, newlen, &ip6_defmcasthlim); - case IPV6CTL_GIF_HLIM: - return sysctl_int(oldp, oldlenp, newp, newlen, - &ip6_gif_hlim); case IPV6CTL_KAME_VERSION: return sysctl_rdstring(oldp, oldlenp, newp, __KAME_VERSION); case IPV6CTL_USE_DEPRECATED: diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index 4e31b1fe439..1a24bdde81e 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_var.h,v 1.7 2000/03/22 03:50:35 itojun Exp $ */ +/* $OpenBSD: ip6_var.h,v 1.8 2000/05/25 01:22:00 itojun Exp $ */ /* $KAME: ip6_var.h,v 1.28 2000/03/09 00:46:12 itojun Exp $ */ /* @@ -221,7 +221,6 @@ extern int ip6_defhlim; /* default hop limit */ extern int ip6_defmcasthlim; /* default multicast hop limit */ extern int ip6_forwarding; /* act as router? */ extern int ip6_forward_srcrt; /* forward src-routed? */ -extern int ip6_gif_hlim; /* Hop limit for gif encap packet */ extern int ip6_use_deprecated; /* allow deprecated addr as source */ extern int ip6_rr_prune; /* router renumbering prefix * walk list every 5 sec. */ |