From owner-cvs-all@FreeBSD.ORG  Mon May 15 08:55:23 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EBEF216A67A;
	Mon, 15 May 2006 08:55:22 +0000 (UTC) (envelope-from bms@spc.org)
Received: from mindfull.spc.org (mindfull.spc.org [83.167.185.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A764D43D62;
	Mon, 15 May 2006 08:55:09 +0000 (GMT) (envelope-from bms@spc.org)
Received: from arginine.spc.org ([83.167.185.2])
	by mindfull.spc.org with esmtps (TLSv1:AES256-SHA:256) (Exim 4.52)
	id 1FfYr4-0007a3-9m; Mon, 15 May 2006 09:55:06 +0100
Received: from localhost (localhost [127.0.0.1])
	by arginine.spc.org (Postfix) with ESMTP
	id 4908A6564E; Mon, 15 May 2006 09:55:08 +0100 (BST)
Received: from arginine.spc.org ([127.0.0.1])
	by localhost (arginine.spc.org [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id 24277-02-2; Mon, 15 May 2006 09:55:07 +0100 (BST)
Received: by arginine.spc.org (Postfix, from userid 1078)
	id 7943A65499; Mon, 15 May 2006 09:55:07 +0100 (BST)
Date: Mon, 15 May 2006 09:55:07 +0100
From: Bruce M Simpson <bms@spc.org>
To: Bruce M Simpson <bms@FreeBSD.org>, src-committers@FreeBSD.org,
	cvs-src@FreeBSD.org, cvs-all@FreeBSD.org, pavlin@icir.org,
	atanu@icir.org, rwatson@FreeBSD.org
Message-ID: <20060515085507.GH46921@spc.org>
Mail-Followup-To: Bruce M Simpson <bms@spc.org>,
	Bruce M Simpson <bms@FreeBSD.org>, src-committers@FreeBSD.org,
	cvs-src@FreeBSD.org, cvs-all@FreeBSD.org, pavlin@icir.org,
	atanu@icir.org, rwatson@FreeBSD.org
References: <200605141422.k4EEMnmC056704@repoman.freebsd.org>
	<20060515085131.GG46921@spc.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060515085131.GG46921@spc.org>
User-Agent: Mutt/1.4.1i
Organization: Incunabulum
X-AntiAbuse: This header was added to track abuse,
	please include it with any abuse report
X-AntiAbuse: Primary Hostname - mindfull.spc.org
X-AntiAbuse: Original Domain - freebsd.org
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - spc.org
X-Source: 
X-Source-Args: 
X-Source-Dir: 
Cc: 
Subject: Re: cvs commit: src/sys/netinet in.h ip_output.c ip_var.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 May 2006 08:55:25 -0000

Something like this:

%%%
--- ip_mroute.c.orig    Mon May 15 09:52:41 2006
+++ ip_mroute.c Mon May 15 09:54:01 2006
@@ -2115,6 +2115,7 @@
        ip_output(m, NULL, &vifp->v_route, IP_FORWARDING, NULL, NULL);
     else {
        struct ip_moptions imo;
+       struct in_multi *imm[2];
        int error;
        static struct route ro; /* XXX check this */

@@ -2122,6 +2123,9 @@
        imo.imo_multicast_ttl  = mtod(m, struct ip *)->ip_ttl - 1;
        imo.imo_multicast_loop = 1;
        imo.imo_multicast_vif  = -1;
+       imo.imo_num_memberships = 0;
+       imo.imo_max_memberships = 2;
+       imo.imo_membership  = &imm[0];

        /*
         * Re-entrancy should not be a problem here, because
Exit 1
%%%