Date: Fri, 13 May 2005 01:58:25 +0400 From: Gleb Smirnoff <glebius@FreeBSD.org> To: Brian Fundakowski Feldman <green@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sbin/ipfw ipfw.8 ipfw2.c src/sys/netinet ip_divert.c ip_fw.h ip_fw2.c Message-ID: <20050512215825.GD43447@cell.sick.ru> In-Reply-To: <20050512151749.GC2058@green.homeunix.org> References: <200505121511.j4CFBUlT076772@repoman.freebsd.org> <20050512151749.GC2058@green.homeunix.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Brian, On Thu, May 12, 2005 at 11:17:49AM -0400, Brian Fundakowski Feldman wrote: B> On Thu, May 12, 2005 at 03:11:30PM +0000, Brian Feldman wrote: B> > green 2005-05-12 15:11:30 UTC B> > B> > FreeBSD src repository B> > B> > Modified files: (Branch: RELENG_5) B> > sbin/ipfw ipfw.8 ipfw2.c B> > sys/netinet ip_divert.c ip_fw.h ip_fw2.c B> > Log: B> > MFC: IPFW ALTQ(4) classification support, diverted traffic match rules, B> > and the TCP packet data length match rule. B> > B> > Revision Changes Path B> > 1.150.2.7 +55 -2 src/sbin/ipfw/ipfw.8 B> > 1.54.2.5 +259 -33 src/sbin/ipfw/ipfw2.c B> > 1.98.2.4 +16 -12 src/sys/netinet/ip_divert.c B> > 1.89.2.4 +17 -3 src/sys/netinet/ip_fw.h B> > 1.70.2.11 +92 -1 src/sys/netinet/ip_fw2.c B> B> Gleb, would you like to merge the subsequent ip_divert.c changes? Definitely, I would like! You have broken ng_ksocket operation in RELENG_5 the same way you did it in HEAD. However, HEAD is for untested changes, so I saw no problem here. After some silence from you, I have fixed it in rev. 1.109. However, RELENG_5 is for _tested_ changes, not for stepping on the same errors again. Since you asked me for merge, this means that you knew about breakage you are committing. Why didn't you incorporated 1.109 into MFC? If this moment is not clear to you, why didn't you send me email _before_ committing? I usually respond quickly. What was the reason to rush in and break things in RELENG_5? P.S. I can't quickly merge it now, because it needs testing and I have no time and testbox now at home at 2 PM. So this will be left unfixed until tomorrow. If you want, you can test and commit it yourself. The testcase is the same I've sent you long time ago: http://lists.freebsd.org/pipermail/freebsd-net/2004-November/005562.html -- Totus tuus, Glebius. GLEBIUS-RIPN GLEB-RIPE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050512215825.GD43447>