* [PATCH 1/3] Fix all set output from list/save when set with counters in use.
@ 2013-11-07 9:40 Sergey Popovich
2013-11-11 21:31 ` Jozsef Kadlecsik
2013-11-12 10:30 ` [PATCH 1/3 v2] " Sergey Popovich
0 siblings, 2 replies; 4+ messages in thread
From: Sergey Popovich @ 2013-11-07 9:40 UTC (permalink / raw)
To: netfilter-devel
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.
Signed-off-by: Sergey Popovich <popovich_sergei@mail.ru>
---
include/libipset/data.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/libipset/data.h b/include/libipset/data.h
index b6e75e8..fded8bd 100644
--- a/include/libipset/data.h
+++ b/include/libipset/data.h
@@ -90,6 +90,9 @@ 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_PACKETS) \
+ | IPSET_FLAG(IPSET_OPT_BYTES) \
| IPSET_FLAG(IPSET_OPT_CREATE_COMMENT))
#define IPSET_ADT_FLAGS \
@@ -110,6 +113,9 @@ enum ipset_opt {
| IPSET_FLAG(IPSET_OPT_BEFORE) \
| IPSET_FLAG(IPSET_OPT_PHYSDEV) \
| IPSET_FLAG(IPSET_OPT_NOMATCH) \
+ | IPSET_FLAG(IPSET_OPT_COUNTERS)\
+ | IPSET_FLAG(IPSET_OPT_PACKETS) \
+ | IPSET_FLAG(IPSET_OPT_BYTES) \
| IPSET_FLAG(IPSET_OPT_ADT_COMMENT))
struct ipset_data;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/3] Fix all set output from list/save when set with counters in use.
2013-11-07 9:40 [PATCH 1/3] Fix all set output from list/save when set with counters in use Sergey Popovich
@ 2013-11-11 21:31 ` Jozsef Kadlecsik
2013-11-12 10:30 ` [PATCH 1/3 v2] " Sergey Popovich
1 sibling, 0 replies; 4+ messages in thread
From: Jozsef Kadlecsik @ 2013-11-11 21:31 UTC (permalink / raw)
To: Sergey Popovich; +Cc: netfilter-devel
On Thu, 7 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.
>
> Signed-off-by: Sergey Popovich <popovich_sergei@mail.ru>
> ---
> include/libipset/data.h | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/include/libipset/data.h b/include/libipset/data.h
> index b6e75e8..fded8bd 100644
> --- a/include/libipset/data.h
> +++ b/include/libipset/data.h
> @@ -90,6 +90,9 @@ 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_PACKETS) \
> + | IPSET_FLAG(IPSET_OPT_BYTES) \
> | IPSET_FLAG(IPSET_OPT_CREATE_COMMENT))
There's no need to add IPSET_OPT_PACKETS and IPSET_OPT_BYTES to the CREATE
option flags, and
> #define IPSET_ADT_FLAGS \
> @@ -110,6 +113,9 @@ enum ipset_opt {
> | IPSET_FLAG(IPSET_OPT_BEFORE) \
> | IPSET_FLAG(IPSET_OPT_PHYSDEV) \
> | IPSET_FLAG(IPSET_OPT_NOMATCH) \
> + | IPSET_FLAG(IPSET_OPT_COUNTERS)\
> + | IPSET_FLAG(IPSET_OPT_PACKETS) \
> + | IPSET_FLAG(IPSET_OPT_BYTES) \
> | IPSET_FLAG(IPSET_OPT_ADT_COMMENT))
similarly, IPSET_OPT_COUNTERS is not required at the ADT option flags.
Please resubmit the patch with these changes. 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
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/3 v2] Fix all set output from list/save when set with counters in use.
2013-11-07 9:40 [PATCH 1/3] Fix all set output from list/save when set with counters in use Sergey Popovich
2013-11-11 21:31 ` Jozsef Kadlecsik
@ 2013-11-12 10:30 ` Sergey Popovich
2013-11-13 9:09 ` Jozsef Kadlecsik
1 sibling, 1 reply; 4+ messages in thread
From: Sergey Popovich @ 2013-11-12 10:30 UTC (permalink / raw)
To: netfilter-devel
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/3 v2] Fix all set output from list/save when set with counters in use.
2013-11-12 10:30 ` [PATCH 1/3 v2] " Sergey Popovich
@ 2013-11-13 9:09 ` Jozsef Kadlecsik
0 siblings, 0 replies; 4+ messages in thread
From: Jozsef Kadlecsik @ 2013-11-13 9:09 UTC (permalink / raw)
To: Sergey Popovich; +Cc: netfilter-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-13 9:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-07 9:40 [PATCH 1/3] Fix all set output from list/save when set with counters in use Sergey Popovich
2013-11-11 21:31 ` Jozsef Kadlecsik
2013-11-12 10:30 ` [PATCH 1/3 v2] " Sergey Popovich
2013-11-13 9:09 ` Jozsef Kadlecsik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).