Date: Thu, 23 Jan 2003 19:10:46 +0300 (MSK) From: Maxim Konovalov <maxim@FreeBSD.org> To: Giorgos Keramidas <keramida@FreeBSD.org> Cc: 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: <20030123184329.T77556@news1.macomnet.ru> In-Reply-To: <20030123034022.GA587@gothmog.gr> References: <20030123034022.GA587@gothmog.gr>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Giorgos,
On 05:40+0200, Jan 23, 2003, Giorgos Keramidas wrote:
> Hi folks,
>
> 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:
Index: ipfw/ipfw2.c
===================================================================
RCS file: /home/ncvs/src/sbin/ipfw/ipfw2.c,v
retrieving revision 1.21
diff -u -r1.21 ipfw2.c
--- ipfw/ipfw2.c 12 Jan 2003 03:31:10 -0000 1.21
+++ ipfw/ipfw2.c 23 Jan 2003 16:07:09 -0000
@@ -823,7 +823,7 @@
printf("%05u ", rule->rulenum);
if (do_acct)
- printf("%10qu %10qu ", rule->pcnt, rule->bcnt);
+ printf("%*qu %*qu ", rule->pcnt, rule->bcnt);
if (do_time) {
char timestr[30];
@@ -1212,7 +1212,7 @@
return;
}
- printf("%05d %10qu %10qu (%ds)",
+ printf("%05d %*qu %*qu (%ds)",
d->rulenum, d->pcnt, d->bcnt, d->expire);
switch (d->dyn_type) {
case O_LIMIT_PARENT:
%%%
> ----- forwarded message -----
>
> Date: Tue, 21 Jan 2003 03:33:55 +0200
> From: Giorgos Keramidas <keramida@freebsd.org>
> Subject: bin/47196: ipfw won't format correctly output from 'ipfw show' command
> To: ipfw@freebsd.org
>
> The attached patch changes ipfw2 to print packet and byte counts with
> a wider format, that fixes the problem described in PR bin/47196. Do
> you think it's ok to commit this to CURRENT?
>
> --- patch start ---
> 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 21 Jan 2003 01:30:03 -0000
> @@ -823,7 +823,7 @@
> printf("%05u ", rule->rulenum);
>
> if (do_acct)
> - printf("%10qu %10qu ", rule->pcnt, rule->bcnt);
> + printf("%20qu %20qu ", rule->pcnt, rule->bcnt);
>
> if (do_time) {
> char timestr[30];
> @@ -1212,7 +1212,7 @@
> return;
> }
>
> - printf("%05d %10qu %10qu (%ds)",
> + printf("%05d %20qu %20qu (%ds)",
> d->rulenum, d->pcnt, d->bcnt, d->expire);
> switch (d->dyn_type) {
> case O_LIMIT_PARENT:
> --- patch end ---
>
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-audit" in the body of the message
>
--
Maxim Konovalov, maxim@macomnet.ru, maxim@FreeBSD.org
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-audit" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030123184329.T77556>