Patchwork [1/3,v2] Fix all set output from list/save when set with counters in use.

login
register
mail settings
Submitter Sergey Popovich
Date Nov. 12, 2013, 10:30 a.m.
Message ID <2840394.lsSE8FCu3c@tuxracer>
Download mbox | patch
Permalink /patch/290581/
State Awaiting Upstream
Delegated to: Jozsef Kadlecsik
Headers show

Comments

Sergey Popovich - Nov. 12, 2013, 10:30 a.m.
Using upstream version with counters support we have following
output when listing all sets currently configured:
--------------------------------------------------

 # ipset create test-1 hash:ip
 # ipset create test-2 hash:ip counters
 # ipset add test-2 192.0.2.1/32
 # ipset create test-3 hash:ip
 # ipset add test-3 192.0.2.1/32
 # ipset list
 Name: test-1
 Type: hash:ip
 Revision: 2
 Header: family inet hashsize 1024 maxelem 65536
 Size in memory: 16504
 References: 0
 Members:

 Name: test-2
 Type: hash:ip
 Revision: 2
 Header: family inet hashsize 1024 maxelem 65536 counters
 Size in memory: 16616
 References: 0
 Members:
 192.0.2.1 packets 0 bytes 0

 Name: test-3
 Type: hash:ip
 Revision: 2
 Header: family inet hashsize 1024 maxelem 65536 counters
 Size in memory: 16520
 References: 0
 Members:
 192.0.2.1 packets 0 bytes 0

Set test-3 created without counters, but displayed as with counters
present.

Restricting output to list only test-3 set we have:
---------------------------------------------------
  # ipset list test-3
  Name: test-3
  Type: hash:ip
  Revision: 2
  Header: family inet hashsize 1024 maxelem 65536
  Size in memory: 16520
  References: 0
  Members:
  192.0.2.1

So test-3 set created correctly without counters support, but in
all sets listing it displayed as such one with counters.

It seems with commit 5a6021823aa0da24b83f8d03f46ad4202f149fa3
(Support counters in the ipset library) we fogot to add counter
options flags to IPSET_CREATE_FLAGS and IPSET_ADT_FLAGS defines to
clear these flags when preparing output in callback_list() from
lib/session.c.

v2: Remove IPSET_OPT_BYTES, IPSET_PAKETS from CREATE and
    IPSET_OPT_COUNTERS from ADT.

Signed-off-by: Sergey Popovich <popovich_sergei@mail.ru>
---
 include/libipset/data.h |    3 +++
 1 file changed, 3 insertions(+)
Jozsef Kadlecsik - Nov. 13, 2013, 9:09 a.m.
On Tue, 12 Nov 2013, Sergey Popovich wrote:

> Using upstream version with counters support we have following
> output when listing all sets currently configured:
> --------------------------------------------------
> 
>  # ipset create test-1 hash:ip
>  # ipset create test-2 hash:ip counters
>  # ipset add test-2 192.0.2.1/32
>  # ipset create test-3 hash:ip
>  # ipset add test-3 192.0.2.1/32
>  # ipset list
>  Name: test-1
>  Type: hash:ip
>  Revision: 2
>  Header: family inet hashsize 1024 maxelem 65536
>  Size in memory: 16504
>  References: 0
>  Members:
> 
>  Name: test-2
>  Type: hash:ip
>  Revision: 2
>  Header: family inet hashsize 1024 maxelem 65536 counters
>  Size in memory: 16616
>  References: 0
>  Members:
>  192.0.2.1 packets 0 bytes 0
> 
>  Name: test-3
>  Type: hash:ip
>  Revision: 2
>  Header: family inet hashsize 1024 maxelem 65536 counters
>  Size in memory: 16520
>  References: 0
>  Members:
>  192.0.2.1 packets 0 bytes 0
> 
> Set test-3 created without counters, but displayed as with counters
> present.
> 
> Restricting output to list only test-3 set we have:
> ---------------------------------------------------
>   # ipset list test-3
>   Name: test-3
>   Type: hash:ip
>   Revision: 2
>   Header: family inet hashsize 1024 maxelem 65536
>   Size in memory: 16520
>   References: 0
>   Members:
>   192.0.2.1
> 
> So test-3 set created correctly without counters support, but in
> all sets listing it displayed as such one with counters.
> 
> It seems with commit 5a6021823aa0da24b83f8d03f46ad4202f149fa3
> (Support counters in the ipset library) we fogot to add counter
> options flags to IPSET_CREATE_FLAGS and IPSET_ADT_FLAGS defines to
> clear these flags when preparing output in callback_list() from
> lib/session.c.
> 
> v2: Remove IPSET_OPT_BYTES, IPSET_PAKETS from CREATE and
>     IPSET_OPT_COUNTERS from ADT.
> 
> Signed-off-by: Sergey Popovich <popovich_sergei@mail.ru>
> ---
>  include/libipset/data.h |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/include/libipset/data.h b/include/libipset/data.h
> index b6e75e8..cbf30cc 100644
> --- a/include/libipset/data.h
> +++ b/include/libipset/data.h
> @@ -90,6 +90,7 @@ enum ipset_opt {
>  	| IPSET_FLAG(IPSET_OPT_PROBES)	\
>  	| IPSET_FLAG(IPSET_OPT_RESIZE)	\
>  	| IPSET_FLAG(IPSET_OPT_SIZE)	\
> +	| IPSET_FLAG(IPSET_OPT_COUNTERS)\
>  	| IPSET_FLAG(IPSET_OPT_CREATE_COMMENT))
>  
>  #define IPSET_ADT_FLAGS			\
> @@ -110,6 +111,8 @@ enum ipset_opt {
>  	| IPSET_FLAG(IPSET_OPT_BEFORE) \
>  	| IPSET_FLAG(IPSET_OPT_PHYSDEV) \
>  	| IPSET_FLAG(IPSET_OPT_NOMATCH) \
> +	| IPSET_FLAG(IPSET_OPT_PACKETS)	\
> +	| IPSET_FLAG(IPSET_OPT_BYTES)	\
>  	| IPSET_FLAG(IPSET_OPT_ADT_COMMENT))
>  
>  struct ipset_data;
> -- 
> 1.7.10.4

Patch is applied, thanks.

Best regards,
Jozsef
-
E-mail  : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/libipset/data.h b/include/libipset/data.h
index b6e75e8..cbf30cc 100644
--- a/include/libipset/data.h
+++ b/include/libipset/data.h
@@ -90,6 +90,7 @@  enum ipset_opt {
 	| IPSET_FLAG(IPSET_OPT_PROBES)	\
 	| IPSET_FLAG(IPSET_OPT_RESIZE)	\
 	| IPSET_FLAG(IPSET_OPT_SIZE)	\
+	| IPSET_FLAG(IPSET_OPT_COUNTERS)\
 	| IPSET_FLAG(IPSET_OPT_CREATE_COMMENT))
 
 #define IPSET_ADT_FLAGS			\
@@ -110,6 +111,8 @@  enum ipset_opt {
 	| IPSET_FLAG(IPSET_OPT_BEFORE) \
 	| IPSET_FLAG(IPSET_OPT_PHYSDEV) \
 	| IPSET_FLAG(IPSET_OPT_NOMATCH) \
+	| IPSET_FLAG(IPSET_OPT_PACKETS)	\
+	| IPSET_FLAG(IPSET_OPT_BYTES)	\
 	| IPSET_FLAG(IPSET_OPT_ADT_COMMENT))
 
 struct ipset_data;