Deleted Added
full compact
in_proto.c (136695) in_proto.c (136714)
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

--- 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 * @(#)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

--- 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 * @(#)in_proto.c 8.2 (Berkeley) 2/9/95
30 * $FreeBSD: head/sys/netinet/in_proto.c 136695 2004-10-19 15:58:22Z andre $
30 * $FreeBSD: head/sys/netinet/in_proto.c 136714 2004-10-19 21:14:57Z andre $
31 */
32
31 */
32
33#include "opt_ipdivert.h"
34#include "opt_ipx.h"
35#include "opt_mrouting.h"
36#include "opt_ipsec.h"
37#include "opt_inet6.h"
38#include "opt_pf.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>

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

49#include <net/if.h>
50#include <net/route.h>
51
52#include <netinet/in.h>
53#include <netinet/in_systm.h>
54#include <netinet/ip.h>
55#include <netinet/ip_var.h>
56#include <netinet/ip_icmp.h>
33#include "opt_ipx.h"
34#include "opt_mrouting.h"
35#include "opt_ipsec.h"
36#include "opt_inet6.h"
37#include "opt_pf.h"
38
39#include <sys/param.h>
40#include <sys/systm.h>

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

48#include <net/if.h>
49#include <net/route.h>
50
51#include <netinet/in.h>
52#include <netinet/in_systm.h>
53#include <netinet/ip.h>
54#include <netinet/ip_var.h>
55#include <netinet/ip_icmp.h>
57#include <netinet/ip_divert.h>
58#include <netinet/igmp_var.h>
59#ifdef PIM
60#include <netinet/pim_var.h>
61#endif
62#include <netinet/tcp.h>
63#include <netinet/tcp_timer.h>
64#include <netinet/tcp_var.h>
65#include <netinet/udp.h>

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

210# ifdef INET6
211{ SOCK_RAW, &inetdomain, IPPROTO_IPV6, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
212 encap4_input, 0, 0, rip_ctloutput,
213 0,
214 encap_init, 0, 0, 0,
215 &rip_usrreqs
216},
217#endif
56#include <netinet/igmp_var.h>
57#ifdef PIM
58#include <netinet/pim_var.h>
59#endif
60#include <netinet/tcp.h>
61#include <netinet/tcp_timer.h>
62#include <netinet/tcp_var.h>
63#include <netinet/udp.h>

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

208# ifdef INET6
209{ SOCK_RAW, &inetdomain, IPPROTO_IPV6, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
210 encap4_input, 0, 0, rip_ctloutput,
211 0,
212 encap_init, 0, 0, 0,
213 &rip_usrreqs
214},
215#endif
218#ifdef IPDIVERT
219{ SOCK_RAW, &inetdomain, IPPROTO_DIVERT, PR_ATOMIC|PR_ADDR,
220 div_input, 0, div_ctlinput, ip_ctloutput,
221 0,
222 div_init, 0, 0, 0,
223 &div_usrreqs,
224},
225#endif
226#ifdef IPXIP
227{ SOCK_RAW, &inetdomain, IPPROTO_IDP, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
228 ipxip_input, 0, ipxip_ctlinput, 0,
229 0,
230 0, 0, 0, 0,
231 &rip_usrreqs
232},
233#endif

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

292SYSCTL_NODE(_net_inet, IPPROTO_IPCOMP, ipcomp, CTLFLAG_RW, 0, "IPCOMP");
293SYSCTL_NODE(_net_inet, IPPROTO_IPIP, ipip, CTLFLAG_RW, 0, "IPIP");
294#else
295#ifdef IPSEC
296SYSCTL_NODE(_net_inet, IPPROTO_AH, ipsec, CTLFLAG_RW, 0, "IPSEC");
297#endif /* IPSEC */
298#endif /* !FAST_IPSEC */
299SYSCTL_NODE(_net_inet, IPPROTO_RAW, raw, CTLFLAG_RW, 0, "RAW");
216#ifdef IPXIP
217{ SOCK_RAW, &inetdomain, IPPROTO_IDP, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
218 ipxip_input, 0, ipxip_ctlinput, 0,
219 0,
220 0, 0, 0, 0,
221 &rip_usrreqs
222},
223#endif

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

282SYSCTL_NODE(_net_inet, IPPROTO_IPCOMP, ipcomp, CTLFLAG_RW, 0, "IPCOMP");
283SYSCTL_NODE(_net_inet, IPPROTO_IPIP, ipip, CTLFLAG_RW, 0, "IPIP");
284#else
285#ifdef IPSEC
286SYSCTL_NODE(_net_inet, IPPROTO_AH, ipsec, CTLFLAG_RW, 0, "IPSEC");
287#endif /* IPSEC */
288#endif /* !FAST_IPSEC */
289SYSCTL_NODE(_net_inet, IPPROTO_RAW, raw, CTLFLAG_RW, 0, "RAW");
300#ifdef IPDIVERT
301SYSCTL_NODE(_net_inet, IPPROTO_DIVERT, divert, CTLFLAG_RW, 0, "DIVERT");
302#endif
303#ifdef PIM
304SYSCTL_NODE(_net_inet, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM");
305#endif
290#ifdef PIM
291SYSCTL_NODE(_net_inet, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM");
292#endif