diff options
| author | bms <bms@FreeBSD.org> | 2007-02-10 13:59:13 +0000 |
|---|---|---|
| committer | bms <bms@FreeBSD.org> | 2007-02-10 13:59:13 +0000 |
| commit | 42ce6b97cf4944025f5baa95924e300d134245e9 (patch) | |
| tree | 2bc80c29f1c4ce175cdb45f240ba4251b0bbd2a9 /sys/netinet/in_proto.c | |
| parent | 47a4a6254787fc8aac468041ae5ec94979429e32 (diff) | |
| download | FreeBSD-src-42ce6b97cf4944025f5baa95924e300d134245e9.zip FreeBSD-src-42ce6b97cf4944025f5baa95924e300d134245e9.tar.gz | |
Build PIM by default as part of the IPv4 multicast forwarding path.
Make PIM dynamically loadable by using encap_attach_func().
PIM may now be loaded into a GENERIC kernel.
Tested with: ports/net/pimdd && tcpreplay && wireshark
Reviewed by: Pavlin Radoslavov
Diffstat (limited to 'sys/netinet/in_proto.c')
| -rw-r--r-- | sys/netinet/in_proto.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index e66f8b4..28196ef 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -56,9 +56,6 @@ #include <netinet/ip_var.h> #include <netinet/ip_icmp.h> #include <netinet/igmp_var.h> -#ifdef PIM -#include <netinet/pim_var.h> -#endif #include <netinet/tcp.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> @@ -345,17 +342,15 @@ struct protosw inetsw[] = { .pr_usrreqs = &rip_usrreqs }, #endif -#ifdef PIM { .pr_type = SOCK_RAW, .pr_domain = &inetdomain, .pr_protocol = IPPROTO_PIM, .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR, - .pr_input = pim_input, + .pr_input = encap4_input, .pr_ctloutput = rip_ctloutput, .pr_usrreqs = &rip_usrreqs }, -#endif /* PIM */ #ifdef DEV_PFSYNC { .pr_type = SOCK_RAW, @@ -438,9 +433,6 @@ SYSCTL_NODE(_net_inet, IPPROTO_AH, ipsec, CTLFLAG_RW, 0, "IPSEC"); #endif /* IPSEC */ #endif /* !FAST_IPSEC */ SYSCTL_NODE(_net_inet, IPPROTO_RAW, raw, CTLFLAG_RW, 0, "RAW"); -#ifdef PIM -SYSCTL_NODE(_net_inet, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM"); -#endif #ifdef DEV_PFSYNC SYSCTL_NODE(_net_inet, IPPROTO_PFSYNC, pfsync, CTLFLAG_RW, 0, "PFSYNC"); #endif |
