Deleted Added
full compact
in_proto.c (103026) in_proto.c (105199)
1/*
2 * Copyright (c) 1982, 1986, 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 * @(#)in_proto.c 8.2 (Berkeley) 2/9/95
1/*
2 * Copyright (c) 1982, 1986, 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 * @(#)in_proto.c 8.2 (Berkeley) 2/9/95
34 * $FreeBSD: head/sys/netinet/in_proto.c 103026 2002-09-06 17:12:50Z sobomax $
34 * $FreeBSD: head/sys/netinet/in_proto.c 105199 2002-10-16 02:25:05Z sam $
35 */
36
37#include "opt_ipdivert.h"
38#include "opt_ipx.h"
39#include "opt_ipsec.h"
40#include "opt_inet6.h"
41
42#include <sys/param.h>

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

71#include <netinet6/ipsec.h>
72#include <netinet6/ah.h>
73#ifdef IPSEC_ESP
74#include <netinet6/esp.h>
75#endif
76#include <netinet6/ipcomp.h>
77#endif /* IPSEC */
78
35 */
36
37#include "opt_ipdivert.h"
38#include "opt_ipx.h"
39#include "opt_ipsec.h"
40#include "opt_inet6.h"
41
42#include <sys/param.h>

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

71#include <netinet6/ipsec.h>
72#include <netinet6/ah.h>
73#ifdef IPSEC_ESP
74#include <netinet6/esp.h>
75#endif
76#include <netinet6/ipcomp.h>
77#endif /* IPSEC */
78
79#ifdef FAST_IPESC
80#include <netipsec/ipsec.h>
81#define ah4_input ipsec4_common_input
82#define esp4_input ipsec4_common_input
83#define ipcomp4_input ipsec4_common_input
84#define IPSEC
85#endif /* FAST_IPSEC */
86
79#ifdef IPXIP
80#include <netipx/ipx_ip.h>
81#endif
82
83#ifdef NSIP
84#include <netns/ns.h>
85#include <netns/ns_if.h>
86#endif

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

227SYSCTL_NODE(_net, PF_INET, inet, CTLFLAG_RW, 0,
228 "Internet Family");
229
230SYSCTL_NODE(_net_inet, IPPROTO_IP, ip, CTLFLAG_RW, 0, "IP");
231SYSCTL_NODE(_net_inet, IPPROTO_ICMP, icmp, CTLFLAG_RW, 0, "ICMP");
232SYSCTL_NODE(_net_inet, IPPROTO_UDP, udp, CTLFLAG_RW, 0, "UDP");
233SYSCTL_NODE(_net_inet, IPPROTO_TCP, tcp, CTLFLAG_RW, 0, "TCP");
234SYSCTL_NODE(_net_inet, IPPROTO_IGMP, igmp, CTLFLAG_RW, 0, "IGMP");
87#ifdef IPXIP
88#include <netipx/ipx_ip.h>
89#endif
90
91#ifdef NSIP
92#include <netns/ns.h>
93#include <netns/ns_if.h>
94#endif

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

235SYSCTL_NODE(_net, PF_INET, inet, CTLFLAG_RW, 0,
236 "Internet Family");
237
238SYSCTL_NODE(_net_inet, IPPROTO_IP, ip, CTLFLAG_RW, 0, "IP");
239SYSCTL_NODE(_net_inet, IPPROTO_ICMP, icmp, CTLFLAG_RW, 0, "ICMP");
240SYSCTL_NODE(_net_inet, IPPROTO_UDP, udp, CTLFLAG_RW, 0, "UDP");
241SYSCTL_NODE(_net_inet, IPPROTO_TCP, tcp, CTLFLAG_RW, 0, "TCP");
242SYSCTL_NODE(_net_inet, IPPROTO_IGMP, igmp, CTLFLAG_RW, 0, "IGMP");
243#ifdef FAST_IPSEC
244/* XXX no protocol # to use, pick something "reserved" */
245SYSCTL_NODE(_net_inet, 253, ipsec, CTLFLAG_RW, 0, "IPSEC");
246SYSCTL_NODE(_net_inet, IPPROTO_AH, ah, CTLFLAG_RW, 0, "AH");
247SYSCTL_NODE(_net_inet, IPPROTO_ESP, esp, CTLFLAG_RW, 0, "ESP");
248SYSCTL_NODE(_net_inet, IPPROTO_IPCOMP, ipcomp, CTLFLAG_RW, 0, "IPCOMP");
249SYSCTL_NODE(_net_inet, IPPROTO_IPIP, ipip, CTLFLAG_RW, 0, "IPIP");
250#else
235#ifdef IPSEC
236SYSCTL_NODE(_net_inet, IPPROTO_AH, ipsec, CTLFLAG_RW, 0, "IPSEC");
237#endif /* IPSEC */
251#ifdef IPSEC
252SYSCTL_NODE(_net_inet, IPPROTO_AH, ipsec, CTLFLAG_RW, 0, "IPSEC");
253#endif /* IPSEC */
254#endif /* !FAST_IPSEC */
238SYSCTL_NODE(_net_inet, IPPROTO_RAW, raw, CTLFLAG_RW, 0, "RAW");
239#ifdef IPDIVERT
240SYSCTL_NODE(_net_inet, IPPROTO_DIVERT, divert, CTLFLAG_RW, 0, "DIVERT");
241#endif
242
255SYSCTL_NODE(_net_inet, IPPROTO_RAW, raw, CTLFLAG_RW, 0, "RAW");
256#ifdef IPDIVERT
257SYSCTL_NODE(_net_inet, IPPROTO_DIVERT, divert, CTLFLAG_RW, 0, "DIVERT");
258#endif
259