1 files changed, 26 insertions, 8 deletions

diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 22a4f459076f..a463193cd241 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -65,6 +65,8 @@
 #include <netinet/ip_fw.h>
 
 #include <sys/socketvar.h>
+int rsvp_on = 0;
+int ip_rsvp_on;
 struct socket *ip_rsvpd;
 
 #ifndef	IPFORWARDING
@@ -255,12 +257,12 @@ next:
 		goto next;
 
         /* greedy RSVP, snatches any PATH packet of the RSVP protocol and no
-         * matter if it is destined to another node, or whether it is
+         * matter if it is destined to another node, or whether it is 
          * a multicast one, RSVP wants it! and prevents it from being forwarded
          * anywhere else. Also checks if the rsvp daemon is running before
 	 * grabbing the packet.
          */
-	if (ip_rsvpd != NULL && ip->ip_p==IPPROTO_RSVP)
+	if (rsvp_on && ip->ip_p==IPPROTO_RSVP) 
 		goto ours;
 
 	/*
@@ -357,9 +359,9 @@ ours:
 
 		/*
 		 * If packet came to us we count it...
-		 * This way we count all incoming packets which has
+		 * This way we count all incoming packets which has 
 		 * not been forwarded...
-		 * Do not convert ip_len to host byte order when
+		 * Do not convert ip_len to host byte order when 
 		 * counting,ppl already made it for us before..
 		 */
 	if (ip_acct_cnt_ptr!=NULL)
@@ -747,7 +749,7 @@ ip_dooptions(m)
 				char buf[4*sizeof "123"];
 				strcpy(buf, inet_ntoa(ip->ip_dst));
 
-				log(LOG_WARNING,
+				log(LOG_WARNING, 
 				    "attempted source route from %s to %s\n",
 				    inet_ntoa(ip->ip_src), buf);
 				type = ICMP_UNREACH;
@@ -1207,17 +1209,17 @@ ip_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
 	case IPCTL_DEFTTL:
 		return (sysctl_int(oldp, oldlenp, newp, newlen, &ip_defttl));
 	case IPCTL_SOURCEROUTE:
-		return (sysctl_int(oldp, oldlenp, newp, newlen,
+		return (sysctl_int(oldp, oldlenp, newp, newlen, 
 				   &ip_dosourceroute));
 #ifdef notyet
 	case IPCTL_DEFMTU:
 		return (sysctl_int(oldp, oldlenp, newp, newlen, &ip_mtu));
 #endif
 	case IPCTL_RTEXPIRE:
-		return (sysctl_int(oldp, oldlenp, newp, newlen,
+		return (sysctl_int(oldp, oldlenp, newp, newlen, 
 				   &rtq_reallyold));
 	case IPCTL_RTMINEXPIRE:
-		return (sysctl_int(oldp, oldlenp, newp, newlen,
+		return (sysctl_int(oldp, oldlenp, newp, newlen, 
 				   &rtq_minreallyold));
 	case IPCTL_RTMAXCACHE:
 		return (sysctl_int(oldp, oldlenp, newp, newlen,
@@ -1239,6 +1241,14 @@ ip_rsvp_init(struct socket *so)
 	  return EADDRINUSE;
 
 	ip_rsvpd = so;
+	/*
+	 * This may seem silly, but we need to be sure we don't over-increment
+	 * the RSVP counter, in case something slips up.
+	 */
+	if (!ip_rsvp_on) {
+		ip_rsvp_on = 1;
+		rsvp_on++;
+	}
 
 	return 0;
 }
@@ -1247,5 +1257,13 @@ int
 ip_rsvp_done(void)
 {
 	ip_rsvpd = NULL;
+	/*
+	 * This may seem silly, but we need to be sure we don't over-decrement
+	 * the RSVP counter, in case something slips up.
+	 */
+	if (ip_rsvp_on) {
+		ip_rsvp_on = 0;
+		rsvp_on--;
+	}
 	return 0;
 }