From 976a1c910673d4c62f6003c1fd4a274e556e2922 Mon Sep 17 00:00:00 2001 From: Bill Fumerola Date: Sun, 18 Jun 2000 02:48:19 +0000 Subject: [PATCH] Reorder the "prob" section in the output of list/show so it can be copy/pasted into add without problems. The previous commit had the other half of this original patch which handled tcpflags/tcpflgs confusion in output/input. --- sbin/ipfw/ipfw.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c index aa79185eb72..47a72891ee9 100644 --- a/sbin/ipfw/ipfw.c +++ b/sbin/ipfw/ipfw.c @@ -217,6 +217,12 @@ show_ipfw(struct ip_fw *chain, int pcwidth, int bcwidth) goto done ; } + if (chain->fw_flg & IP_FW_F_RND_MATCH) { + double d = 1.0 * (int)(chain->pipe_ptr) ; + d = 1 - (d / 0x7fffffff) ; + printf("prob %f ", d); + } + switch (chain->fw_flg & IP_FW_F_COMMAND) { case IP_FW_F_ACCEPT: @@ -260,11 +266,6 @@ show_ipfw(struct ip_fw *chain, int pcwidth, int bcwidth) errx(EX_OSERR, "impossible"); } - if (chain->fw_flg & IP_FW_F_RND_MATCH) { - double d = 1.0 * (int)(chain->pipe_ptr) ; - d = 1 - (d / 0x7fffffff) ; - printf(" prob %f", d); - } if (chain->fw_flg & IP_FW_F_PRN) { printf(" log"); if (chain->fw_logamount)