summaryrefslogtreecommitdiffstats
path: root/sys/net/route.c
diff options
context:
space:
mode:
authorluigi <luigi@FreeBSD.org>2002-11-15 22:53:53 +0000
committerluigi <luigi@FreeBSD.org>2002-11-15 22:53:53 +0000
commit60e892bf319d72d9b1ee2c14488fa30da0195da3 (patch)
tree3749705a7135b04736f5f3cc35c85e50866bc963 /sys/net/route.c
parent5044bd9ace87bfc9ba423a4ea2003b64b244ba2c (diff)
downloadFreeBSD-src-60e892bf319d72d9b1ee2c14488fa30da0195da3.zip
FreeBSD-src-60e892bf319d72d9b1ee2c14488fa30da0195da3.tar.gz
Massive cleanup of the ip_mroute code.
No functional changes, but: + the mrouting module now should behave the same as the compiled-in version (it did not before, some of the rsvp code was not loaded properly); + netinet/ip_mroute.c is now truly optional; + removed some redundant/unused code; + changed many instances of '0' to NULL and INADDR_ANY as appropriate; + removed several static variables to make the code more SMP-friendly; + fixed some minor bugs in the mrouting code (mostly, incorrect return values from functions). This commit is also a prerequisite to the addition of support for PIM, which i would like to put in before DP2 (it does not change any of the existing APIs, anyways). Note, in the process we found out that some device drivers fail to properly handle changes in IFF_ALLMULTI, leading to interesting behaviour when a multicast router is started. This bug is not corrected by this commit, and will be fixed with a separate commit. Detailed changes: -------------------- netinet/ip_mroute.c all the above. conf/files make ip_mroute.c optional net/route.c fix mrt_ioctl hook netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here together with other rsvp code, and a couple of indentation fixes. netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks netinet/ip_var.h rsvp function hooks netinet/raw_ip.c hooks for mrouting and rsvp functions, plus interface cleanup. netinet/ip_mroute.h remove an unused and optional field from a struct Most of the code is from Pavlin Radoslavov and the XORP project Reviewed by: sam MFC after: 1 week
Diffstat (limited to 'sys/net/route.c')
-rw-r--r--sys/net/route.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/net/route.c b/sys/net/route.c
index d71a950..adf0b3b 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -403,7 +403,7 @@ rtioctl(req, data)
{
#ifdef INET
/* Multicast goop, grrr... */
- return mrt_ioctl(req, data);
+ return mrt_ioctl ? mrt_ioctl(req, data) : EOPNOTSUPP;
#else /* INET */
return ENXIO;
#endif /* INET */
OpenPOWER on IntegriCloud