2005-06-23 18:42:58 +00:00
|
|
|
/*-
|
|
|
|
* Copyright (c) 1989 Stephen Deering
|
|
|
|
* Copyright (c) 1992, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* This code is derived from software contributed to Berkeley by
|
|
|
|
* Stephen Deering of Stanford University.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
|
|
|
* @(#)ip_mroute.c 8.2 (Berkeley) 11/15/93
|
|
|
|
*/
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* IP multicast forwarding procedures
|
1994-05-24 10:09:53 +00:00
|
|
|
*
|
|
|
|
* Written by David Waitzman, BBN Labs, August 1988.
|
|
|
|
* Modified by Steve Deering, Stanford, February 1989.
|
1994-09-06 22:42:31 +00:00
|
|
|
* Modified by Mark J. Steiglitz, Stanford, May, 1991
|
|
|
|
* Modified by Van Jacobson, LBL, January 1993
|
|
|
|
* Modified by Ajit Thyagarajan, PARC, August 1993
|
1995-06-13 17:51:16 +00:00
|
|
|
* Modified by Bill Fenner, PARC, April 1995
|
2003-08-07 18:16:59 +00:00
|
|
|
* Modified by Ahmed Helmy, SGI, June 1996
|
|
|
|
* Modified by George Edmond Eddy (Rusty), ISI, February 1998
|
|
|
|
* Modified by Pavlin Radoslavov, USC/ISI, May 1998, August 1999, October 2000
|
|
|
|
* Modified by Hitoshi Asaeda, WIDE, August 2000
|
|
|
|
* Modified by Pavlin Radoslavov, ICSI, October 2002
|
1994-05-24 10:09:53 +00:00
|
|
|
*
|
1995-06-13 17:51:16 +00:00
|
|
|
* MROUTING Revision: 3.5
|
2003-08-07 18:16:59 +00:00
|
|
|
* and PIM-SMv2 and PIM-DM support, advanced API support,
|
|
|
|
* bandwidth metering and signaling
|
|
|
|
*
|
1999-08-28 01:08:13 +00:00
|
|
|
* $FreeBSD$
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
|
2007-02-24 11:38:47 +00:00
|
|
|
#include "opt_inet.h"
|
|
|
|
#include "opt_inet6.h"
|
2002-10-20 21:59:00 +00:00
|
|
|
#include "opt_mac.h"
|
1996-03-02 18:24:13 +00:00
|
|
|
#include "opt_mrouting.h"
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
#define _PIM_VT 1
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/param.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <sys/kernel.h>
|
|
|
|
#include <sys/lock.h>
|
1999-01-18 02:06:59 +00:00
|
|
|
#include <sys/malloc.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/mbuf.h>
|
2004-05-30 20:27:19 +00:00
|
|
|
#include <sys/module.h>
|
2006-11-06 13:42:10 +00:00
|
|
|
#include <sys/priv.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <sys/protosw.h>
|
|
|
|
#include <sys/signalvar.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/socketvar.h>
|
1997-03-24 11:33:46 +00:00
|
|
|
#include <sys/sockio.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <sys/sx.h>
|
|
|
|
#include <sys/sysctl.h>
|
1994-09-06 22:42:31 +00:00
|
|
|
#include <sys/syslog.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <sys/systm.h>
|
|
|
|
#include <sys/time.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <net/if.h>
|
2003-03-04 23:19:55 +00:00
|
|
|
#include <net/netisr.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <net/route.h>
|
|
|
|
#include <netinet/in.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <netinet/igmp.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <netinet/in_systm.h>
|
|
|
|
#include <netinet/in_var.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <netinet/ip.h>
|
2001-07-25 20:15:49 +00:00
|
|
|
#include <netinet/ip_encap.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <netinet/ip_mroute.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <netinet/ip_var.h>
|
2005-11-18 20:12:40 +00:00
|
|
|
#include <netinet/ip_options.h>
|
2003-08-07 18:16:59 +00:00
|
|
|
#include <netinet/pim.h>
|
|
|
|
#include <netinet/pim_var.h>
|
1995-06-13 17:51:16 +00:00
|
|
|
#include <netinet/udp.h>
|
2007-02-24 11:38:47 +00:00
|
|
|
#ifdef INET6
|
|
|
|
#include <netinet/ip6.h>
|
|
|
|
#include <netinet6/in6_var.h>
|
|
|
|
#include <netinet6/ip6_mroute.h>
|
|
|
|
#include <netinet6/ip6_var.h>
|
|
|
|
#endif
|
2000-05-08 23:56:30 +00:00
|
|
|
#include <machine/in_cksum.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2006-10-22 11:52:19 +00:00
|
|
|
#include <security/mac/mac_framework.h>
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
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
2002-11-15 22:53:53 +00:00
|
|
|
* Control debugging code for rsvp and multicast routing code.
|
|
|
|
* Can only set them with the debugger.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static u_int rsvpdebug; /* non-zero enables debugging */
|
1994-05-24 10:09:53 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static u_int mrtdebug; /* any set of the flags below */
|
|
|
|
#define DEBUG_MFC 0x02
|
|
|
|
#define DEBUG_FORWARD 0x04
|
|
|
|
#define DEBUG_EXPIRE 0x08
|
|
|
|
#define DEBUG_XMIT 0x10
|
2003-08-07 18:16:59 +00:00
|
|
|
#define DEBUG_PIM 0x20
|
|
|
|
|
|
|
|
#define VIFI_INVALID ((vifi_t) -1)
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
#define M_HASCL(m) ((m)->m_flags & M_EXT)
|
|
|
|
|
1999-01-18 02:06:59 +00:00
|
|
|
static MALLOC_DEFINE(M_MRTABLE, "mroutetbl", "multicast routing tables");
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
/*
|
|
|
|
* Locking. We use two locks: one for the virtual interface table and
|
|
|
|
* one for the forwarding table. These locks may be nested in which case
|
|
|
|
* the VIF lock must always be taken first. Note that each lock is used
|
|
|
|
* to cover not only the specific data structure but also related data
|
|
|
|
* structures. It may be better to add more fine-grained locking later;
|
|
|
|
* it's not clear how performance-critical this code is.
|
2006-09-28 12:21:08 +00:00
|
|
|
*
|
|
|
|
* XXX: This module could particularly benefit from being cleaned
|
|
|
|
* up to use the <sys/queue.h> macros.
|
|
|
|
*
|
2003-09-06 04:53:43 +00:00
|
|
|
*/
|
|
|
|
|
2001-07-25 20:15:49 +00:00
|
|
|
static struct mrtstat mrtstat;
|
|
|
|
SYSCTL_STRUCT(_net_inet_ip, OID_AUTO, mrtstat, CTLFLAG_RW,
|
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
2002-11-15 22:53:53 +00:00
|
|
|
&mrtstat, mrtstat,
|
|
|
|
"Multicast Routing Statistics (struct mrtstat, netinet/ip_mroute.h)");
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1999-01-18 02:06:59 +00:00
|
|
|
static struct mfc *mfctable[MFCTBLSIZ];
|
2003-08-05 17:01:33 +00:00
|
|
|
SYSCTL_OPAQUE(_net_inet_ip, OID_AUTO, mfctable, CTLFLAG_RD,
|
|
|
|
&mfctable, sizeof(mfctable), "S,*mfc[MFCTBLSIZ]",
|
|
|
|
"Multicast Forwarding Table (struct *mfc[MFCTBLSIZ], netinet/ip_mroute.h)");
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
static struct mtx mfc_mtx;
|
|
|
|
#define MFC_LOCK() mtx_lock(&mfc_mtx)
|
|
|
|
#define MFC_UNLOCK() mtx_unlock(&mfc_mtx)
|
2004-06-24 02:01:48 +00:00
|
|
|
#define MFC_LOCK_ASSERT() do { \
|
|
|
|
mtx_assert(&mfc_mtx, MA_OWNED); \
|
|
|
|
NET_ASSERT_GIANT(); \
|
|
|
|
} while (0)
|
2003-09-06 04:53:43 +00:00
|
|
|
#define MFC_LOCK_INIT() mtx_init(&mfc_mtx, "mroute mfc table", NULL, MTX_DEF)
|
|
|
|
#define MFC_LOCK_DESTROY() mtx_destroy(&mfc_mtx)
|
|
|
|
|
1995-12-14 09:55:16 +00:00
|
|
|
static struct vif viftable[MAXVIFS];
|
2003-08-05 17:01:33 +00:00
|
|
|
SYSCTL_OPAQUE(_net_inet_ip, OID_AUTO, viftable, CTLFLAG_RD,
|
|
|
|
&viftable, sizeof(viftable), "S,vif[MAXVIFS]",
|
|
|
|
"Multicast Virtual Interfaces (struct vif[MAXVIFS], netinet/ip_mroute.h)");
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
static struct mtx vif_mtx;
|
|
|
|
#define VIF_LOCK() mtx_lock(&vif_mtx)
|
|
|
|
#define VIF_UNLOCK() mtx_unlock(&vif_mtx)
|
|
|
|
#define VIF_LOCK_ASSERT() mtx_assert(&vif_mtx, MA_OWNED)
|
|
|
|
#define VIF_LOCK_INIT() mtx_init(&vif_mtx, "mroute vif table", NULL, MTX_DEF)
|
|
|
|
#define VIF_LOCK_DESTROY() mtx_destroy(&vif_mtx)
|
|
|
|
|
2003-08-05 17:01:33 +00:00
|
|
|
static u_char nexpire[MFCTBLSIZ];
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2006-09-28 12:21:08 +00:00
|
|
|
static eventhandler_tag if_detach_event_tag = NULL;
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
static struct callout expire_upcalls_ch;
|
1997-09-21 22:02:25 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
#define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */
|
|
|
|
#define UPCALL_EXPIRE 6 /* number of timeouts */
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
#define ENCAP_TTL 64
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Bandwidth meter variables and constants
|
|
|
|
*/
|
|
|
|
static MALLOC_DEFINE(M_BWMETER, "bwmeter", "multicast upcall bw meters");
|
|
|
|
/*
|
|
|
|
* Pending timeouts are stored in a hash table, the key being the
|
|
|
|
* expiration time. Periodically, the entries are analysed and processed.
|
|
|
|
*/
|
|
|
|
#define BW_METER_BUCKETS 1024
|
|
|
|
static struct bw_meter *bw_meter_timers[BW_METER_BUCKETS];
|
2003-09-06 04:53:43 +00:00
|
|
|
static struct callout bw_meter_ch;
|
2003-08-07 18:16:59 +00:00
|
|
|
#define BW_METER_PERIOD (hz) /* periodical handling of bw meters */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Pending upcalls are stored in a vector which is flushed when
|
|
|
|
* full, or periodically
|
|
|
|
*/
|
|
|
|
static struct bw_upcall bw_upcalls[BW_UPCALLS_MAX];
|
|
|
|
static u_int bw_upcalls_n; /* # of pending upcalls */
|
2003-09-06 04:53:43 +00:00
|
|
|
static struct callout bw_upcalls_ch;
|
2003-08-07 18:16:59 +00:00
|
|
|
#define BW_UPCALLS_PERIOD (hz) /* periodical flush of bw upcalls */
|
|
|
|
|
|
|
|
static struct pimstat pimstat;
|
2007-02-10 13:59:13 +00:00
|
|
|
|
|
|
|
SYSCTL_NODE(_net_inet, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM");
|
2003-08-07 18:16:59 +00:00
|
|
|
SYSCTL_STRUCT(_net_inet_pim, PIMCTL_STATS, stats, CTLFLAG_RD,
|
|
|
|
&pimstat, pimstat,
|
|
|
|
"PIM Statistics (struct pimstat, netinet/pim_var.h)");
|
|
|
|
|
2007-02-10 14:48:42 +00:00
|
|
|
static u_long pim_squelch_wholepkt = 0;
|
|
|
|
SYSCTL_ULONG(_net_inet_pim, OID_AUTO, squelch_wholepkt, CTLFLAG_RW,
|
|
|
|
&pim_squelch_wholepkt, 0,
|
|
|
|
"Disable IGMP_WHOLEPKT notifications if rendezvous point is unspecified");
|
|
|
|
|
2007-02-10 13:59:13 +00:00
|
|
|
extern struct domain inetdomain;
|
|
|
|
struct protosw in_pim_protosw = {
|
|
|
|
.pr_type = SOCK_RAW,
|
|
|
|
.pr_domain = &inetdomain,
|
|
|
|
.pr_protocol = IPPROTO_PIM,
|
|
|
|
.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
|
|
|
|
.pr_input = pim_input,
|
|
|
|
.pr_output = (pr_output_t*)rip_output,
|
|
|
|
.pr_ctloutput = rip_ctloutput,
|
|
|
|
.pr_usrreqs = &rip_usrreqs
|
|
|
|
};
|
|
|
|
static const struct encaptab *pim_encap_cookie;
|
2007-02-24 11:38:47 +00:00
|
|
|
|
|
|
|
#ifdef INET6
|
|
|
|
/* ip6_mroute.c glue */
|
|
|
|
extern struct in6_protosw in6_pim_protosw;
|
|
|
|
static const struct encaptab *pim6_encap_cookie;
|
|
|
|
|
|
|
|
extern int X_ip6_mrouter_set(struct socket *, struct sockopt *);
|
|
|
|
extern int X_ip6_mrouter_get(struct socket *, struct sockopt *);
|
|
|
|
extern int X_ip6_mrouter_done(void);
|
|
|
|
extern int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *);
|
|
|
|
extern int X_mrt6_ioctl(int, caddr_t);
|
|
|
|
#endif
|
|
|
|
|
2007-02-10 13:59:13 +00:00
|
|
|
static int pim_encapcheck(const struct mbuf *, int, int, void *);
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Note: the PIM Register encapsulation adds the following in front of a
|
|
|
|
* data packet:
|
|
|
|
*
|
|
|
|
* struct pim_encap_hdr {
|
|
|
|
* struct ip ip;
|
|
|
|
* struct pim_encap_pimhdr pim;
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct pim_encap_pimhdr {
|
|
|
|
struct pim pim;
|
|
|
|
uint32_t flags;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct ip pim_encap_iphdr = {
|
|
|
|
#if BYTE_ORDER == LITTLE_ENDIAN
|
|
|
|
sizeof(struct ip) >> 2,
|
|
|
|
IPVERSION,
|
|
|
|
#else
|
|
|
|
IPVERSION,
|
|
|
|
sizeof(struct ip) >> 2,
|
|
|
|
#endif
|
|
|
|
0, /* tos */
|
|
|
|
sizeof(struct ip), /* total length */
|
|
|
|
0, /* id */
|
2004-08-16 18:32:07 +00:00
|
|
|
0, /* frag offset */
|
2003-08-07 18:16:59 +00:00
|
|
|
ENCAP_TTL,
|
|
|
|
IPPROTO_PIM,
|
|
|
|
0, /* checksum */
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct pim_encap_pimhdr pim_encap_pimhdr = {
|
|
|
|
{
|
|
|
|
PIM_MAKE_VT(PIM_VERSION, PIM_REGISTER), /* PIM vers and message type */
|
|
|
|
0, /* reserved */
|
|
|
|
0, /* checksum */
|
|
|
|
},
|
|
|
|
0 /* flags */
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct ifnet multicast_register_if;
|
|
|
|
static vifi_t reg_vif_num = VIFI_INVALID;
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* Private variables.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static vifi_t numvifs;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2002-03-19 21:25:46 +00:00
|
|
|
static u_long X_ip_mcast_src(int vifi);
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static int X_ip_mforward(struct ip *ip, struct ifnet *ifp,
|
|
|
|
struct mbuf *m, struct ip_moptions *imo);
|
2002-03-19 21:25:46 +00:00
|
|
|
static int X_ip_mrouter_done(void);
|
|
|
|
static int X_ip_mrouter_get(struct socket *so, struct sockopt *m);
|
|
|
|
static int X_ip_mrouter_set(struct socket *so, struct sockopt *m);
|
|
|
|
static int X_legal_vif_num(int vif);
|
|
|
|
static int X_mrt_ioctl(int cmd, caddr_t data);
|
1995-12-02 19:38:06 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
static int get_sg_cnt(struct sioc_sg_req *);
|
|
|
|
static int get_vif_cnt(struct sioc_vif_req *);
|
2006-09-28 12:21:08 +00:00
|
|
|
static void if_detached_event(void *arg __unused, struct ifnet *);
|
1998-08-23 03:07:17 +00:00
|
|
|
static int ip_mrouter_init(struct socket *, int);
|
1994-09-06 22:42:31 +00:00
|
|
|
static int add_vif(struct vifctl *);
|
2006-09-28 12:21:08 +00:00
|
|
|
static int del_vif_locked(vifi_t);
|
1998-08-23 03:07:17 +00:00
|
|
|
static int del_vif(vifi_t);
|
2003-08-07 18:16:59 +00:00
|
|
|
static int add_mfc(struct mfcctl2 *);
|
|
|
|
static int del_mfc(struct mfcctl2 *);
|
|
|
|
static int set_api_config(uint32_t *); /* chose API capabilities */
|
1995-12-02 19:38:06 +00:00
|
|
|
static int socket_send(struct socket *, struct mbuf *, struct sockaddr_in *);
|
1998-08-23 03:07:17 +00:00
|
|
|
static int set_assert(int);
|
1995-06-13 17:51:16 +00:00
|
|
|
static void expire_upcalls(void *);
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static int ip_mdq(struct mbuf *, struct ifnet *, struct mfc *, vifi_t);
|
1994-09-06 22:42:31 +00:00
|
|
|
static void phyint_send(struct ip *, struct vif *, struct mbuf *);
|
2007-02-08 22:58:01 +00:00
|
|
|
static void send_packet(struct vif *, struct mbuf *);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Bandwidth monitoring
|
|
|
|
*/
|
|
|
|
static void free_bw_list(struct bw_meter *list);
|
|
|
|
static int add_bw_upcall(struct bw_upcall *);
|
|
|
|
static int del_bw_upcall(struct bw_upcall *);
|
|
|
|
static void bw_meter_receive_packet(struct bw_meter *x, int plen,
|
|
|
|
struct timeval *nowp);
|
|
|
|
static void bw_meter_prepare_upcall(struct bw_meter *x, struct timeval *nowp);
|
|
|
|
static void bw_upcalls_send(void);
|
|
|
|
static void schedule_bw_meter(struct bw_meter *x, struct timeval *nowp);
|
|
|
|
static void unschedule_bw_meter(struct bw_meter *x);
|
|
|
|
static void bw_meter_process(void);
|
|
|
|
static void expire_bw_upcalls_send(void *);
|
|
|
|
static void expire_bw_meter_process(void *);
|
|
|
|
|
|
|
|
static int pim_register_send(struct ip *, struct vif *,
|
|
|
|
struct mbuf *, struct mfc *);
|
|
|
|
static int pim_register_send_rp(struct ip *, struct vif *,
|
|
|
|
struct mbuf *, struct mfc *);
|
|
|
|
static int pim_register_send_upcall(struct ip *, struct vif *,
|
|
|
|
struct mbuf *, struct mfc *);
|
|
|
|
static struct mbuf *pim_register_prepare(struct ip *, struct mbuf *);
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/*
|
1995-06-13 17:51:16 +00:00
|
|
|
* whether or not special PIM assert processing is enabled.
|
1995-05-30 08:16:23 +00:00
|
|
|
*/
|
1995-06-13 17:51:16 +00:00
|
|
|
static int pim_assert;
|
|
|
|
/*
|
|
|
|
* Rate limit for assert notification messages, in usec
|
|
|
|
*/
|
|
|
|
#define ASSERT_MSG_TIME 3000000
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Kernel multicast routing API capabilities and setup.
|
|
|
|
* If more API capabilities are added to the kernel, they should be
|
|
|
|
* recorded in `mrt_api_support'.
|
|
|
|
*/
|
|
|
|
static const uint32_t mrt_api_support = (MRT_MFC_FLAGS_DISABLE_WRONGVIF |
|
|
|
|
MRT_MFC_FLAGS_BORDER_VIF |
|
|
|
|
MRT_MFC_RP |
|
|
|
|
MRT_MFC_BW_UPCALL);
|
|
|
|
static uint32_t mrt_api_config = 0;
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1995-06-13 17:51:16 +00:00
|
|
|
* Hash function for a source, group entry
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1995-06-13 17:51:16 +00:00
|
|
|
#define MFCHASH(a, g) MFCHASHMOD(((a) >> 20) ^ ((a) >> 10) ^ (a) ^ \
|
|
|
|
((g) >> 20) ^ ((g) >> 10) ^ (g))
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/*
|
|
|
|
* Find a route for a given origin IP address and Multicast group address
|
|
|
|
* Type of service parameter to be added in the future!!!
|
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
2002-11-15 22:53:53 +00:00
|
|
|
* Statistics are updated by the caller if needed
|
|
|
|
* (mrtstat.mrts_mfc_lookups and mrtstat.mrts_mfc_misses)
|
1994-09-06 22:42:31 +00:00
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static struct mfc *
|
|
|
|
mfc_find(in_addr_t o, in_addr_t g)
|
|
|
|
{
|
|
|
|
struct mfc *rt;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK_ASSERT();
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
for (rt = mfctable[MFCHASH(o,g)]; rt; rt = rt->mfc_next)
|
|
|
|
if ((rt->mfc_origin.s_addr == o) &&
|
|
|
|
(rt->mfc_mcastgrp.s_addr == g) && (rt->mfc_stall == NULL))
|
|
|
|
break;
|
|
|
|
return rt;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/*
|
|
|
|
* Macros to compute elapsed time efficiently
|
|
|
|
* Borrowed from Van Jacobson's scheduling code
|
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
#define TV_DELTA(a, b, delta) { \
|
|
|
|
int xxs; \
|
|
|
|
delta = (a).tv_usec - (b).tv_usec; \
|
|
|
|
if ((xxs = (a).tv_sec - (b).tv_sec)) { \
|
|
|
|
switch (xxs) { \
|
|
|
|
case 2: \
|
|
|
|
delta += 1000000; \
|
|
|
|
/* FALLTHROUGH */ \
|
|
|
|
case 1: \
|
|
|
|
delta += 1000000; \
|
|
|
|
break; \
|
|
|
|
default: \
|
|
|
|
delta += (1000000 * xxs); \
|
|
|
|
} \
|
|
|
|
} \
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
#define TV_LT(a, b) (((a).tv_usec < (b).tv_usec && \
|
|
|
|
(a).tv_sec <= (b).tv_sec) || (a).tv_sec < (b).tv_sec)
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/*
|
1995-06-13 17:51:16 +00:00
|
|
|
* Handle MRT setsockopt commands to modify the multicast routing tables.
|
1994-09-06 22:42:31 +00:00
|
|
|
*/
|
1995-11-14 20:34:56 +00:00
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
X_ip_mrouter_set(struct socket *so, struct sockopt *sopt)
|
1994-09-06 22:42:31 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
int error, optval;
|
|
|
|
vifi_t vifi;
|
|
|
|
struct vifctl vifc;
|
2003-08-07 18:16:59 +00:00
|
|
|
struct mfcctl2 mfc;
|
|
|
|
struct bw_upcall bw_upcall;
|
|
|
|
uint32_t i;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
|
|
|
|
if (so != ip_mrouter && sopt->sopt_name != MRT_INIT)
|
|
|
|
return EPERM;
|
|
|
|
|
|
|
|
error = 0;
|
|
|
|
switch (sopt->sopt_name) {
|
|
|
|
case MRT_INIT:
|
|
|
|
error = sooptcopyin(sopt, &optval, sizeof optval, sizeof optval);
|
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
error = ip_mrouter_init(so, optval);
|
|
|
|
break;
|
1998-08-23 03:07:17 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
case MRT_DONE:
|
|
|
|
error = ip_mrouter_done();
|
|
|
|
break;
|
1998-08-23 03:07:17 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
case MRT_ADD_VIF:
|
|
|
|
error = sooptcopyin(sopt, &vifc, sizeof vifc, sizeof vifc);
|
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
error = add_vif(&vifc);
|
|
|
|
break;
|
1998-08-23 03:07:17 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
case MRT_DEL_VIF:
|
|
|
|
error = sooptcopyin(sopt, &vifi, sizeof vifi, sizeof vifi);
|
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
error = del_vif(vifi);
|
|
|
|
break;
|
1998-08-23 03:07:17 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
case MRT_ADD_MFC:
|
|
|
|
case MRT_DEL_MFC:
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* select data size depending on API version.
|
|
|
|
*/
|
|
|
|
if (sopt->sopt_name == MRT_ADD_MFC &&
|
|
|
|
mrt_api_config & MRT_API_FLAGS_ALL) {
|
|
|
|
error = sooptcopyin(sopt, &mfc, sizeof(struct mfcctl2),
|
|
|
|
sizeof(struct mfcctl2));
|
|
|
|
} else {
|
|
|
|
error = sooptcopyin(sopt, &mfc, sizeof(struct mfcctl),
|
|
|
|
sizeof(struct mfcctl));
|
|
|
|
bzero((caddr_t)&mfc + sizeof(struct mfcctl),
|
|
|
|
sizeof(mfc) - sizeof(struct mfcctl));
|
|
|
|
}
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
if (sopt->sopt_name == MRT_ADD_MFC)
|
|
|
|
error = add_mfc(&mfc);
|
|
|
|
else
|
|
|
|
error = del_mfc(&mfc);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MRT_ASSERT:
|
|
|
|
error = sooptcopyin(sopt, &optval, sizeof optval, sizeof optval);
|
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
set_assert(optval);
|
|
|
|
break;
|
1998-08-23 03:07:17 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
case MRT_API_CONFIG:
|
|
|
|
error = sooptcopyin(sopt, &i, sizeof i, sizeof i);
|
|
|
|
if (!error)
|
|
|
|
error = set_api_config(&i);
|
|
|
|
if (!error)
|
|
|
|
error = sooptcopyout(sopt, &i, sizeof i);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MRT_ADD_BW_UPCALL:
|
|
|
|
case MRT_DEL_BW_UPCALL:
|
|
|
|
error = sooptcopyin(sopt, &bw_upcall, sizeof bw_upcall,
|
|
|
|
sizeof bw_upcall);
|
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
if (sopt->sopt_name == MRT_ADD_BW_UPCALL)
|
|
|
|
error = add_bw_upcall(&bw_upcall);
|
|
|
|
else
|
|
|
|
error = del_bw_upcall(&bw_upcall);
|
|
|
|
break;
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
default:
|
|
|
|
error = EOPNOTSUPP;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return error;
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
|
|
|
* Handle MRT getsockopt commands
|
|
|
|
*/
|
1995-11-14 20:34:56 +00:00
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
X_ip_mrouter_get(struct socket *so, struct sockopt *sopt)
|
1995-06-13 17:51:16 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
int error;
|
|
|
|
static int version = 0x0305; /* !!! why is this here? XXX */
|
1995-06-13 17:51:16 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
switch (sopt->sopt_name) {
|
|
|
|
case MRT_VERSION:
|
|
|
|
error = sooptcopyout(sopt, &version, sizeof version);
|
|
|
|
break;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
case MRT_ASSERT:
|
|
|
|
error = sooptcopyout(sopt, &pim_assert, sizeof pim_assert);
|
|
|
|
break;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
case MRT_API_SUPPORT:
|
|
|
|
error = sooptcopyout(sopt, &mrt_api_support, sizeof mrt_api_support);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MRT_API_CONFIG:
|
|
|
|
error = sooptcopyout(sopt, &mrt_api_config, sizeof mrt_api_config);
|
|
|
|
break;
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
default:
|
|
|
|
error = EOPNOTSUPP;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/*
|
|
|
|
* Handle ioctl commands to obtain information from the cache
|
|
|
|
*/
|
1995-11-14 20:34:56 +00:00
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
X_mrt_ioctl(int cmd, caddr_t data)
|
1994-09-06 22:42:31 +00:00
|
|
|
{
|
|
|
|
int error = 0;
|
|
|
|
|
2004-08-21 17:38:57 +00:00
|
|
|
/*
|
|
|
|
* Currently the only function calling this ioctl routine is rtioctl().
|
|
|
|
* Typically, only root can create the raw socket in order to execute
|
|
|
|
* this ioctl method, however the request might be coming from a prison
|
|
|
|
*/
|
2006-11-06 13:42:10 +00:00
|
|
|
error = priv_check(curthread, PRIV_NETINET_MROUTE);
|
2004-08-21 17:38:57 +00:00
|
|
|
if (error)
|
|
|
|
return (error);
|
1994-09-06 22:42:31 +00:00
|
|
|
switch (cmd) {
|
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
2002-11-15 22:53:53 +00:00
|
|
|
case (SIOCGETVIFCNT):
|
|
|
|
error = get_vif_cnt((struct sioc_vif_req *)data);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case (SIOCGETSGCNT):
|
|
|
|
error = get_sg_cnt((struct sioc_sg_req *)data);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
error = EINVAL;
|
|
|
|
break;
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
return error;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1995-06-13 17:51:16 +00:00
|
|
|
* returns the packet, byte, rpf-failure count for the source group provided
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1995-06-13 17:51:16 +00:00
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
get_sg_cnt(struct sioc_sg_req *req)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct mfc *rt;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK();
|
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
2002-11-15 22:53:53 +00:00
|
|
|
rt = mfc_find(req->src.s_addr, req->grp.s_addr);
|
|
|
|
if (rt == NULL) {
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
req->pktcnt = req->bytecnt = req->wrong_if = 0xffffffff;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return EADDRNOTAVAIL;
|
|
|
|
}
|
|
|
|
req->pktcnt = rt->mfc_pkt_cnt;
|
|
|
|
req->bytecnt = rt->mfc_byte_cnt;
|
|
|
|
req->wrong_if = rt->mfc_wrong_if;
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/*
|
1995-06-13 17:51:16 +00:00
|
|
|
* returns the input and output packet and byte counts on the vif provided
|
1994-09-06 22:42:31 +00:00
|
|
|
*/
|
1995-06-13 17:51:16 +00:00
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
get_vif_cnt(struct sioc_vif_req *req)
|
1994-09-06 22:42:31 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
vifi_t vifi = req->vifi;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK();
|
|
|
|
if (vifi >= numvifs) {
|
|
|
|
VIF_UNLOCK();
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return EINVAL;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
1995-06-13 17:51:16 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
req->icount = viftable[vifi].v_pkt_in;
|
|
|
|
req->ocount = viftable[vifi].v_pkt_out;
|
1995-06-13 17:51:16 +00:00
|
|
|
req->ibytes = viftable[vifi].v_bytes_in;
|
|
|
|
req->obytes = viftable[vifi].v_bytes_out;
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_UNLOCK();
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-10-24 00:09:18 +00:00
|
|
|
static void
|
|
|
|
ip_mrouter_reset(void)
|
|
|
|
{
|
|
|
|
bzero((caddr_t)mfctable, sizeof(mfctable));
|
|
|
|
bzero((caddr_t)nexpire, sizeof(nexpire));
|
|
|
|
|
|
|
|
pim_assert = 0;
|
|
|
|
mrt_api_config = 0;
|
|
|
|
|
2005-03-01 12:01:17 +00:00
|
|
|
callout_init(&expire_upcalls_ch, NET_CALLOUT_MPSAFE);
|
2003-10-24 00:09:18 +00:00
|
|
|
|
|
|
|
bw_upcalls_n = 0;
|
|
|
|
bzero((caddr_t)bw_meter_timers, sizeof(bw_meter_timers));
|
2005-03-01 12:01:17 +00:00
|
|
|
callout_init(&bw_upcalls_ch, NET_CALLOUT_MPSAFE);
|
|
|
|
callout_init(&bw_meter_ch, NET_CALLOUT_MPSAFE);
|
2003-10-24 00:09:18 +00:00
|
|
|
}
|
|
|
|
|
2007-02-10 13:59:13 +00:00
|
|
|
static struct mtx mrouter_mtx;
|
2003-12-20 18:32:48 +00:00
|
|
|
|
2006-09-28 12:21:08 +00:00
|
|
|
static void
|
|
|
|
if_detached_event(void *arg __unused, struct ifnet *ifp)
|
|
|
|
{
|
|
|
|
vifi_t vifi;
|
|
|
|
int i;
|
|
|
|
struct mfc *mfc;
|
|
|
|
struct mfc *nmfc;
|
|
|
|
struct mfc **ppmfc; /* Pointer to previous node's next-pointer */
|
|
|
|
struct rtdetq *pq;
|
|
|
|
struct rtdetq *npq;
|
|
|
|
|
|
|
|
mtx_lock(&mrouter_mtx);
|
|
|
|
if (ip_mrouter == NULL) {
|
|
|
|
mtx_unlock(&mrouter_mtx);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Tear down multicast forwarder state associated with this ifnet.
|
|
|
|
* 1. Walk the vif list, matching vifs against this ifnet.
|
|
|
|
* 2. Walk the multicast forwarding cache (mfc) looking for
|
|
|
|
* inner matches with this vif's index.
|
|
|
|
* 3. Free any pending mbufs for this mfc.
|
|
|
|
* 4. Free the associated mfc entry and state associated with this vif.
|
|
|
|
* Be very careful about unlinking from a singly-linked list whose
|
|
|
|
* "head node" is a pointer in a simple array.
|
|
|
|
* 5. Free vif state. This should disable ALLMULTI on the interface.
|
|
|
|
*/
|
|
|
|
VIF_LOCK();
|
|
|
|
MFC_LOCK();
|
|
|
|
for (vifi = 0; vifi < numvifs; vifi++) {
|
|
|
|
if (viftable[vifi].v_ifp != ifp)
|
|
|
|
continue;
|
|
|
|
for (i = 0; i < MFCTBLSIZ; i++) {
|
|
|
|
ppmfc = &mfctable[i];
|
|
|
|
for (mfc = mfctable[i]; mfc != NULL; ) {
|
|
|
|
nmfc = mfc->mfc_next;
|
|
|
|
if (mfc->mfc_parent == vifi) {
|
|
|
|
for (pq = mfc->mfc_stall; pq != NULL; ) {
|
|
|
|
npq = pq->next;
|
|
|
|
m_freem(pq->m);
|
|
|
|
free(pq, M_MRTABLE);
|
|
|
|
pq = npq;
|
|
|
|
}
|
|
|
|
free_bw_list(mfc->mfc_bw_meter);
|
|
|
|
free(mfc, M_MRTABLE);
|
|
|
|
*ppmfc = nmfc;
|
|
|
|
} else {
|
|
|
|
ppmfc = &mfc->mfc_next;
|
|
|
|
}
|
|
|
|
mfc = nmfc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
del_vif_locked(vifi);
|
|
|
|
}
|
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
|
|
|
|
|
|
|
mtx_unlock(&mrouter_mtx);
|
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* Enable multicast routing
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1995-11-14 20:34:56 +00:00
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
ip_mrouter_init(struct socket *so, int version)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mrtdebug)
|
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
2002-11-15 22:53:53 +00:00
|
|
|
log(LOG_DEBUG, "ip_mrouter_init: so_type = %d, pr_protocol = %d\n",
|
|
|
|
so->so_type, so->so_proto->pr_protocol);
|
1995-06-13 17:51:16 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_IGMP)
|
|
|
|
return EOPNOTSUPP;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1998-08-23 03:07:17 +00:00
|
|
|
if (version != 1)
|
1995-06-13 17:51:16 +00:00
|
|
|
return ENOPROTOOPT;
|
|
|
|
|
2003-12-20 18:32:48 +00:00
|
|
|
mtx_lock(&mrouter_mtx);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-12-20 18:32:48 +00:00
|
|
|
if (ip_mrouter != NULL) {
|
|
|
|
mtx_unlock(&mrouter_mtx);
|
|
|
|
return EADDRINUSE;
|
|
|
|
}
|
1995-06-13 17:51:16 +00:00
|
|
|
|
2006-09-28 12:21:08 +00:00
|
|
|
if_detach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event,
|
|
|
|
if_detached_event, NULL, EVENTHANDLER_PRI_ANY);
|
|
|
|
if (if_detach_event_tag == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
callout_reset(&expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, NULL);
|
1995-06-13 17:51:16 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
callout_reset(&bw_upcalls_ch, BW_UPCALLS_PERIOD,
|
|
|
|
expire_bw_upcalls_send, NULL);
|
|
|
|
callout_reset(&bw_meter_ch, BW_METER_PERIOD, expire_bw_meter_process, NULL);
|
|
|
|
|
2003-10-24 00:09:18 +00:00
|
|
|
ip_mrouter = so;
|
2003-08-07 18:16:59 +00:00
|
|
|
|
2003-12-20 18:32:48 +00:00
|
|
|
mtx_unlock(&mrouter_mtx);
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
if (mrtdebug)
|
1995-10-06 19:30:43 +00:00
|
|
|
log(LOG_DEBUG, "ip_mrouter_init\n");
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
return 0;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* Disable multicast routing
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1995-11-14 20:34:56 +00:00
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
X_ip_mrouter_done(void)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
1994-09-06 22:42:31 +00:00
|
|
|
vifi_t vifi;
|
|
|
|
int i;
|
|
|
|
struct ifnet *ifp;
|
|
|
|
struct ifreq ifr;
|
1999-01-18 02:06:59 +00:00
|
|
|
struct mfc *rt;
|
1994-09-06 22:42:31 +00:00
|
|
|
struct rtdetq *rte;
|
|
|
|
|
2003-12-20 18:32:48 +00:00
|
|
|
mtx_lock(&mrouter_mtx);
|
|
|
|
|
|
|
|
if (ip_mrouter == NULL) {
|
|
|
|
mtx_unlock(&mrouter_mtx);
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
/*
|
|
|
|
* Detach/disable hooks to the reset of the system.
|
|
|
|
*/
|
|
|
|
ip_mrouter = NULL;
|
|
|
|
mrt_api_config = 0;
|
|
|
|
|
2003-10-29 19:15:00 +00:00
|
|
|
VIF_LOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
/*
|
|
|
|
* For each phyint in use, disable promiscuous reception of all IP
|
|
|
|
* multicasts.
|
|
|
|
*/
|
|
|
|
for (vifi = 0; vifi < numvifs; vifi++) {
|
|
|
|
if (viftable[vifi].v_lcl_addr.s_addr != 0 &&
|
2003-08-07 18:16:59 +00:00
|
|
|
!(viftable[vifi].v_flags & (VIFF_TUNNEL | VIFF_REGISTER))) {
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct sockaddr_in *so = (struct sockaddr_in *)&(ifr.ifr_addr);
|
|
|
|
|
|
|
|
so->sin_len = sizeof(struct sockaddr_in);
|
|
|
|
so->sin_family = AF_INET;
|
|
|
|
so->sin_addr.s_addr = INADDR_ANY;
|
1994-09-06 22:42:31 +00:00
|
|
|
ifp = viftable[vifi].v_ifp;
|
1997-01-13 21:26:53 +00:00
|
|
|
if_allmulti(ifp, 0);
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
bzero((caddr_t)viftable, sizeof(viftable));
|
|
|
|
numvifs = 0;
|
1995-06-13 17:51:16 +00:00
|
|
|
pim_assert = 0;
|
2003-12-20 18:32:48 +00:00
|
|
|
VIF_UNLOCK();
|
2006-09-28 12:21:08 +00:00
|
|
|
EVENTHANDLER_DEREGISTER(ifnet_departure_event, if_detach_event_tag);
|
2003-08-07 18:16:59 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/*
|
1995-06-13 17:51:16 +00:00
|
|
|
* Free all multicast forwarding cache entries.
|
1994-09-06 22:42:31 +00:00
|
|
|
*/
|
2003-09-06 04:53:43 +00:00
|
|
|
callout_stop(&expire_upcalls_ch);
|
|
|
|
callout_stop(&bw_upcalls_ch);
|
|
|
|
callout_stop(&bw_meter_ch);
|
|
|
|
|
2003-10-29 19:15:00 +00:00
|
|
|
MFC_LOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
for (i = 0; i < MFCTBLSIZ; i++) {
|
1999-01-18 02:06:59 +00:00
|
|
|
for (rt = mfctable[i]; rt != NULL; ) {
|
|
|
|
struct mfc *nr = rt->mfc_next;
|
|
|
|
|
|
|
|
for (rte = rt->mfc_stall; rte != NULL; ) {
|
|
|
|
struct rtdetq *n = rte->next;
|
|
|
|
|
|
|
|
m_freem(rte->m);
|
|
|
|
free(rte, M_MRTABLE);
|
|
|
|
rte = n;
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
2003-08-07 18:16:59 +00:00
|
|
|
free_bw_list(rt->mfc_bw_meter);
|
1999-01-18 02:06:59 +00:00
|
|
|
free(rt, M_MRTABLE);
|
|
|
|
rt = nr;
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
bzero((caddr_t)mfctable, sizeof(mfctable));
|
2003-12-20 18:32:48 +00:00
|
|
|
bzero((caddr_t)nexpire, sizeof(nexpire));
|
2003-09-06 04:53:43 +00:00
|
|
|
bw_upcalls_n = 0;
|
2003-08-07 18:16:59 +00:00
|
|
|
bzero(bw_meter_timers, sizeof(bw_meter_timers));
|
2003-12-20 18:32:48 +00:00
|
|
|
MFC_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
|
|
|
|
reg_vif_num = VIFI_INVALID;
|
|
|
|
|
2003-12-20 18:32:48 +00:00
|
|
|
mtx_unlock(&mrouter_mtx);
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
if (mrtdebug)
|
1995-10-06 19:30:43 +00:00
|
|
|
log(LOG_DEBUG, "ip_mrouter_done\n");
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
return 0;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
|
|
|
* Set PIM assert processing global
|
|
|
|
*/
|
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
set_assert(int i)
|
1995-06-13 17:51:16 +00:00
|
|
|
{
|
1998-08-23 03:07:17 +00:00
|
|
|
if ((i != 1) && (i != 0))
|
1995-06-13 17:51:16 +00:00
|
|
|
return EINVAL;
|
|
|
|
|
1998-08-23 03:07:17 +00:00
|
|
|
pim_assert = i;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Configure API capabilities
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
set_api_config(uint32_t *apival)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We can set the API capabilities only if it is the first operation
|
|
|
|
* after MRT_INIT. I.e.:
|
|
|
|
* - there are no vifs installed
|
|
|
|
* - pim_assert is not enabled
|
|
|
|
* - the MFC table is empty
|
|
|
|
*/
|
|
|
|
if (numvifs > 0) {
|
|
|
|
*apival = 0;
|
|
|
|
return EPERM;
|
|
|
|
}
|
|
|
|
if (pim_assert) {
|
|
|
|
*apival = 0;
|
|
|
|
return EPERM;
|
|
|
|
}
|
|
|
|
for (i = 0; i < MFCTBLSIZ; i++) {
|
|
|
|
if (mfctable[i] != NULL) {
|
|
|
|
*apival = 0;
|
|
|
|
return EPERM;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mrt_api_config = *apival & mrt_api_support;
|
|
|
|
*apival = mrt_api_config;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* Add a vif to the vif table
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1994-09-06 22:42:31 +00:00
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
add_vif(struct vifctl *vifcp)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct vif *vifp = viftable + vifcp->vifc_vifi;
|
|
|
|
struct sockaddr_in sin = {sizeof sin, AF_INET};
|
1994-09-06 22:42:31 +00:00
|
|
|
struct ifaddr *ifa;
|
|
|
|
struct ifnet *ifp;
|
2003-09-06 04:53:43 +00:00
|
|
|
int error;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK();
|
|
|
|
if (vifcp->vifc_vifi >= MAXVIFS) {
|
|
|
|
VIF_UNLOCK();
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return EINVAL;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
2007-02-08 22:58:01 +00:00
|
|
|
/* rate limiting is no longer supported by this code */
|
|
|
|
if (vifcp->vifc_rate_limit != 0) {
|
|
|
|
log(LOG_ERR, "rate limiting is no longer supported\n");
|
|
|
|
VIF_UNLOCK();
|
|
|
|
return EINVAL;
|
|
|
|
}
|
2003-09-06 04:53:43 +00:00
|
|
|
if (vifp->v_lcl_addr.s_addr != INADDR_ANY) {
|
|
|
|
VIF_UNLOCK();
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return EADDRINUSE;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
|
|
|
if (vifcp->vifc_lcl_addr.s_addr == INADDR_ANY) {
|
|
|
|
VIF_UNLOCK();
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return EADDRNOTAVAIL;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
/* Find the interface with an address in AF_INET family */
|
2003-08-07 18:16:59 +00:00
|
|
|
if (vifcp->vifc_flags & VIFF_REGISTER) {
|
|
|
|
/*
|
|
|
|
* XXX: Because VIFF_REGISTER does not really need a valid
|
|
|
|
* local interface (e.g. it could be 127.0.0.2), we don't
|
|
|
|
* check its address.
|
|
|
|
*/
|
|
|
|
ifp = NULL;
|
2007-02-10 13:59:13 +00:00
|
|
|
} else {
|
2003-08-07 18:16:59 +00:00
|
|
|
sin.sin_addr = vifcp->vifc_lcl_addr;
|
|
|
|
ifa = ifa_ifwithaddr((struct sockaddr *)&sin);
|
2003-09-06 04:53:43 +00:00
|
|
|
if (ifa == NULL) {
|
|
|
|
VIF_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
return EADDRNOTAVAIL;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
2003-08-07 18:16:59 +00:00
|
|
|
ifp = ifa->ifa_ifp;
|
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2007-02-07 16:04:13 +00:00
|
|
|
if ((vifcp->vifc_flags & VIFF_TUNNEL) != 0) {
|
|
|
|
log(LOG_ERR, "tunnels are no longer supported\n");
|
|
|
|
VIF_UNLOCK();
|
|
|
|
return EOPNOTSUPP;
|
2003-08-07 18:16:59 +00:00
|
|
|
} else if (vifcp->vifc_flags & VIFF_REGISTER) {
|
|
|
|
ifp = &multicast_register_if;
|
|
|
|
if (mrtdebug)
|
|
|
|
log(LOG_DEBUG, "Adding a register vif, ifp: %p\n",
|
|
|
|
(void *)&multicast_register_if);
|
|
|
|
if (reg_vif_num == VIFI_INVALID) {
|
2003-10-31 18:32:15 +00:00
|
|
|
if_initname(&multicast_register_if, "register_vif", 0);
|
2003-08-07 18:16:59 +00:00
|
|
|
multicast_register_if.if_flags = IFF_LOOPBACK;
|
|
|
|
reg_vif_num = vifcp->vifc_vifi;
|
|
|
|
}
|
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
2002-11-15 22:53:53 +00:00
|
|
|
} else { /* Make sure the interface supports multicast */
|
2003-09-06 04:53:43 +00:00
|
|
|
if ((ifp->if_flags & IFF_MULTICAST) == 0) {
|
|
|
|
VIF_UNLOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
return EOPNOTSUPP;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
/* Enable promiscuous reception of all IP multicasts from the if */
|
1997-02-21 18:34:58 +00:00
|
|
|
error = if_allmulti(ifp, 1);
|
2003-09-06 04:53:43 +00:00
|
|
|
if (error) {
|
|
|
|
VIF_UNLOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
return error;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
vifp->v_flags = vifcp->vifc_flags;
|
|
|
|
vifp->v_threshold = vifcp->vifc_threshold;
|
|
|
|
vifp->v_lcl_addr = vifcp->vifc_lcl_addr;
|
|
|
|
vifp->v_rmt_addr = vifcp->vifc_rmt_addr;
|
|
|
|
vifp->v_ifp = ifp;
|
1995-06-13 17:51:16 +00:00
|
|
|
vifp->v_rsvp_on = 0;
|
|
|
|
vifp->v_rsvpd = NULL;
|
1994-09-06 22:42:31 +00:00
|
|
|
/* initialize per vif pkt counters */
|
|
|
|
vifp->v_pkt_in = 0;
|
|
|
|
vifp->v_pkt_out = 0;
|
1995-06-13 17:51:16 +00:00
|
|
|
vifp->v_bytes_in = 0;
|
|
|
|
vifp->v_bytes_out = 0;
|
2007-02-08 22:58:01 +00:00
|
|
|
bzero(&vifp->v_route, sizeof(vifp->v_route));
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
/* Adjust numvifs up if the vifi is higher than numvifs */
|
|
|
|
if (numvifs <= vifcp->vifc_vifi) numvifs = vifcp->vifc_vifi + 1;
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_UNLOCK();
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
if (mrtdebug)
|
2007-02-08 22:58:01 +00:00
|
|
|
log(LOG_DEBUG, "add_vif #%d, lcladdr %lx, %s %lx, thresh %x\n",
|
2004-08-16 18:32:07 +00:00
|
|
|
vifcp->vifc_vifi,
|
1998-08-17 01:05:25 +00:00
|
|
|
(u_long)ntohl(vifcp->vifc_lcl_addr.s_addr),
|
1994-09-06 22:42:31 +00:00
|
|
|
(vifcp->vifc_flags & VIFF_TUNNEL) ? "rmtaddr" : "mask",
|
1998-08-17 01:05:25 +00:00
|
|
|
(u_long)ntohl(vifcp->vifc_rmt_addr.s_addr),
|
2007-02-08 22:58:01 +00:00
|
|
|
vifcp->vifc_threshold);
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
return 0;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* Delete a vif from the vif table
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
static int
|
2006-09-28 12:21:08 +00:00
|
|
|
del_vif_locked(vifi_t vifi)
|
1994-09-06 22:42:31 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct vif *vifp;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2006-09-28 12:21:08 +00:00
|
|
|
VIF_LOCK_ASSERT();
|
2003-09-06 04:53:43 +00:00
|
|
|
|
|
|
|
if (vifi >= numvifs) {
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return EINVAL;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
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
2002-11-15 22:53:53 +00:00
|
|
|
vifp = &viftable[vifi];
|
2003-09-06 04:53:43 +00:00
|
|
|
if (vifp->v_lcl_addr.s_addr == INADDR_ANY) {
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return EADDRNOTAVAIL;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (!(vifp->v_flags & (VIFF_TUNNEL | VIFF_REGISTER)))
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if_allmulti(vifp->v_ifp, 0);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (vifp->v_flags & VIFF_REGISTER)
|
|
|
|
reg_vif_num = VIFI_INVALID;
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
bzero((caddr_t)vifp, sizeof (*vifp));
|
|
|
|
|
1998-08-23 03:07:17 +00:00
|
|
|
if (mrtdebug)
|
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
2002-11-15 22:53:53 +00:00
|
|
|
log(LOG_DEBUG, "del_vif %d, numvifs %d\n", vifi, numvifs);
|
1998-08-23 03:07:17 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/* Adjust numvifs down */
|
|
|
|
for (vifi = numvifs; vifi > 0; vifi--)
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (viftable[vifi-1].v_lcl_addr.s_addr != INADDR_ANY)
|
|
|
|
break;
|
1994-09-06 22:42:31 +00:00
|
|
|
numvifs = vifi;
|
|
|
|
|
2006-09-28 12:21:08 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
del_vif(vifi_t vifi)
|
|
|
|
{
|
|
|
|
int cc;
|
|
|
|
|
|
|
|
VIF_LOCK();
|
|
|
|
cc = del_vif_locked(vifi);
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_UNLOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2006-09-28 12:21:08 +00:00
|
|
|
return cc;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
/*
|
|
|
|
* update an mfc entry without resetting counters and S,G addresses.
|
|
|
|
*/
|
|
|
|
static void
|
2003-08-07 18:16:59 +00:00
|
|
|
update_mfc_params(struct mfc *rt, struct mfcctl2 *mfccp)
|
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
2002-11-15 22:53:53 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
rt->mfc_parent = mfccp->mfcc_parent;
|
2003-08-07 18:16:59 +00:00
|
|
|
for (i = 0; i < numvifs; i++) {
|
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
2002-11-15 22:53:53 +00:00
|
|
|
rt->mfc_ttls[i] = mfccp->mfcc_ttls[i];
|
2003-08-07 18:16:59 +00:00
|
|
|
rt->mfc_flags[i] = mfccp->mfcc_flags[i] & mrt_api_config &
|
|
|
|
MRT_MFC_FLAGS_ALL;
|
|
|
|
}
|
|
|
|
/* set the RP address */
|
|
|
|
if (mrt_api_config & MRT_MFC_RP)
|
|
|
|
rt->mfc_rp = mfccp->mfcc_rp;
|
|
|
|
else
|
|
|
|
rt->mfc_rp.s_addr = INADDR_ANY;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* fully initialize an mfc entry from the parameter.
|
|
|
|
*/
|
|
|
|
static void
|
2003-08-07 18:16:59 +00:00
|
|
|
init_mfc_params(struct mfc *rt, struct mfcctl2 *mfccp)
|
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
2002-11-15 22:53:53 +00:00
|
|
|
{
|
|
|
|
rt->mfc_origin = mfccp->mfcc_origin;
|
|
|
|
rt->mfc_mcastgrp = mfccp->mfcc_mcastgrp;
|
|
|
|
|
|
|
|
update_mfc_params(rt, mfccp);
|
|
|
|
|
|
|
|
/* initialize pkt counters per src-grp */
|
|
|
|
rt->mfc_pkt_cnt = 0;
|
|
|
|
rt->mfc_byte_cnt = 0;
|
|
|
|
rt->mfc_wrong_if = 0;
|
|
|
|
rt->mfc_last_assert.tv_sec = rt->mfc_last_assert.tv_usec = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* Add an mfc entry
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
static int
|
2003-08-07 18:16:59 +00:00
|
|
|
add_mfc(struct mfcctl2 *mfccp)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
1994-09-06 22:42:31 +00:00
|
|
|
struct mfc *rt;
|
|
|
|
u_long hash;
|
|
|
|
struct rtdetq *rte;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
u_short nstl;
|
2003-09-06 04:53:43 +00:00
|
|
|
|
|
|
|
VIF_LOCK();
|
|
|
|
MFC_LOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
rt = mfc_find(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr);
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
/* If an entry already exists, just update the fields */
|
|
|
|
if (rt) {
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mrtdebug & DEBUG_MFC)
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_DEBUG,"add_mfc update o %lx g %lx p %x\n",
|
|
|
|
(u_long)ntohl(mfccp->mfcc_origin.s_addr),
|
|
|
|
(u_long)ntohl(mfccp->mfcc_mcastgrp.s_addr),
|
1994-09-06 22:42:31 +00:00
|
|
|
mfccp->mfcc_parent);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
update_mfc_params(rt, mfccp);
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-08-16 18:32:07 +00:00
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* Find the entry for which the upcall was made and update
|
|
|
|
*/
|
1995-06-13 17:51:16 +00:00
|
|
|
hash = MFCHASH(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr);
|
1999-01-18 02:06:59 +00:00
|
|
|
for (rt = mfctable[hash], nstl = 0; rt; rt = rt->mfc_next) {
|
1994-09-06 22:42:31 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
if ((rt->mfc_origin.s_addr == mfccp->mfcc_origin.s_addr) &&
|
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
2002-11-15 22:53:53 +00:00
|
|
|
(rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr) &&
|
|
|
|
(rt->mfc_stall != NULL)) {
|
2004-08-16 18:32:07 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
if (nstl++)
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_ERR, "add_mfc %s o %lx g %lx p %x dbx %p\n",
|
1995-06-13 17:51:16 +00:00
|
|
|
"multiple kernel entries",
|
1998-08-17 01:05:25 +00:00
|
|
|
(u_long)ntohl(mfccp->mfcc_origin.s_addr),
|
|
|
|
(u_long)ntohl(mfccp->mfcc_mcastgrp.s_addr),
|
1999-01-18 02:06:59 +00:00
|
|
|
mfccp->mfcc_parent, (void *)rt->mfc_stall);
|
1995-06-13 17:51:16 +00:00
|
|
|
|
|
|
|
if (mrtdebug & DEBUG_MFC)
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_DEBUG,"add_mfc o %lx g %lx p %x dbg %p\n",
|
|
|
|
(u_long)ntohl(mfccp->mfcc_origin.s_addr),
|
|
|
|
(u_long)ntohl(mfccp->mfcc_mcastgrp.s_addr),
|
1999-01-18 02:06:59 +00:00
|
|
|
mfccp->mfcc_parent, (void *)rt->mfc_stall);
|
1994-09-06 22:42:31 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
init_mfc_params(rt, mfccp);
|
1994-09-06 22:42:31 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
rt->mfc_expire = 0; /* Don't clean this guy up */
|
|
|
|
nexpire[hash]--;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
/* free packets Qed at the end of this entry */
|
1999-01-18 02:06:59 +00:00
|
|
|
for (rte = rt->mfc_stall; rte != NULL; ) {
|
|
|
|
struct rtdetq *n = rte->next;
|
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
ip_mdq(rte->m, rte->ifp, rt, -1);
|
1994-09-06 22:42:31 +00:00
|
|
|
m_freem(rte->m);
|
1999-01-18 02:06:59 +00:00
|
|
|
free(rte, M_MRTABLE);
|
|
|
|
rte = n;
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
1999-01-18 02:06:59 +00:00
|
|
|
rt->mfc_stall = NULL;
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* It is possible that an entry is being inserted without an upcall
|
|
|
|
*/
|
|
|
|
if (nstl == 0) {
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mrtdebug & DEBUG_MFC)
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_DEBUG,"add_mfc no upcall h %lu o %lx g %lx p %x\n",
|
|
|
|
hash, (u_long)ntohl(mfccp->mfcc_origin.s_addr),
|
|
|
|
(u_long)ntohl(mfccp->mfcc_mcastgrp.s_addr),
|
1994-09-06 22:42:31 +00:00
|
|
|
mfccp->mfcc_parent);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
1999-01-18 02:06:59 +00:00
|
|
|
for (rt = mfctable[hash]; rt != NULL; rt = rt->mfc_next) {
|
1995-06-13 17:51:16 +00:00
|
|
|
if ((rt->mfc_origin.s_addr == mfccp->mfcc_origin.s_addr) &&
|
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
2002-11-15 22:53:53 +00:00
|
|
|
(rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr)) {
|
|
|
|
init_mfc_params(rt, mfccp);
|
1995-06-13 17:51:16 +00:00
|
|
|
if (rt->mfc_expire)
|
|
|
|
nexpire[hash]--;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
rt->mfc_expire = 0;
|
|
|
|
break; /* XXX */
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
}
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (rt == NULL) { /* no upcall, so make a new entry */
|
1999-01-18 02:06:59 +00:00
|
|
|
rt = (struct mfc *)malloc(sizeof(*rt), M_MRTABLE, M_NOWAIT);
|
|
|
|
if (rt == NULL) {
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
return ENOBUFS;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
init_mfc_params(rt, mfccp);
|
1995-06-13 17:51:16 +00:00
|
|
|
rt->mfc_expire = 0;
|
1999-01-18 02:06:59 +00:00
|
|
|
rt->mfc_stall = NULL;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
rt->mfc_bw_meter = NULL;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
/* insert new entry at head of hash chain */
|
1999-01-18 02:06:59 +00:00
|
|
|
rt->mfc_next = mfctable[hash];
|
|
|
|
mfctable[hash] = rt;
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
}
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
return 0;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* Delete an mfc entry
|
|
|
|
*/
|
|
|
|
static int
|
2003-08-07 18:16:59 +00:00
|
|
|
del_mfc(struct mfcctl2 *mfccp)
|
1994-09-06 22:42:31 +00:00
|
|
|
{
|
2004-08-16 18:32:07 +00:00
|
|
|
struct in_addr origin;
|
|
|
|
struct in_addr mcastgrp;
|
|
|
|
struct mfc *rt;
|
|
|
|
struct mfc **nptr;
|
|
|
|
u_long hash;
|
2003-08-07 18:16:59 +00:00
|
|
|
struct bw_meter *list;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
origin = mfccp->mfcc_origin;
|
|
|
|
mcastgrp = mfccp->mfcc_mcastgrp;
|
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mrtdebug & DEBUG_MFC)
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_DEBUG,"del_mfc orig %lx mcastgrp %lx\n",
|
|
|
|
(u_long)ntohl(origin.s_addr), (u_long)ntohl(mcastgrp.s_addr));
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
hash = MFCHASH(origin.s_addr, mcastgrp.s_addr);
|
|
|
|
for (nptr = &mfctable[hash]; (rt = *nptr) != NULL; nptr = &rt->mfc_next)
|
1994-09-06 22:42:31 +00:00
|
|
|
if (origin.s_addr == rt->mfc_origin.s_addr &&
|
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
2002-11-15 22:53:53 +00:00
|
|
|
mcastgrp.s_addr == rt->mfc_mcastgrp.s_addr &&
|
|
|
|
rt->mfc_stall == NULL)
|
1994-09-06 22:42:31 +00:00
|
|
|
break;
|
1999-01-18 02:06:59 +00:00
|
|
|
if (rt == NULL) {
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
return EADDRNOTAVAIL;
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
|
1999-01-18 02:06:59 +00:00
|
|
|
*nptr = rt->mfc_next;
|
2003-08-07 18:16:59 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* free the bw_meter entries
|
|
|
|
*/
|
|
|
|
list = rt->mfc_bw_meter;
|
|
|
|
rt->mfc_bw_meter = NULL;
|
|
|
|
|
1999-01-18 02:06:59 +00:00
|
|
|
free(rt, M_MRTABLE);
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
free_bw_list(list);
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
return 0;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
2006-09-29 15:45:11 +00:00
|
|
|
* Send a message to the routing daemon on the multicast routing socket
|
1995-06-13 17:51:16 +00:00
|
|
|
*/
|
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in *src)
|
1995-06-13 17:51:16 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (s) {
|
Reduce the number of unnecessary unlock-relocks on socket buffer mutexes
associated with performing a wakeup on the socket buffer:
- When performing an sbappend*() followed by a so[rw]wakeup(), explicitly
acquire the socket buffer lock and use the _locked() variants of both
calls. Note that the _locked() sowakeup() versions unlock the mutex on
return. This is done in uipc_send(), divert_packet(), mroute
socket_send(), raw_append(), tcp_reass(), tcp_input(), and udp_append().
- When the socket buffer lock is dropped before a sowakeup(), remove the
explicit unlock and use the _locked() sowakeup() variant. This is done
in soisdisconnecting(), soisdisconnected() when setting the can't send/
receive flags and dropping data, and in uipc_rcvd() which adjusting
back-pressure on the sockets.
For UNIX domain sockets running mpsafe with a contention-intensive SMP
mysql benchmark, this results in a 1.6% query rate improvement due to
reduce mutex costs.
2004-06-26 19:10:39 +00:00
|
|
|
SOCKBUF_LOCK(&s->so_rcv);
|
|
|
|
if (sbappendaddr_locked(&s->so_rcv, (struct sockaddr *)src, mm,
|
|
|
|
NULL) != 0) {
|
|
|
|
sorwakeup_locked(s);
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return 0;
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
Reduce the number of unnecessary unlock-relocks on socket buffer mutexes
associated with performing a wakeup on the socket buffer:
- When performing an sbappend*() followed by a so[rw]wakeup(), explicitly
acquire the socket buffer lock and use the _locked() variants of both
calls. Note that the _locked() sowakeup() versions unlock the mutex on
return. This is done in uipc_send(), divert_packet(), mroute
socket_send(), raw_append(), tcp_reass(), tcp_input(), and udp_append().
- When the socket buffer lock is dropped before a sowakeup(), remove the
explicit unlock and use the _locked() sowakeup() variant. This is done
in soisdisconnecting(), soisdisconnected() when setting the can't send/
receive flags and dropping data, and in uipc_rcvd() which adjusting
back-pressure on the sockets.
For UNIX domain sockets running mpsafe with a contention-intensive SMP
mysql benchmark, this results in a 1.6% query rate improvement due to
reduce mutex costs.
2004-06-26 19:10:39 +00:00
|
|
|
SOCKBUF_UNLOCK(&s->so_rcv);
|
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
2002-11-15 22:53:53 +00:00
|
|
|
}
|
|
|
|
m_freem(mm);
|
|
|
|
return -1;
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* IP multicast forwarding function. This function assumes that the packet
|
|
|
|
* pointed to by "ip" has arrived on (or is about to be sent to) the interface
|
|
|
|
* pointed to by "ifp", and the packet is to be relayed to other networks
|
|
|
|
* that have members of the packet's destination IP multicast group.
|
|
|
|
*
|
1995-06-13 17:51:16 +00:00
|
|
|
* The packet is returned unscathed to the caller, unless it is
|
|
|
|
* erroneous, in which case a non-zero return value tells the caller to
|
1994-05-24 10:09:53 +00:00
|
|
|
* discard it.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define TUNNEL_LEN 12 /* # bytes of IP option for tunnel encapsulation */
|
|
|
|
|
1995-11-14 20:34:56 +00:00
|
|
|
static int
|
2003-08-07 18:16:59 +00:00
|
|
|
X_ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m,
|
|
|
|
struct ip_moptions *imo)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct mfc *rt;
|
2003-09-06 04:53:43 +00:00
|
|
|
int error;
|
1995-06-13 17:51:16 +00:00
|
|
|
vifi_t vifi;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mrtdebug & DEBUG_FORWARD)
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_DEBUG, "ip_mforward: src %lx, dst %lx, ifp %p\n",
|
|
|
|
(u_long)ntohl(ip->ip_src.s_addr), (u_long)ntohl(ip->ip_dst.s_addr),
|
|
|
|
(void *)ifp);
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2001-07-25 20:15:49 +00:00
|
|
|
if (ip->ip_hl < (sizeof(struct ip) + TUNNEL_LEN) >> 2 ||
|
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
2002-11-15 22:53:53 +00:00
|
|
|
((u_char *)(ip + 1))[1] != IPOPT_LSRR ) {
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1995-06-13 17:51:16 +00:00
|
|
|
* Packet arrived via a physical interface or
|
2003-08-07 18:16:59 +00:00
|
|
|
* an encapsulated tunnel or a register_vif.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1994-09-06 22:42:31 +00:00
|
|
|
} else {
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* Packet arrived through a source-route tunnel.
|
1995-06-13 17:51:16 +00:00
|
|
|
* Source-route tunnels are no longer supported.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static int last_log;
|
2005-09-19 22:31:45 +00:00
|
|
|
if (last_log != time_uptime) {
|
|
|
|
last_log = time_uptime;
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_ERR,
|
|
|
|
"ip_mforward: received source-routed packet from %lx\n",
|
|
|
|
(u_long)ntohl(ip->ip_src.s_addr));
|
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
2002-11-15 22:53:53 +00:00
|
|
|
}
|
1995-06-13 17:51:16 +00:00
|
|
|
return 1;
|
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK();
|
|
|
|
MFC_LOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
if (imo && ((vifi = imo->imo_multicast_vif) < numvifs)) {
|
2007-02-10 23:15:28 +00:00
|
|
|
if (ip->ip_ttl < MAXTTL)
|
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
2002-11-15 22:53:53 +00:00
|
|
|
ip->ip_ttl++; /* compensate for -1 in *_send routines */
|
1995-06-13 17:51:16 +00:00
|
|
|
if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct vif *vifp = viftable + vifi;
|
|
|
|
|
2003-10-31 18:32:15 +00:00
|
|
|
printf("Sending IPPROTO_RSVP from %lx to %lx on vif %d (%s%s)\n",
|
2001-10-29 02:19:19 +00:00
|
|
|
(long)ntohl(ip->ip_src.s_addr), (long)ntohl(ip->ip_dst.s_addr),
|
|
|
|
vifi,
|
1995-06-13 17:51:16 +00:00
|
|
|
(vifp->v_flags & VIFF_TUNNEL) ? "tunnel on " : "",
|
2003-10-31 18:32:15 +00:00
|
|
|
vifp->v_ifp->if_xname);
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
2003-09-06 04:53:43 +00:00
|
|
|
error = ip_mdq(m, ifp, NULL, vifi);
|
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
|
|
|
return error;
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
|
|
|
if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
|
1995-11-14 20:34:56 +00:00
|
|
|
printf("Warning: IPPROTO_RSVP from %lx to %lx without vif option\n",
|
2001-10-29 02:19:19 +00:00
|
|
|
(long)ntohl(ip->ip_src.s_addr), (long)ntohl(ip->ip_dst.s_addr));
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (!imo)
|
|
|
|
printf("In fact, no options were specified at all\n");
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't forward a packet with time-to-live of zero or one,
|
|
|
|
* or a packet destined to a local-only group.
|
|
|
|
*/
|
2003-09-06 04:53:43 +00:00
|
|
|
if (ip->ip_ttl <= 1 || ntohl(ip->ip_dst.s_addr) <= INADDR_MAX_LOCAL_GROUP) {
|
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
return 0;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine forwarding vifs from the forwarding cache table
|
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
++mrtstat.mrts_mfc_lookups;
|
|
|
|
rt = mfc_find(ip->ip_src.s_addr, ip->ip_dst.s_addr);
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
/* Entry exists, so forward if necessary */
|
|
|
|
if (rt != NULL) {
|
2003-09-06 04:53:43 +00:00
|
|
|
error = ip_mdq(m, ifp, rt, -1);
|
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
|
|
|
return error;
|
1995-06-13 17:51:16 +00:00
|
|
|
} else {
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1994-09-06 22:42:31 +00:00
|
|
|
* If we don't have a route for packet's origin,
|
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
2002-11-15 22:53:53 +00:00
|
|
|
* Make a copy of the packet & send message to routing daemon
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1994-09-06 22:42:31 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct mbuf *mb0;
|
|
|
|
struct rtdetq *rte;
|
|
|
|
u_long hash;
|
1996-03-11 17:11:23 +00:00
|
|
|
int hlen = ip->ip_hl << 2;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
++mrtstat.mrts_mfc_misses;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
mrtstat.mrts_no_route++;
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mrtdebug & (DEBUG_FORWARD | DEBUG_MFC))
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_DEBUG, "ip_mforward: no rte s %lx g %lx\n",
|
|
|
|
(u_long)ntohl(ip->ip_src.s_addr),
|
|
|
|
(u_long)ntohl(ip->ip_dst.s_addr));
|
1994-09-06 22:42:31 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
|
|
|
* Allocate mbufs early so that we don't do extra work if we are
|
1996-03-11 17:11:23 +00:00
|
|
|
* just going to fail anyway. Make sure to pullup the header so
|
|
|
|
* that other people can't step on it.
|
1995-06-13 17:51:16 +00:00
|
|
|
*/
|
1999-01-18 02:06:59 +00:00
|
|
|
rte = (struct rtdetq *)malloc((sizeof *rte), M_MRTABLE, M_NOWAIT);
|
|
|
|
if (rte == NULL) {
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
return ENOBUFS;
|
|
|
|
}
|
2003-08-07 18:16:59 +00:00
|
|
|
mb0 = m_copypacket(m, M_DONTWAIT);
|
1996-03-11 17:11:23 +00:00
|
|
|
if (mb0 && (M_HASCL(mb0) || mb0->m_len < hlen))
|
|
|
|
mb0 = m_pullup(mb0, hlen);
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mb0 == NULL) {
|
1999-01-18 02:06:59 +00:00
|
|
|
free(rte, M_MRTABLE);
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
/* is there an upcall waiting for this flow ? */
|
1995-06-13 17:51:16 +00:00
|
|
|
hash = MFCHASH(ip->ip_src.s_addr, ip->ip_dst.s_addr);
|
1999-01-18 02:06:59 +00:00
|
|
|
for (rt = mfctable[hash]; rt; rt = rt->mfc_next) {
|
1995-06-13 17:51:16 +00:00
|
|
|
if ((ip->ip_src.s_addr == rt->mfc_origin.s_addr) &&
|
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
2002-11-15 22:53:53 +00:00
|
|
|
(ip->ip_dst.s_addr == rt->mfc_mcastgrp.s_addr) &&
|
|
|
|
(rt->mfc_stall != NULL))
|
1994-09-06 22:42:31 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-01-18 02:06:59 +00:00
|
|
|
if (rt == NULL) {
|
1995-06-13 17:51:16 +00:00
|
|
|
int i;
|
|
|
|
struct igmpmsg *im;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct sockaddr_in k_igmpsrc = { sizeof k_igmpsrc, AF_INET };
|
|
|
|
struct mbuf *mm;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Locate the vifi for the incoming interface for this packet.
|
|
|
|
* If none found, drop packet.
|
|
|
|
*/
|
2003-08-05 17:01:33 +00:00
|
|
|
for (vifi=0; vifi < numvifs && viftable[vifi].v_ifp != ifp; vifi++)
|
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
2002-11-15 22:53:53 +00:00
|
|
|
;
|
2003-08-05 17:01:33 +00:00
|
|
|
if (vifi >= numvifs) /* vif not found, drop packet */
|
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
2002-11-15 22:53:53 +00:00
|
|
|
goto non_fatal;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/* no upcall, so make a new entry */
|
1999-01-18 02:06:59 +00:00
|
|
|
rt = (struct mfc *)malloc(sizeof(*rt), M_MRTABLE, M_NOWAIT);
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (rt == NULL)
|
|
|
|
goto fail;
|
1995-06-13 17:51:16 +00:00
|
|
|
/* Make a copy of the header to send to the user level process */
|
1996-07-12 17:22:32 +00:00
|
|
|
mm = m_copy(mb0, 0, hlen);
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (mm == NULL)
|
|
|
|
goto fail1;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2004-08-16 18:32:07 +00:00
|
|
|
/*
|
|
|
|
* Send message to routing daemon to install
|
1995-06-13 17:51:16 +00:00
|
|
|
* a route into the kernel table
|
|
|
|
*/
|
2004-08-16 18:32:07 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
im = mtod(mm, struct igmpmsg *);
|
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
2002-11-15 22:53:53 +00:00
|
|
|
im->im_msgtype = IGMPMSG_NOCACHE;
|
|
|
|
im->im_mbz = 0;
|
|
|
|
im->im_vif = vifi;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
|
|
|
mrtstat.mrts_upcalls++;
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
k_igmpsrc.sin_addr = ip->ip_src;
|
1995-06-13 17:51:16 +00:00
|
|
|
if (socket_send(ip_mrouter, mm, &k_igmpsrc) < 0) {
|
1995-10-06 19:30:43 +00:00
|
|
|
log(LOG_WARNING, "ip_mforward: ip_mrouter socket queue full\n");
|
1995-06-13 17:51:16 +00:00
|
|
|
++mrtstat.mrts_upq_sockfull;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
fail1:
|
|
|
|
free(rt, M_MRTABLE);
|
|
|
|
fail:
|
1999-01-18 02:06:59 +00:00
|
|
|
free(rte, M_MRTABLE);
|
1995-06-19 17:22:01 +00:00
|
|
|
m_freem(mb0);
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/* insert new entry at head of hash chain */
|
|
|
|
rt->mfc_origin.s_addr = ip->ip_src.s_addr;
|
|
|
|
rt->mfc_mcastgrp.s_addr = ip->ip_dst.s_addr;
|
1995-06-13 17:51:16 +00:00
|
|
|
rt->mfc_expire = UPCALL_EXPIRE;
|
|
|
|
nexpire[hash]++;
|
2003-08-07 18:16:59 +00:00
|
|
|
for (i = 0; i < numvifs; i++) {
|
1995-06-13 17:51:16 +00:00
|
|
|
rt->mfc_ttls[i] = 0;
|
2003-08-07 18:16:59 +00:00
|
|
|
rt->mfc_flags[i] = 0;
|
|
|
|
}
|
1995-06-13 17:51:16 +00:00
|
|
|
rt->mfc_parent = -1;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
rt->mfc_rp.s_addr = INADDR_ANY; /* clear the RP address */
|
|
|
|
|
|
|
|
rt->mfc_bw_meter = NULL;
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/* link into table */
|
1999-01-18 02:06:59 +00:00
|
|
|
rt->mfc_next = mfctable[hash];
|
|
|
|
mfctable[hash] = rt;
|
|
|
|
rt->mfc_stall = rte;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
} else {
|
|
|
|
/* determine if q has overflowed */
|
1999-01-18 02:06:59 +00:00
|
|
|
int npkts = 0;
|
|
|
|
struct rtdetq **p;
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
/*
|
|
|
|
* XXX ouch! we need to append to the list, but we
|
|
|
|
* only have a pointer to the front, so we have to
|
|
|
|
* scan the entire list every time.
|
|
|
|
*/
|
1999-01-18 02:06:59 +00:00
|
|
|
for (p = &rt->mfc_stall; *p != NULL; p = &(*p)->next)
|
1995-06-13 17:51:16 +00:00
|
|
|
npkts++;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
if (npkts > MAX_UPQ) {
|
|
|
|
mrtstat.mrts_upq_ovflw++;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
non_fatal:
|
1999-01-18 02:06:59 +00:00
|
|
|
free(rte, M_MRTABLE);
|
1995-06-19 17:22:01 +00:00
|
|
|
m_freem(mb0);
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
return 0;
|
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
1999-01-18 02:06:59 +00:00
|
|
|
/* Add this entry to the end of the queue */
|
|
|
|
*p = rte;
|
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2004-08-16 18:32:07 +00:00
|
|
|
rte->m = mb0;
|
|
|
|
rte->ifp = ifp;
|
1999-01-18 02:06:59 +00:00
|
|
|
rte->next = NULL;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
VIF_UNLOCK();
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
return 0;
|
2004-08-16 18:32:07 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/*
|
|
|
|
* Clean up the cache entry if upcall is not serviced
|
|
|
|
*/
|
1994-05-24 10:09:53 +00:00
|
|
|
static void
|
1995-06-13 17:51:16 +00:00
|
|
|
expire_upcalls(void *unused)
|
1994-09-06 22:42:31 +00:00
|
|
|
{
|
|
|
|
struct rtdetq *rte;
|
1999-01-18 02:06:59 +00:00
|
|
|
struct mfc *mfc, **nptr;
|
1995-06-13 17:51:16 +00:00
|
|
|
int i;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
for (i = 0; i < MFCTBLSIZ; i++) {
|
|
|
|
if (nexpire[i] == 0)
|
|
|
|
continue;
|
|
|
|
nptr = &mfctable[i];
|
1999-01-18 02:06:59 +00:00
|
|
|
for (mfc = *nptr; mfc != NULL; mfc = *nptr) {
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
|
|
|
* Skip real cache entries
|
|
|
|
* Make sure it wasn't marked to not expire (shouldn't happen)
|
|
|
|
* If it expires now
|
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (mfc->mfc_stall != NULL && mfc->mfc_expire != 0 &&
|
|
|
|
--mfc->mfc_expire == 0) {
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mrtdebug & DEBUG_EXPIRE)
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_DEBUG, "expire_upcalls: expiring (%lx %lx)\n",
|
|
|
|
(u_long)ntohl(mfc->mfc_origin.s_addr),
|
|
|
|
(u_long)ntohl(mfc->mfc_mcastgrp.s_addr));
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
|
|
|
* drop all the packets
|
|
|
|
* free the mbuf with the pkt, if, timing info
|
|
|
|
*/
|
1999-01-18 02:06:59 +00:00
|
|
|
for (rte = mfc->mfc_stall; rte; ) {
|
|
|
|
struct rtdetq *n = rte->next;
|
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
m_freem(rte->m);
|
1999-01-18 02:06:59 +00:00
|
|
|
free(rte, M_MRTABLE);
|
|
|
|
rte = n;
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
|
|
|
++mrtstat.mrts_cache_cleanups;
|
|
|
|
nexpire[i]--;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* free the bw_meter entries
|
|
|
|
*/
|
|
|
|
while (mfc->mfc_bw_meter != NULL) {
|
|
|
|
struct bw_meter *x = mfc->mfc_bw_meter;
|
|
|
|
|
|
|
|
mfc->mfc_bw_meter = x->bm_mfc_next;
|
|
|
|
free(x, M_BWMETER);
|
|
|
|
}
|
|
|
|
|
1999-01-18 02:06:59 +00:00
|
|
|
*nptr = mfc->mfc_next;
|
|
|
|
free(mfc, M_MRTABLE);
|
1995-06-13 17:51:16 +00:00
|
|
|
} else {
|
1999-01-18 02:06:59 +00:00
|
|
|
nptr = &mfc->mfc_next;
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
|
|
|
|
|
|
|
callout_reset(&expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, NULL);
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Packet forwarding routine once entry in the cache is made
|
|
|
|
*/
|
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct ip *ip = mtod(m, struct ip *);
|
|
|
|
vifi_t vifi;
|
|
|
|
int plen = ip->ip_len;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK_ASSERT();
|
1995-06-13 17:51:16 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If xmt_vif is not -1, send on only the requested vif.
|
|
|
|
*
|
|
|
|
* (since vifi_t is u_short, -1 becomes MAXUSHORT, which > numvifs.)
|
|
|
|
*/
|
|
|
|
if (xmt_vif < numvifs) {
|
2003-08-07 18:16:59 +00:00
|
|
|
if (viftable[xmt_vif].v_flags & VIFF_REGISTER)
|
2007-02-10 13:59:13 +00:00
|
|
|
pim_register_send(ip, viftable + xmt_vif, m, rt);
|
2004-08-16 18:32:07 +00:00
|
|
|
else
|
2007-02-10 13:59:13 +00:00
|
|
|
phyint_send(ip, viftable + xmt_vif, m);
|
1995-06-13 17:51:16 +00:00
|
|
|
return 1;
|
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't forward if it didn't arrive from the parent vif for its origin.
|
|
|
|
*/
|
|
|
|
vifi = rt->mfc_parent;
|
1995-06-13 17:51:16 +00:00
|
|
|
if ((vifi >= numvifs) || (viftable[vifi].v_ifp != ifp)) {
|
1994-09-06 22:42:31 +00:00
|
|
|
/* came in the wrong interface */
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mrtdebug & DEBUG_FORWARD)
|
1998-08-17 01:05:25 +00:00
|
|
|
log(LOG_DEBUG, "wrong if: ifp %p vifi %d vififp %p\n",
|
2004-08-16 18:32:07 +00:00
|
|
|
(void *)ifp, vifi, (void *)viftable[vifi].v_ifp);
|
1994-09-06 22:42:31 +00:00
|
|
|
++mrtstat.mrts_wrong_if;
|
1995-06-13 17:51:16 +00:00
|
|
|
++rt->mfc_wrong_if;
|
|
|
|
/*
|
2003-08-07 18:16:59 +00:00
|
|
|
* If we are doing PIM assert processing, send a message
|
|
|
|
* to the routing daemon.
|
|
|
|
*
|
|
|
|
* XXX: A PIM-SM router needs the WRONGVIF detection so it
|
|
|
|
* can complete the SPT switch, regardless of the type
|
|
|
|
* of the iif (broadcast media, GRE tunnel, etc).
|
1995-06-13 17:51:16 +00:00
|
|
|
*/
|
2003-08-07 18:16:59 +00:00
|
|
|
if (pim_assert && (vifi < numvifs) && viftable[vifi].v_ifp) {
|
1995-06-13 17:51:16 +00:00
|
|
|
struct timeval now;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
u_long delta;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (ifp == &multicast_register_if)
|
|
|
|
pimstat.pims_rcv_registers_wrongiif++;
|
|
|
|
|
2003-08-05 17:01:33 +00:00
|
|
|
/* Get vifi for the incoming packet */
|
|
|
|
for (vifi=0; vifi < numvifs && viftable[vifi].v_ifp != ifp; vifi++)
|
|
|
|
;
|
|
|
|
if (vifi >= numvifs)
|
2003-08-07 18:16:59 +00:00
|
|
|
return 0; /* The iif is not found: ignore the packet. */
|
|
|
|
|
|
|
|
if (rt->mfc_flags[vifi] & MRT_MFC_FLAGS_DISABLE_WRONGVIF)
|
|
|
|
return 0; /* WRONGVIF disabled: ignore the packet */
|
2003-08-05 17:01:33 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
GET_TIME(now);
|
|
|
|
|
2006-01-24 17:09:12 +00:00
|
|
|
TV_DELTA(now, rt->mfc_last_assert, delta);
|
1995-06-13 17:51:16 +00:00
|
|
|
|
|
|
|
if (delta > ASSERT_MSG_TIME) {
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct sockaddr_in k_igmpsrc = { sizeof k_igmpsrc, AF_INET };
|
|
|
|
struct igmpmsg *im;
|
|
|
|
int hlen = ip->ip_hl << 2;
|
|
|
|
struct mbuf *mm = m_copy(m, 0, hlen);
|
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mm && (M_HASCL(mm) || mm->m_len < hlen))
|
|
|
|
mm = m_pullup(mm, hlen);
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (mm == NULL)
|
1995-06-13 17:51:16 +00:00
|
|
|
return ENOBUFS;
|
|
|
|
|
|
|
|
rt->mfc_last_assert = now;
|
|
|
|
|
|
|
|
im = mtod(mm, struct igmpmsg *);
|
|
|
|
im->im_msgtype = IGMPMSG_WRONGVIF;
|
|
|
|
im->im_mbz = 0;
|
|
|
|
im->im_vif = vifi;
|
|
|
|
|
2003-08-05 17:01:33 +00:00
|
|
|
mrtstat.mrts_upcalls++;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
2003-08-05 17:01:33 +00:00
|
|
|
k_igmpsrc.sin_addr = im->im_src;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (socket_send(ip_mrouter, mm, &k_igmpsrc) < 0) {
|
|
|
|
log(LOG_WARNING,
|
|
|
|
"ip_mforward: ip_mrouter socket queue full\n");
|
|
|
|
++mrtstat.mrts_upq_sockfull;
|
|
|
|
return ENOBUFS;
|
|
|
|
}
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
/* If I sourced this packet, it counts as output, else it was input. */
|
|
|
|
if (ip->ip_src.s_addr == viftable[vifi].v_lcl_addr.s_addr) {
|
|
|
|
viftable[vifi].v_pkt_out++;
|
|
|
|
viftable[vifi].v_bytes_out += plen;
|
|
|
|
} else {
|
|
|
|
viftable[vifi].v_pkt_in++;
|
|
|
|
viftable[vifi].v_bytes_in += plen;
|
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
rt->mfc_pkt_cnt++;
|
1995-06-13 17:51:16 +00:00
|
|
|
rt->mfc_byte_cnt += plen;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* For each vif, decide if a copy of the packet should be forwarded.
|
|
|
|
* Forward if:
|
|
|
|
* - the ttl exceeds the vif's threshold
|
|
|
|
* - there are group members downstream on interface
|
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
for (vifi = 0; vifi < numvifs; vifi++)
|
|
|
|
if ((rt->mfc_ttls[vifi] > 0) && (ip->ip_ttl > rt->mfc_ttls[vifi])) {
|
|
|
|
viftable[vifi].v_pkt_out++;
|
|
|
|
viftable[vifi].v_bytes_out += plen;
|
2003-08-07 18:16:59 +00:00
|
|
|
if (viftable[vifi].v_flags & VIFF_REGISTER)
|
|
|
|
pim_register_send(ip, viftable + vifi, m, rt);
|
|
|
|
else
|
2007-02-10 13:59:13 +00:00
|
|
|
phyint_send(ip, viftable + vifi, m);
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Perform upcall-related bw measuring.
|
|
|
|
*/
|
|
|
|
if (rt->mfc_bw_meter != NULL) {
|
|
|
|
struct bw_meter *x;
|
|
|
|
struct timeval now;
|
|
|
|
|
|
|
|
GET_TIME(now);
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK_ASSERT();
|
2003-08-07 18:16:59 +00:00
|
|
|
for (x = rt->mfc_bw_meter; x != NULL; x = x->bm_mfc_next)
|
|
|
|
bw_meter_receive_packet(x, plen, &now);
|
|
|
|
}
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
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
2002-11-15 22:53:53 +00:00
|
|
|
* check if a vif number is legal/ok. This is used by ip_output.
|
1994-09-06 22:42:31 +00:00
|
|
|
*/
|
1995-11-14 20:34:56 +00:00
|
|
|
static int
|
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
2002-11-15 22:53:53 +00:00
|
|
|
X_legal_vif_num(int vif)
|
1995-06-13 17:51:16 +00:00
|
|
|
{
|
2003-09-06 04:53:43 +00:00
|
|
|
/* XXX unlocked, matter? */
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return (vif >= 0 && vif < numvifs);
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
|
|
|
* Return the local address used by this vif
|
|
|
|
*/
|
1995-11-14 20:34:56 +00:00
|
|
|
static u_long
|
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
2002-11-15 22:53:53 +00:00
|
|
|
X_ip_mcast_src(int vifi)
|
1995-06-13 17:51:16 +00:00
|
|
|
{
|
2003-09-06 04:53:43 +00:00
|
|
|
/* XXX unlocked, matter? */
|
1995-06-13 17:51:16 +00:00
|
|
|
if (vifi >= 0 && vifi < numvifs)
|
|
|
|
return viftable[vifi].v_lcl_addr.s_addr;
|
|
|
|
else
|
|
|
|
return INADDR_ANY;
|
|
|
|
}
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
static void
|
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
2002-11-15 22:53:53 +00:00
|
|
|
phyint_send(struct ip *ip, struct vif *vifp, struct mbuf *m)
|
1994-09-06 22:42:31 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct mbuf *mb_copy;
|
|
|
|
int hlen = ip->ip_hl << 2;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK_ASSERT();
|
|
|
|
|
1994-10-13 22:12:42 +00:00
|
|
|
/*
|
1995-06-13 17:51:16 +00:00
|
|
|
* Make a new reference to the packet; make sure that
|
|
|
|
* the IP header is actually copied, not just referenced,
|
|
|
|
* so that ip_output() only scribbles on the copy.
|
1994-10-13 22:12:42 +00:00
|
|
|
*/
|
2003-08-07 18:16:59 +00:00
|
|
|
mb_copy = m_copypacket(m, M_DONTWAIT);
|
1995-06-13 17:51:16 +00:00
|
|
|
if (mb_copy && (M_HASCL(mb_copy) || mb_copy->m_len < hlen))
|
|
|
|
mb_copy = m_pullup(mb_copy, hlen);
|
1994-10-13 22:12:42 +00:00
|
|
|
if (mb_copy == NULL)
|
1995-06-13 17:51:16 +00:00
|
|
|
return;
|
1994-10-13 22:12:42 +00:00
|
|
|
|
2007-02-08 22:58:01 +00:00
|
|
|
send_packet(vifp, mb_copy);
|
1994-09-06 22:42:31 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1995-06-13 17:51:16 +00:00
|
|
|
static void
|
2007-02-08 22:58:01 +00:00
|
|
|
send_packet(struct vif *vifp, struct mbuf *m)
|
1994-09-06 22:42:31 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct ip_moptions imo;
|
2006-05-18 19:51:08 +00:00
|
|
|
struct in_multi *imm[2];
|
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
2002-11-15 22:53:53 +00:00
|
|
|
int error;
|
2007-02-08 22:58:01 +00:00
|
|
|
|
|
|
|
VIF_LOCK_ASSERT();
|
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
2002-11-15 22:53:53 +00:00
|
|
|
|
1995-08-23 18:20:17 +00:00
|
|
|
imo.imo_multicast_ifp = vifp->v_ifp;
|
|
|
|
imo.imo_multicast_ttl = mtod(m, struct ip *)->ip_ttl - 1;
|
|
|
|
imo.imo_multicast_loop = 1;
|
|
|
|
imo.imo_multicast_vif = -1;
|
2006-05-18 19:51:08 +00:00
|
|
|
imo.imo_num_memberships = 0;
|
|
|
|
imo.imo_max_memberships = 2;
|
|
|
|
imo.imo_membership = &imm[0];
|
1995-08-23 18:20:17 +00:00
|
|
|
|
1996-04-18 15:41:11 +00:00
|
|
|
/*
|
|
|
|
* Re-entrancy should not be a problem here, because
|
|
|
|
* the packets that we send out and are looped back at us
|
|
|
|
* should get rejected because they appear to come from
|
|
|
|
* the loopback interface, thus preventing looping.
|
|
|
|
*/
|
2007-02-08 23:05:08 +00:00
|
|
|
error = ip_output(m, NULL, &vifp->v_route, IP_FORWARDING, &imo, NULL);
|
2007-02-08 22:58:01 +00:00
|
|
|
if (mrtdebug & DEBUG_XMIT) {
|
2005-12-15 21:57:32 +00:00
|
|
|
log(LOG_DEBUG, "phyint_send on vif %td err %d\n",
|
|
|
|
vifp - viftable, error);
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static int
|
|
|
|
X_ip_rsvp_vif(struct socket *so, struct sockopt *sopt)
|
1995-06-13 17:51:16 +00:00
|
|
|
{
|
2003-09-06 04:53:43 +00:00
|
|
|
int error, vifi;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
|
|
|
if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
error = sooptcopyin(sopt, &vifi, sizeof vifi, sizeof vifi);
|
1998-08-23 03:07:17 +00:00
|
|
|
if (error)
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return error;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (vifi < 0 || vifi >= numvifs) { /* Error if vif is invalid */
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
return EADDRNOTAVAIL;
|
|
|
|
}
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (sopt->sopt_name == IP_RSVP_VIF_ON) {
|
|
|
|
/* Check if socket is available. */
|
|
|
|
if (viftable[vifi].v_rsvpd != NULL) {
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_UNLOCK();
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return EADDRINUSE;
|
1998-08-23 03:07:17 +00:00
|
|
|
}
|
1995-06-13 17:51:16 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
viftable[vifi].v_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 (!viftable[vifi].v_rsvp_on) {
|
|
|
|
viftable[vifi].v_rsvp_on = 1;
|
|
|
|
rsvp_on++;
|
|
|
|
}
|
|
|
|
} else { /* must be VIF_OFF */
|
2002-06-26 21:00:53 +00:00
|
|
|
/*
|
|
|
|
* XXX as an additional consistency check, one could make sure
|
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
2002-11-15 22:53:53 +00:00
|
|
|
* that viftable[vifi].v_rsvpd == so, otherwise passing so as
|
2002-06-26 21:00:53 +00:00
|
|
|
* first parameter is pretty useless.
|
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
viftable[vifi].v_rsvpd = NULL;
|
1998-08-23 03:07:17 +00:00
|
|
|
/*
|
|
|
|
* This may seem silly, but we need to be sure we don't over-decrement
|
|
|
|
* the RSVP counter, in case something slips up.
|
|
|
|
*/
|
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
2002-11-15 22:53:53 +00:00
|
|
|
if (viftable[vifi].v_rsvp_on) {
|
|
|
|
viftable[vifi].v_rsvp_on = 0;
|
|
|
|
rsvp_on--;
|
1998-08-23 03:07:17 +00:00
|
|
|
}
|
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
2002-11-15 22:53:53 +00:00
|
|
|
}
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_UNLOCK();
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return 0;
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static void
|
|
|
|
X_ip_rsvp_force_done(struct socket *so)
|
1995-06-13 17:51:16 +00:00
|
|
|
{
|
|
|
|
int vifi;
|
|
|
|
|
|
|
|
/* Don't bother if it is not the right type of socket. */
|
|
|
|
if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP)
|
|
|
|
return;
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
|
|
|
|
/* The socket may be attached to more than one vif...this
|
|
|
|
* is perfectly legal.
|
|
|
|
*/
|
|
|
|
for (vifi = 0; vifi < numvifs; vifi++) {
|
|
|
|
if (viftable[vifi].v_rsvpd == so) {
|
|
|
|
viftable[vifi].v_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 (viftable[vifi].v_rsvp_on) {
|
|
|
|
viftable[vifi].v_rsvp_on = 0;
|
|
|
|
rsvp_on--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
static void
|
|
|
|
X_rsvp_input(struct mbuf *m, int off)
|
1995-06-13 17:51:16 +00:00
|
|
|
{
|
|
|
|
int vifi;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
struct ip *ip = mtod(m, struct ip *);
|
|
|
|
struct sockaddr_in rsvp_src = { sizeof rsvp_src, AF_INET };
|
1995-07-24 18:15:13 +00:00
|
|
|
struct ifnet *ifp;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
|
|
|
if (rsvpdebug)
|
|
|
|
printf("rsvp_input: rsvp_on %d\n",rsvp_on);
|
|
|
|
|
|
|
|
/* Can still get packets with rsvp_on = 0 if there is a local member
|
|
|
|
* of the group to which the RSVP packet is addressed. But in this
|
|
|
|
* case we want to throw the packet away.
|
|
|
|
*/
|
|
|
|
if (!rsvp_on) {
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rsvpdebug)
|
|
|
|
printf("rsvp_input: check vifs\n");
|
|
|
|
|
1995-07-24 18:15:13 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
2003-04-08 14:25:47 +00:00
|
|
|
M_ASSERTPKTHDR(m);
|
1995-07-24 18:15:13 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
ifp = m->m_pkthdr.rcvif;
|
2003-09-06 04:53:43 +00:00
|
|
|
|
|
|
|
VIF_LOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
/* Find which vif the packet arrived on. */
|
2000-09-17 13:50:12 +00:00
|
|
|
for (vifi = 0; vifi < numvifs; vifi++)
|
1995-06-13 17:51:16 +00:00
|
|
|
if (viftable[vifi].v_ifp == ifp)
|
2000-09-17 13:50:12 +00:00
|
|
|
break;
|
1995-06-13 17:51:16 +00:00
|
|
|
|
2000-09-17 13:50:12 +00:00
|
|
|
if (vifi == numvifs || viftable[vifi].v_rsvpd == NULL) {
|
2003-09-06 04:53:43 +00:00
|
|
|
/*
|
|
|
|
* Drop the lock here to avoid holding it across rip_input.
|
|
|
|
* This could make rsvpdebug printfs wrong. If you care,
|
|
|
|
* record the state of stuff before dropping the lock.
|
|
|
|
*/
|
|
|
|
VIF_UNLOCK();
|
2000-09-17 13:50:12 +00:00
|
|
|
/*
|
|
|
|
* If the old-style non-vif-associated socket is set,
|
|
|
|
* then use it. Otherwise, drop packet since there
|
|
|
|
* is no specific socket for this vif.
|
|
|
|
*/
|
|
|
|
if (ip_rsvpd != NULL) {
|
1995-06-13 17:51:16 +00:00
|
|
|
if (rsvpdebug)
|
2000-09-17 13:50:12 +00:00
|
|
|
printf("rsvp_input: Sending packet up old-style socket\n");
|
2001-09-03 20:03:55 +00:00
|
|
|
rip_input(m, off); /* xxx */
|
2000-09-17 13:50:12 +00:00
|
|
|
} else {
|
|
|
|
if (rsvpdebug && vifi == numvifs)
|
|
|
|
printf("rsvp_input: Can't find vif for packet.\n");
|
|
|
|
else if (rsvpdebug && viftable[vifi].v_rsvpd == NULL)
|
|
|
|
printf("rsvp_input: No socket defined for vif %d\n",vifi);
|
1995-06-13 17:51:16 +00:00
|
|
|
m_freem(m);
|
2000-09-17 13:50:12 +00:00
|
|
|
}
|
|
|
|
return;
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
|
|
|
rsvp_src.sin_addr = ip->ip_src;
|
|
|
|
|
|
|
|
if (rsvpdebug && m)
|
1995-11-14 20:34:56 +00:00
|
|
|
printf("rsvp_input: m->m_len = %d, sbspace() = %ld\n",
|
1995-06-13 17:51:16 +00:00
|
|
|
m->m_len,sbspace(&(viftable[vifi].v_rsvpd->so_rcv)));
|
|
|
|
|
1999-05-06 18:13:11 +00:00
|
|
|
if (socket_send(viftable[vifi].v_rsvpd, m, &rsvp_src) < 0) {
|
1995-06-13 17:51:16 +00:00
|
|
|
if (rsvpdebug)
|
|
|
|
printf("rsvp_input: Failed to append to socket\n");
|
1999-05-06 18:13:11 +00:00
|
|
|
} else {
|
1995-06-13 17:51:16 +00:00
|
|
|
if (rsvpdebug)
|
|
|
|
printf("rsvp_input: send packet up\n");
|
1999-05-06 18:13:11 +00:00
|
|
|
}
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_UNLOCK();
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Code for bandwidth monitors
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Define common interface for timeval-related methods
|
|
|
|
*/
|
|
|
|
#define BW_TIMEVALCMP(tvp, uvp, cmp) timevalcmp((tvp), (uvp), cmp)
|
|
|
|
#define BW_TIMEVALDECR(vvp, uvp) timevalsub((vvp), (uvp))
|
|
|
|
#define BW_TIMEVALADD(vvp, uvp) timevaladd((vvp), (uvp))
|
|
|
|
|
|
|
|
static uint32_t
|
|
|
|
compute_bw_meter_flags(struct bw_upcall *req)
|
|
|
|
{
|
|
|
|
uint32_t flags = 0;
|
|
|
|
|
|
|
|
if (req->bu_flags & BW_UPCALL_UNIT_PACKETS)
|
|
|
|
flags |= BW_METER_UNIT_PACKETS;
|
|
|
|
if (req->bu_flags & BW_UPCALL_UNIT_BYTES)
|
|
|
|
flags |= BW_METER_UNIT_BYTES;
|
|
|
|
if (req->bu_flags & BW_UPCALL_GEQ)
|
|
|
|
flags |= BW_METER_GEQ;
|
|
|
|
if (req->bu_flags & BW_UPCALL_LEQ)
|
|
|
|
flags |= BW_METER_LEQ;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
return flags;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Add a bw_meter entry
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
add_bw_upcall(struct bw_upcall *req)
|
|
|
|
{
|
|
|
|
struct mfc *mfc;
|
|
|
|
struct timeval delta = { BW_UPCALL_THRESHOLD_INTERVAL_MIN_SEC,
|
|
|
|
BW_UPCALL_THRESHOLD_INTERVAL_MIN_USEC };
|
|
|
|
struct timeval now;
|
|
|
|
struct bw_meter *x;
|
|
|
|
uint32_t flags;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (!(mrt_api_config & MRT_MFC_BW_UPCALL))
|
|
|
|
return EOPNOTSUPP;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Test if the flags are valid */
|
|
|
|
if (!(req->bu_flags & (BW_UPCALL_UNIT_PACKETS | BW_UPCALL_UNIT_BYTES)))
|
|
|
|
return EINVAL;
|
|
|
|
if (!(req->bu_flags & (BW_UPCALL_GEQ | BW_UPCALL_LEQ)))
|
|
|
|
return EINVAL;
|
|
|
|
if ((req->bu_flags & (BW_UPCALL_GEQ | BW_UPCALL_LEQ))
|
|
|
|
== (BW_UPCALL_GEQ | BW_UPCALL_LEQ))
|
|
|
|
return EINVAL;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Test if the threshold time interval is valid */
|
|
|
|
if (BW_TIMEVALCMP(&req->bu_threshold.b_time, &delta, <))
|
|
|
|
return EINVAL;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
flags = compute_bw_meter_flags(req);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find if we have already same bw_meter entry
|
|
|
|
*/
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
mfc = mfc_find(req->bu_src.s_addr, req->bu_dst.s_addr);
|
|
|
|
if (mfc == NULL) {
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
return EADDRNOTAVAIL;
|
|
|
|
}
|
|
|
|
for (x = mfc->mfc_bw_meter; x != NULL; x = x->bm_mfc_next) {
|
|
|
|
if ((BW_TIMEVALCMP(&x->bm_threshold.b_time,
|
|
|
|
&req->bu_threshold.b_time, ==)) &&
|
|
|
|
(x->bm_threshold.b_packets == req->bu_threshold.b_packets) &&
|
|
|
|
(x->bm_threshold.b_bytes == req->bu_threshold.b_bytes) &&
|
|
|
|
(x->bm_flags & BW_METER_USER_FLAGS) == flags) {
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
return 0; /* XXX Already installed */
|
|
|
|
}
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Allocate the new bw_meter entry */
|
|
|
|
x = (struct bw_meter *)malloc(sizeof(*x), M_BWMETER, M_NOWAIT);
|
2003-09-06 04:53:43 +00:00
|
|
|
if (x == NULL) {
|
|
|
|
MFC_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
return ENOBUFS;
|
2003-09-06 04:53:43 +00:00
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Set the new bw_meter entry */
|
|
|
|
x->bm_threshold.b_time = req->bu_threshold.b_time;
|
|
|
|
GET_TIME(now);
|
|
|
|
x->bm_start_time = now;
|
|
|
|
x->bm_threshold.b_packets = req->bu_threshold.b_packets;
|
|
|
|
x->bm_threshold.b_bytes = req->bu_threshold.b_bytes;
|
|
|
|
x->bm_measured.b_packets = 0;
|
|
|
|
x->bm_measured.b_bytes = 0;
|
|
|
|
x->bm_flags = flags;
|
|
|
|
x->bm_time_next = NULL;
|
|
|
|
x->bm_time_hash = BW_METER_BUCKETS;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Add the new bw_meter entry to the front of entries for this MFC */
|
|
|
|
x->bm_mfc = mfc;
|
|
|
|
x->bm_mfc_next = mfc->mfc_bw_meter;
|
|
|
|
mfc->mfc_bw_meter = x;
|
|
|
|
schedule_bw_meter(x, &now);
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
free_bw_list(struct bw_meter *list)
|
|
|
|
{
|
|
|
|
while (list != NULL) {
|
|
|
|
struct bw_meter *x = list;
|
|
|
|
|
|
|
|
list = list->bm_mfc_next;
|
|
|
|
unschedule_bw_meter(x);
|
|
|
|
free(x, M_BWMETER);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Delete one or multiple bw_meter entries
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
del_bw_upcall(struct bw_upcall *req)
|
|
|
|
{
|
|
|
|
struct mfc *mfc;
|
|
|
|
struct bw_meter *x;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (!(mrt_api_config & MRT_MFC_BW_UPCALL))
|
|
|
|
return EOPNOTSUPP;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Find the corresponding MFC entry */
|
|
|
|
mfc = mfc_find(req->bu_src.s_addr, req->bu_dst.s_addr);
|
|
|
|
if (mfc == NULL) {
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
return EADDRNOTAVAIL;
|
|
|
|
} else if (req->bu_flags & BW_UPCALL_DELETE_ALL) {
|
|
|
|
/*
|
|
|
|
* Delete all bw_meter entries for this mfc
|
|
|
|
*/
|
|
|
|
struct bw_meter *list;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
list = mfc->mfc_bw_meter;
|
|
|
|
mfc->mfc_bw_meter = NULL;
|
|
|
|
free_bw_list(list);
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
return 0;
|
|
|
|
} else { /* Delete a single bw_meter entry */
|
|
|
|
struct bw_meter *prev;
|
|
|
|
uint32_t flags = 0;
|
|
|
|
|
|
|
|
flags = compute_bw_meter_flags(req);
|
|
|
|
|
|
|
|
/* Find the bw_meter entry to delete */
|
|
|
|
for (prev = NULL, x = mfc->mfc_bw_meter; x != NULL;
|
2004-08-03 02:01:44 +00:00
|
|
|
prev = x, x = x->bm_mfc_next) {
|
2003-08-07 18:16:59 +00:00
|
|
|
if ((BW_TIMEVALCMP(&x->bm_threshold.b_time,
|
|
|
|
&req->bu_threshold.b_time, ==)) &&
|
|
|
|
(x->bm_threshold.b_packets == req->bu_threshold.b_packets) &&
|
|
|
|
(x->bm_threshold.b_bytes == req->bu_threshold.b_bytes) &&
|
|
|
|
(x->bm_flags & BW_METER_USER_FLAGS) == flags)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (x != NULL) { /* Delete entry from the list for this MFC */
|
|
|
|
if (prev != NULL)
|
|
|
|
prev->bm_mfc_next = x->bm_mfc_next; /* remove from middle*/
|
|
|
|
else
|
|
|
|
x->bm_mfc->mfc_bw_meter = x->bm_mfc_next;/* new head of list */
|
|
|
|
|
|
|
|
unschedule_bw_meter(x);
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Free the bw_meter entry */
|
|
|
|
free(x, M_BWMETER);
|
|
|
|
return 0;
|
|
|
|
} else {
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* NOTREACHED */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Perform bandwidth measurement processing that may result in an upcall
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
bw_meter_receive_packet(struct bw_meter *x, int plen, struct timeval *nowp)
|
|
|
|
{
|
|
|
|
struct timeval delta;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK_ASSERT();
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
delta = *nowp;
|
|
|
|
BW_TIMEVALDECR(&delta, &x->bm_start_time);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (x->bm_flags & BW_METER_GEQ) {
|
|
|
|
/*
|
|
|
|
* Processing for ">=" type of bw_meter entry
|
|
|
|
*/
|
|
|
|
if (BW_TIMEVALCMP(&delta, &x->bm_threshold.b_time, >)) {
|
|
|
|
/* Reset the bw_meter entry */
|
|
|
|
x->bm_start_time = *nowp;
|
|
|
|
x->bm_measured.b_packets = 0;
|
|
|
|
x->bm_measured.b_bytes = 0;
|
|
|
|
x->bm_flags &= ~BW_METER_UPCALL_DELIVERED;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Record that a packet is received */
|
|
|
|
x->bm_measured.b_packets++;
|
|
|
|
x->bm_measured.b_bytes += plen;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Test if we should deliver an upcall
|
|
|
|
*/
|
2004-08-16 18:32:07 +00:00
|
|
|
if (!(x->bm_flags & BW_METER_UPCALL_DELIVERED)) {
|
2003-08-07 18:16:59 +00:00
|
|
|
if (((x->bm_flags & BW_METER_UNIT_PACKETS) &&
|
|
|
|
(x->bm_measured.b_packets >= x->bm_threshold.b_packets)) ||
|
|
|
|
((x->bm_flags & BW_METER_UNIT_BYTES) &&
|
|
|
|
(x->bm_measured.b_bytes >= x->bm_threshold.b_bytes))) {
|
|
|
|
/* Prepare an upcall for delivery */
|
|
|
|
bw_meter_prepare_upcall(x, nowp);
|
|
|
|
x->bm_flags |= BW_METER_UPCALL_DELIVERED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (x->bm_flags & BW_METER_LEQ) {
|
|
|
|
/*
|
|
|
|
* Processing for "<=" type of bw_meter entry
|
|
|
|
*/
|
|
|
|
if (BW_TIMEVALCMP(&delta, &x->bm_threshold.b_time, >)) {
|
|
|
|
/*
|
|
|
|
* We are behind time with the multicast forwarding table
|
|
|
|
* scanning for "<=" type of bw_meter entries, so test now
|
|
|
|
* if we should deliver an upcall.
|
|
|
|
*/
|
|
|
|
if (((x->bm_flags & BW_METER_UNIT_PACKETS) &&
|
|
|
|
(x->bm_measured.b_packets <= x->bm_threshold.b_packets)) ||
|
|
|
|
((x->bm_flags & BW_METER_UNIT_BYTES) &&
|
|
|
|
(x->bm_measured.b_bytes <= x->bm_threshold.b_bytes))) {
|
|
|
|
/* Prepare an upcall for delivery */
|
|
|
|
bw_meter_prepare_upcall(x, nowp);
|
|
|
|
}
|
|
|
|
/* Reschedule the bw_meter entry */
|
|
|
|
unschedule_bw_meter(x);
|
|
|
|
schedule_bw_meter(x, nowp);
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Record that a packet is received */
|
|
|
|
x->bm_measured.b_packets++;
|
|
|
|
x->bm_measured.b_bytes += plen;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Test if we should restart the measuring interval
|
|
|
|
*/
|
|
|
|
if ((x->bm_flags & BW_METER_UNIT_PACKETS &&
|
|
|
|
x->bm_measured.b_packets <= x->bm_threshold.b_packets) ||
|
|
|
|
(x->bm_flags & BW_METER_UNIT_BYTES &&
|
|
|
|
x->bm_measured.b_bytes <= x->bm_threshold.b_bytes)) {
|
|
|
|
/* Don't restart the measuring interval */
|
|
|
|
} else {
|
|
|
|
/* Do restart the measuring interval */
|
|
|
|
/*
|
|
|
|
* XXX: note that we don't unschedule and schedule, because this
|
|
|
|
* might be too much overhead per packet. Instead, when we process
|
|
|
|
* all entries for a given timer hash bin, we check whether it is
|
|
|
|
* really a timeout. If not, we reschedule at that time.
|
|
|
|
*/
|
|
|
|
x->bm_start_time = *nowp;
|
|
|
|
x->bm_measured.b_packets = 0;
|
|
|
|
x->bm_measured.b_bytes = 0;
|
|
|
|
x->bm_flags &= ~BW_METER_UPCALL_DELIVERED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Prepare a bandwidth-related upcall
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
bw_meter_prepare_upcall(struct bw_meter *x, struct timeval *nowp)
|
|
|
|
{
|
|
|
|
struct timeval delta;
|
|
|
|
struct bw_upcall *u;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK_ASSERT();
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
2004-08-16 18:32:07 +00:00
|
|
|
* Compute the measured time interval
|
2003-08-07 18:16:59 +00:00
|
|
|
*/
|
|
|
|
delta = *nowp;
|
|
|
|
BW_TIMEVALDECR(&delta, &x->bm_start_time);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* If there are too many pending upcalls, deliver them now
|
|
|
|
*/
|
|
|
|
if (bw_upcalls_n >= BW_UPCALLS_MAX)
|
|
|
|
bw_upcalls_send();
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Set the bw_upcall entry
|
|
|
|
*/
|
|
|
|
u = &bw_upcalls[bw_upcalls_n++];
|
|
|
|
u->bu_src = x->bm_mfc->mfc_origin;
|
|
|
|
u->bu_dst = x->bm_mfc->mfc_mcastgrp;
|
|
|
|
u->bu_threshold.b_time = x->bm_threshold.b_time;
|
|
|
|
u->bu_threshold.b_packets = x->bm_threshold.b_packets;
|
|
|
|
u->bu_threshold.b_bytes = x->bm_threshold.b_bytes;
|
|
|
|
u->bu_measured.b_time = delta;
|
|
|
|
u->bu_measured.b_packets = x->bm_measured.b_packets;
|
|
|
|
u->bu_measured.b_bytes = x->bm_measured.b_bytes;
|
|
|
|
u->bu_flags = 0;
|
|
|
|
if (x->bm_flags & BW_METER_UNIT_PACKETS)
|
|
|
|
u->bu_flags |= BW_UPCALL_UNIT_PACKETS;
|
|
|
|
if (x->bm_flags & BW_METER_UNIT_BYTES)
|
|
|
|
u->bu_flags |= BW_UPCALL_UNIT_BYTES;
|
|
|
|
if (x->bm_flags & BW_METER_GEQ)
|
|
|
|
u->bu_flags |= BW_UPCALL_GEQ;
|
|
|
|
if (x->bm_flags & BW_METER_LEQ)
|
|
|
|
u->bu_flags |= BW_UPCALL_LEQ;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Send the pending bandwidth-related upcalls
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
bw_upcalls_send(void)
|
|
|
|
{
|
|
|
|
struct mbuf *m;
|
|
|
|
int len = bw_upcalls_n * sizeof(bw_upcalls[0]);
|
|
|
|
struct sockaddr_in k_igmpsrc = { sizeof k_igmpsrc, AF_INET };
|
|
|
|
static struct igmpmsg igmpmsg = { 0, /* unused1 */
|
|
|
|
0, /* unused2 */
|
|
|
|
IGMPMSG_BW_UPCALL,/* im_msgtype */
|
|
|
|
0, /* im_mbz */
|
|
|
|
0, /* im_vif */
|
|
|
|
0, /* unused3 */
|
|
|
|
{ 0 }, /* im_src */
|
|
|
|
{ 0 } }; /* im_dst */
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK_ASSERT();
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (bw_upcalls_n == 0)
|
|
|
|
return; /* No pending upcalls */
|
|
|
|
|
|
|
|
bw_upcalls_n = 0;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Allocate a new mbuf, initialize it with the header and
|
|
|
|
* the payload for the pending calls.
|
|
|
|
*/
|
2005-11-02 13:46:32 +00:00
|
|
|
MGETHDR(m, M_DONTWAIT, MT_DATA);
|
2003-08-07 18:16:59 +00:00
|
|
|
if (m == NULL) {
|
|
|
|
log(LOG_WARNING, "bw_upcalls_send: cannot allocate mbuf\n");
|
|
|
|
return;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
m->m_len = m->m_pkthdr.len = 0;
|
|
|
|
m_copyback(m, 0, sizeof(struct igmpmsg), (caddr_t)&igmpmsg);
|
|
|
|
m_copyback(m, sizeof(struct igmpmsg), len, (caddr_t)&bw_upcalls[0]);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Send the upcalls
|
|
|
|
* XXX do we need to set the address in k_igmpsrc ?
|
|
|
|
*/
|
|
|
|
mrtstat.mrts_upcalls++;
|
|
|
|
if (socket_send(ip_mrouter, m, &k_igmpsrc) < 0) {
|
|
|
|
log(LOG_WARNING, "bw_upcalls_send: ip_mrouter socket queue full\n");
|
|
|
|
++mrtstat.mrts_upq_sockfull;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Compute the timeout hash value for the bw_meter entries
|
|
|
|
*/
|
|
|
|
#define BW_METER_TIMEHASH(bw_meter, hash) \
|
|
|
|
do { \
|
|
|
|
struct timeval next_timeval = (bw_meter)->bm_start_time; \
|
|
|
|
\
|
|
|
|
BW_TIMEVALADD(&next_timeval, &(bw_meter)->bm_threshold.b_time); \
|
|
|
|
(hash) = next_timeval.tv_sec; \
|
|
|
|
if (next_timeval.tv_usec) \
|
|
|
|
(hash)++; /* XXX: make sure we don't timeout early */ \
|
|
|
|
(hash) %= BW_METER_BUCKETS; \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Schedule a timer to process periodically bw_meter entry of type "<="
|
|
|
|
* by linking the entry in the proper hash bucket.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
schedule_bw_meter(struct bw_meter *x, struct timeval *nowp)
|
|
|
|
{
|
2003-09-06 04:53:43 +00:00
|
|
|
int time_hash;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK_ASSERT();
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (!(x->bm_flags & BW_METER_LEQ))
|
|
|
|
return; /* XXX: we schedule timers only for "<=" entries */
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Reset the bw_meter entry
|
|
|
|
*/
|
|
|
|
x->bm_start_time = *nowp;
|
|
|
|
x->bm_measured.b_packets = 0;
|
|
|
|
x->bm_measured.b_bytes = 0;
|
|
|
|
x->bm_flags &= ~BW_METER_UPCALL_DELIVERED;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Compute the timeout hash value and insert the entry
|
|
|
|
*/
|
|
|
|
BW_METER_TIMEHASH(x, time_hash);
|
|
|
|
x->bm_time_next = bw_meter_timers[time_hash];
|
|
|
|
bw_meter_timers[time_hash] = x;
|
|
|
|
x->bm_time_hash = time_hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unschedule the periodic timer that processes bw_meter entry of type "<="
|
|
|
|
* by removing the entry from the proper hash bucket.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
unschedule_bw_meter(struct bw_meter *x)
|
|
|
|
{
|
|
|
|
int time_hash;
|
|
|
|
struct bw_meter *prev, *tmp;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK_ASSERT();
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (!(x->bm_flags & BW_METER_LEQ))
|
|
|
|
return; /* XXX: we schedule timers only for "<=" entries */
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Compute the timeout hash value and delete the entry
|
|
|
|
*/
|
|
|
|
time_hash = x->bm_time_hash;
|
|
|
|
if (time_hash >= BW_METER_BUCKETS)
|
|
|
|
return; /* Entry was not scheduled */
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
for (prev = NULL, tmp = bw_meter_timers[time_hash];
|
|
|
|
tmp != NULL; prev = tmp, tmp = tmp->bm_time_next)
|
|
|
|
if (tmp == x)
|
|
|
|
break;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (tmp == NULL)
|
|
|
|
panic("unschedule_bw_meter: bw_meter entry not found");
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (prev != NULL)
|
|
|
|
prev->bm_time_next = x->bm_time_next;
|
|
|
|
else
|
|
|
|
bw_meter_timers[time_hash] = x->bm_time_next;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
x->bm_time_next = NULL;
|
|
|
|
x->bm_time_hash = BW_METER_BUCKETS;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Process all "<=" type of bw_meter that should be processed now,
|
|
|
|
* and for each entry prepare an upcall if necessary. Each processed
|
|
|
|
* entry is rescheduled again for the (periodic) processing.
|
|
|
|
*
|
|
|
|
* This is run periodically (once per second normally). On each round,
|
|
|
|
* all the potentially matching entries are in the hash slot that we are
|
|
|
|
* looking at.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
bw_meter_process()
|
|
|
|
{
|
|
|
|
static uint32_t last_tv_sec; /* last time we processed this */
|
|
|
|
|
|
|
|
uint32_t loops;
|
2003-09-06 04:53:43 +00:00
|
|
|
int i;
|
2003-08-07 18:16:59 +00:00
|
|
|
struct timeval now, process_endtime;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
GET_TIME(now);
|
|
|
|
if (last_tv_sec == now.tv_sec)
|
|
|
|
return; /* nothing to do */
|
|
|
|
|
|
|
|
loops = now.tv_sec - last_tv_sec;
|
|
|
|
last_tv_sec = now.tv_sec;
|
|
|
|
if (loops > BW_METER_BUCKETS)
|
|
|
|
loops = BW_METER_BUCKETS;
|
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Process all bins of bw_meter entries from the one after the last
|
|
|
|
* processed to the current one. On entry, i points to the last bucket
|
|
|
|
* visited, so we need to increment i at the beginning of the loop.
|
|
|
|
*/
|
2003-08-19 17:22:51 +00:00
|
|
|
for (i = (now.tv_sec - loops) % BW_METER_BUCKETS; loops > 0; loops--) {
|
2003-08-07 18:16:59 +00:00
|
|
|
struct bw_meter *x, *tmp_list;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (++i >= BW_METER_BUCKETS)
|
|
|
|
i = 0;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-19 17:22:51 +00:00
|
|
|
/* Disconnect the list of bw_meter entries from the bin */
|
2003-08-07 18:16:59 +00:00
|
|
|
tmp_list = bw_meter_timers[i];
|
|
|
|
bw_meter_timers[i] = NULL;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-19 17:22:51 +00:00
|
|
|
/* Process the list of bw_meter entries */
|
2003-08-07 18:16:59 +00:00
|
|
|
while (tmp_list != NULL) {
|
|
|
|
x = tmp_list;
|
|
|
|
tmp_list = tmp_list->bm_time_next;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Test if the time interval is over */
|
|
|
|
process_endtime = x->bm_start_time;
|
|
|
|
BW_TIMEVALADD(&process_endtime, &x->bm_threshold.b_time);
|
|
|
|
if (BW_TIMEVALCMP(&process_endtime, &now, >)) {
|
|
|
|
/* Not yet: reschedule, but don't reset */
|
|
|
|
int time_hash;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
BW_METER_TIMEHASH(x, time_hash);
|
2003-08-19 17:22:51 +00:00
|
|
|
if (time_hash == i && process_endtime.tv_sec == now.tv_sec) {
|
|
|
|
/*
|
|
|
|
* XXX: somehow the bin processing is a bit ahead of time.
|
|
|
|
* Put the entry in the next bin.
|
|
|
|
*/
|
|
|
|
if (++time_hash >= BW_METER_BUCKETS)
|
|
|
|
time_hash = 0;
|
|
|
|
}
|
2003-08-07 18:16:59 +00:00
|
|
|
x->bm_time_next = bw_meter_timers[time_hash];
|
|
|
|
bw_meter_timers[time_hash] = x;
|
|
|
|
x->bm_time_hash = time_hash;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
continue;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Test if we should deliver an upcall
|
|
|
|
*/
|
|
|
|
if (((x->bm_flags & BW_METER_UNIT_PACKETS) &&
|
|
|
|
(x->bm_measured.b_packets <= x->bm_threshold.b_packets)) ||
|
|
|
|
((x->bm_flags & BW_METER_UNIT_BYTES) &&
|
|
|
|
(x->bm_measured.b_bytes <= x->bm_threshold.b_bytes))) {
|
|
|
|
/* Prepare an upcall for delivery */
|
|
|
|
bw_meter_prepare_upcall(x, &now);
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Reschedule for next processing
|
|
|
|
*/
|
|
|
|
schedule_bw_meter(x, &now);
|
|
|
|
}
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Send all upcalls that are pending delivery */
|
|
|
|
bw_upcalls_send();
|
2003-09-06 04:53:43 +00:00
|
|
|
|
|
|
|
MFC_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* A periodic function for sending all upcalls that are pending delivery
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
expire_bw_upcalls_send(void *unused)
|
|
|
|
{
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_LOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
bw_upcalls_send();
|
2003-09-06 04:53:43 +00:00
|
|
|
MFC_UNLOCK();
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
callout_reset(&bw_upcalls_ch, BW_UPCALLS_PERIOD,
|
|
|
|
expire_bw_upcalls_send, NULL);
|
2003-08-07 18:16:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* A periodic function for periodic scanning of the multicast forwarding
|
|
|
|
* table for processing all "<=" bw_meter entries.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
expire_bw_meter_process(void *unused)
|
|
|
|
{
|
|
|
|
if (mrt_api_config & MRT_MFC_BW_UPCALL)
|
|
|
|
bw_meter_process();
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
callout_reset(&bw_meter_ch, BW_METER_PERIOD, expire_bw_meter_process, NULL);
|
2003-08-07 18:16:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* End of bandwidth monitoring code
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Send the packet up to the user daemon, or eventually do kernel encapsulation
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
pim_register_send(struct ip *ip, struct vif *vifp,
|
|
|
|
struct mbuf *m, struct mfc *rt)
|
|
|
|
{
|
|
|
|
struct mbuf *mb_copy, *mm;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (mrtdebug & DEBUG_PIM)
|
2004-08-16 18:32:07 +00:00
|
|
|
log(LOG_DEBUG, "pim_register_send: ");
|
|
|
|
|
2007-02-10 14:48:42 +00:00
|
|
|
/*
|
|
|
|
* Do not send IGMP_WHOLEPKT notifications to userland, if the
|
|
|
|
* rendezvous point was unspecified, and we were told not to.
|
|
|
|
*/
|
|
|
|
if (pim_squelch_wholepkt != 0 && (mrt_api_config & MRT_MFC_RP) &&
|
|
|
|
(rt->mfc_rp.s_addr == INADDR_ANY))
|
|
|
|
return 0;
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
mb_copy = pim_register_prepare(ip, m);
|
|
|
|
if (mb_copy == NULL)
|
|
|
|
return ENOBUFS;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Send all the fragments. Note that the mbuf for each fragment
|
|
|
|
* is freed by the sending machinery.
|
|
|
|
*/
|
|
|
|
for (mm = mb_copy; mm; mm = mb_copy) {
|
|
|
|
mb_copy = mm->m_nextpkt;
|
|
|
|
mm->m_nextpkt = 0;
|
|
|
|
mm = m_pullup(mm, sizeof(struct ip));
|
|
|
|
if (mm != NULL) {
|
|
|
|
ip = mtod(mm, struct ip *);
|
|
|
|
if ((mrt_api_config & MRT_MFC_RP) &&
|
|
|
|
(rt->mfc_rp.s_addr != INADDR_ANY)) {
|
|
|
|
pim_register_send_rp(ip, vifp, mm, rt);
|
|
|
|
} else {
|
|
|
|
pim_register_send_upcall(ip, vifp, mm, rt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return a copy of the data packet that is ready for PIM Register
|
|
|
|
* encapsulation.
|
|
|
|
* XXX: Note that in the returned copy the IP header is a valid one.
|
|
|
|
*/
|
|
|
|
static struct mbuf *
|
|
|
|
pim_register_prepare(struct ip *ip, struct mbuf *m)
|
|
|
|
{
|
|
|
|
struct mbuf *mb_copy = NULL;
|
|
|
|
int mtu;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-19 17:22:51 +00:00
|
|
|
/* Take care of delayed checksums */
|
2003-08-07 18:16:59 +00:00
|
|
|
if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
|
|
|
|
in_delayed_cksum(m);
|
|
|
|
m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
|
|
|
|
}
|
2003-08-19 17:22:51 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Copy the old packet & pullup its IP header into the
|
|
|
|
* new mbuf so we can modify it.
|
|
|
|
*/
|
|
|
|
mb_copy = m_copypacket(m, M_DONTWAIT);
|
|
|
|
if (mb_copy == NULL)
|
|
|
|
return NULL;
|
|
|
|
mb_copy = m_pullup(mb_copy, ip->ip_hl << 2);
|
|
|
|
if (mb_copy == NULL)
|
|
|
|
return NULL;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* take care of the TTL */
|
|
|
|
ip = mtod(mb_copy, struct ip *);
|
|
|
|
--ip->ip_ttl;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Compute the MTU after the PIM Register encapsulation */
|
|
|
|
mtu = 0xffff - sizeof(pim_encap_iphdr) - sizeof(pim_encap_pimhdr);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-19 17:22:51 +00:00
|
|
|
if (ip->ip_len <= mtu) {
|
|
|
|
/* Turn the IP header into a valid one */
|
|
|
|
ip->ip_len = htons(ip->ip_len);
|
|
|
|
ip->ip_off = htons(ip->ip_off);
|
|
|
|
ip->ip_sum = 0;
|
|
|
|
ip->ip_sum = in_cksum(mb_copy, ip->ip_hl << 2);
|
|
|
|
} else {
|
|
|
|
/* Fragment the packet */
|
|
|
|
if (ip_fragment(ip, &mb_copy, mtu, 0, CSUM_DELAY_IP) != 0) {
|
|
|
|
m_freem(mb_copy);
|
|
|
|
return NULL;
|
|
|
|
}
|
2003-08-07 18:16:59 +00:00
|
|
|
}
|
|
|
|
return mb_copy;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Send an upcall with the data packet to the user-level process.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
pim_register_send_upcall(struct ip *ip, struct vif *vifp,
|
|
|
|
struct mbuf *mb_copy, struct mfc *rt)
|
|
|
|
{
|
|
|
|
struct mbuf *mb_first;
|
|
|
|
int len = ntohs(ip->ip_len);
|
|
|
|
struct igmpmsg *im;
|
|
|
|
struct sockaddr_in k_igmpsrc = { sizeof k_igmpsrc, AF_INET };
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK_ASSERT();
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Add a new mbuf with an upcall header
|
|
|
|
*/
|
2005-11-02 13:46:32 +00:00
|
|
|
MGETHDR(mb_first, M_DONTWAIT, MT_DATA);
|
2003-08-07 18:16:59 +00:00
|
|
|
if (mb_first == NULL) {
|
|
|
|
m_freem(mb_copy);
|
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
mb_first->m_data += max_linkhdr;
|
|
|
|
mb_first->m_pkthdr.len = len + sizeof(struct igmpmsg);
|
|
|
|
mb_first->m_len = sizeof(struct igmpmsg);
|
|
|
|
mb_first->m_next = mb_copy;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Send message to routing daemon */
|
|
|
|
im = mtod(mb_first, struct igmpmsg *);
|
|
|
|
im->im_msgtype = IGMPMSG_WHOLEPKT;
|
|
|
|
im->im_mbz = 0;
|
|
|
|
im->im_vif = vifp - viftable;
|
|
|
|
im->im_src = ip->ip_src;
|
|
|
|
im->im_dst = ip->ip_dst;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
k_igmpsrc.sin_addr = ip->ip_src;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
mrtstat.mrts_upcalls++;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (socket_send(ip_mrouter, mb_first, &k_igmpsrc) < 0) {
|
|
|
|
if (mrtdebug & DEBUG_PIM)
|
|
|
|
log(LOG_WARNING,
|
|
|
|
"mcast: pim_register_send_upcall: ip_mrouter socket queue full");
|
|
|
|
++mrtstat.mrts_upq_sockfull;
|
|
|
|
return ENOBUFS;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Keep statistics */
|
|
|
|
pimstat.pims_snd_registers_msgs++;
|
|
|
|
pimstat.pims_snd_registers_bytes += len;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Encapsulate the data packet in PIM Register message and send it to the RP.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
pim_register_send_rp(struct ip *ip, struct vif *vifp,
|
|
|
|
struct mbuf *mb_copy, struct mfc *rt)
|
|
|
|
{
|
|
|
|
struct mbuf *mb_first;
|
|
|
|
struct ip *ip_outer;
|
|
|
|
struct pim_encap_pimhdr *pimhdr;
|
|
|
|
int len = ntohs(ip->ip_len);
|
|
|
|
vifi_t vifi = rt->mfc_parent;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK_ASSERT();
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if ((vifi >= numvifs) || (viftable[vifi].v_lcl_addr.s_addr == 0)) {
|
|
|
|
m_freem(mb_copy);
|
|
|
|
return EADDRNOTAVAIL; /* The iif vif is invalid */
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Add a new mbuf with the encapsulating header
|
|
|
|
*/
|
2005-11-02 13:46:32 +00:00
|
|
|
MGETHDR(mb_first, M_DONTWAIT, MT_DATA);
|
2003-08-07 18:16:59 +00:00
|
|
|
if (mb_first == NULL) {
|
|
|
|
m_freem(mb_copy);
|
|
|
|
return ENOBUFS;
|
|
|
|
}
|
|
|
|
mb_first->m_data += max_linkhdr;
|
|
|
|
mb_first->m_len = sizeof(pim_encap_iphdr) + sizeof(pim_encap_pimhdr);
|
|
|
|
mb_first->m_next = mb_copy;
|
|
|
|
|
|
|
|
mb_first->m_pkthdr.len = len + mb_first->m_len;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Fill in the encapsulating IP and PIM header
|
|
|
|
*/
|
|
|
|
ip_outer = mtod(mb_first, struct ip *);
|
|
|
|
*ip_outer = pim_encap_iphdr;
|
2004-08-14 15:32:40 +00:00
|
|
|
ip_outer->ip_id = ip_newid();
|
2003-08-07 18:16:59 +00:00
|
|
|
ip_outer->ip_len = len + sizeof(pim_encap_iphdr) + sizeof(pim_encap_pimhdr);
|
|
|
|
ip_outer->ip_src = viftable[vifi].v_lcl_addr;
|
|
|
|
ip_outer->ip_dst = rt->mfc_rp;
|
|
|
|
/*
|
|
|
|
* Copy the inner header TOS to the outer header, and take care of the
|
|
|
|
* IP_DF bit.
|
|
|
|
*/
|
|
|
|
ip_outer->ip_tos = ip->ip_tos;
|
|
|
|
if (ntohs(ip->ip_off) & IP_DF)
|
|
|
|
ip_outer->ip_off |= IP_DF;
|
|
|
|
pimhdr = (struct pim_encap_pimhdr *)((caddr_t)ip_outer
|
|
|
|
+ sizeof(pim_encap_iphdr));
|
|
|
|
*pimhdr = pim_encap_pimhdr;
|
|
|
|
/* If the iif crosses a border, set the Border-bit */
|
|
|
|
if (rt->mfc_flags[vifi] & MRT_MFC_FLAGS_BORDER_VIF & mrt_api_config)
|
|
|
|
pimhdr->flags |= htonl(PIM_BORDER_REGISTER);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
mb_first->m_data += sizeof(pim_encap_iphdr);
|
|
|
|
pimhdr->pim.pim_cksum = in_cksum(mb_first, sizeof(pim_encap_pimhdr));
|
|
|
|
mb_first->m_data -= sizeof(pim_encap_iphdr);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2007-02-08 22:58:01 +00:00
|
|
|
send_packet(vifp, mb_first);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Keep statistics */
|
|
|
|
pimstat.pims_snd_registers_msgs++;
|
|
|
|
pimstat.pims_snd_registers_bytes += len;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-02-10 13:59:13 +00:00
|
|
|
/*
|
2007-02-24 11:38:47 +00:00
|
|
|
* pim_encapcheck() is called by the encap[46]_input() path at runtime to
|
2007-02-10 13:59:13 +00:00
|
|
|
* determine if a packet is for PIM; allowing PIM to be dynamically loaded
|
|
|
|
* into the kernel.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
pim_encapcheck(const struct mbuf *m, int off, int proto, void *arg)
|
|
|
|
{
|
|
|
|
|
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
KASSERT(proto == IPPROTO_PIM, ("not for IPPROTO_PIM"));
|
|
|
|
#endif
|
|
|
|
if (proto != IPPROTO_PIM)
|
|
|
|
return 0; /* not for us; reject the datagram. */
|
|
|
|
|
|
|
|
return 64; /* claim the datagram. */
|
|
|
|
}
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* PIM-SMv2 and PIM-DM messages processing.
|
|
|
|
* Receives and verifies the PIM control messages, and passes them
|
|
|
|
* up to the listening socket, using rip_input().
|
|
|
|
* The only message with special processing is the PIM_REGISTER message
|
|
|
|
* (used by PIM-SM): the PIM header is stripped off, and the inner packet
|
|
|
|
* is passed to if_simloop().
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
pim_input(struct mbuf *m, int off)
|
|
|
|
{
|
|
|
|
struct ip *ip = mtod(m, struct ip *);
|
|
|
|
struct pim *pim;
|
|
|
|
int minlen;
|
|
|
|
int datalen = ip->ip_len;
|
|
|
|
int ip_tos;
|
|
|
|
int iphlen = off;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Keep statistics */
|
|
|
|
pimstat.pims_rcv_total_msgs++;
|
|
|
|
pimstat.pims_rcv_total_bytes += datalen;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Validate lengths
|
|
|
|
*/
|
|
|
|
if (datalen < PIM_MINLEN) {
|
|
|
|
pimstat.pims_rcv_tooshort++;
|
|
|
|
log(LOG_ERR, "pim_input: packet size too small %d from %lx\n",
|
|
|
|
datalen, (u_long)ip->ip_src.s_addr);
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* If the packet is at least as big as a REGISTER, go agead
|
|
|
|
* and grab the PIM REGISTER header size, to avoid another
|
|
|
|
* possible m_pullup() later.
|
2004-08-16 18:32:07 +00:00
|
|
|
*
|
2003-08-07 18:16:59 +00:00
|
|
|
* PIM_MINLEN == pimhdr + u_int32_t == 4 + 4 = 8
|
|
|
|
* PIM_REG_MINLEN == pimhdr + reghdr + encap_iphdr == 4 + 4 + 20 = 28
|
|
|
|
*/
|
|
|
|
minlen = iphlen + (datalen >= PIM_REG_MINLEN ? PIM_REG_MINLEN : PIM_MINLEN);
|
|
|
|
/*
|
|
|
|
* Get the IP and PIM headers in contiguous memory, and
|
|
|
|
* possibly the PIM REGISTER header.
|
|
|
|
*/
|
|
|
|
if ((m->m_flags & M_EXT || m->m_len < minlen) &&
|
|
|
|
(m = m_pullup(m, minlen)) == 0) {
|
|
|
|
log(LOG_ERR, "pim_input: m_pullup failure\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* m_pullup() may have given us a new mbuf so reset ip. */
|
|
|
|
ip = mtod(m, struct ip *);
|
|
|
|
ip_tos = ip->ip_tos;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* adjust mbuf to point to the PIM header */
|
|
|
|
m->m_data += iphlen;
|
|
|
|
m->m_len -= iphlen;
|
|
|
|
pim = mtod(m, struct pim *);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Validate checksum. If PIM REGISTER, exclude the data packet.
|
|
|
|
*
|
|
|
|
* XXX: some older PIMv2 implementations don't make this distinction,
|
|
|
|
* so for compatibility reason perform the checksum over part of the
|
|
|
|
* message, and if error, then over the whole message.
|
|
|
|
*/
|
|
|
|
if (PIM_VT_T(pim->pim_vt) == PIM_REGISTER && in_cksum(m, PIM_MINLEN) == 0) {
|
|
|
|
/* do nothing, checksum okay */
|
|
|
|
} else if (in_cksum(m, datalen)) {
|
|
|
|
pimstat.pims_rcv_badsum++;
|
|
|
|
if (mrtdebug & DEBUG_PIM)
|
|
|
|
log(LOG_DEBUG, "pim_input: invalid checksum");
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* PIM version check */
|
|
|
|
if (PIM_VT_V(pim->pim_vt) < PIM_VERSION) {
|
|
|
|
pimstat.pims_rcv_badversion++;
|
|
|
|
log(LOG_ERR, "pim_input: incorrect version %d, expecting %d\n",
|
|
|
|
PIM_VT_V(pim->pim_vt), PIM_VERSION);
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* restore mbuf back to the outer IP */
|
|
|
|
m->m_data -= iphlen;
|
|
|
|
m->m_len += iphlen;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (PIM_VT_T(pim->pim_vt) == PIM_REGISTER) {
|
|
|
|
/*
|
|
|
|
* Since this is a REGISTER, we'll make a copy of the register
|
|
|
|
* headers ip + pim + u_int32 + encap_ip, to be passed up to the
|
|
|
|
* routing daemon.
|
|
|
|
*/
|
|
|
|
struct sockaddr_in dst = { sizeof(dst), AF_INET };
|
|
|
|
struct mbuf *mcp;
|
|
|
|
struct ip *encap_ip;
|
|
|
|
u_int32_t *reghdr;
|
2003-09-06 04:53:43 +00:00
|
|
|
struct ifnet *vifp;
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_LOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
if ((reg_vif_num >= numvifs) || (reg_vif_num == VIFI_INVALID)) {
|
2003-09-06 04:53:43 +00:00
|
|
|
VIF_UNLOCK();
|
2003-08-07 18:16:59 +00:00
|
|
|
if (mrtdebug & DEBUG_PIM)
|
|
|
|
log(LOG_DEBUG,
|
|
|
|
"pim_input: register vif not set: %d\n", reg_vif_num);
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
2003-09-06 04:53:43 +00:00
|
|
|
/* XXX need refcnt? */
|
|
|
|
vifp = viftable[reg_vif_num].v_ifp;
|
|
|
|
VIF_UNLOCK();
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Validate length
|
|
|
|
*/
|
|
|
|
if (datalen < PIM_REG_MINLEN) {
|
|
|
|
pimstat.pims_rcv_tooshort++;
|
|
|
|
pimstat.pims_rcv_badregisters++;
|
|
|
|
log(LOG_ERR,
|
|
|
|
"pim_input: register packet size too small %d from %lx\n",
|
|
|
|
datalen, (u_long)ip->ip_src.s_addr);
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
reghdr = (u_int32_t *)(pim + 1);
|
|
|
|
encap_ip = (struct ip *)(reghdr + 1);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (mrtdebug & DEBUG_PIM) {
|
|
|
|
log(LOG_DEBUG,
|
|
|
|
"pim_input[register], encap_ip: %lx -> %lx, encap_ip len %d\n",
|
|
|
|
(u_long)ntohl(encap_ip->ip_src.s_addr),
|
|
|
|
(u_long)ntohl(encap_ip->ip_dst.s_addr),
|
|
|
|
ntohs(encap_ip->ip_len));
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* verify the version number of the inner packet */
|
|
|
|
if (encap_ip->ip_v != IPVERSION) {
|
|
|
|
pimstat.pims_rcv_badregisters++;
|
|
|
|
if (mrtdebug & DEBUG_PIM) {
|
|
|
|
log(LOG_DEBUG, "pim_input: invalid IP version (%d) "
|
|
|
|
"of the inner packet\n", encap_ip->ip_v);
|
|
|
|
}
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* verify the inner packet is destined to a mcast group */
|
|
|
|
if (!IN_MULTICAST(ntohl(encap_ip->ip_dst.s_addr))) {
|
|
|
|
pimstat.pims_rcv_badregisters++;
|
|
|
|
if (mrtdebug & DEBUG_PIM)
|
|
|
|
log(LOG_DEBUG,
|
|
|
|
"pim_input: inner packet of register is not "
|
|
|
|
"multicast %lx\n",
|
|
|
|
(u_long)ntohl(encap_ip->ip_dst.s_addr));
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
2004-03-08 07:47:27 +00:00
|
|
|
|
|
|
|
/* If a NULL_REGISTER, pass it to the daemon */
|
|
|
|
if ((ntohl(*reghdr) & PIM_NULL_REGISTER))
|
|
|
|
goto pim_input_to_daemon;
|
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Copy the TOS from the outer IP header to the inner IP header.
|
|
|
|
*/
|
|
|
|
if (encap_ip->ip_tos != ip_tos) {
|
|
|
|
/* Outer TOS -> inner TOS */
|
|
|
|
encap_ip->ip_tos = ip_tos;
|
|
|
|
/* Recompute the inner header checksum. Sigh... */
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* adjust mbuf to point to the inner IP header */
|
|
|
|
m->m_data += (iphlen + PIM_MINLEN);
|
|
|
|
m->m_len -= (iphlen + PIM_MINLEN);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
encap_ip->ip_sum = 0;
|
|
|
|
encap_ip->ip_sum = in_cksum(m, encap_ip->ip_hl << 2);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* restore mbuf to point back to the outer IP header */
|
|
|
|
m->m_data -= (iphlen + PIM_MINLEN);
|
|
|
|
m->m_len += (iphlen + PIM_MINLEN);
|
|
|
|
}
|
2004-03-08 07:47:27 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Decapsulate the inner IP packet and loopback to forward it
|
2004-08-16 18:32:07 +00:00
|
|
|
* as a normal multicast packet. Also, make a copy of the
|
2003-08-07 18:16:59 +00:00
|
|
|
* outer_iphdr + pimhdr + reghdr + encap_iphdr
|
|
|
|
* to pass to the daemon later, so it can take the appropriate
|
|
|
|
* actions (e.g., send back PIM_REGISTER_STOP).
|
|
|
|
* XXX: here m->m_data points to the outer IP header.
|
|
|
|
*/
|
|
|
|
mcp = m_copy(m, 0, iphlen + PIM_REG_MINLEN);
|
|
|
|
if (mcp == NULL) {
|
|
|
|
log(LOG_ERR,
|
|
|
|
"pim_input: pim register: could not copy register head\n");
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* Keep statistics */
|
|
|
|
/* XXX: registers_bytes include only the encap. mcast pkt */
|
|
|
|
pimstat.pims_rcv_registers_msgs++;
|
|
|
|
pimstat.pims_rcv_registers_bytes += ntohs(encap_ip->ip_len);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* forward the inner ip packet; point m_data at the inner ip.
|
|
|
|
*/
|
|
|
|
m_adj(m, iphlen + PIM_MINLEN);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
if (mrtdebug & DEBUG_PIM) {
|
|
|
|
log(LOG_DEBUG,
|
|
|
|
"pim_input: forwarding decapsulated register: "
|
|
|
|
"src %lx, dst %lx, vif %d\n",
|
|
|
|
(u_long)ntohl(encap_ip->ip_src.s_addr),
|
|
|
|
(u_long)ntohl(encap_ip->ip_dst.s_addr),
|
|
|
|
reg_vif_num);
|
|
|
|
}
|
2003-09-06 04:53:43 +00:00
|
|
|
/* NB: vifp was collected above; can it change on us? */
|
|
|
|
if_simloop(vifp, m, dst.sin_family, 0);
|
2004-08-16 18:32:07 +00:00
|
|
|
|
2003-08-07 18:16:59 +00:00
|
|
|
/* prepare the register head to send to the mrouting daemon */
|
|
|
|
m = mcp;
|
|
|
|
}
|
|
|
|
|
2004-08-16 18:32:07 +00:00
|
|
|
pim_input_to_daemon:
|
2003-08-07 18:16:59 +00:00
|
|
|
/*
|
|
|
|
* Pass the PIM message up to the daemon; if it is a Register message,
|
|
|
|
* pass the 'head' only up to the daemon. This includes the
|
|
|
|
* outer IP header, PIM header, PIM-Register header and the
|
|
|
|
* inner IP header.
|
|
|
|
* XXX: the outer IP header pkt size of a Register is not adjust to
|
|
|
|
* reflect the fact that the inner multicast data is truncated.
|
|
|
|
*/
|
|
|
|
rip_input(m, iphlen);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-02-24 11:38:47 +00:00
|
|
|
/*
|
|
|
|
* XXX: This is common code for dealing with initialization for both
|
|
|
|
* the IPv4 and IPv6 multicast forwarding paths. It could do with cleanup.
|
|
|
|
*/
|
1994-09-14 21:21:29 +00:00
|
|
|
static int
|
2001-07-25 20:15:49 +00:00
|
|
|
ip_mroute_modevent(module_t mod, int type, void *unused)
|
1994-09-14 21:21:29 +00:00
|
|
|
{
|
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
2002-11-15 22:53:53 +00:00
|
|
|
switch (type) {
|
|
|
|
case MOD_LOAD:
|
2003-12-20 18:32:48 +00:00
|
|
|
mtx_init(&mrouter_mtx, "mrouter initialization", NULL, MTX_DEF);
|
|
|
|
MFC_LOCK_INIT();
|
|
|
|
VIF_LOCK_INIT();
|
2003-10-24 00:09:18 +00:00
|
|
|
ip_mrouter_reset();
|
2007-02-10 14:48:42 +00:00
|
|
|
TUNABLE_ULONG_FETCH("net.inet.pim.squelch_wholepkt",
|
|
|
|
&pim_squelch_wholepkt);
|
2007-02-24 11:38:47 +00:00
|
|
|
|
2007-02-10 13:59:13 +00:00
|
|
|
pim_encap_cookie = encap_attach_func(AF_INET, IPPROTO_PIM,
|
|
|
|
pim_encapcheck, &in_pim_protosw, NULL);
|
|
|
|
if (pim_encap_cookie == NULL) {
|
|
|
|
printf("ip_mroute: unable to attach pim encap\n");
|
|
|
|
VIF_LOCK_DESTROY();
|
|
|
|
MFC_LOCK_DESTROY();
|
|
|
|
mtx_destroy(&mrouter_mtx);
|
|
|
|
return (EINVAL);
|
|
|
|
}
|
2007-02-24 11:38:47 +00:00
|
|
|
|
|
|
|
#ifdef INET6
|
|
|
|
pim6_encap_cookie = encap_attach_func(AF_INET6, IPPROTO_PIM,
|
|
|
|
pim_encapcheck, (struct protosw *)&in6_pim_protosw, NULL);
|
|
|
|
if (pim6_encap_cookie == NULL) {
|
|
|
|
printf("ip_mroute: unable to attach pim6 encap\n");
|
|
|
|
if (pim_encap_cookie) {
|
|
|
|
encap_detach(pim_encap_cookie);
|
|
|
|
pim_encap_cookie = NULL;
|
|
|
|
}
|
|
|
|
VIF_LOCK_DESTROY();
|
|
|
|
MFC_LOCK_DESTROY();
|
|
|
|
mtx_destroy(&mrouter_mtx);
|
|
|
|
return (EINVAL);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
ip_mcast_src = X_ip_mcast_src;
|
|
|
|
ip_mforward = X_ip_mforward;
|
|
|
|
ip_mrouter_done = X_ip_mrouter_done;
|
|
|
|
ip_mrouter_get = X_ip_mrouter_get;
|
|
|
|
ip_mrouter_set = X_ip_mrouter_set;
|
2007-02-24 11:38:47 +00:00
|
|
|
|
|
|
|
#ifdef INET6
|
|
|
|
ip6_mforward = X_ip6_mforward;
|
|
|
|
ip6_mrouter_done = X_ip6_mrouter_done;
|
|
|
|
ip6_mrouter_get = X_ip6_mrouter_get;
|
|
|
|
ip6_mrouter_set = X_ip6_mrouter_set;
|
|
|
|
mrt6_ioctl = X_mrt6_ioctl;
|
|
|
|
#endif
|
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
ip_rsvp_force_done = X_ip_rsvp_force_done;
|
|
|
|
ip_rsvp_vif = X_ip_rsvp_vif;
|
2007-02-24 11:38:47 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
legal_vif_num = X_legal_vif_num;
|
|
|
|
mrt_ioctl = X_mrt_ioctl;
|
|
|
|
rsvp_input_p = X_rsvp_input;
|
|
|
|
break;
|
1994-09-14 21:21:29 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
case MOD_UNLOAD:
|
2003-10-24 00:09:18 +00:00
|
|
|
/*
|
|
|
|
* Typically module unload happens after the user-level
|
|
|
|
* process has shutdown the kernel services (the check
|
|
|
|
* below insures someone can't just yank the module out
|
|
|
|
* from under a running process). But if the module is
|
|
|
|
* just loaded and then unloaded w/o starting up a user
|
|
|
|
* process we still need to cleanup.
|
|
|
|
*/
|
2007-02-24 11:38:47 +00:00
|
|
|
if (ip_mrouter
|
|
|
|
#ifdef INET6
|
|
|
|
|| ip6_mrouter
|
|
|
|
#endif
|
|
|
|
)
|
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
2002-11-15 22:53:53 +00:00
|
|
|
return EINVAL;
|
1994-09-14 21:21:29 +00:00
|
|
|
|
2007-02-24 11:38:47 +00:00
|
|
|
#ifdef INET6
|
|
|
|
if (pim6_encap_cookie) {
|
|
|
|
encap_detach(pim6_encap_cookie);
|
|
|
|
pim6_encap_cookie = NULL;
|
|
|
|
}
|
|
|
|
X_ip6_mrouter_done();
|
|
|
|
ip6_mforward = NULL;
|
|
|
|
ip6_mrouter_done = NULL;
|
|
|
|
ip6_mrouter_get = NULL;
|
|
|
|
ip6_mrouter_set = NULL;
|
|
|
|
mrt6_ioctl = NULL;
|
|
|
|
#endif
|
|
|
|
|
2007-02-10 13:59:13 +00:00
|
|
|
if (pim_encap_cookie) {
|
|
|
|
encap_detach(pim_encap_cookie);
|
|
|
|
pim_encap_cookie = NULL;
|
|
|
|
}
|
2003-10-24 00:09:18 +00:00
|
|
|
X_ip_mrouter_done();
|
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
2002-11-15 22:53:53 +00:00
|
|
|
ip_mcast_src = NULL;
|
|
|
|
ip_mforward = NULL;
|
|
|
|
ip_mrouter_done = NULL;
|
|
|
|
ip_mrouter_get = NULL;
|
|
|
|
ip_mrouter_set = NULL;
|
2007-02-24 11:38:47 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
ip_rsvp_force_done = NULL;
|
|
|
|
ip_rsvp_vif = NULL;
|
2007-02-24 11:38:47 +00:00
|
|
|
|
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
2002-11-15 22:53:53 +00:00
|
|
|
legal_vif_num = NULL;
|
|
|
|
mrt_ioctl = NULL;
|
|
|
|
rsvp_input_p = NULL;
|
2007-02-24 11:38:47 +00:00
|
|
|
|
2003-12-20 18:32:48 +00:00
|
|
|
VIF_LOCK_DESTROY();
|
|
|
|
MFC_LOCK_DESTROY();
|
|
|
|
mtx_destroy(&mrouter_mtx);
|
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
2002-11-15 22:53:53 +00:00
|
|
|
break;
|
2007-02-24 11:38:47 +00:00
|
|
|
|
2004-07-15 08:26:07 +00:00
|
|
|
default:
|
|
|
|
return EOPNOTSUPP;
|
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
2002-11-15 22:53:53 +00:00
|
|
|
}
|
|
|
|
return 0;
|
1994-09-14 21:21:29 +00:00
|
|
|
}
|
|
|
|
|
2001-07-25 20:15:49 +00:00
|
|
|
static moduledata_t ip_mroutemod = {
|
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
2002-11-15 22:53:53 +00:00
|
|
|
"ip_mroute",
|
|
|
|
ip_mroute_modevent,
|
|
|
|
0
|
2001-07-25 20:15:49 +00:00
|
|
|
};
|
|
|
|
DECLARE_MODULE(ip_mroute, ip_mroutemod, SI_SUB_PSEUDO, SI_ORDER_ANY);
|