[iptables] libxt_dscp: fix save of negated dscp match rules

Patrick McHardy netfilter-cvslog-bounces at lists.netfilter.org
Mon Aug 4 13:31:27 CEST 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=dee5f0009f7ca1a6d092c3c17450c33c53121b7c
commit dee5f0009f7ca1a6d092c3c17450c33c53121b7c
Author:     Phil Oester <kernel at linuxace.com>
AuthorDate: Mon Aug 4 13:30:30 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Mon Aug 4 13:30:30 2008 +0200

    libxt_dscp: fix save of negated dscp match rules
    
    As pointed out by Vyacheslav Garashchenko, iptables-save does not
    save negated dscp matches properly.  Fix below.
    
    This closes bugzilla #533.
    
    Phil
    
    Signed-off-by: Phil Oester <kernel at linuxace.com>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit 04c97954d5933fc935616f69a8e63944d5c6cec4
Author:     Phil Oester <kernel at linuxace.com>
AuthorDate: Mon Aug 4 13:28:07 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Mon Aug 4 13:28:07 2008 +0200

    iptables-save: fix hashlimit output
    
    In bugzilla 550, Xeb notes that the --hashlimit-htable-gcinterval
    argument is saved incorrectly.  Patch below corrects.
    
    Patch-from: Xeb <xeb at mail.ru>
    Signed-off-by: Phil Oester <kernel at linuxace.com>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
       via  dee5f0009f7ca1a6d092c3c17450c33c53121b7c (commit)
       via  04c97954d5933fc935616f69a8e63944d5c6cec4 (commit)
      from  3c5d15c880c6dca1facf666272fc309b5d307def (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dee5f0009f7ca1a6d092c3c17450c33c53121b7c
Author: Phil Oester <kernel at linuxace.com>
Date:   Mon Aug 4 13:30:30 2008 +0200

    libxt_dscp: fix save of negated dscp match rules
    
    As pointed out by Vyacheslav Garashchenko, iptables-save does not
    save negated dscp matches properly.  Fix below.
    
    This closes bugzilla #533.
    
    Phil
    
    Signed-off-by: Phil Oester <kernel at linuxace.com>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit 04c97954d5933fc935616f69a8e63944d5c6cec4
Author: Phil Oester <kernel at linuxace.com>
Date:   Mon Aug 4 13:28:07 2008 +0200

    iptables-save: fix hashlimit output
    
    In bugzilla 550, Xeb notes that the --hashlimit-htable-gcinterval
    argument is saved incorrectly.  Patch below corrects.
    
    Patch-from: Xeb <xeb at mail.ru>
    Signed-off-by: Phil Oester <kernel at linuxace.com>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

-----------------------------------------------------------------------

 extensions/libxt_dscp.c      |    2 +-
 extensions/libxt_hashlimit.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
In bugzilla 550, Xeb notes that the --hashlimit-htable-gcinterval
argument is saved incorrectly.  Patch below corrects.

Patch-from: Xeb <xeb at mail.ru>
Signed-off-by: Phil Oester <kernel at linuxace.com>
Signed-off-by: Patrick McHardy <kaber at trash.net>

diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c
index 1f34fb9..da9b05f 100644
--- a/extensions/libxt_hashlimit.c
+++ b/extensions/libxt_hashlimit.c
@@ -614,7 +614,7 @@ static void hashlimit_save(const void *ip, const struct xt_entry_match *match)
 	if (r->cfg.max)
 		printf("--hashlimit-htable-max %u ", r->cfg.max);
 	if (r->cfg.gc_interval != XT_HASHLIMIT_GCINTERVAL)
-		printf("--hashlimit-htable-gcinterval %u", r->cfg.gc_interval);
+		printf("--hashlimit-htable-gcinterval %u ", r->cfg.gc_interval);
 	if (r->cfg.expire != XT_HASHLIMIT_EXPIRE)
 		printf("--hashlimit-htable-expire %u ", r->cfg.expire);
 }



More information about the netfilter-cvslog mailing list