From owner-freebsd-net@FreeBSD.ORG  Wed Feb  7 15:25:25 2007
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
X-Original-To: net@freebsd.org
Delivered-To: freebsd-net@FreeBSD.ORG
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5C0B116A409
	for <net@freebsd.org>; Wed,  7 Feb 2007 15:25:25 +0000 (UTC)
	(envelope-from fenner@research.att.com)
Received: from mail-red.research.att.com (mail-red.research.att.com
	[192.20.225.110])
	by mx1.freebsd.org (Postfix) with ESMTP id 347FB13C4AC
	for <net@freebsd.org>; Wed,  7 Feb 2007 15:25:25 +0000 (UTC)
	(envelope-from fenner@research.att.com)
Received: from bright.research.att.com (bright.research.att.com
	[135.207.20.189])
	by mail-blue.research.att.com (Postfix) with ESMTP id D4E14147AFA;
	Wed,  7 Feb 2007 10:04:14 -0500 (EST)
Received: (from fenner@localhost)
	by bright.research.att.com (8.13.1/8.12.10/Submit) id l17F4EJx001944;
	Wed, 7 Feb 2007 07:04:14 -0800
From: Bill Fenner <fenner@research.att.com>
Message-Id: <200702071504.l17F4EJx001944@bright.research.att.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
To: "Bruce M. Simpson" <bms@freebsd.org>
References: <45C39CBF.7010105@incunabulum.net> <45C94116.3090404@FreeBSD.org>
Date: Wed, 7 Feb 2007 07:04:14 -0800
Versions: dmail (linux) 2.7/makemail 2.14
Cc: net@freebsd.org
Subject: Re: Proposal: remove encap from MROUTING
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Feb 2007 15:25:25 -0000


>I plan to commit this patch some time this week.
>---mroute-notunnels.diff, text/x-patch follows---

Please do.  Only one comment:

>@@ -859,8 +816,6 @@ X_ip_mrouter_done(void)
>     /*
>      * Reset de-encapsulation cache
>      */
>-    last_encap_src = INADDR_ANY;
>-    last_encap_vif = NULL;
> #ifdef PIM
>     reg_vif_num = VIFI_INVALID;
> #endif

I think that comment goes with the removed lines so should be
removed with them.

While you're thinking about removing stuff, think about removing the
tbf code next.  There are way more flexible ways of rate limiting
traffic in the base system, so the tbf hack can and should just die.
Just return an error when trying to create a vif with a rate limit.

  Bill