diff options
| author | Josh Hunt <johunt@akamai.com> | 2014-02-28 22:14:58 -0500 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2014-03-04 17:36:49 +0100 |
| commit | 51ffda2edac5f30fa59d7e2728fe67868f2b850e (patch) | |
| tree | 749cf84d5401c68e4d4964518a1f9baa674baef7 /include/libipset | |
| parent | ca6038b28b875211f3a17f27e8c28af7a55898f7 (diff) | |
ipset: add userspace support for forceadd
The userspace side of the forceadd changes.
Signed-off-by: Josh Hunt <johunt@akamai.com>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'include/libipset')
| -rw-r--r-- | include/libipset/data.h | 4 | ||||
| -rw-r--r-- | include/libipset/linux_ip_set.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/libipset/data.h b/include/libipset/data.h index 3a26b1e..06ece1e 100644 --- a/include/libipset/data.h +++ b/include/libipset/data.h @@ -36,6 +36,7 @@ enum ipset_opt { IPSET_OPT_PROBES, IPSET_OPT_RESIZE, IPSET_OPT_SIZE, + IPSET_OPT_FORCEADD, /* Create-specific options, filled out by the kernel */ IPSET_OPT_ELEMENTS, IPSET_OPT_REFERENCES, @@ -94,7 +95,8 @@ enum ipset_opt { | IPSET_FLAG(IPSET_OPT_RESIZE) \ | IPSET_FLAG(IPSET_OPT_SIZE) \ | IPSET_FLAG(IPSET_OPT_COUNTERS)\ - | IPSET_FLAG(IPSET_OPT_CREATE_COMMENT)) + | IPSET_FLAG(IPSET_OPT_CREATE_COMMENT)\ + | IPSET_FLAG(IPSET_OPT_FORCEADD)) #define IPSET_ADT_FLAGS \ (IPSET_FLAG(IPSET_OPT_IP) \ diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h index b8cc493..7272b2b 100644 --- a/include/libipset/linux_ip_set.h +++ b/include/libipset/linux_ip_set.h @@ -186,13 +186,16 @@ enum ipset_cadt_flags { IPSET_FLAG_WITH_COUNTERS = (1 << IPSET_FLAG_BIT_WITH_COUNTERS), IPSET_FLAG_BIT_WITH_COMMENT = 4, IPSET_FLAG_WITH_COMMENT = (1 << IPSET_FLAG_BIT_WITH_COMMENT), + IPSET_FLAG_BIT_WITH_FORCEADD = 5, + IPSET_FLAG_WITH_FORCEADD = (1 << IPSET_FLAG_BIT_WITH_FORCEADD), IPSET_FLAG_CADT_MAX = 15, }; /* The flag bits which correspond to the non-extension create flags */ enum ipset_create_flags { - IPSET_CREATE_FLAG_NONE = 0, - IPSET_CREATE_FLAG_MAX = 7, + IPSET_CREATE_FLAG_BIT_FORCEADD = 0, + IPSET_CREATE_FLAG_FORCEADD = (1 << IPSET_CREATE_FLAG_BIT_FORCEADD), + IPSET_CREATE_FLAG_BIT_MAX = 7, }; /* Commands with settype-specific attributes */ |