Date: Wed, 24 Mar 2010 15:19:47 +0000 (UTC) From: Luigi Rizzo <luigi@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r205603 - stable/8/sys/netinet/ipfw Message-ID: <201003241519.o2OFJlMT035432@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: luigi Date: Wed Mar 24 15:19:47 2010 New Revision: 205603 URL: http://svn.freebsd.org/changeset/base/205603 Log: MFC 205602: Honor ip.fw.one_pass when a packet comes out of a pipe without being delayed. I forgot to handle this case when i did the mtag cleanup three months ago. I am merging immediately because this bugfix is important for people using RELENG_8. PR: 145004 Modified: stable/8/sys/netinet/ipfw/ip_dn_io.c Modified: stable/8/sys/netinet/ipfw/ip_dn_io.c ============================================================================== --- stable/8/sys/netinet/ipfw/ip_dn_io.c Wed Mar 24 15:16:59 2010 (r205602) +++ stable/8/sys/netinet/ipfw/ip_dn_io.c Wed Mar 24 15:19:47 2010 (r205603) @@ -762,7 +762,11 @@ dummynet_io(struct mbuf **m0, int dir, s * */ if (/*dn_cfg.io_fast &&*/ m == *m0 && (dir & PROTO_LAYER2) == 0 ) { - /* fast io */ + /* fast io, rename the tag * to carry reinject info. */ + struct m_tag *tag = m_tag_first(m); + + tag->m_tag_cookie = MTAG_IPFW_RULE; + tag->m_tag_id = 0; io_pkt_fast++; if (m->m_nextpkt != NULL) { printf("dummynet: fast io: pkt chain detected!\n");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003241519.o2OFJlMT035432>