Sorry I didn't commit these files at the commit just a few minutes before.

(IPv6 multicast routing)
I think I mistakenly touched TAB and the last arg sys/netinet6 to
the cvs commit changed to sys/netinet6/in6_proto.c.

5 files changed, 2197 insertions, 1 deletions

diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 8953a5d..083f780 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -403,7 +403,7 @@ ip6_input(m)
 		IN6_LOOKUP_MULTI(ip6->ip6_dst, m->m_pkthdr.rcvif, in6m);
 		if (in6m)
 			ours = 1;
-		else {
+		else if (!ip6_mrouter) {
 			ip6stat.ip6s_notmember++;
 			ip6stat.ip6s_cantforward++;
 			in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard);
@@ -539,6 +539,19 @@ ip6_input(m)
 	 * Forward if desirable.
 	 */
 	if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
+		/*
+		 * If we are acting as a multicast router, all
+		 * incoming multicast packets are passed to the
+		 * kernel-level multicast forwarding function.
+		 * The packet is returned (relatively) intact; if
+		 * ip6_mforward() returns a non-zero value, the packet
+		 * must be discarded, else it may be accepted below.
+		 */
+		if (ip6_mrouter && ip6_mforward(ip6, m->m_pkthdr.rcvif, m)) {
+			ip6stat.ip6s_cantforward++;
+			m_freem(m);
+			return;
+		}
 		if (!ours) {
 			m_freem(m);
 			return;
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
new file mode 100644
index 0000000..1f6b5f2
--- /dev/null
+++ b/sys/netinet6/ip6_mroute.c
@@ -0,0 +1,1661 @@
+/*
+ * Copyright (C) 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * 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.
+ * 3. Neither the name of the project 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 PROJECT 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 PROJECT 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.
+ *
+ * $FreeBSD$
+ */
+
+/*	BSDI ip_mroute.c,v 2.10 1996/11/14 00:29:52 jch Exp	*/
+
+/*
+ * IP multicast forwarding procedures
+ *
+ * Written by David Waitzman, BBN Labs, August 1988.
+ * Modified by Steve Deering, Stanford, February 1989.
+ * Modified by Mark J. Steiglitz, Stanford, May, 1991
+ * Modified by Van Jacobson, LBL, January 1993
+ * Modified by Ajit Thyagarajan, PARC, August 1993
+ * Modified by Bill Fenenr, PARC, April 1994
+ *
+ * MROUTING Revision: 3.5.1.2 + PIM-SMv2 (pimd) Support
+ */
+
+#include "opt_inet.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/sockio.h>
+#include <sys/protosw.h>
+#include <sys/errno.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <sys/sockio.h>
+#include <sys/syslog.h>
+
+#include <net/if.h>
+#include <net/route.h>
+#include <net/raw_cb.h>
+
+#include <netinet/in.h>
+#include <netinet/in_var.h>
+
+#include <netinet6/ip6.h>
+#include <netinet6/ip6_var.h>
+#include <netinet6/ip6_mroute.h>
+#include <netinet6/pim6.h>
+#include <netinet6/pim6_var.h>
+
+static MALLOC_DEFINE(M_MRTABLE, "mf6c", "multicast forwarding cache entry");
+
+#define	M_HASCL(m) ((m)->m_flags & M_EXT)
+
+static int	ip6_mdq __P((struct mbuf *, struct ifnet *, struct mf6c *));
+static void	phyint_send __P((struct ip6_hdr *, struct mif6 *,
+				 struct mbuf *));
+
+static int	set_pim6 __P((int *));
+static int	socket_send __P((struct socket *, struct mbuf *,
+				 struct sockaddr_in6 *));
+static int	register_send __P((struct ip6_hdr *, struct mif6 *,
+				   struct mbuf *));
+
+/*
+ * Globals.  All but ip6_mrouter, ip6_mrtproto and mrt6stat could be static,
+ * except for netstat or debugging purposes.
+ */
+struct	socket	*ip6_mrouter  = NULL;
+int	ip6_mrtproto = IPPROTO_PIM;    /* for netstat only */
+struct	mrt6stat	mrt6stat;
+
+#define	NO_RTE_FOUND 	0x1
+#define	RTE_FOUND	0x2
+
+struct	mf6c	*mf6ctable[MF6CTBLSIZ];
+u_char	nexpire[MF6CTBLSIZ];
+static	struct mif6 mif6table[MAXMIFS];
+#ifdef MRT6DEBUG
+u_int		mrt6debug = 0;	  /* debug level 	*/
+#define	DEBUG_MFC	0x02
+#define	DEBUG_FORWARD	0x04
+#define	DEBUG_EXPIRE	0x08
+#define	DEBUG_XMIT	0x10
+#define	DEBUG_REG       0x20
+#define	DEBUG_PIM       0x40
+#endif
+
+static void	expire_upcalls __P((void *));
+#define	EXPIRE_TIMEOUT	(hz / 4)	/* 4x / second */
+#define	UPCALL_EXPIRE	6		/* number of timeouts */
+
+#ifdef INET
+#ifdef MROUTING
+extern struct socket *ip_mrouter;
+#endif
+#endif
+
+/*
+ * 'Interfaces' associated with decapsulator (so we can tell
+ * packets that went through it from ones that get reflected
+ * by a broken gateway).  These interfaces are never linked into
+ * the system ifnet list & no routes point to them.  I.e., packets
+ * can't be sent this way.  They only exist as a placeholder for
+ * multicast source verification.
+ */
+struct ifnet multicast_register_if;
+
+#define	ENCAP_HOPS 64
+
+/*
+ * Private variables.
+ */
+static mifi_t nummifs = 0;
+static mifi_t reg_mif_num = (mifi_t)-1;
+
+static struct pim6stat pim6stat;
+static struct callout_handle expire_upcalls_ch;
+
+/*
+ * one-back cache used by ipip_input to locate a tunnel's mif
+ * given a datagram's src ip address.
+ */
+static int pim6;
+
+/*
+ * Hash function for a source, group entry
+ */
+#define	MF6CHASH(a, g) MF6CHASHMOD((a).s6_addr32[0] ^ (a).s6_addr32[1] ^ \
+				   (a).s6_addr32[2] ^ (a).s6_addr32[3] ^ \
+				   (g).s6_addr32[0] ^ (g).s6_addr32[1] ^ \
+				   (g).s6_addr32[2] ^ (g).s6_addr32[3])
+
+/*
+ * Find a route for a given origin IPv6 address and Multicast group address.
+ * Quality of service parameter to be added in the future!!!
+ */
+
+#define	MF6CFIND(o, g, rt) { \
+	register struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \
+	rt = NULL; \
+	mrt6stat.mrt6s_mfc_lookups++; \
+	while (_rt) { \
+		if (IN6_ARE_ADDR_EQUAL(&_rt->mf6c_origin.sin6_addr, &(o)) && \
+		    IN6_ARE_ADDR_EQUAL(&_rt->mf6c_mcastgrp.sin6_addr, &(g)) && \
+		    (_rt->mf6c_stall == NULL)) { \
+			rt = _rt; \
+			break; \
+		} \
+		_rt = _rt->mf6c_next; \
+	} \
+	if (rt == NULL) { \
+		mrt6stat.mrt6s_mfc_misses++; \
+	} \
+}
+
+/*
+ * Macros to compute elapsed time efficiently
+ * Borrowed from Van Jacobson's scheduling code
+ */
+#define	TV_DELTA(a, b, delta) { \
+	    register int xxs; \
+		\
+	    delta = (a).tv_usec - (b).tv_usec; \
+	    if ((xxs = (a).tv_sec - (b).tv_sec)) { \
+	       switch (xxs) { \
+		      case 2: \
+			  delta += 1000000; \
+			      /* fall through */ \
+		      case 1: \
+			  delta += 1000000; \
+			  break; \
+		      default: \
+			  delta += (1000000 * xxs); \
+	       } \
+	    } \
+}
+
+#define	TV_LT(a, b) (((a).tv_usec < (b).tv_usec && \
+	      (a).tv_sec <= (b).tv_sec) || (a).tv_sec < (b).tv_sec)
+
+#ifdef UPCALL_TIMING
+#define	UPCALL_MAX	50
+u_long upcall_data[UPCALL_MAX + 1];
+static void collate();
+#endif /* UPCALL_TIMING */
+
+static int get_sg_cnt __P((struct sioc_sg_req6 *));
+static int get_mif6_cnt __P((struct sioc_mif_req6 *));
+static int ip6_mrouter_init __P((struct socket *, struct mbuf *));
+static int add_m6if __P((struct mif6ctl *));
+static int del_m6if __P((mifi_t *));
+static int add_m6fc __P((struct mf6cctl *));
+static int del_m6fc __P((struct mf6cctl *));
+
+/*
+ * Handle MRT setsockopt commands to modify the multicast routing tables.
+ */
+int
+ip6_mrouter_set(so, sopt)
+	struct socket *so;
+	struct sockopt *sopt;
+{
+	int	error = 0;
+	struct mbuf *m;
+
+	if (so != ip6_mrouter && sopt->sopt_name != MRT6_INIT)
+		return (EACCES);
+
+	if ((error = soopt_getm(sopt, &m)) != 0) /* XXX */
+		return (error);
+	if ((error = soopt_mcopyin(sopt, m)) != 0) /* XXX */
+		return (error);
+
+	switch (sopt->sopt_name) {
+	 case MRT6_INIT:
+		 error = ip6_mrouter_init(so, m);
+		 break;
+	 case MRT6_DONE:
+		 error = ip6_mrouter_done();
+		 break;
+	 case MRT6_ADD_MIF:
+		 error = add_m6if(mtod(m, struct mif6ctl *));
+		 break;
+	 case MRT6_DEL_MIF:
+		 error = del_m6if(mtod(m, mifi_t *));
+		 break;
+	 case MRT6_ADD_MFC:
+		 error = add_m6fc(mtod(m, struct mf6cctl *));
+		 break;
+	 case MRT6_DEL_MFC:
+		 error = del_m6fc(mtod(m, struct mf6cctl *));
+		 break;
+	 case MRT6_PIM:
+		 error = set_pim6(mtod(m, int *));
+		 break;
+	 default:
+		 error = EOPNOTSUPP;
+		 break;
+	}
+
+	(void)m_freem(m);
+	return(error);
+}
+
+/*
+ * Handle MRT getsockopt commands
+ */
+int
+ip6_mrouter_get(so, sopt)
+	struct socket *so;
+	struct sockopt *sopt;
+{
+	int error = 0;
+
+	if (so != ip6_mrouter) return EACCES;
+
+	switch (sopt->sopt_name) {
+		case MRT6_PIM:
+			error = sooptcopyout(sopt, &pim6, sizeof(pim6));
+			break;
+	}
+	return (error);
+}
+
+/*
+ * Handle ioctl commands to obtain information from the cache
+ */
+int
+mrt6_ioctl(cmd, data)
+	int cmd;
+	caddr_t data;
+{
+    int error = 0;
+
+    switch (cmd) {
+     case SIOCGETSGCNT_IN6:
+	     return(get_sg_cnt((struct sioc_sg_req6 *)data));
+	     break;		/* for safety */
+     case SIOCGETMIFCNT_IN6:
+	     return(get_mif6_cnt((struct sioc_mif_req6 *)data));
+	     break;		/* for safety */
+     default:
+	     return (EINVAL);
+	     break;
+    }
+    return error;
+}
+
+/*
+ * returns the packet, byte, rpf-failure count for the source group provided
+ */
+static int
+get_sg_cnt(req)
+	register struct sioc_sg_req6 *req;
+{
+	register struct mf6c *rt;
+	int s;
+
+	s = splnet();
+	MF6CFIND(req->src.sin6_addr, req->grp.sin6_addr, rt);
+	splx(s);
+	if (rt != NULL) {
+		req->pktcnt = rt->mf6c_pkt_cnt;
+		req->bytecnt = rt->mf6c_byte_cnt;
+		req->wrong_if = rt->mf6c_wrong_if;
+	} else
+		return(ESRCH);
+
+	return 0;
+}
+
+/*
+ * returns the input and output packet and byte counts on the mif provided
+ */
+static int
+get_mif6_cnt(req)
+	register struct sioc_mif_req6 *req;
+{
+	register mifi_t mifi = req->mifi;
+
+	if (mifi >= nummifs)
+		return EINVAL;
+
+	req->icount = mif6table[mifi].m6_pkt_in;
+	req->ocount = mif6table[mifi].m6_pkt_out;
+	req->ibytes = mif6table[mifi].m6_bytes_in;
+	req->obytes = mif6table[mifi].m6_bytes_out;
+
+	return 0;
+}
+
+static int
+set_pim6(i)
+	int *i;
+{
+	if ((*i != 1) && (*i != 0))
+		return EINVAL;
+
+	pim6 = *i;
+
+	return 0;
+}
+
+/*
+ * Enable multicast routing
+ */
+static int
+ip6_mrouter_init(so, m)
+	struct socket *so;
+	struct mbuf *m;
+{
+	int *v;
+
+#ifdef MRT6DEBUG
+	if (mrt6debug)
+		log(LOG_DEBUG,
+		    "ip6_mrouter_init: so_type = %d, pr_protocol = %d\n",
+		    so->so_type, so->so_proto->pr_protocol);
+#endif
+
+	if (so->so_type != SOCK_RAW ||
+	    so->so_proto->pr_protocol != IPPROTO_ICMPV6)
+		return EOPNOTSUPP;
+
+	if (!m || (m->m_len != sizeof(int *)))
+		return ENOPROTOOPT;
+
+	v = mtod(m, int *);
+	if (*v != 1)
+		return ENOPROTOOPT;
+
+	if (ip6_mrouter != NULL) return EADDRINUSE;
+
+	ip6_mrouter = so;
+
+	bzero((caddr_t)mf6ctable, sizeof(mf6ctable));
+	bzero((caddr_t)nexpire, sizeof(nexpire));
+
+	pim6 = 0;/* used for stubbing out/in pim stuff */
+
+	expire_upcalls_ch =
+		timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT);
+
+#ifdef MRT6DEBUG
+	if (mrt6debug)
+		log(LOG_DEBUG, "ip6_mrouter_init\n");
+#endif
+
+	return 0;
+}
+
+/*
+ * Disable multicast routing
+ */
+int
+ip6_mrouter_done()
+{
+	mifi_t mifi;
+	int i;
+	struct ifnet *ifp;
+	struct in6_ifreq ifr;
+	struct mf6c *rt;
+	struct rtdetq *rte;
+	int s;
+
+	s = splnet();
+
+	/*
+	 * For each phyint in use, disable promiscuous reception of all IPv6
+	 * multicasts.
+	 */
+#ifdef INET
+#ifdef MROUTING
+	/*
+	 * If there is still IPv4 multicast routing daemon,
+	 * we remain interfaces to receive all muliticasted packets.
+	 * XXX: there may be an interface in which the IPv4 multicast
+	 * daemon is not interested...
+	 */
+	if (!ip_mrouter)
+#endif
+#endif
+	{
+		for (mifi = 0; mifi < nummifs; mifi++) {
+			if (mif6table[mifi].m6_ifp &&
+			    !(mif6table[mifi].m6_flags & MIFF_REGISTER)) {
+				ifr.ifr_addr.sin6_family = AF_INET6;
+				ifr.ifr_addr.sin6_addr= in6addr_any;
+				ifp = mif6table[mifi].m6_ifp;
+				(*ifp->if_ioctl)(ifp, SIOCDELMULTI,
+						 (caddr_t)&ifr);
+			}
+		}
+	}
+	bzero((caddr_t)mif6table, sizeof(mif6table));
+	nummifs = 0;
+
+	pim6 = 0; /* used to stub out/in pim specific code */
+
+	untimeout(expire_upcalls, (caddr_t)NULL, expire_upcalls_ch);
+
+	/*
+	 * Free all multicast forwarding cache entries.
+	 */
+	for (i = 0; i < MF6CTBLSIZ; i++) {
+		rt = mf6ctable[i];
+		while (rt) {
+			struct mf6c *frt;
+
+			for (rte = rt->mf6c_stall; rte != NULL; ) {
+				struct rtdetq *n = rte->next;
+
+				m_free(rte->m);
+				free(rte, M_MRTABLE);
+				rte = n;
+			}
+			frt = rt;
+			rt = rt->mf6c_next;
+			free(frt, M_MRTABLE);
+		}
+	}
+
+	bzero((caddr_t)mf6ctable, sizeof(mf6ctable));
+
+	/*
+	 * Reset de-encapsulation cache
+	 */
+	reg_mif_num = -1;
+
+	ip6_mrouter = NULL;
+
+	splx(s);
+
+#ifdef MRT6DEBUG
+	if (mrt6debug)
+		log(LOG_DEBUG, "ip6_mrouter_done\n");
+#endif
+
+	return 0;
+}
+
+static struct sockaddr_in6 sin6 = { sizeof(sin6), AF_INET6 };
+
+/*
+ * Add a mif to the mif table
+ */
+static int
+add_m6if(mifcp)
+	register struct mif6ctl *mifcp;
+{
+	register struct mif6 *mifp;
+	struct ifnet *ifp;
+	int error, s;
+
+	if (mifcp->mif6c_mifi >= MAXMIFS)
+		return EINVAL;
+	mifp = mif6table + mifcp->mif6c_mifi;
+	if (mifp->m6_ifp)
+		return EADDRINUSE; /* XXX: is it appropriate? */
+	if (mifcp->mif6c_pifi == 0 || mifcp->mif6c_pifi > if_index)
+		return ENXIO;
+	ifp = ifindex2ifnet[mifcp->mif6c_pifi];
+
+	if (mifcp->mif6c_flags & MIFF_REGISTER) {
+		if (reg_mif_num == (mifi_t)-1) {
+			multicast_register_if.if_name = "register_mif";
+			multicast_register_if.if_flags |= IFF_LOOPBACK;
+			multicast_register_if.if_index = mifcp->mif6c_mifi;
+			reg_mif_num = mifcp->mif6c_mifi;
+		}
+
+		ifp = &multicast_register_if;
+
+	} /* if REGISTER */
+	else {
+		/* Make sure the interface supports multicast */
+		if ((ifp->if_flags & IFF_MULTICAST) == 0)
+			return EOPNOTSUPP;
+
+		s = splnet();
+		error = if_allmulti(ifp, 1);
+		splx(s);
+		if (error)
+			return error;
+	}
+
+	s = splnet();
+	mifp->m6_flags     = mifcp->mif6c_flags;
+	mifp->m6_ifp       = ifp;
+	/* initialize per mif pkt counters */
+	mifp->m6_pkt_in    = 0;
+	mifp->m6_pkt_out   = 0;
+	mifp->m6_bytes_in  = 0;
+	mifp->m6_bytes_out = 0;
+	splx(s);
+
+	/* Adjust nummifs up if the mifi is higher than nummifs */
+	if (nummifs <= mifcp->mif6c_mifi)
+		nummifs = mifcp->mif6c_mifi + 1;
+
+#ifdef MRT6DEBUG
+	if (mrt6debug)
+		log(LOG_DEBUG,
+		    "add_mif #%d, phyint %s%d\n",
+		    mifcp->mif6c_mifi,
+		    ifp->if_name, ifp->if_unit);
+#endif
+
+	return 0;
+}
+
+/*
+ * Delete a mif from the mif table
+ */
+static int
+del_m6if(mifip)
+	mifi_t *mifip;
+{
+	register struct mif6 *mifp = mif6table + *mifip;
+	register mifi_t mifi;
+	struct ifnet *ifp;
+	int s;
+
+	if (*mifip >= nummifs)
+		return EINVAL;
+	if (mifp->m6_ifp == NULL)
+		return EINVAL;
+
+	s = splnet();
+
+	if (!(mifp->m6_flags & MIFF_REGISTER)) {
+		/*
+		 * XXX: what if there is yet IPv4 multicast daemon
+		 *      using the interface?
+		 */
+		ifp = mifp->m6_ifp;
+
+		if_allmulti(ifp, 0);
+	}
+
+	bzero((caddr_t)mifp, sizeof (*mifp));
+
+	/* Adjust nummifs down */
+	for (mifi = nummifs; mifi > 0; mifi--)
+		if (mif6table[mifi - 1].m6_ifp)
+			break;
+	nummifs = mifi;
+
+	splx(s);
+
+#ifdef MRT6DEBUG
+	if (mrt6debug)
+		log(LOG_DEBUG, "del_m6if %d, nummifs %d\n", *mifip, nummifs);
+#endif
+
+	return 0;
+}
+
+/*
+ * Add an mfc entry
+ */
+static int
+add_m6fc(mfccp)
+	struct mf6cctl *mfccp;
+{
+	struct mf6c *rt;
+	u_long hash;
+	struct rtdetq *rte;
+	register u_short nstl;
+	int s;
+
+	MF6CFIND(mfccp->mf6cc_origin.sin6_addr,
+		 mfccp->mf6cc_mcastgrp.sin6_addr, rt);
+
+	/* If an entry already exists, just update the fields */
+	if (rt) {
+#ifdef MRT6DEBUG
+		if (mrt6debug & DEBUG_MFC)
+			log(LOG_DEBUG,"add_m6fc update o %s g %s p %x\n",
+			    ip6_sprintf(&mfccp->mf6cc_origin.sin6_addr),
+			    ip6_sprintf(&mfccp->mf6cc_mcastgrp.sin6_addr),
+			    mfccp->mf6cc_parent);
+#endif
+
+		s = splnet();
+		rt->mf6c_parent = mfccp->mf6cc_parent;
+		rt->mf6c_ifset = mfccp->mf6cc_ifset;
+		splx(s);
+		return 0;
+	}
+
+	/*
+	 * Find the entry for which the upcall was made and update
+	 */
+	s = splnet();
+	hash = MF6CHASH(mfccp->mf6cc_origin.sin6_addr,
+			mfccp->mf6cc_mcastgrp.sin6_addr);
+	for (rt = mf6ctable[hash], nstl = 0; rt; rt = rt->mf6c_next) {
+		if (IN6_ARE_ADDR_EQUAL(&rt->mf6c_origin.sin6_addr,
+				       &mfccp->mf6cc_origin.sin6_addr) &&
+		    IN6_ARE_ADDR_EQUAL(&rt->mf6c_mcastgrp.sin6_addr,
+				       &mfccp->mf6cc_mcastgrp.sin6_addr) &&
+		    (rt->mf6c_stall != NULL)) {
+
+			if (nstl++)
+				log(LOG_ERR,
+				    "add_m6fc: %s o %s g %s p %x dbx %p\n",
+				    "multiple kernel entries",
+				    ip6_sprintf(&mfccp->mf6cc_origin.sin6_addr),
+				    ip6_sprintf(&mfccp->mf6cc_mcastgrp.sin6_addr),
+				    mfccp->mf6cc_parent, rt->mf6c_stall);
+
+#ifdef MRT6DEBUG
+			if (mrt6debug & DEBUG_MFC)
+				log(LOG_DEBUG,
+				    "add_m6fc o %s g %s p %x dbg %x\n",
+				    ip6_sprintf(&mfccp->mf6cc_origin.sin6_addr),
+				    ip6_sprintf(&mfccp->mf6cc_mcastgrp.sin6_addr),
+				    mfccp->mf6cc_parent, rt->mf6c_stall);
+#endif
+
+			rt->mf6c_origin     = mfccp->mf6cc_origin;
+			rt->mf6c_mcastgrp   = mfccp->mf6cc_mcastgrp;
+			rt->mf6c_parent     = mfccp->mf6cc_parent;
+			rt->mf6c_ifset	    = mfccp->mf6cc_ifset;
+			/* initialize pkt counters per src-grp */
+			rt->mf6c_pkt_cnt    = 0;
+			rt->mf6c_byte_cnt   = 0;
+			rt->mf6c_wrong_if   = 0;
+
+			rt->mf6c_expire = 0;	/* Don't clean this guy up */
+			nexpire[hash]--;
+
+			/* free packets Qed at the end of this entry */
+			for (rte = rt->mf6c_stall; rte != NULL; ) {
+				struct rtdetq *n = rte->next;
+				ip6_mdq(rte->m, rte->ifp, rt);
+				m_freem(rte->m);
+#ifdef UPCALL_TIMING
+				collate(&(rte->t));
+#endif /* UPCALL_TIMING */
+				free(rte, M_MRTABLE);
+				rte = n;
+			}
+			rt->mf6c_stall = NULL;
+		}
+	}
+
+	/*
+	 * It is possible that an entry is being inserted without an upcall
+	 */
+	if (nstl == 0) {
+#ifdef MRT6DEBUG
+		if (mrt6debug & DEBUG_MFC)
+			log(LOG_DEBUG,"add_mfc no upcall h %d o %s g %s p %x\n",
+			    hash,
+			    ip6_sprintf(&mfccp->mf6cc_origin.sin6_addr),
+			    ip6_sprintf(&mfccp->mf6cc_mcastgrp.sin6_addr),
+			    mfccp->mf6cc_parent);
+#endif
+
+		for (rt = mf6ctable[hash]; rt; rt = rt->mf6c_next) {
+
+			if (IN6_ARE_ADDR_EQUAL(&rt->mf6c_origin.sin6_addr,
+					       &mfccp->mf6cc_origin.sin6_addr)&&
+			    IN6_ARE_ADDR_EQUAL(&rt->mf6c_mcastgrp.sin6_addr,
+					       &mfccp->mf6cc_mcastgrp.sin6_addr)) {
+
+				rt->mf6c_origin     = mfccp->mf6cc_origin;
+				rt->mf6c_mcastgrp   = mfccp->mf6cc_mcastgrp;
+				rt->mf6c_parent     = mfccp->mf6cc_parent;
+				/* initialize pkt counters per src-grp */
+				rt->mf6c_pkt_cnt    = 0;
+				rt->mf6c_byte_cnt   = 0;
+				rt->mf6c_wrong_if   = 0;
+
+				if (rt->mf6c_expire)
+					nexpire[hash]--;
+				rt->mf6c_expire	   = 0;
+			}
+		}
+		if (rt == NULL) {
+			/* no upcall, so make a new entry */
+			rt = (struct mf6c *)malloc(sizeof(*rt), M_MRTABLE,
+						  M_NOWAIT);
+			if (rt == NULL) {
+				splx(s);
+				return ENOBUFS;
+			}
+
+			/* insert new entry at head of hash chain */
+			rt->mf6c_origin     = mfccp->mf6cc_origin;
+			rt->mf6c_mcastgrp   = mfccp->mf6cc_mcastgrp;
+			rt->mf6c_parent     = mfccp->mf6cc_parent;
+			/* initialize pkt counters per src-grp */
+			rt->mf6c_pkt_cnt    = 0;
+			rt->mf6c_byte_cnt   = 0;
+			rt->mf6c_wrong_if   = 0;
+			rt->mf6c_expire     = 0;
+			rt->mf6c_stall = NULL;
+
+			/* link into table */
+			rt->mf6c_next  = mf6ctable[hash];
+			mf6ctable[hash] = rt;
+		}
+	}
+	splx(s);
+	return 0;
+}
+
+#ifdef UPCALL_TIMING
+/*
+ * collect delay statistics on the upcalls
+ */
+static void
+collate(t)
+	register struct timeval *t;
+{
+	register u_long d;
+	register struct timeval tp;
+	register u_long delta;
+
+	GET_TIME(tp);
+
+	if (TV_LT(*t, tp))
+	{
+		TV_DELTA(tp, *t, delta);
+
+		d = delta >> 10;
+		if (d > UPCALL_MAX)
+			d = UPCALL_MAX;
+
+		++upcall_data[d];
+	}
+}
+#endif /* UPCALL_TIMING */
+
+/*
+ * Delete an mfc entry
+ */
+static int
+del_m6fc(mfccp)
+	struct mf6cctl *mfccp;
+{
+	struct sockaddr_in6 	origin;
+	struct sockaddr_in6 	mcastgrp;
+	struct mf6c 		*rt;
+	struct mf6c	 	**nptr;
+	u_long 		hash;
+	int s;
+
+	origin = mfccp->mf6cc_origin;
+	mcastgrp = mfccp->mf6cc_mcastgrp;
+	hash = MF6CHASH(origin.sin6_addr, mcastgrp.sin6_addr);
+
+#ifdef MRT6DEBUG
+	if (mrt6debug & DEBUG_MFC)
+		log(LOG_DEBUG,"del_m6fc orig %s mcastgrp %s\n",
+		    ip6_sprintf(&origin.sin6_addr),
+		    ip6_sprintf(&mcastgrp.sin6_addr));
+#endif
+
+	s = splnet();
+
+	nptr = &mf6ctable[hash];
+	while ((rt = *nptr) != NULL) {
+		if (IN6_ARE_ADDR_EQUAL(&origin.sin6_addr,
+				       &rt->mf6c_origin.sin6_addr) &&
+		    IN6_ARE_ADDR_EQUAL(&mcastgrp.sin6_addr,
+				       &rt->mf6c_mcastgrp.sin6_addr) &&
+		    rt->mf6c_stall == NULL)
+			break;
+
+		nptr = &rt->mf6c_next;
+	}
+	if (rt == NULL) {
+		splx(s);
+		return EADDRNOTAVAIL;
+	}
+
+	*nptr = rt->mf6c_next;
+	free(rt, M_MRTABLE);
+
+	splx(s);
+
+	return 0;
+}
+
+static int
+socket_send(s, mm, src)
+	struct socket *s;
+	struct mbuf *mm;
+	struct sockaddr_in6 *src;
+{
+	if (s) {
+		if (sbappendaddr(&s->so_rcv,
+				 (struct sockaddr *)src,
+				 mm, (struct mbuf *)0) != 0) {
+			sorwakeup(s);
+			return 0;
+		}
+	}
+	m_freem(mm);
+	return -1;
+}
+
+/*
+ * IPv6 multicast forwarding function. This function assumes that the packet
+ * pointed to by "ip6" 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 IPv6 multicast group.
+ *
+ * The packet is returned unscathed to the caller, unless it is
+ * erroneous, in which case a non-zero return value tells the caller to
+ * discard it.
+ */
+
+int
+ip6_mforward(ip6, ifp, m)
+	register struct ip6_hdr *ip6;
+	struct ifnet *ifp;
+	struct mbuf *m;
+{
+	register struct mf6c *rt;
+	register struct mif6 *mifp;
+	register struct mbuf *mm;
+	int s;
+	mifi_t mifi;
+
+#ifdef MRT6DEBUG
+	if (mrt6debug & DEBUG_FORWARD)
+		log(LOG_DEBUG, "ip6_mforward: src %s, dst %s, ifindex %d\n",
+		    ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&ip6->ip6_dst),
+		    ifp->if_index);
+#endif
+
+	/*
+	 * Don't forward a packet with Hop limit of zero or one,
+	 * or a packet destined to a local-only group.
+	 */
+	if (ip6->ip6_hlim <= 1 || IN6_IS_ADDR_MC_NODELOCAL(&ip6->ip6_dst) ||
+	    IN6_IS_ADDR_MC_LINKLOCAL(&ip6->ip6_dst))
+		return 0;
+	ip6->ip6_hlim--;
+
+	/*
+	 * Determine forwarding mifs from the forwarding cache table
+	 */
+	s = splnet();
+	MF6CFIND(ip6->ip6_src, ip6->ip6_dst, rt);
+
+	/* Entry exists, so forward if necessary */
+	if (rt) {
+		splx(s);
+		return (ip6_mdq(m, ifp, rt));
+	} else {
+		/*
+		 * If we don't have a route for packet's origin,
+		 * Make a copy of the packet &
+		 * send message to routing daemon
+		 */
+
+		register struct mbuf *mb0;
+		register struct rtdetq *rte;
+		register u_long hash;
+/*	register int i, npkts;*/
+#ifdef UPCALL_TIMING
+		struct timeval tp;
+
+		GET_TIME(tp);
+#endif /* UPCALL_TIMING */
+
+		mrt6stat.mrt6s_no_route++;
+#ifdef MRT6DEBUG
+		if (mrt6debug & (DEBUG_FORWARD | DEBUG_MFC))
+			log(LOG_DEBUG, "ip6_mforward: no rte s %s g %s\n",
+			    ip6_sprintf(&ip6->ip6_src),
+			    ip6_sprintf(&ip6->ip6_dst));
+#endif
+
+		/*
+		 * Allocate mbufs early so that we don't do extra work if we
+		 * are just going to fail anyway.
+		 */
+		rte = (struct rtdetq *)malloc(sizeof(*rte), M_MRTABLE,
+					      M_NOWAIT);
+		if (rte == NULL) {
+			splx(s);
+			return ENOBUFS;
+		}
+		mb0 = m_copy(m, 0, M_COPYALL);
+		/*
+		 * Pullup packet header if needed before storing it,
+		 * as other references may modify it in the meantime.
+		 */
+		if (mb0 &&
+		    (M_HASCL(mb0) || mb0->m_len < sizeof(struct ip6_hdr)))
+			mb0 = m_pullup(mb0, sizeof(struct ip6_hdr));
+		if (mb0 == NULL) {
+			free(rte, M_MRTABLE);
+			splx(s);
+			return ENOBUFS;
+		}
+
+		/* is there an upcall waiting for this packet? */
+		hash = MF6CHASH(ip6->ip6_src, ip6->ip6_dst);
+		for (rt = mf6ctable[hash]; rt; rt = rt->mf6c_next) {
+			if (IN6_ARE_ADDR_EQUAL(&ip6->ip6_src,
+					       &rt->mf6c_origin.sin6_addr) &&
+			    IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst,
+					       &rt->mf6c_mcastgrp.sin6_addr) &&
+			    (rt->mf6c_stall != NULL))
+				break;
+		}
+
+		if (rt == NULL) {
+			struct mrt6msg *im;
+
+			/* no upcall, so make a new entry */
+			rt = (struct mf6c *)malloc(sizeof(*rt), M_MRTABLE,
+						  M_NOWAIT);
+			if (rt == NULL) {
+				free(rte, M_MRTABLE);
+				m_freem(mb0);
+				splx(s);
+				return ENOBUFS;
+			}
+			/*
+			 * Make a copy of the header to send to the user
+			 * level process
+			 */
+			mm = m_copy(mb0, 0, sizeof(struct ip6_hdr));
+
+			if (mm == NULL) {
+				free(rte, M_MRTABLE);
+				m_freem(mb0);
+				free(rt, M_MRTABLE);
+				splx(s);
+				return ENOBUFS;
+			}
+
+			/*
+			 * Send message to routing daemon
+			 */
+			sin6.sin6_addr = ip6->ip6_src;
+
+			im = mtod(mm, struct mrt6msg *);
+			im->im6_msgtype	= MRT6MSG_NOCACHE;
+			im->im6_mbz		= 0;
+
+#ifdef MRT6DEBUG
+			if (mrt6debug & DEBUG_FORWARD)
+				log(LOG_DEBUG,
+				    "getting the iif info in the kernel\n");
+#endif
+
+			for (mifp = mif6table, mifi = 0;
+			     mifi < nummifs && mifp->m6_ifp != ifp;
+			     mifp++, mifi++)
+				;
+
+			im->im6_mif = mifi;
+
+			if (socket_send(ip6_mrouter, mm, &sin6) < 0) {
+				log(LOG_WARNING, "ip6_mforward: ip6_mrouter "
+				    "socket queue full\n");
+				mrt6stat.mrt6s_upq_sockfull++;
+				free(rte, M_MRTABLE);
+				m_freem(mb0);
+				free(rt, M_MRTABLE);
+				splx(s);
+				return ENOBUFS;
+			}
+
+			mrt6stat.mrt6s_upcalls++;
+
+			/* insert new entry at head of hash chain */
+			bzero(rt, sizeof(*rt));
+			rt->mf6c_origin.sin6_family = AF_INET6;
+			rt->mf6c_origin.sin6_len = sizeof(struct sockaddr_in6);
+			rt->mf6c_origin.sin6_addr = ip6->ip6_src;
+			rt->mf6c_mcastgrp.sin6_family = AF_INET6;
+			rt->mf6c_mcastgrp.sin6_len = sizeof(struct sockaddr_in6);
+			rt->mf6c_mcastgrp.sin6_addr = ip6->ip6_dst;
+			rt->mf6c_expire = UPCALL_EXPIRE;
+			nexpire[hash]++;
+			rt->mf6c_parent = MF6C_INCOMPLETE_PARENT;
+
+			/* link into table */
+			rt->mf6c_next  = mf6ctable[hash];
+			mf6ctable[hash] = rt;
+			/* Add this entry to the end of the queue */
+			rt->mf6c_stall = rte;
+		} else {
+			/* determine if q has overflowed */
+			struct rtdetq **p;
+			register int npkts = 0;
+
+			for (p = &rt->mf6c_stall; *p != NULL; p = &(*p)->next)
+				if (++npkts > MAX_UPQ6) {
+					mrt6stat.mrt6s_upq_ovflw++;
+					free(rte, M_MRTABLE);
+					m_freem(mb0);
+					splx(s);
+					return 0;
+				}
+
+			/* Add this entry to the end of the queue */
+			*p = rte;
+		}
+
+		rte->next = NULL;
+		rte->m = mb0;
+		rte->ifp = ifp;
+#ifdef UPCALL_TIMING
+		rte->t = tp;
+#endif /* UPCALL_TIMING */
+
+		splx(s);
+
+		return 0;
+	}
+}
+
+/*
+ * Clean up cache entries if upcalls are not serviced
+ * Call from the Slow Timeout mechanism, every half second.
+ */
+static void
+expire_upcalls(unused)
+	void *unused;
+{
+	struct rtdetq *rte;
+	struct mf6c *mfc, **nptr;
+	int i;
+	int s;
+
+	s = splnet();
+	for (i = 0; i < MF6CTBLSIZ; i++) {
+		if (nexpire[i] == 0)
+			continue;
+		nptr = &mf6ctable[i];
+		while ((mfc = *nptr) != NULL) {
+			rte = mfc->mf6c_stall;
+			/*
+			 * Skip real cache entries
+			 * Make sure it wasn't marked to not expire (shouldn't happen)
+			 * If it expires now
+			 */
+			if (rte != NULL &&
+			    mfc->mf6c_expire != 0 &&
+			    --mfc->mf6c_expire == 0) {
+#ifdef MRT6DEBUG
+				if (mrt6debug & DEBUG_EXPIRE)
+					log(LOG_DEBUG, "expire_upcalls: expiring (%s %s)\n",
+					    ip6_sprintf(&mfc->mf6c_origin.sin6_addr),
+					    ip6_sprintf(&mfc->mf6c_mcastgrp.sin6_addr));
+#endif
+				/*
+				 * drop all the packets
+				 * free the mbuf with the pkt, if, timing info
+				 */
+				do {
+					struct rtdetq *n = rte->next;
+					m_freem(rte->m);
+					free(rte, M_MRTABLE);
+					rte = n;
+				} while (rte != NULL);
+				mrt6stat.mrt6s_cache_cleanups++;
+				nexpire[i]--;
+
+				*nptr = mfc->mf6c_next;
+				free(mfc, M_MRTABLE);
+			} else {
+				nptr = &mfc->mf6c_next;
+			}
+		}
+	}
+	splx(s);
+	expire_upcalls_ch =
+		timeout(expire_upcalls, (caddr_t)NULL, EXPIRE_TIMEOUT);
+}
+
+/*
+ * Packet forwarding routine once entry in the cache is made
+ */
+static int
+ip6_mdq(m, ifp, rt)
+	register struct mbuf *m;
+	register struct ifnet *ifp;
+	register struct mf6c *rt;
+{
+	register struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);
+	register mifi_t mifi, iif;
+	register struct mif6 *mifp;
+	register int plen = m->m_pkthdr.len;
+
+/*
+ * Macro to send packet on mif.  Since RSVP packets don't get counted on
+ * input, they shouldn't get counted on output, so statistics keeping is
+ * seperate.
+ */
+
+#define	MC6_SEND(ip6,mifp,m) {                             	\
+		if ((mifp)->m6_flags & MIFF_REGISTER) 		\
+		    register_send((ip6), (mifp), (m));	 	\
+                else                                     	\
+                    phyint_send((ip6), (mifp), (m));      	\
+}
+
+	/*
+	 * Don't forward if it didn't arrive from the parent mif
+	 * for its origin.
+	 */
+	mifi = rt->mf6c_parent;
+	if ((mifi >= nummifs) || (mif6table[mifi].m6_ifp != ifp)) {
+		/* came in the wrong interface */
+#ifdef MRT6DEBUG
+		if (mrt6debug & DEBUG_FORWARD)
+			log(LOG_DEBUG,
+			    "wrong if: ifid %d mifi %d mififid %x\n",
+			    ifp->if_index, mifi,
+			    mif6table[mifi].m6_ifp->if_index);
+#endif
+		mrt6stat.mrt6s_wrong_if++;
+		rt->mf6c_wrong_if++;
+		/*
+		 * If we are doing PIM processing, and we are forwarding
+		 * packets on this interface, send a message to the
+		 * routing daemon.
+		 */
+		if(mifi < nummifs) /* have to make sure this is a valid mif */
+			if(mif6table[mifi].m6_ifp)
+
+				if (pim6 && (m->m_flags & M_LOOP) == 0) {
+					/*
+					 * Check the M_LOOP flag to avoid an
+					 * unnecessary PIM assert.
+					 * XXX: M_LOOP is an ad-hoc hack...
+					 */
+					static struct sockaddr_in6 sin6 =
+					{ sizeof(sin6), AF_INET6 };
+
+					register struct mbuf *mm;
+					struct mrt6msg *im;
+
+					mm = m_copy(m, 0,
+						    sizeof(struct ip6_hdr));
+					if (mm &&
+					    (M_HASCL(mm) ||
+					     mm->m_len < sizeof(struct ip6_hdr)))
+						mm = m_pullup(mm, sizeof(struct ip6_hdr));
+					if (mm == NULL)
+						return ENOBUFS;
+
+					im = mtod(mm, struct mrt6msg *);
+					im->im6_msgtype	= MRT6MSG_WRONGMIF;
+					im->im6_mbz	= 0;
+
+					for (mifp = mif6table, iif = 0;
+					     iif < nummifs && mifp &&
+						     mifp->m6_ifp != ifp;
+					     mifp++, iif++);
+
+					im->im6_mif	= iif;
+
+					sin6.sin6_addr = im->im6_src;
+
+					mrt6stat.mrt6s_upcalls++;
+
+					if (socket_send(ip6_mrouter, mm,
+							&sin6) < 0) {
+#ifdef MRT6DEBUG
+						if (mrt6debug)
+							log(LOG_WARNING, "mdq, ip6_mrouter socket queue full\n");
+#endif
+						++mrt6stat.mrt6s_upq_sockfull;
+						return ENOBUFS;
+					}	/* if socket Q full */
+				}		/* if PIM */
+		return 0;
+	}			/* if wrong iif */
+
+	/* If I sourced this packet, it counts as output, else it was input. */
+	if (m->m_pkthdr.rcvif == NULL) {
+		/* XXX: is rcvif really NULL when output?? */
+		mif6table[mifi].m6_pkt_out++;
+		mif6table[mifi].m6_bytes_out += plen;
+	} else {
+		mif6table[mifi].m6_pkt_in++;
+		mif6table[mifi].m6_bytes_in += plen;
+	}
+	rt->mf6c_pkt_cnt++;
+	rt->mf6c_byte_cnt += plen;
+
+	/*
+	 * For each mif, forward a copy of the packet if there are group
+	 * members downstream on the interface.
+	 */
+	for (mifp = mif6table, mifi = 0; mifi < nummifs; mifp++, mifi++)
+		if (IF_ISSET(mifi, &rt->mf6c_ifset)) {
+			mifp->m6_pkt_out++;
+			mifp->m6_bytes_out += plen;
+			MC6_SEND(ip6, mifp, m);
+		}
+	return 0;
+}
+
+static void
+phyint_send(ip6, mifp, m)
+    struct ip6_hdr *ip6;
+    struct mif6 *mifp;
+    struct mbuf *m;
+{
+	register struct mbuf *mb_copy;
+	struct ifnet *ifp = mifp->m6_ifp;
+	int error = 0;
+	int s = splnet();
+	static struct route_in6 ro6;
+	struct	in6_multi *in6m;
+
+	/*
+	 * Make a new reference to the packet; make sure that
+	 * the IPv6 header is actually copied, not just referenced,
+	 * so that ip6_output() only scribbles on the copy.
+	 */
+	mb_copy = m_copy(m, 0, M_COPYALL);
+	if (mb_copy &&
+	    (M_HASCL(mb_copy) || mb_copy->m_len < sizeof(struct ip6_hdr)))
+		mb_copy = m_pullup(mb_copy, sizeof(struct ip6_hdr));
+	if (mb_copy == NULL)
+		return;
+	/* set MCAST flag to the outgoing packet */
+	mb_copy->m_flags |= M_MCAST;
+
+	/*
+	 * If we sourced the packet, call ip6_output since we may devide
+	 * the packet into fragments when the packet is too big for the
+	 * outgoing interface.
+	 * Otherwise, we can simply send the packet to the interface
+	 * sending queue.
+	 */
+	if (m->m_pkthdr.rcvif == NULL) {
+		struct ip6_moptions im6o;
+
+		im6o.im6o_multicast_ifp = ifp;
+		/* XXX: ip6_output will override ip6->ip6_hlim */
+		im6o.im6o_multicast_hlim = ip6->ip6_hlim;
+		im6o.im6o_multicast_loop = 1;
+		error = ip6_output(mb_copy, NULL, &ro6,
+				   IPV6_FORWARDING, &im6o, NULL);
+
+#ifdef MRT6DEBUG
+		if (mrt6debug & DEBUG_XMIT)
+			log(LOG_DEBUG, "phyint_send on mif %d err %d\n",
+			    mifp - mif6table, error);
+#endif
+		splx(s);
+		return;
+	}
+
+	/*
+	 * If we belong to the destination multicast group
+	 * on the outgoing interface, loop back a copy.
+	 */
+	IN6_LOOKUP_MULTI(ip6->ip6_dst, ifp, in6m);
+	if (in6m != NULL) {
+		ro6.ro_dst.sin6_len = sizeof(struct sockaddr_in6);
+		ro6.ro_dst.sin6_family = AF_INET6;
+		ro6.ro_dst.sin6_addr = ip6->ip6_dst;
+		ip6_mloopback(ifp, m, &ro6.ro_dst);
+	}
+	/*
+	 * Put the packet into the sending queue of the outgoing interface
+	 * if it would fit in the MTU of the interface.
+	 */
+	if (mb_copy->m_pkthdr.len < ifp->if_mtu || ifp->if_mtu < IPV6_MMTU) {
+		ro6.ro_dst.sin6_len = sizeof(struct sockaddr_in6);
+		ro6.ro_dst.sin6_family = AF_INET6;
+		ro6.ro_dst.sin6_addr = ip6->ip6_dst;
+		/*
+		 * We just call if_output instead of nd6_output here, since
+		 * we need no ND for a multicast forwarded packet...right?
+		 */
+		error = (*ifp->if_output)(ifp, mb_copy,
+					  (struct sockaddr *)&ro6.ro_dst,
+					  NULL);
+#ifdef MRT6DEBUG
+		if (mrt6debug & DEBUG_XMIT)
+			log(LOG_DEBUG, "phyint_send on mif %d err %d\n",
+			    mifp - mif6table, error);
+#endif
+	}
+	else {
+#ifdef MULTICAST_PMTUD
+		icmp6_error(mb_copy, ICMP6_PACKET_TOO_BIG, 0, ifp->if_mtu);
+		return;
+#else
+#ifdef MRT6DEBUG
+		if (mrt6debug & DEBUG_XMIT)
+			log(LOG_DEBUG,
+			    "phyint_send: packet too big on %s%u o %s g %s"
+			    " size %d(discarded)\n",
+			    ifp->if_name, ifp->if_unit,
+			    ip6_sprintf(&ip6->ip6_src),
+			    ip6_sprintf(&ip6->ip6_dst),
+			    mb_copy->m_pkthdr.len);
+#endif /* MRT6DEBUG */
+		m_freem(mb_copy); /* simply discard the packet */
+		return;
+#endif
+	}
+}
+
+static int
+register_send(ip6, mif, m)
+	register struct ip6_hdr *ip6;
+	struct mif6 *mif;
+	register struct mbuf *m;
+{
+	register struct mbuf *mm;
+	register int i, len = m->m_pkthdr.len;
+	static struct sockaddr_in6 sin6 = { sizeof(sin6), AF_INET6 };
+	struct mrt6msg *im6;
+
+#ifdef MRT6DEBUG
+	if (mrt6debug)
+		log(LOG_DEBUG, "** IPv6 register_send **\n src %s dst %s\n",
+		    ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&ip6->ip6_dst));
+#endif
+	++pim6stat.pim6s_snd_registers;
+
+	/* Make a copy of the packet to send to the user level process */
+	MGETHDR(mm, M_DONTWAIT, MT_HEADER);
+	if (mm == NULL)
+		return ENOBUFS;
+	mm->m_data += max_linkhdr;
+	mm->m_len = sizeof(struct ip6_hdr);
+
+	if ((mm->m_next = m_copy(m, 0, M_COPYALL)) == NULL) {
+		m_freem(mm);
+		return ENOBUFS;
+	}
+	i = MHLEN - M_LEADINGSPACE(mm);
+	if (i > len)
+		i = len;
+	mm = m_pullup(mm, i);
+	if (mm == NULL){
+		m_freem(mm);
+		return ENOBUFS;
+	}
+/* TODO: check it! */
+	mm->m_pkthdr.len = len + sizeof(struct ip6_hdr);
+
+	/*
+	 * Send message to routing daemon
+	 */
+	sin6.sin6_addr = ip6->ip6_src;
+
+	im6 = mtod(mm, struct mrt6msg *);
+	im6->im6_msgtype      = MRT6MSG_WHOLEPKT;
+	im6->im6_mbz          = 0;
+
+	im6->im6_mif = mif - mif6table;
+
+	/* iif info is not given for reg. encap.n */
+	mrt6stat.mrt6s_upcalls++;
+
+	if (socket_send(ip6_mrouter, mm, &sin6) < 0) {
+#ifdef MRT6DEBUG
+		if (mrt6debug)
+			log(LOG_WARNING,
+			    "register_send: ip_mrouter socket queue full\n");
+#endif
+                ++mrt6stat.mrt6s_upq_sockfull;
+                return ENOBUFS;
+	}
+	return 0;
+}
+
+/*
+ * PIM sparse mode hook
+ * Receives the pim control messages, and passes them up to the listening
+ * socket, using rip6_input.
+ * The only message processed is the REGISTER pim message; the pim header
+ * is stripped off, and the inner packet is passed to register_mforward.
+ */
+int
+pim6_input(mp, offp, proto)
+	struct mbuf **mp;
+	int *offp, proto;
+{
+        register struct pim *pim; /* pointer to a pim struct */
+        register struct ip6_hdr *ip6;
+        register int pimlen;
+	struct mbuf *m = *mp;
+        int minlen;
+	int off = *offp;
+
+	++pim6stat.pim6s_rcv_total;
+
+        ip6 = mtod(m, struct ip6_hdr *);
+        pimlen = m->m_pkthdr.len - *offp;
+
+        /*
+         * Validate lengths
+         */
+	if (pimlen < PIM_MINLEN) {
+		++pim6stat.pim6s_rcv_tooshort;
+#ifdef MRT6DEBUG
+		if (mrt6debug & DEBUG_PIM)
+			log(LOG_DEBUG,"pim6_input: PIM packet too short\n");
+#endif
+		m_freem(m);
+		return(IPPROTO_DONE);
+	}
+
+	/*
+	 * if the packet is at least as big as a REGISTER, go ahead
+	 * and grab the PIM REGISTER header size, to avoid another
+	 * possible m_pullup() later.
+	 *
+	 * PIM_MINLEN       == pimhdr + u_int32 == 8
+	 * PIM6_REG_MINLEN   == pimhdr + reghdr + eip6hdr == 4 + 4 + 40
+	 */
+	minlen = (pimlen >= PIM6_REG_MINLEN) ? PIM6_REG_MINLEN : PIM_MINLEN;
+
+	/*
+	 * Make sure that the IP6 and PIM headers in contiguous memory, and
+	 * possibly the PIM REGISTER header
+	 */
+	IP6_EXTHDR_CHECK(m, off, minlen, IPPROTO_DONE);
+	/* adjust pointer */
+	ip6 = mtod(m, struct ip6_hdr *);
+
+	/* adjust mbuf to point to the PIM header */
+	pim = (struct pim *)((caddr_t)ip6 + off);
+
+#define	PIM6_CHECKSUM
+#ifdef PIM6_CHECKSUM
+	{
+		int cksumlen;
+
+		/*
+		 * Validate checksum.
+		 * If PIM REGISTER, exclude the data packet
+		 */
+		if (pim->pim_type == PIM_REGISTER)
+			cksumlen = PIM_MINLEN;
+		else
+			cksumlen = pimlen;
+
+		if (in6_cksum(m, IPPROTO_PIM, off, cksumlen)) {
+			++pim6stat.pim6s_rcv_badsum;
+#ifdef MRT6DEBUG
+			if (mrt6debug & DEBUG_PIM)
+				log(LOG_DEBUG,
+				    "pim6_input: invalid checksum\n");
+#endif
+			m_freem(m);
+			return(IPPROTO_DONE);
+		}
+	}
+#endif /* PIM_CHECKSUM */
+
+	/* PIM version check */
+	if (pim->pim_ver != PIM_VERSION) {
+		++pim6stat.pim6s_rcv_badversion;
+#ifdef MRT6DEBUG
+		log(LOG_ERR,
+		    "pim6_input: incorrect version %d, expecting %d\n",
+		    pim->pim_ver, PIM_VERSION);
+#endif
+		m_freem(m);
+		return(IPPROTO_DONE);
+	}
+
+	if (pim->pim_type == PIM_REGISTER) {
+		/*
+		 * since this is a REGISTER, we'll make a copy of the register
+		 * headers ip6+pim+u_int32_t+encap_ip6, to be passed up to the
+		 * routing daemon.
+		 */
+		static struct sockaddr_in6 dst = { sizeof(dst), AF_INET6 };
+
+		struct mbuf *mcp;
+		struct ip6_hdr *eip6;
+		u_int32_t *reghdr;
+		int rc;
+
+		++pim6stat.pim6s_rcv_registers;
+
+		if ((reg_mif_num >= nummifs) || (reg_mif_num == (mifi_t) -1)) {
+#ifdef MRT6DEBUG
+			if (mrt6debug & DEBUG_PIM)
+				log(LOG_DEBUG,
+				    "pim6_input: register mif not set: %d\n",
+				    reg_mif_num);
+#endif
+			m_freem(m);
+			return(IPPROTO_DONE);
+		}
+
+		reghdr = (u_int32_t *)(pim + 1);
+
+		if ((ntohl(*reghdr) & PIM_NULL_REGISTER))
+			goto pim6_input_to_daemon;
+
+		/*
+		 * Validate length
+		 */
+		if (pimlen < PIM6_REG_MINLEN) {
+			++pim6stat.pim6s_rcv_tooshort;
+			++pim6stat.pim6s_rcv_badregisters;
+#ifdef MRT6DEBUG
+			log(LOG_ERR,
+			    "pim6_input: register packet size too "
+			    "small %d from %s\n",
+			    pimlen, ip6_sprintf(&ip6->ip6_src));
+#endif
+			m_freem(m);
+			return(IPPROTO_DONE);
+		}
+
+		eip6 = (struct ip6_hdr *) (reghdr + 1);
+#ifdef MRT6DEBUG
+		if (mrt6debug & DEBUG_PIM)
+			log(LOG_DEBUG,
+			    "pim6_input[register], eip6: %s -> %s, "
+			    "eip6 plen %d\n",
+			    ip6_sprintf(&eip6->ip6_src),
+			    ip6_sprintf(&eip6->ip6_dst),
+			    ntohs(eip6->ip6_plen));
+#endif
+
+		/* verify the inner packet is destined to a mcast group */
+		if (!IN6_IS_ADDR_MULTICAST(&eip6->ip6_dst)) {
+			++pim6stat.pim6s_rcv_badregisters;
+#ifdef MRT6DEBUG
+			if (mrt6debug & DEBUG_PIM)
+				log(LOG_DEBUG,
+				    "pim6_input: inner packet of register "
+				    "is not multicast %s\n",
+				    ip6_sprintf(&eip6->ip6_dst));
+#endif
+			m_freem(m);
+			return(IPPROTO_DONE);
+		}
+
+		/*
+		 * make a copy of the whole header to pass to the daemon later.
+		 */
+		mcp = m_copy(m, 0, off + PIM6_REG_MINLEN);
+		if (mcp == NULL) {
+#ifdef MRT6DEBUG
+			log(LOG_ERR,
+			    "pim6_input: pim register: "
+			    "could not copy register head\n");
+#endif
+			m_freem(m);
+			return(IPPROTO_DONE);
+		}
+
+		/*
+		 * forward the inner ip6 packet; point m_data at the inner ip6.
+		 */
+		m_adj(m, off + PIM_MINLEN);
+#ifdef MRT6DEBUG
+		if (mrt6debug & DEBUG_PIM) {
+			log(LOG_DEBUG,
+			    "pim6_input: forwarding decapsulated register: "
+			    "src %s, dst %s, mif %d\n",
+			    ip6_sprintf(&eip6->ip6_src),
+			    ip6_sprintf(&eip6->ip6_dst),
+			    reg_mif_num);
+		}
+#endif
+
+ 		rc = if_simloop(mif6table[reg_mif_num].m6_ifp, m,
+			      (struct sockaddr *) &dst, NULL);
+
+		/* prepare the register head to send to the mrouting daemon */
+		m = mcp;
+	}
+
+	/*
+	 * 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
+	 * encapsulator ip6 header, pim header, register header and the
+	 * encapsulated ip6 header.
+	 */
+  pim6_input_to_daemon:
+	rip6_input(&m, offp, proto);
+	return(IPPROTO_DONE);
+}
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
new file mode 100644
index 0000000..112ffbe
--- /dev/null
+++ b/sys/netinet6/ip6_mroute.h
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * 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.
+ * 3. Neither the name of the project 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 PROJECT 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 PROJECT 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.
+ *
+ * $FreeBSD$
+ */
+
+/*	BSDI ip_mroute.h,v 2.5 1996/10/11 16:01:48 pjd Exp	*/
+
+/*
+ * Definitions for IP multicast forwarding.
+ *
+ * Written by David Waitzman, BBN Labs, August 1988.
+ * Modified by Steve Deering, Stanford, February 1989.
+ * Modified by Ajit Thyagarajan, PARC, August 1993.
+ * Modified by Ajit Thyagarajan, PARC, August 1994.
+ * Modified by Ahmed Helmy, USC, September 1996.
+ *
+ * MROUTING Revision: 1.2
+ */
+
+#ifndef _NETINET6_IP6_MROUTE_H_
+#define	_NETINET6_IP6_MROUTE_H_
+
+/*
+ * Multicast Routing set/getsockopt commands.
+ */
+#define	MRT6_INIT		100	/* initialize forwarder */
+#define	MRT6_DONE		101	/* shut down forwarder */
+#define	MRT6_ADD_MIF		102	/* add multicast interface */
+#define	MRT6_DEL_MIF		103	/* delete multicast interface */
+#define	MRT6_ADD_MFC		104	/* insert forwarding cache entry */
+#define	MRT6_DEL_MFC		105	/* delete forwarding cache entry */
+#define	MRT6_PIM                107     /* enable pim code */
+
+#define	GET_TIME(t)	microtime(&t)
+
+/*
+ * Types and macros for handling bitmaps with one bit per multicast interface.
+ */
+typedef u_short mifi_t;		/* type of a mif index */
+#define	MAXMIFS		64
+
+#ifndef	IF_SETSIZE
+#define	IF_SETSIZE	256
+#endif
+
+typedef	long	if_mask;
+#define	NIFBITS	(sizeof(if_mask) * NBBY)	/* bits per mask */
+
+#ifndef howmany
+#define	howmany(x, y)	(((x) + ((y) - 1)) / (y))
+#endif
+
+typedef	struct if_set {
+	fd_mask	ifs_bits[howmany(IF_SETSIZE, NIFBITS)];
+} if_set;
+
+#define	IF_SET(n, p)	((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
+#define	IF_CLR(n, p)	((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS)))
+#define	IF_ISSET(n, p)	((p)->ifs_bits[(n)/NIFBITS] & (1 << ((n) % NIFBITS)))
+#define	IF_COPY(f, t)	bcopy(f, t, sizeof(*(f)))
+#define	IF_ZERO(p)	bzero(p, sizeof(*(p)))
+
+/*
+ * Argument structure for MRT6_ADD_IF.
+ */
+struct mif6ctl {
+	mifi_t	mif6c_mifi;	    	/* the index of the mif to be added  */
+	u_char	mif6c_flags;     	/* MIFF_ flags defined below         */
+	u_short	mif6c_pifi;		/* the index of the physical IF */
+};
+
+#define	MIFF_REGISTER	0x1	/* mif represents a register end-point */
+
+/*
+ * Argument structure for MRT6_ADD_MFC and MRT6_DEL_MFC
+ */
+struct mf6cctl {
+	struct	sockaddr_in6 mf6cc_origin;	/* IPv6 origin of mcasts */
+	struct	sockaddr_in6 mf6cc_mcastgrp; /* multicast group associated */
+	mifi_t	mf6cc_parent;	/* incoming ifindex */
+	struct	if_set	mf6cc_ifset;	/* set of forwarding ifs */
+};
+
+/*
+ * The kernel's multicast routing statistics.
+ */
+struct mrt6stat {
+	u_quad_t	mrt6s_mfc_lookups; /* # forw. cache hash table hits  */
+	u_quad_t	mrt6s_mfc_misses; /* # forw. cache hash table misses */
+	u_quad_t	mrt6s_upcalls;	  /* # calls to mrouted              */
+	u_quad_t	mrt6s_no_route;	  /* no route for packet's origin    */
+	u_quad_t	mrt6s_bad_tunnel; /* malformed tunnel options        */
+	u_quad_t	mrt6s_cant_tunnel; /* no room for tunnel options     */
+	u_quad_t	mrt6s_wrong_if;	  /* arrived on wrong interface	     */
+	u_quad_t	mrt6s_upq_ovflw;  /* upcall Q overflow		     */
+	u_quad_t	mrt6s_cache_cleanups; /* # entries with no upcalls   */
+	u_quad_t	mrt6s_drop_sel;   /* pkts dropped selectively        */
+	u_quad_t	mrt6s_q_overflow; /* pkts dropped - Q overflow       */
+	u_quad_t	mrt6s_pkt2large;  /* pkts dropped - size > BKT SIZE  */
+	u_quad_t	mrt6s_upq_sockfull; /* upcalls dropped - socket full */
+};
+
+/*
+ * Struct used to communicate from kernel to multicast router
+ * note the convenient similarity to an IPv6 header.
+ */
+struct mrt6msg {
+	u_long	unused1;
+	u_char	im6_msgtype;		/* what type of message	    */
+#define	MRT6MSG_NOCACHE		1
+#define	MRT6MSG_WRONGMIF	2
+#define	MRT6MSG_WHOLEPKT	3		/* used for user level encap*/
+	u_char	im6_mbz;			/* must be zero		    */
+	u_char	im6_mif;			/* mif rec'd on		    */
+	u_char	unused2;
+	struct	in6_addr  im6_src, im6_dst;
+};
+
+/*
+ * Argument structure used by multicast routing daemon to get src-grp
+ * packet counts
+ */
+struct sioc_sg_req6 {
+	struct	sockaddr_in6 src;
+	struct	sockaddr_in6 grp;
+	u_quad_t	pktcnt;
+	u_quad_t	bytecnt;
+	u_quad_t	wrong_if;
+};
+
+/*
+ * Argument structure used by mrouted to get mif pkt counts
+ */
+struct sioc_mif_req6 {
+	mifi_t	mifi;		/* mif number				*/
+	u_quad_t	icount;	/* Input packet count on mif		*/
+	u_quad_t	ocount;	/* Output packet count on mif		*/
+	u_quad_t	ibytes;	/* Input byte count on mif		*/
+	u_quad_t	obytes;	/* Output byte count on mif		*/
+};
+
+#if defined(_KERNEL) || defined(KERNEL)
+/*
+ * The kernel's multicast-interface structure.
+ */
+struct mif6 {
+        u_char	m6_flags;     	/* MIFF_ flags defined above         */
+	u_int	m6_rate_limit; 	/* max rate			     */
+	struct	in6_addr m6_lcl_addr;  	/* local interface address           */
+	struct	ifnet	*m6_ifp;     	/* pointer to interface              */
+	u_quad_t	m6_pkt_in;	/* # pkts in on interface            */
+	u_quad_t	m6_pkt_out;	/* # pkts out on interface           */
+	u_quad_t	m6_bytes_in;	/* # bytes in on interface	     */
+	u_quad_t	m6_bytes_out;	/* # bytes out on interface	     */
+	struct	route_in6 m6_route;/* cached route if this is a tunnel */
+};
+
+/*
+ * The kernel's multicast forwarding cache entry structure
+ */
+struct mf6c {
+	struct	sockaddr_in6  mf6c_origin;	/* IPv6 origin of mcasts     */
+	struct	sockaddr_in6  mf6c_mcastgrp;	/* multicast group associated*/
+	mifi_t	mf6c_parent; 		/* incoming IF               */
+	struct	if_set	 mf6c_ifset;		/* set of outgoing IFs */
+	u_quad_t	mf6c_pkt_cnt;		/* pkt count for src-grp     */
+	u_quad_t	mf6c_byte_cnt;		/* byte count for src-grp    */
+	u_quad_t	mf6c_wrong_if;		/* wrong if for src-grp	     */
+	int	mf6c_expire;		/* time to clean entry up    */
+	struct	timeval  mf6c_last_assert;	/* last time I sent an assert*/
+	struct	rtdetq  *mf6c_stall;		/* pkts waiting for route */
+	struct	mf6c    *mf6c_next;		/* hash table linkage */
+};
+
+#define	MF6C_INCOMPLETE_PARENT ((mifi_t)-1)
+
+/*
+ * Argument structure used for pkt info. while upcall is made
+ */
+#ifndef _NETINET_IP_MROUTE_H_
+struct rtdetq {		/* XXX: rtdetq is also defined in ip_mroute.h */
+	struct	mbuf 	*m;		/* A copy of the packet	    	    */
+	struct	ifnet	*ifp;		/* Interface pkt came in on 	    */
+#ifdef UPCALL_TIMING
+	struct	timeval	t;		/* Timestamp */
+#endif /* UPCALL_TIMING */
+	struct	rtdetq	*next;
+};
+#endif /* _NETINET_IP_MROUTE_H_ */
+
+#define	MF6CTBLSIZ	256
+#if (MF6CTBLSIZ & (MF6CTBLSIZ - 1)) == 0	  /* from sys:route.h */
+#define	MF6CHASHMOD(h)	((h) & (MF6CTBLSIZ - 1))
+#else
+#define	MF6CHASHMOD(h)	((h) % MF6CTBLSIZ)
+#endif
+
+#define	MAX_UPQ6	4		/* max. no of pkts in upcall Q */
+
+int	ip6_mrouter_set __P((struct socket *so, struct sockopt *sopt));
+int	ip6_mrouter_get __P((struct socket *so, struct sockopt *sopt));
+int	ip6_mrouter_done __P((void));
+int	mrt6_ioctl __P((int, caddr_t));
+#endif /* _KERNEL */
+
+#endif /* !_NETINET6_IP6_MROUTE_H_ */
+/*
+ * Copyright (C) 1998 WIDE Project.
+ * All rights reserved.
+ * 
+ * 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.
+ * 3. Neither the name of the project 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 PROJECT 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 PROJECT 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.
+ */
+
+/*	BSDI ip_mroute.h,v 2.5 1996/10/11 16:01:48 pjd Exp	*/
+
+/*
+ * Definitions for IP multicast forwarding.
+ *
+ * Written by David Waitzman, BBN Labs, August 1988.
+ * Modified by Steve Deering, Stanford, February 1989.
+ * Modified by Ajit Thyagarajan, PARC, August 1993.
+ * Modified by Ajit Thyagarajan, PARC, August 1994.
+ * Modified by Ahmed Helmy, USC, September 1996.
+ *
+ * MROUTING Revision: 1.2
+ */
+
+#ifndef _NETINET6_IP6_MROUTE_H_
+#define _NETINET6_IP6_MROUTE_H_
+
+/*
+ * Multicast Routing set/getsockopt commands.
+ */
+#define MRT6_INIT		100	/* initialize forwarder */
+#define MRT6_DONE		101	/* shut down forwarder */
+#define MRT6_ADD_MIF		102	/* add multicast interface */
+#define MRT6_DEL_MIF		103	/* delete multicast interface */
+#define MRT6_ADD_MFC		104	/* insert forwarding cache entry */
+#define MRT6_DEL_MFC		105	/* delete forwarding cache entry */
+#define MRT6_PIM                107     /* enable pim code */
+
+#if BSD >= 199103 
+#define GET_TIME(t)	microtime(&t)
+#elif defined(sun)
+#define GET_TIME(t)	uniqtime(&t)
+#else
+#define GET_TIME(t)	((t) = time)
+#endif
+
+/*
+ * Types and macros for handling bitmaps with one bit per multicast interface.
+ */
+typedef u_short mifi_t;		/* type of a mif index */
+#define MAXMIFS		64
+
+#ifndef	IF_SETSIZE
+#define	IF_SETSIZE	256
+#endif
+
+typedef	long	if_mask;
+#define	NIFBITS	(sizeof(if_mask) * NBBY)	/* bits per mask */
+
+#ifndef howmany
+#define	howmany(x, y)	(((x) + ((y) - 1)) / (y))
+#endif
+
+typedef	struct if_set {
+	fd_mask	ifs_bits[howmany(IF_SETSIZE, NIFBITS)];
+} if_set;
+
+#define	IF_SET(n, p)	((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
+#define	IF_CLR(n, p)	((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS)))
+#define	IF_ISSET(n, p)	((p)->ifs_bits[(n)/NIFBITS] & (1 << ((n) % NIFBITS)))
+#define	IF_COPY(f, t)	bcopy(f, t, sizeof(*(f)))
+#define	IF_ZERO(p)	bzero(p, sizeof(*(p)))
+
+/*
+ * Argument structure for MRT6_ADD_IF.
+ */
+struct mif6ctl {
+	mifi_t	    mif6c_mifi;	    	/* the index of the mif to be added  */
+	u_char	    mif6c_flags;     	/* MIFF_ flags defined below         */
+	u_short	    mif6c_pifi;		/* the index of the physical IF */
+#ifdef notyet
+	u_int	    mif6c_rate_limit;    /* max rate           		     */
+#endif
+};
+
+#define	MIFF_REGISTER	0x1	/* mif represents a register end-point */
+
+/*
+ * Argument structure for MRT6_ADD_MFC and MRT6_DEL_MFC
+ */
+struct mf6cctl {
+	struct sockaddr_in6 mf6cc_origin;	/* IPv6 origin of mcasts */
+	struct sockaddr_in6 mf6cc_mcastgrp; /* multicast group associated */
+	mifi_t		mf6cc_parent;	/* incoming ifindex */
+	struct if_set	mf6cc_ifset;	/* set of forwarding ifs */
+};
+
+/*
+ * The kernel's multicast routing statistics.
+ */
+struct mrt6stat {
+	u_quad_t mrt6s_mfc_lookups;	/* # forw. cache hash table hits   */
+	u_quad_t mrt6s_mfc_misses;	/* # forw. cache hash table misses */
+	u_quad_t mrt6s_upcalls;		/* # calls to mrouted              */
+	u_quad_t mrt6s_no_route;	/* no route for packet's origin    */
+	u_quad_t mrt6s_bad_tunnel;	/* malformed tunnel options        */
+	u_quad_t mrt6s_cant_tunnel;	/* no room for tunnel options      */
+	u_quad_t mrt6s_wrong_if;	/* arrived on wrong interface	   */
+	u_quad_t mrt6s_upq_ovflw;	/* upcall Q overflow		   */
+	u_quad_t mrt6s_cache_cleanups;	/* # entries with no upcalls 	   */
+	u_quad_t mrt6s_drop_sel;     	/* pkts dropped selectively        */
+	u_quad_t mrt6s_q_overflow;    	/* pkts dropped - Q overflow       */
+	u_quad_t mrt6s_pkt2large;     	/* pkts dropped - size > BKT SIZE  */
+	u_quad_t mrt6s_upq_sockfull;	/* upcalls dropped - socket full   */
+};
+
+/*
+ * Struct used to communicate from kernel to multicast router
+ * note the convenient similarity to an IPv6 header.
+ */
+struct mrt6msg {
+	u_long	    unused1;
+	u_char	    im6_msgtype;		/* what type of message	    */
+#define MRT6MSG_NOCACHE		1
+#define MRT6MSG_WRONGMIF	2
+#define MRT6MSG_WHOLEPKT	3		/* used for user level encap*/
+	u_char	    im6_mbz;			/* must be zero		    */
+	u_char	    im6_mif;			/* mif rec'd on		    */
+	u_char	    unused2;
+	struct in6_addr  im6_src, im6_dst;
+};
+
+/*
+ * Argument structure used by multicast routing daemon to get src-grp
+ * packet counts
+ */
+struct sioc_sg_req6 {
+	struct sockaddr_in6 src;
+	struct sockaddr_in6 grp;
+	u_quad_t pktcnt;
+	u_quad_t bytecnt;
+	u_quad_t wrong_if;
+};
+
+/*
+ * Argument structure used by mrouted to get mif pkt counts
+ */
+struct sioc_mif_req6 {
+	mifi_t mifi;		/* mif number				*/
+	u_quad_t icount;	/* Input packet count on mif		*/
+	u_quad_t ocount;	/* Output packet count on mif		*/
+	u_quad_t ibytes;	/* Input byte count on mif		*/
+	u_quad_t obytes;	/* Output byte count on mif		*/
+};
+
+#if defined(_KERNEL) || defined(KERNEL)
+/*
+ * The kernel's multicast-interface structure.
+ */
+struct mif6 {
+        u_char   	m6_flags;     	/* MIFF_ flags defined above         */
+	u_int      	m6_rate_limit; 	/* max rate			     */
+#ifdef notyet
+	struct tbf      *m6_tbf;      	/* token bucket structure at intf.   */
+#endif 
+	struct in6_addr	m6_lcl_addr;   	/* local interface address           */
+	struct ifnet    *m6_ifp;     	/* pointer to interface              */
+	u_quad_t	m6_pkt_in;	/* # pkts in on interface            */
+	u_quad_t	m6_pkt_out;	/* # pkts out on interface           */
+	u_quad_t	m6_bytes_in;	/* # bytes in on interface	     */
+	u_quad_t	m6_bytes_out;	/* # bytes out on interface	     */
+	struct route_in6 m6_route;/* cached route if this is a tunnel */
+#ifdef notyet
+	u_int		m6_rsvp_on;	/* RSVP listening on this vif */
+	struct socket   *m6_rsvpd;	/* RSVP daemon socket */
+#endif 
+};
+
+/*
+ * The kernel's multicast forwarding cache entry structure 
+ */
+struct mf6c {
+	struct sockaddr_in6  mf6c_origin;	/* IPv6 origin of mcasts     */
+	struct sockaddr_in6  mf6c_mcastgrp;	/* multicast group associated*/
+	mifi_t	    	 mf6c_parent; 		/* incoming IF               */
+	struct if_set	 mf6c_ifset;		/* set of outgoing IFs */
+
+	u_quad_t    	mf6c_pkt_cnt;		/* pkt count for src-grp     */
+	u_quad_t    	mf6c_byte_cnt;		/* byte count for src-grp    */
+	u_quad_t    	mf6c_wrong_if;		/* wrong if for src-grp	     */
+	int	    	mf6c_expire;		/* time to clean entry up    */
+	struct timeval  mf6c_last_assert;	/* last time I sent an assert*/
+	struct rtdetq  *mf6c_stall;		/* pkts waiting for route */
+	struct mf6c    *mf6c_next;		/* hash table linkage */
+};
+
+#define MF6C_INCOMPLETE_PARENT ((mifi_t)-1)
+
+/*
+ * Argument structure used for pkt info. while upcall is made
+ */
+#ifndef _NETINET_IP_MROUTE_H_
+struct rtdetq {		/* XXX: rtdetq is also defined in ip_mroute.h */
+    struct mbuf 	*m;		/* A copy of the packet	    	    */
+    struct ifnet	*ifp;		/* Interface pkt came in on 	    */
+#ifdef UPCALL_TIMING
+    struct timeval	t;		/* Timestamp */
+#endif /* UPCALL_TIMING */
+    struct rtdetq	*next;
+};
+#endif /* _NETINET_IP_MROUTE_H_ */
+
+#define MF6CTBLSIZ	256
+#if (MF6CTBLSIZ & (MF6CTBLSIZ - 1)) == 0	  /* from sys:route.h */
+#define MF6CHASHMOD(h)	((h) & (MF6CTBLSIZ - 1))
+#else
+#define MF6CHASHMOD(h)	((h) % MF6CTBLSIZ)
+#endif
+
+#define MAX_UPQ6	4		/* max. no of pkts in upcall Q */
+
+#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+int	ip6_mrouter_set __P((struct socket *so, struct sockopt *sopt));
+int	ip6_mrouter_get __P((struct socket *so, struct sockopt *sopt));
+#else
+int	ip6_mrouter_set __P((int, struct socket *, struct mbuf *));
+int	ip6_mrouter_get __P((int, struct socket *, struct mbuf **));
+#endif
+int	ip6_mrouter_done __P((void));
+int	mrt6_ioctl __P((int, caddr_t));
+#endif /* _KERNEL */
+
+#endif /* !_NETINET6_IP6_MROUTE_H_ */
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 73326c9..0909e9b 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -661,6 +661,25 @@ skip_ipsec2:;
 			 * forbid loopback, loop back a copy.
 			 */
 			ip6_mloopback(ifp, m, dst);
