From owner-cvs-all Thu Nov 23 14:25: 8 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8949037B4C5; Thu, 23 Nov 2000 14:25:04 -0800 (PST) Received: (from bmilekic@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id OAA70132; Thu, 23 Nov 2000 14:25:04 -0800 (PST) (envelope-from bmilekic@FreeBSD.org) Message-Id: <200011232225.OAA70132@freefall.freebsd.org> From: Bosko Milekic Date: Thu, 23 Nov 2000 14:25:04 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/net bridge.c src/sys/netinet ip_dummynet.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG bmilekic 2000/11/23 14:25:04 PST Modified files: sys/net bridge.c sys/netinet ip_dummynet.c Log: Fixup (hopefully) bridging + ipfw + dummynet together... * Some dummynet code incorrectly handled a malloc()-allocated pseudo-mbuf header structure, called "pkt," and could consequently pollute the mbuf free list if it was ever passed to m_freem(). The fix involved passing not pkt, but essentially pkt->m_next (which is a real mbuf) to the mbuf utility routines. * Also, for dummynet, in bdg_forward(), made the code copy the ethernet header back into the mbuf (prepended) because the dummynet code that follows expects it to be there but it is, unfortunately for dummynet, passed to bdg_forward as a seperate argument. PRs: kern/19551 ; misc/21534 ; kern/23010 Submitted by: Thomas Moestl Reviewed by: bmilekic Approved by: luigi Revision Changes Path 1.27 +17 -3 src/sys/net/bridge.c 1.31 +6 -6 src/sys/netinet/ip_dummynet.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message