From owner-cvs-src@FreeBSD.ORG Mon May 15 23:00:50 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF77A16A6C8; Mon, 15 May 2006 23:00:50 +0000 (UTC) (envelope-from pavlin@icir.org) Received: from possum.icir.org (possum.icir.org [192.150.187.67]) by mx1.FreeBSD.org (Postfix) with ESMTP id 970B143D48; Mon, 15 May 2006 23:00:50 +0000 (GMT) (envelope-from pavlin@icir.org) Received: from possum.icir.org (localhost [127.0.0.1]) by possum.icir.org (8.12.11/8.12.11) with ESMTP id k4FN0k2N086754; Mon, 15 May 2006 16:00:46 -0700 (PDT) (envelope-from pavlin@possum.icir.org) Message-Id: <200605152300.k4FN0k2N086754@possum.icir.org> To: Bruce M Simpson , Bruce M Simpson , src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org, pavlin@icir.org, atanu@icir.org, rwatson@FreeBSD.org In-Reply-To: Message from Bruce M Simpson of "Mon, 15 May 2006 09:55:07 BST." <20060515085507.GH46921@spc.org> Date: Mon, 15 May 2006 16:00:46 -0700 From: Pavlin Radoslavov Cc: Subject: Re: cvs commit: src/sys/netinet in.h ip_output.c ip_var.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 May 2006 23:00:56 -0000 Bruce M Simpson wrote: > Something like this: In general, you may want to appropriately initialize ip_moptions everywhere it is allocated. E.g., a quick search for "ip_moptions" reveals that igmp_sendpkt() inside netinet/igmp.c also may have to be modified. Another suspect (among others) is field "sc_imo" inside struct pfsync_softc (file sys/contrib/pf/net/if_pfsync.h). Pavlin > %%% > --- 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 > %%%