+		} else {
+			/*
+			 * If we are acting as a multicast router, perform
+			 * multicast forwarding as if the packet had just
+			 * arrived on the interface to which we are about
+			 * to send.  The multicast forwarding function
+			 * recursively calls this function, using the
+			 * IPV6_FORWARDING flag to prevent infinite recursion.
+			 *
+			 * Multicasts that are looped back by ip6_mloopback(),
+			 * above, will be forwarded by the ip6_input() routine,
+			 * if necessary.
+			 */
+			if (ip6_mrouter && (flags & IPV6_FORWARDING) == 0) {
+				if (ip6_mforward(ip6, ifp, m) != NULL) {
+					m_freem(m);
+					goto done;
+				}
+			}
 		}
 		/*
 		 * Multicasts with a hoplimit of zero may be looped back,
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 9027663..bc881ac 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -87,6 +87,7 @@
 #include <netinet/in_systm.h>
 #include <netinet6/ip6.h>
 #include <netinet6/ip6_var.h>
+#include <netinet6/ip6_mroute.h>
 #include <netinet6/icmp6.h>
 #include <netinet/in_pcb.h>
 #include <netinet6/in6_pcb.h>
@@ -419,6 +420,15 @@ rip6_ctloutput(so, sopt)
 	switch (sopt->sopt_dir) {
 	case SOPT_GET:
 		switch (sopt->sopt_name) {
+		case MRT6_INIT:
+		case MRT6_DONE:
+		case MRT6_ADD_MIF:
+		case MRT6_DEL_MIF:
+		case MRT6_ADD_MFC:
+		case MRT6_DEL_MFC:
+		case MRT6_PIM:
+			error = ip6_mrouter_get(so, sopt);
+			break;
 		default:
 			error = ip6_ctloutput(so, sopt);
 			break;
@@ -427,6 +437,15 @@ rip6_ctloutput(so, sopt)
 
 	case SOPT_SET:
 		switch (sopt->sopt_name) {
+		case MRT6_INIT:
+		case MRT6_DONE:
+		case MRT6_ADD_MIF:
+		case MRT6_DEL_MIF:
+		case MRT6_ADD_MFC:
+		case MRT6_DEL_MFC:
+		case MRT6_PIM:
+			error = ip6_mrouter_set(so, sopt);
+			break;
 		default:
 			error = ip6_ctloutput(so, sopt);
 			break;