Deleted Added
full compact
in_proto.c (139823) in_proto.c (142215)
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 139823 2005-01-07 01:45:51Z imp $
30 * $FreeBSD: head/sys/netinet/in_proto.c 142215 2005-02-22 13:04:05Z glebius $
31 */
32
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"
31 */
32
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#include "opt_carp.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>

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

85#include <netipx/ipx_ip.h>
86#endif
87
88#ifdef DEV_PFSYNC
89#include <net/pfvar.h>
90#include <net/if_pfsync.h>
91#endif
92
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>

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

86#include <netipx/ipx_ip.h>
87#endif
88
89#ifdef DEV_PFSYNC
90#include <net/pfvar.h>
91#include <net/if_pfsync.h>
92#endif
93
94#ifdef DEV_CARP
95#include <netinet/ip_carp.h>
96#endif
97
93extern struct domain inetdomain;
94
95/* Spacer for loadable protocols. */
96#define IPPROTOSPACER \
97{ 0, &inetdomain, PROTO_SPACER, 0, \
98 NULL, NULL, NULL, NULL, \
99 NULL, \
100 NULL, NULL, NULL, NULL, \

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

232#ifdef DEV_PFSYNC
233{ SOCK_RAW, &inetdomain, IPPROTO_PFSYNC, PR_ATOMIC|PR_ADDR,
234 pfsync_input, 0, 0, rip_ctloutput,
235 0,
236 0, 0, 0, 0,
237 &rip_usrreqs
238},
239#endif /* DEV_PFSYNC */
98extern struct domain inetdomain;
99
100/* Spacer for loadable protocols. */
101#define IPPROTOSPACER \
102{ 0, &inetdomain, PROTO_SPACER, 0, \
103 NULL, NULL, NULL, NULL, \
104 NULL, \
105 NULL, NULL, NULL, NULL, \

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

237#ifdef DEV_PFSYNC
238{ SOCK_RAW, &inetdomain, IPPROTO_PFSYNC, PR_ATOMIC|PR_ADDR,
239 pfsync_input, 0, 0, rip_ctloutput,
240 0,
241 0, 0, 0, 0,
242 &rip_usrreqs
243},
244#endif /* DEV_PFSYNC */
245#ifdef DEV_CARP
246{ SOCK_RAW, &inetdomain, IPPROTO_CARP, PR_ATOMIC|PR_ADDR,
247 carp_input, (pr_output_t*)rip_output, 0, rip_ctloutput,
248 0,
249 0, 0, 0, 0,
250 &rip_usrreqs
251},
252#endif /* DEV_CARP */
240/* Spacer n-times for loadable protocols. */
241IPPROTOSPACER,
242IPPROTOSPACER,
243IPPROTOSPACER,
244IPPROTOSPACER,
245IPPROTOSPACER,
246IPPROTOSPACER,
247IPPROTOSPACER,

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

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");
290#ifdef PIM
291SYSCTL_NODE(_net_inet, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM");
292#endif
253/* Spacer n-times for loadable protocols. */
254IPPROTOSPACER,
255IPPROTOSPACER,
256IPPROTOSPACER,
257IPPROTOSPACER,
258IPPROTOSPACER,
259IPPROTOSPACER,
260IPPROTOSPACER,

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

298#ifdef IPSEC
299SYSCTL_NODE(_net_inet, IPPROTO_AH, ipsec, CTLFLAG_RW, 0, "IPSEC");
300#endif /* IPSEC */
301#endif /* !FAST_IPSEC */
302SYSCTL_NODE(_net_inet, IPPROTO_RAW, raw, CTLFLAG_RW, 0, "RAW");
303#ifdef PIM
304SYSCTL_NODE(_net_inet, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM");
305#endif
306#ifdef DEV_CARP
307SYSCTL_NODE(_net_inet, IPPROTO_CARP, carp, CTLFLAG_RW, 0, "CARP");
308#endif