From owner-freebsd-audit Fri Jan 24 10: 0:57 2003 Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A403537B401; Fri, 24 Jan 2003 10:00:55 -0800 (PST) Received: from freebsd.org.ru (sweet.etrust.ru [194.84.67.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75B8243F13; Fri, 24 Jan 2003 10:00:54 -0800 (PST) (envelope-from osa@freebsd.org.ru) Received: by freebsd.org.ru (Postfix, from userid 1000) id 5FD8A97; Fri, 24 Jan 2003 21:00:52 +0300 (MSK) Date: Fri, 24 Jan 2003 21:00:52 +0300 From: "Sergey A. Osokin" To: Maxim Konovalov Cc: Giorgos Keramidas , freebsd-audit@FreeBSD.org, des@FreeBSD.org, luigi@FreeBSD.org Subject: Re: (fwd) bin/47196: ipfw won't format correctly output from 'ipfw show' command Message-ID: <20030124180052.GG57203@freebsd.org.ru> Reply-To: osa@FreeBSD.org.ru References: <20030123034022.GA587@gothmog.gr> <20030123184329.T77556@news1.macomnet.ru> <20030123195335.GC678@gothmog.gr> <20030124194701.P19393@news1.macomnet.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030124194701.P19393@news1.macomnet.ru> User-Agent: Mutt/1.4i Sender: owner-freebsd-audit@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, Jan 24, 2003 at 08:02:38PM +0300, Maxim Konovalov wrote: > On 21:53+0200, Jan 23, 2003, Giorgos Keramidas wrote: > > > On 2003-01-23 19:10, Maxim Konovalov wrote: > > > On 05:40+0200, Jan 23, 2003, Giorgos Keramidas wrote: > > > > I've sent the following 2 days ago to ipfw@ but received no reply. > > > > Does anyone feel like testing/reviewing or committing this? This > > > > change should be all we need to fix & close PR bin/47196 :-) > > > > > > Formatting was broken in rev. 1.103 ipfw.c in -CURRENT and ipfw2 > > > in -CURRENT and -STABLE inherited the bug later. > > > > > > I think we should rever this part of rev. 1.103 of ipfw.c in ipfw2.c: > > > > Not quite. See inline comments. > > Yes, you are right. Revert 1.103 a little more. Note we always show > packets/bytes for dynamic rules. > > Index: ipfw2.c > =================================================================== > RCS file: /home/ncvs/src/sbin/ipfw/ipfw2.c,v > retrieving revision 1.21 > diff -u -r1.21 ipfw2.c > --- ipfw2.c 12 Jan 2003 03:31:10 -0000 1.21 > +++ ipfw2.c 24 Jan 2003 16:34:48 -0000 > @@ -802,7 +802,7 @@ > } > > @@ -1557,7 +1557,7 @@ > ipfw_dyn_rule *dynrules, *d; > > void *lim, *data = NULL; > - int n, nbytes, nstat, ndyn; > + int bcwidth, n, nbytes, nstat, ndyn, pcwidth, width; ^^^^^^^^^^^^^^^^^^ Alphabetic: bcwidth, n, nbytes, ndyn, nstat, pcwidth, width; > int exitval = EX_OK; > int lac; > char **lav; -- Rgdz, /"\ ASCII RIBBON CAMPAIGN Sergey Osokin aka oZZ, \ / AGAINST HTML MAIL http://ozz.pp.ru/ X AND NEWS / \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-audit" in the body of the message