Deleted Added
full compact
in_proto.c (128019) in_proto.c (130613)
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 128019 2004-04-07 20:46:16Z imp $
30 * $FreeBSD: head/sys/netinet/in_proto.c 130613 2004-06-16 23:24:02Z mlaier $
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"
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"
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/kernel.h>
42#include <sys/socket.h>
43#include <sys/domain.h>
44#include <sys/protosw.h>
45#include <sys/queue.h>

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

81#ifdef FAST_IPSEC
82#include <netipsec/ipsec.h>
83#endif /* FAST_IPSEC */
84
85#ifdef IPXIP
86#include <netipx/ipx_ip.h>
87#endif
88
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/socket.h>
44#include <sys/domain.h>
45#include <sys/protosw.h>
46#include <sys/queue.h>

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

82#ifdef FAST_IPSEC
83#include <netipsec/ipsec.h>
84#endif /* FAST_IPSEC */
85
86#ifdef IPXIP
87#include <netipx/ipx_ip.h>
88#endif
89
90#ifdef DEV_PFSYNC
91#include <net/pfvar.h>
92#include <net/if_pfsync.h>
93#endif
94
89extern struct domain inetdomain;
90static struct pr_usrreqs nousrreqs;
91
92struct protosw inetsw[] = {
93{ 0, &inetdomain, 0, 0,
94 0, 0, 0, 0,
95 0,
96 ip_init, 0, ip_slowtimo, ip_drain,

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

220#ifdef PIM
221{ SOCK_RAW, &inetdomain, IPPROTO_PIM, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
222 pim_input, 0, 0, rip_ctloutput,
223 0,
224 0, 0, 0, 0,
225 &rip_usrreqs
226},
227#endif /* PIM */
95extern struct domain inetdomain;
96static struct pr_usrreqs nousrreqs;
97
98struct protosw inetsw[] = {
99{ 0, &inetdomain, 0, 0,
100 0, 0, 0, 0,
101 0,
102 ip_init, 0, ip_slowtimo, ip_drain,

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

226#ifdef PIM
227{ SOCK_RAW, &inetdomain, IPPROTO_PIM, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
228 pim_input, 0, 0, rip_ctloutput,
229 0,
230 0, 0, 0, 0,
231 &rip_usrreqs
232},
233#endif /* PIM */
234#ifdef DEV_PFSYNC
235{ SOCK_RAW, &inetdomain, IPPROTO_PFSYNC, PR_ATOMIC|PR_ADDR,
236 pfsync_input, 0, 0, rip_ctloutput,
237 0,
238 0, 0, 0, 0,
239 &rip_usrreqs
240},
241#endif /* DEV_PFSYNC */
228 /* raw wildcard */
229{ SOCK_RAW, &inetdomain, 0, PR_ATOMIC|PR_ADDR,
230 rip_input, 0, 0, rip_ctloutput,
231 0,
232 rip_init, 0, 0, 0,
233 &rip_usrreqs
234},
235};

--- 39 unchanged lines hidden ---
242 /* raw wildcard */
243{ SOCK_RAW, &inetdomain, 0, PR_ATOMIC|PR_ADDR,
244 rip_input, 0, 0, rip_ctloutput,
245 0,
246 rip_init, 0, 0, 0,
247 &rip_usrreqs
248},
249};

--- 39 unchanged lines hidden ---