Declare rsvp_input() to take the correct set of arguments and figure out

the receipt interface in the correct way.
This commit is contained in:
Garrett Wollman 1995-07-24 18:15:13 +00:00
parent e1b686876b
commit 59929500b4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=9682

View File

@ -9,7 +9,7 @@
* Modified by Bill Fenner, PARC, April 1995 * Modified by Bill Fenner, PARC, April 1995
* *
* MROUTING Revision: 3.5 * MROUTING Revision: 3.5
* $Id$ * $Id: ip_mroute.c,v 1.19 1995/06/26 16:15:49 wollman Exp $
*/ */
@ -2116,14 +2116,15 @@ ip_rsvp_force_done(so)
} }
void void
rsvp_input(m, ifp) rsvp_input(m, iphlen)
struct mbuf *m; struct mbuf *m;
struct ifnet *ifp; int iphlen;
{ {
int vifi; int vifi;
register struct ip *ip = mtod(m, struct ip *); register struct ip *ip = mtod(m, struct ip *);
static struct sockaddr_in rsvp_src = { AF_INET }; static struct sockaddr_in rsvp_src = { sizeof rsvp_src, AF_INET };
register int s; register int s;
struct ifnet *ifp;
if (rsvpdebug) if (rsvpdebug)
printf("rsvp_input: rsvp_on %d\n",rsvp_on); printf("rsvp_input: rsvp_on %d\n",rsvp_on);
@ -2152,6 +2153,12 @@ rsvp_input(m, ifp)
if (rsvpdebug) if (rsvpdebug)
printf("rsvp_input: check vifs\n"); printf("rsvp_input: check vifs\n");
#ifdef DIAGNOSTIC
if (!(m->m_flags & M_PKTHDR))
panic("rsvp_input no hdr");
#endif
ifp = m->m_pkthdr.rcvif;
/* Find which vif the packet arrived on. */ /* Find which vif the packet arrived on. */
for (vifi = 0; vifi < numvifs; vifi++) { for (vifi = 0; vifi < numvifs; vifi++) {
if (viftable[vifi].v_ifp == ifp) if (viftable[vifi].v_ifp == ifp)