ipset: Add wildcard support to net,iface
Subsystems (2)
PATCH 1/1 ipset: Add wildcard support to net,iface
The net,iface equal functions currently compares the full interface names. In several cases, wildcard (or prefix) matching is useful. For example, when converting a large iptables rule-set to make use of ipset, I was able to significantly reduce the number of set elements by making use of wildcard matching.
Wildcard matching is enabled by adding "wildcard" when adding an element to a set. Internally, this causes the IPSET_FLAG_IFACE_WILDCARD-flag to be set. When this flag is set, only the initial part of the interface name is used for comparison.
Wildcard matching is done per element and not per set, as there are many cases where mixing wildcard and non-wildcard elements are useful. This means that is up to the user to handle (avoid) overlapping interface names.
--- include/libipset/args.h | 1 + include/libipset/data.h | 4 +- include/libipset/linux_ip_set.h | 2 + .../uapi/linux/netfilter/ipset/ip_set.h | 2 + .../netfilter/ipset/ip_set_hash_netiface.c | 23 ++++- lib/args.c | 8 ++ lib/data.c | 8 ++ lib/ipset_hash_netiface.c | 95 +++++++++++++++++++ src/ipset.8 | 8 +- 9 files changed, 144 insertions(+), 7 deletions(-)
include/libipset/args.h +1 -0
@@ -44,6 +44,7 @@ enum ipset_keywords {IPSET_ARG_FORCEADD ,/* forceadd */ IPSET_ARG_MARKMASK ,/* markmask */ IPSET_ARG_NOMATCH ,/* nomatch */ +IPSET_ARG_IFACE_WILDCARD ,/* interface wildcard match */ /* Extensions */ IPSET_ARG_TIMEOUT ,/* timeout */ IPSET_ARG_COUNTERS, /* counters */
include/libipset/data.h +3 -1
@@ -66,6 +66,7 @@ enum ipset_opt {IPSET_OPT_SKBMARK ,IPSET_OPT_SKBPRIO ,IPSET_OPT_SKBQUEUE , +IPSET_OPT_IFACE_WILDCARD ,/* Internal options */ IPSET_OPT_FLAGS =48 ,/* IPSET_FLAG_EXIST| */ IPSET_OPT_CADT_FLAGS, /* IPSET_FLAG_BEFORE| */
@@ -128,7 +129,8 @@ enum ipset_opt { | IPSET_FLAG(IPSET_OPT_ADT_COMMENT)\ | IPSET_FLAG(IPSET_OPT_SKBMARK) \ | IPSET_FLAG(IPSET_OPT_SKBPRIO) \ - | IPSET_FLAG(IPSET_OPT_SKBQUEUE)) + | IPSET_FLAG(IPSET_OPT_SKBQUEUE) \ + | IPSET_FLAG(IPSET_OPT_IFACE_WILDCARD))struct ipset_data ;
include/libipset/linux_ip_set.h +2 -0
@@ -204,6 +204,8 @@ enum ipset_cadt_flags {IPSET_FLAG_WITH_FORCEADD = (1 <<IPSET_FLAG_BIT_WITH_FORCEADD ),IPSET_FLAG_BIT_WITH_SKBINFO =6 ,IPSET_FLAG_WITH_SKBINFO = (1 <<IPSET_FLAG_BIT_WITH_SKBINFO ), +IPSET_FLAG_BIT_IFACE_WILDCARD =7 , +IPSET_FLAG_IFACE_WILDCARD = (1 <<IPSET_FLAG_BIT_IFACE_WILDCARD ), IPSET_FLAG_CADT_MAX = 15, };
kernel/include/uapi/linux/netfilter/ipset/ip_set.h +2 -0
@@ -204,6 +204,8 @@ enum ipset_cadt_flags {IPSET_FLAG_WITH_FORCEADD = (1 <<IPSET_FLAG_BIT_WITH_FORCEADD ),IPSET_FLAG_BIT_WITH_SKBINFO =6 ,IPSET_FLAG_WITH_SKBINFO = (1 <<IPSET_FLAG_BIT_WITH_SKBINFO ), +IPSET_FLAG_BIT_IFACE_WILDCARD =7 , +IPSET_FLAG_IFACE_WILDCARD = (1 <<IPSET_FLAG_BIT_IFACE_WILDCARD ), IPSET_FLAG_CADT_MAX = 15, };
kernel/net/netfilter/ipset/ip_set_hash_netiface.c +18 -5
@@ -29,7 +29,8 @@/* 3 Counters support added */ /* 4 Comments support added */ /* 5 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 6/* skbinfo support added */ +/* 6 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 7/* interface wildcard support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -61,6 +62,7 @@ struct hash_netiface4_elem {u8 cidr;u8 nomatch;u8 elem; +u8 wildcard;char iface[IFNAMSIZ ]; };
@@ -75,7 +77,9 @@ hash_netiface4_data_equal(const struct hash_netiface4_elem *ip1, ip1->cidr == ip2->cidr && (++*multi) && ip1->physdev == ip2->physdev && -strcmp (ip1->iface, ip2->iface) ==0 ; + (ip1->wildcard ? +strncmp (ip1->iface, ip2->iface,strlen (ip1->iface)) ==0 : +strcmp (ip1->iface, ip2->iface) ==0 ); } static inline int
@@ -107,7 +111,8 @@ static bool hash_netiface4_data_list(struct sk_buff *skb, const struct hash_netiface4_elem *data) { - u32 flags = data->physdev ? IPSET_FLAG_PHYSDEV : 0; + u32 flags = (data->physdev ? IPSET_FLAG_PHYSDEV : 0) | + (data->wildcard ?IPSET_FLAG_IFACE_WILDCARD :0 );if (data->nomatch) flags |=IPSET_FLAG_NOMATCH ;
@@ -233,6 +238,8 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[], e.physdev =1 ;if (cadt_flags &IPSET_FLAG_NOMATCH ) flags |= (IPSET_FLAG_NOMATCH <<16 ); +if (cadt_flags &IPSET_FLAG_IFACE_WILDCARD ) + e.wildcard =1 ; }if (adt ==IPSET_TEST || !tb[IPSET_ATTR_IP_TO ]) { e.ip =htonl (ip &ip_set_hostmask (e.cidr));
@@ -284,6 +291,7 @@ struct hash_netiface6_elem {u8 cidr;u8 nomatch;u8 elem; +u8 wildcard;char iface[IFNAMSIZ ]; };
@@ -298,7 +306,9 @@ hash_netiface6_data_equal(const struct hash_netiface6_elem *ip1, ip1->cidr == ip2->cidr && (++*multi) && ip1->physdev == ip2->physdev && -strcmp (ip1->iface, ip2->iface) ==0 ; + (ip1->wildcard ? +strncmp (ip1->iface, ip2->iface,strlen (ip1->iface)) ==0 : +strcmp (ip1->iface, ip2->iface) ==0 ); } static inline int
@@ -330,7 +340,8 @@ static bool hash_netiface6_data_list(struct sk_buff *skb, const struct hash_netiface6_elem *data) { - u32 flags = data->physdev ? IPSET_FLAG_PHYSDEV : 0; + u32 flags = (data->physdev ? IPSET_FLAG_PHYSDEV : 0) | + (data->wildcard ?IPSET_FLAG_IFACE_WILDCARD :0 );if (data->nomatch) flags |=IPSET_FLAG_NOMATCH ;
@@ -444,6 +455,8 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[], e.physdev =1 ;if (cadt_flags &IPSET_FLAG_NOMATCH ) flags |= (IPSET_FLAG_NOMATCH <<16 ); +if (cadt_flags &IPSET_FLAG_IFACE_WILDCARD ) + e.wildcard =1 ; } ret =adtfn (set, &e, &ext, &ext, flags);
lib/args.c +8 -0
@@ -195,6 +195,14 @@ static const struct ipset_arg ipset_args[] = { .print = ipset_print_flag, .help = "[nomatch]", }, + [IPSET_ARG_IFACE_WILDCARD] = { + .name = { "wildcard", NULL }, + .has_arg = IPSET_NO_ARG, + .opt = IPSET_OPT_IFACE_WILDCARD, + .parse = ipset_parse_flag, + .print = ipset_print_flag, + .help = "[wildcard]", + },/* Extensions */ [IPSET_ARG_TIMEOUT] = { .name = { "timeout", NULL },
lib/data.c +8 -0
@@ -410,6 +410,9 @@ ipset_data_set(struct ipset_data *data, enum ipset_opt opt, const void *value)case IPSET_OPT_NOMATCH :cadt_flag_type_attr (data, opt,IPSET_FLAG_NOMATCH );break ; +case IPSET_OPT_IFACE_WILDCARD : +cadt_flag_type_attr (data, opt,IPSET_FLAG_IFACE_WILDCARD ); +break ;case IPSET_OPT_FLAGS : data->flags = *(const uint32_t *)value;break ;
@@ -433,6 +436,9 @@ ipset_data_set(struct ipset_data *data, enum ipset_opt opt, const void *value)if (data->cadt_flags &IPSET_FLAG_WITH_SKBINFO )ipset_data_flags_set (data,IPSET_FLAG (IPSET_OPT_SKBINFO )); +if (data->cadt_flags &IPSET_FLAG_IFACE_WILDCARD ) +ipset_data_flags_set (data, +IPSET_FLAG (IPSET_OPT_IFACE_WILDCARD ));break ;default :return -1 ;
@@ -564,6 +570,7 @@ ipset_data_get(const struct ipset_data *data, enum ipset_opt opt)case IPSET_OPT_CREATE_COMMENT :case IPSET_OPT_FORCEADD :case IPSET_OPT_SKBINFO : +case IPSET_OPT_IFACE_WILDCARD :return &data->cadt_flags;default :return NULL ;
@@ -630,6 +637,7 @@ ipset_data_sizeof(enum ipset_opt opt, uint8_t family)case IPSET_OPT_NOMATCH :case IPSET_OPT_COUNTERS :case IPSET_OPT_FORCEADD : +case IPSET_OPT_IFACE_WILDCARD :return sizeof (uint32_t );case IPSET_OPT_ADT_COMMENT :return IPSET_MAX_COMMENT_SIZE +1 ;
lib/ipset_hash_netiface.c +95 -0
105 lines not on this page · raw message
src/ipset.8 +7 -1
@@ -385,6 +385,12 @@ succeed and evict a random entry from the set. .IP ipset create foo hash:ip forceadd .PP +.SS wildcard +This flag is valid when adding elements to a \fBhash:net,iface\fR set. If the +flag is set, then prefix matching is used when comparing with this element. For +example, an element containing the interface name "eth" will match any name with +that prefix. +.PP .SH "SET TYPES" .SS bitmap:ip The \fBbitmap:ip\fR set type uses a memory range to store either IPv4 host
@@ -957,7 +963,7 @@ address and interface name pairs. .PP \fIADD\-ENTRY\fR := \fInetaddr\fR,[\fBphysdev\fR:]\fIiface\fR .PP -\fIADD\-OPTIONS\fR := [ \fBtimeout\fR \fIvalue\fR ] [ \fBnomatch\fR ] [ \fBpackets\fR \fIvalue\fR ] [ \fBbytes\fR \fIvalue\fR ] [ \fBcomment\fR \fIstring\fR ] [ \fBskbmark\fR \fIvalue\fR ] [ \fBskbprio\fR \fIvalue\fR ] [ \fBskbqueue\fR \fIvalue\fR ] +\fIADD\-OPTIONS\fR := [ \fBtimeout\fR \fIvalue\fR ] [ \fBnomatch\fR ] [ \fBpackets\fR \fIvalue\fR ] [ \fBbytes\fR \fIvalue\fR ] [ \fBcomment\fR \fIstring\fR ] [ \fBskbmark\fR \fIvalue\fR ] [ \fBskbprio\fR \fIvalue\fR ] [ \fBskbqueue\fR \fIvalue\fR ] [ \fBwildcard\fR ] .PP \fIDEL\-ENTRY\fR := \fInetaddr\fR,[\fBphysdev\fR:]\fIiface\fR .PP
Signature · 1 line
2.20.1
Hi Kristian,
Quoted 10 lines · Kristian Evensen
The net,iface equal functions currently compares the full interface names. In several cases, wildcard (or prefix) matching is useful. For example, when converting a large iptables rule-set to make use of ipset, I was able to significantly reduce the number of set elements by making use of wildcard matching.
Wildcard matching is enabled by adding "wildcard" when adding an element to a set. Internally, this causes the IPSET_FLAG_IFACE_WILDCARD-flag to be set. When this flag is set, only the initial part of the interface name is used for comparison.
Sorry for the long delay - I'm still pondering on the syntax.
ip[6]tables uses the "+" notation for prefix matching. So in order to be compatible with it, it'd be better to use "ifac+" instead of "ifac prefix". The parsing/printing could be solved in the interface parser/printer functions internally. What do you think?
Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics
H-1525 Budapest 114, POB. 49, Hungary
Hi Jozsef,
Quoted 6 lines · Kadlecsik József
Sorry for the long delay - I'm still pondering on the syntax.
ip[6]tables uses the "+" notation for prefix matching. So in order to be compatible with it, it'd be better to use "ifac+" instead of "ifac prefix". The parsing/printing could be solved in the interface parser/printer functions internally. What do you think?
No worries about the delay :)
Before submitting the patch, I spent a lot of time thinking about the syntax since, as you say, ip[6]tables uses "+" to indicate prefix matching. The first version of the change checked for a "+" at the end of the interface name, instead of the wildcard flag. However, the reason I went with the wildcard flag, was that I discovered that "+" is a valid character in interface names on Linux. One thing we could do, is to remove any trailing "+" if the wildcard flag is set. However, I believe such a solution will be a bit redundant, but I have no strong opinion on how to parse the interface name provided by the user :)
BR,
Kristian
Hi Jozsef,
Quoted 1 line · Kadlecsik József
Sorry for the long delay - I'm still pondering on the syntax.
I hope you are doing fine. I don't mean to be rude or anything by nagging, but I was wondering if you have had time to think some more about the syntax for wildcard-support?
Have a nice day!
BR,
Kristian
Hi Kristian,
Quoted 7 lines · Kristian Evensen
Quoted 1 line · Kadlecsik József
Sorry for the long delay - I'm still pondering on the syntax.
I hope you are doing fine. I don't mean to be rude or anything by nagging, but I was wondering if you have had time to think some more about the syntax for wildcard-support?
I have just applied your patch in my ipset git tree. I'm working on a new release, hopefully it'll be out at the weekend. Thanks for the patience!
Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics
H-1525 Budapest 114, POB. 49, Hungary
Hi Jozsef,
Quoted 2 lines · Kadlecsik József
I have just applied your patch in my ipset git tree. I'm working on a new release, hopefully it'll be out at the weekend. Thanks for the patience!
No problem and thanks a lot! Enjoy the rest of the day.
BR,
Kristian