summaryrefslogtreecommitdiffstats
path: root/sys/netinet/ip_mroute.c
diff options
context:
space:
mode:
authorwollman <wollman@FreeBSD.org>1995-07-26 18:05:16 +0000
committerwollman <wollman@FreeBSD.org>1995-07-26 18:05:16 +0000
commit39a85a58ed8d6e8e315fe2b097174f032de724c4 (patch)
tree0733cadd9ba1a752d85a8046472fba0c995ad24f /sys/netinet/ip_mroute.c
parent94e5a8eb42395728836ef3ee2387fe1f64b655f1 (diff)
downloadFreeBSD-src-39a85a58ed8d6e8e315fe2b097174f032de724c4.zip
FreeBSD-src-39a85a58ed8d6e8e315fe2b097174f032de724c4.tar.gz
Fix test for determining when RSVP is inactive in a router. (In this
case, multicast options are not passed to ip_mforward().) The previous version had a wrong test, thus causing RSVP mrouters to forward RSVP messages in violation of the spec.
Diffstat (limited to 'sys/netinet/ip_mroute.c')
-rw-r--r--sys/netinet/ip_mroute.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index c743469..2fc8340 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,7 +9,7 @@
* Modified by Bill Fenner, PARC, April 1995
*
* MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.19 1995/06/26 16:15:49 wollman Exp $
+ * $Id: ip_mroute.c,v 1.20 1995/07/24 18:15:13 wollman Exp $
*/
@@ -52,8 +52,6 @@
#endif
#endif
-extern int rsvp_on;
-
#ifndef MROUTING
/*
* Dummy routines and globals used when multicast routing is not compiled in.
@@ -1126,6 +1124,8 @@ X_ip_mforward(ip, ifp, m, imo)
if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
printf("Warning: IPPROTO_RSVP from %x to %x without vif option\n",
ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr));
+ if(!imo)
+ printf("In fact, no options were specified at all\n");
}
/*
OpenPOWER on IntegriCloud