Deleted Added
full compact
ip_mroute.c (9334) ip_mroute.c (9682)
1/*
2 * IP multicast forwarding procedures
3 *
4 * Written by David Waitzman, BBN Labs, August 1988.
5 * Modified by Steve Deering, Stanford, February 1989.
6 * Modified by Mark J. Steiglitz, Stanford, May, 1991
7 * Modified by Van Jacobson, LBL, January 1993
8 * Modified by Ajit Thyagarajan, PARC, August 1993
9 * Modified by Bill Fenner, PARC, April 1995
10 *
11 * MROUTING Revision: 3.5
1/*
2 * IP multicast forwarding procedures
3 *
4 * Written by David Waitzman, BBN Labs, August 1988.
5 * Modified by Steve Deering, Stanford, February 1989.
6 * Modified by Mark J. Steiglitz, Stanford, May, 1991
7 * Modified by Van Jacobson, LBL, January 1993
8 * Modified by Ajit Thyagarajan, PARC, August 1993
9 * Modified by Bill Fenner, PARC, April 1995
10 *
11 * MROUTING Revision: 3.5
12 * $Id$
12 * $Id: ip_mroute.c,v 1.19 1995/06/26 16:15:49 wollman Exp $
13 */
14
15
16#include <sys/param.h>
17#include <sys/systm.h>
18#include <sys/mbuf.h>
19#include <sys/socket.h>
20#include <sys/socketvar.h>

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

2111 }
2112 }
2113
2114 splx(s);
2115 return;
2116}
2117
2118void
13 */
14
15
16#include <sys/param.h>
17#include <sys/systm.h>
18#include <sys/mbuf.h>
19#include <sys/socket.h>
20#include <sys/socketvar.h>

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

2111 }
2112 }
2113
2114 splx(s);
2115 return;
2116}
2117
2118void
2119rsvp_input(m, ifp)
2120 struct mbuf *m;
2121 struct ifnet *ifp;
2119rsvp_input(m, iphlen)
2120 struct mbuf *m;
2121 int iphlen;
2122{
2123 int vifi;
2124 register struct ip *ip = mtod(m, struct ip *);
2122{
2123 int vifi;
2124 register struct ip *ip = mtod(m, struct ip *);
2125 static struct sockaddr_in rsvp_src = { AF_INET };
2125 static struct sockaddr_in rsvp_src = { sizeof rsvp_src, AF_INET };
2126 register int s;
2126 register int s;
2127 struct ifnet *ifp;
2127
2128 if (rsvpdebug)
2129 printf("rsvp_input: rsvp_on %d\n",rsvp_on);
2130
2131 /* Can still get packets with rsvp_on = 0 if there is a local member
2132 * of the group to which the RSVP packet is addressed. But in this
2133 * case we want to throw the packet away.
2134 */

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

2147 return;
2148 }
2149
2150 s = splnet();
2151
2152 if (rsvpdebug)
2153 printf("rsvp_input: check vifs\n");
2154
2128
2129 if (rsvpdebug)
2130 printf("rsvp_input: rsvp_on %d\n",rsvp_on);
2131
2132 /* Can still get packets with rsvp_on = 0 if there is a local member
2133 * of the group to which the RSVP packet is addressed. But in this
2134 * case we want to throw the packet away.
2135 */

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

2148 return;
2149 }
2150
2151 s = splnet();
2152
2153 if (rsvpdebug)
2154 printf("rsvp_input: check vifs\n");
2155
2156#ifdef DIAGNOSTIC
2157 if (!(m->m_flags & M_PKTHDR))
2158 panic("rsvp_input no hdr");
2159#endif
2160
2161 ifp = m->m_pkthdr.rcvif;
2155 /* Find which vif the packet arrived on. */
2156 for (vifi = 0; vifi < numvifs; vifi++) {
2157 if (viftable[vifi].v_ifp == ifp)
2158 break;
2159 }
2160
2161 if (vifi == numvifs) {
2162 /* Can't find vif packet arrived on. Drop packet. */

--- 108 unchanged lines hidden ---
2162 /* Find which vif the packet arrived on. */
2163 for (vifi = 0; vifi < numvifs; vifi++) {
2164 if (viftable[vifi].v_ifp == ifp)
2165 break;
2166 }
2167
2168 if (vifi == numvifs) {
2169 /* Can't find vif packet arrived on. Drop packet. */

--- 108 unchanged lines hidden ---