[PATCH iptables] extensions: libxt_rateest: fix bps options for iptables-save

[PATCH iptables] extensions: libxt_rateest: fix bps options for iptables-save

[Luciano Coelho]

The output generated by the libxt_rateest extension for bps matches
was wrong and could not be restored properly.  This patch fixes this
problem by using the correct options in the right order when saving
the table.

Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
 extensions/libxt_rateest.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extensions/libxt_rateest.c b/extensions/libxt_rateest.c
index 62100f4..ad0884e 100644
--- a/extensions/libxt_rateest.c
+++ b/extensions/libxt_rateest.c
@@ -419,9 +419,11 @@ rateest_save(const void *ip, const struct xt_entry_match *match)
 	} else {
 		printf("--rateest %s ", info->name1);
 		if (info->flags & XT_RATEEST_MATCH_BPS) {
-			printf("--rateest-bps ");
-			rateest_print_mode(info, "--rateest-");
+			printf("--rateest-bps1 ");
+			rateest_print_rate(info->bps1, 0);
+			printf("--rateest-bps2 ");
 			rateest_print_rate(info->bps2, 0);
+			rateest_print_mode(info, "--rateest-");
 		}
 		if (info->flags & XT_RATEEST_MATCH_PPS) {
 			printf("--rateest-pps ");
-- 
1.7.0.4

Re: [PATCH iptables] extensions: libxt_rateest: fix bps options for iptables-save

[Patrick McHardy]

Am 15.07.2010 18:04, schrieb Luciano Coelho:
> The output generated by the libxt_rateest extension for bps matches
> was wrong and could not be restored properly.  This patch fixes this
> problem by using the correct options in the right order when saving
> the table.

Applied, thanks.

Re: [PATCH iptables] extensions: libxt_rateest: fix bps options for iptables-save

[Luciano Coelho]

On Thu, 2010-07-15 at 18:10 +0200, ext Patrick McHardy wrote:
> Am 15.07.2010 18:04, schrieb Luciano Coelho:
> > The output generated by the libxt_rateest extension for bps matches
> > was wrong and could not be restored properly.  This patch fixes this
> > problem by using the correct options in the right order when saving
> > the table.
> 
> Applied, thanks.

A quick question: do you apply this to iptables-next? Or iptables-next
will only be aligned with master when you merge them (when the stuff
included in iptables-next gets released in the kernel)?

-- 
Cheers,
Luca.

Re: [PATCH iptables] extensions: libxt_rateest: fix bps options for iptables-save

[Patrick McHardy]

Am 15.07.2010 18:14, schrieb Luciano Coelho:
> On Thu, 2010-07-15 at 18:10 +0200, ext Patrick McHardy wrote:
>> Am 15.07.2010 18:04, schrieb Luciano Coelho:
>>> The output generated by the libxt_rateest extension for bps matches
>>> was wrong and could not be restored properly.  This patch fixes this
>>> problem by using the correct options in the right order when saving
>>> the table.
>>
>> Applied, thanks.
> 
> A quick question: do you apply this to iptables-next? Or iptables-next
> will only be aligned with master when you merge them (when the stuff
> included in iptables-next gets released in the kernel)?
> 

This one was applied to the master branch. The iptables-next branch
contains support for new features that will be merged during the
next merge window. The branch will be merged once the iptables
release for the 2.6.35 kernel is out.