* [PATCH v2] extensions: libxt_multiport: Add translation to nft
@ 2016-05-30 19:47 Laura Garcia Liebana
2016-05-30 22:08 ` Arturo Borrero Gonzalez
0 siblings, 1 reply; 7+ messages in thread
From: Laura Garcia Liebana @ 2016-05-30 19:47 UTC (permalink / raw)
To: netfilter-devel
Add translation for multiport to nftables, which it's supported natively.
Examples:
$ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport --dports 80,81 -j ACCEPT
nft add rule ip filter INPUT ip protocol tcp tcp dport { 80,81} counter accept
$ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport --dports 80:88 -j ACCEPT
nft add rule ip filter INPUT ip protocol tcp tcp dport { 80-88} counter accept
$ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport ! --dports 80:88 -j ACCEPT
nft add rule ip filter INPUT ip protocol tcp tcp dport != 80-88 counter accept
Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
---
Changes in v2:
- Add curley brackets to lists and range of ports.
extensions/libxt_multiport.c | 116 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 116 insertions(+)
diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index 03af5a9..25b5589 100644
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -468,6 +468,118 @@ static void multiport_save6_v1(const void *ip_void,
__multiport_save_v1(match, ip->proto);
}
+static int __multiport_xlate(const void *ip, const struct xt_entry_match *match,
+ struct xt_xlate *xl, int numeric)
+{
+ const struct xt_multiport *multiinfo
+ = (const struct xt_multiport *)match->data;
+ unsigned int i;
+
+ switch (multiinfo->flags) {
+ case XT_MULTIPORT_SOURCE:
+ xt_xlate_add(xl, "sport ");
+ break;
+ case XT_MULTIPORT_DESTINATION:
+ xt_xlate_add(xl, "dport ");
+ break;
+ case XT_MULTIPORT_EITHER:
+ return 0;
+ }
+
+ if (multiinfo->count > 1)
+ xt_xlate_add(xl, "{ ");
+
+ for (i = 0; i < multiinfo->count; i++)
+ xt_xlate_add(xl, "%s%u", i ? "," : "", multiinfo->ports[i]);
+
+ if (multiinfo->count > 1)
+ xt_xlate_add(xl, "}");
+
+ xt_xlate_add(xl, " ");
+
+ return 1;
+}
+
+static int multiport_xlate(const void *ip, const struct xt_entry_match *match,
+ struct xt_xlate *xl, int numeric)
+{
+ uint8_t proto = ((const struct ipt_ip *)ip)->proto;
+
+ xt_xlate_add(xl, "%s ", proto_to_name(proto));
+ return __multiport_xlate(ip, match, xl, numeric);
+}
+
+static int multiport_xlate6(const void *ip, const struct xt_entry_match *match,
+ struct xt_xlate *xl, int numeric)
+{
+ uint8_t proto = ((const struct ip6t_ip6 *)ip)->proto;
+
+ xt_xlate_add(xl, "%s ", proto_to_name(proto));
+ return __multiport_xlate(ip, match, xl, numeric);
+}
+
+static int __multiport_xlate_v1(const void *ip,
+ const struct xt_entry_match *match,
+ struct xt_xlate *xl, int numeric)
+{
+ const struct xt_multiport_v1 *multiinfo
+ = (const struct xt_multiport_v1 *)match->data;
+ unsigned int i;
+
+ switch (multiinfo->flags) {
+ case XT_MULTIPORT_SOURCE:
+ xt_xlate_add(xl, "sport ");
+ break;
+ case XT_MULTIPORT_DESTINATION:
+ xt_xlate_add(xl, "dport ");
+ break;
+ case XT_MULTIPORT_EITHER:
+ return 0;
+ }
+
+ if (multiinfo->invert) {
+ xt_xlate_add(xl, "!= ");
+ } else {
+ if (multiinfo->count > 1)
+ xt_xlate_add(xl, "{ ");
+ }
+
+ for (i = 0; i < multiinfo->count; i++) {
+ xt_xlate_add(xl, "%s%u", i ? "," : "", multiinfo->ports[i]);
+ if (i && multiinfo->invert)
+ return 0;
+ if (multiinfo->pflags[i])
+ xt_xlate_add(xl, "-%u", multiinfo->ports[++i]);
+ }
+
+ if (multiinfo->count > 1 && !multiinfo->invert)
+ xt_xlate_add(xl, "}");
+
+ xt_xlate_add(xl, " ");
+
+ return 1;
+}
+
+static int multiport_xlate_v1(const void *ip,
+ const struct xt_entry_match *match,
+ struct xt_xlate *xl, int numeric)
+{
+ uint8_t proto = ((const struct ipt_ip *)ip)->proto;
+
+ xt_xlate_add(xl, "%s ", proto_to_name(proto));
+ return __multiport_xlate_v1(ip, match, xl, numeric);
+}
+
+static int multiport_xlate6_v1(const void *ip,
+ const struct xt_entry_match *match,
+ struct xt_xlate *xl, int numeric)
+{
+ uint8_t proto = ((const struct ip6t_ip6 *)ip)->proto;
+
+ xt_xlate_add(xl, "%s ", proto_to_name(proto));
+ return __multiport_xlate_v1(ip, match, xl, numeric);
+}
+
static struct xtables_match multiport_mt_reg[] = {
{
.family = NFPROTO_IPV4,
@@ -482,6 +594,7 @@ static struct xtables_match multiport_mt_reg[] = {
.print = multiport_print,
.save = multiport_save,
.x6_options = multiport_opts,
+ .xlate = multiport_xlate,
},
{
.family = NFPROTO_IPV6,
@@ -496,6 +609,7 @@ static struct xtables_match multiport_mt_reg[] = {
.print = multiport_print6,
.save = multiport_save6,
.x6_options = multiport_opts,
+ .xlate = multiport_xlate6,
},
{
.family = NFPROTO_IPV4,
@@ -510,6 +624,7 @@ static struct xtables_match multiport_mt_reg[] = {
.print = multiport_print_v1,
.save = multiport_save_v1,
.x6_options = multiport_opts,
+ .xlate = multiport_xlate_v1,
},
{
.family = NFPROTO_IPV6,
@@ -524,6 +639,7 @@ static struct xtables_match multiport_mt_reg[] = {
.print = multiport_print6_v1,
.save = multiport_save6_v1,
.x6_options = multiport_opts,
+ .xlate = multiport_xlate6_v1,
},
};
--
2.7.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] extensions: libxt_multiport: Add translation to nft
2016-05-30 19:47 [PATCH v2] extensions: libxt_multiport: Add translation to nft Laura Garcia Liebana
@ 2016-05-30 22:08 ` Arturo Borrero Gonzalez
2016-05-30 22:41 ` Pablo Neira Ayuso
2016-05-31 7:22 ` Laura Garcia
0 siblings, 2 replies; 7+ messages in thread
From: Arturo Borrero Gonzalez @ 2016-05-30 22:08 UTC (permalink / raw)
To: Laura Garcia Liebana; +Cc: Netfilter Development Mailing list
On 30 May 2016 at 21:47, Laura Garcia Liebana <nevola@gmail.com> wrote:
> Add translation for multiport to nftables, which it's supported natively.
>
> Examples:
>
> $ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport --dports 80,81 -j ACCEPT
> nft add rule ip filter INPUT ip protocol tcp tcp dport { 80,81} counter accept
>
> $ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport --dports 80:88 -j ACCEPT
> nft add rule ip filter INPUT ip protocol tcp tcp dport { 80-88} counter accept
>
> $ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport ! --dports 80:88 -j ACCEPT
> nft add rule ip filter INPUT ip protocol tcp tcp dport != 80-88 counter accept
>
Lets clarify the syntax, this is valid:
tcp dport 8000-8100
tcp dport { 8000-8100}
tcp dport { 8000-8100, 9000-9100}
but they mean different things. It seems we should avoid the braces {}
for the range case, otherwise we would be using a set with a single
element.
However,
tcp dport {8000,8100} <-- valid
tcp dport 8000,8100 <-- invalid
So we should always use braces {} in the non-range case.
Same seems to apply in the case of inversion.
so we end with this combinations:
tcp dport {x,x}
tcp dport != {x,x}
tcp dport x-x
tcp dport != x-x
BTW, related to this, there seems to be a bug in nftables:
% nft add rule t c tcp dport != {80, 81}
BUG: invalid expression type set
nft: evaluate.c:1463: expr_evaluate_relational: Assertion `0' failed.
Aborted
> Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
> ---
> Changes in v2:
> - Add curley brackets to lists and range of ports.
>
> extensions/libxt_multiport.c | 116 +++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 116 insertions(+)
>
> diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
> index 03af5a9..25b5589 100644
> --- a/extensions/libxt_multiport.c
> +++ b/extensions/libxt_multiport.c
> @@ -468,6 +468,118 @@ static void multiport_save6_v1(const void *ip_void,
> __multiport_save_v1(match, ip->proto);
> }
>
> +static int __multiport_xlate(const void *ip, const struct xt_entry_match *match,
> + struct xt_xlate *xl, int numeric)
> +{
> + const struct xt_multiport *multiinfo
> + = (const struct xt_multiport *)match->data;
> + unsigned int i;
> +
> + switch (multiinfo->flags) {
> + case XT_MULTIPORT_SOURCE:
> + xt_xlate_add(xl, "sport ");
> + break;
> + case XT_MULTIPORT_DESTINATION:
> + xt_xlate_add(xl, "dport ");
> + break;
> + case XT_MULTIPORT_EITHER:
> + return 0;
> + }
this case XT_MULTIPORT_EITHER seems unsupported in nftables.
Is there anything established to do in case we find an impossible
translation? print a warning or something? I don't know right now.
I guess we should avoid printing an invalid nftables rule as if the
translation was 100% ok (which is not true in this case).
Just wondering, I should check myself because I don't know this right now.
> +
> + if (multiinfo->count > 1)
> + xt_xlate_add(xl, "{ ");
> +
> + for (i = 0; i < multiinfo->count; i++)
> + xt_xlate_add(xl, "%s%u", i ? "," : "", multiinfo->ports[i]);
> +
> + if (multiinfo->count > 1)
> + xt_xlate_add(xl, "}");
> +
> + xt_xlate_add(xl, " ");
> +
> + return 1;
> +}
> +
> +static int multiport_xlate(const void *ip, const struct xt_entry_match *match,
> + struct xt_xlate *xl, int numeric)
> +{
> + uint8_t proto = ((const struct ipt_ip *)ip)->proto;
> +
> + xt_xlate_add(xl, "%s ", proto_to_name(proto));
> + return __multiport_xlate(ip, match, xl, numeric);
> +}
> +
> +static int multiport_xlate6(const void *ip, const struct xt_entry_match *match,
> + struct xt_xlate *xl, int numeric)
> +{
> + uint8_t proto = ((const struct ip6t_ip6 *)ip)->proto;
> +
> + xt_xlate_add(xl, "%s ", proto_to_name(proto));
> + return __multiport_xlate(ip, match, xl, numeric);
> +}
> +
> +static int __multiport_xlate_v1(const void *ip,
> + const struct xt_entry_match *match,
> + struct xt_xlate *xl, int numeric)
> +{
> + const struct xt_multiport_v1 *multiinfo
> + = (const struct xt_multiport_v1 *)match->data;
> + unsigned int i;
> +
> + switch (multiinfo->flags) {
> + case XT_MULTIPORT_SOURCE:
> + xt_xlate_add(xl, "sport ");
> + break;
> + case XT_MULTIPORT_DESTINATION:
> + xt_xlate_add(xl, "dport ");
> + break;
> + case XT_MULTIPORT_EITHER:
> + return 0;
> + }
same XT_MULTIPORT_EITHER here.
> +
> + if (multiinfo->invert) {
> + xt_xlate_add(xl, "!= ");
> + } else {
> + if (multiinfo->count > 1)
> + xt_xlate_add(xl, "{ ");
> + }
This if/else seems bogus. We only allow port sets if not inverting?
> +
> + for (i = 0; i < multiinfo->count; i++) {
> + xt_xlate_add(xl, "%s%u", i ? "," : "", multiinfo->ports[i]);
> + if (i && multiinfo->invert)
> + return 0;
This return here could mean that we build an incomplete nftables rule
(ie, missing '}')
> + if (multiinfo->pflags[i])
> + xt_xlate_add(xl, "-%u", multiinfo->ports[++i]);
> + }
> +
> + if (multiinfo->count > 1 && !multiinfo->invert)
> + xt_xlate_add(xl, "}");
> +
> + xt_xlate_add(xl, " ");
> +
> + return 1;
> +}
--
Arturo Borrero González
--
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] extensions: libxt_multiport: Add translation to nft
2016-05-30 22:08 ` Arturo Borrero Gonzalez
@ 2016-05-30 22:41 ` Pablo Neira Ayuso
2016-05-31 8:23 ` Arturo Borrero Gonzalez
2016-05-31 7:22 ` Laura Garcia
1 sibling, 1 reply; 7+ messages in thread
From: Pablo Neira Ayuso @ 2016-05-30 22:41 UTC (permalink / raw)
To: Arturo Borrero Gonzalez
Cc: Laura Garcia Liebana, Netfilter Development Mailing list
On Tue, May 31, 2016 at 12:08:57AM +0200, Arturo Borrero Gonzalez wrote:
> On 30 May 2016 at 21:47, Laura Garcia Liebana <nevola@gmail.com> wrote:
> > Add translation for multiport to nftables, which it's supported natively.
> >
> > Examples:
> >
> > $ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport --dports 80,81 -j ACCEPT
> > nft add rule ip filter INPUT ip protocol tcp tcp dport { 80,81} counter accept
> >
> > $ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport --dports 80:88 -j ACCEPT
> > nft add rule ip filter INPUT ip protocol tcp tcp dport { 80-88} counter accept
> >
> > $ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport ! --dports 80:88 -j ACCEPT
> > nft add rule ip filter INPUT ip protocol tcp tcp dport != 80-88 counter accept
> >
>
> Lets clarify the syntax, this is valid:
>
> tcp dport 8000-8100
> tcp dport { 8000-8100}
> tcp dport { 8000-8100, 9000-9100}
>
> but they mean different things. It seems we should avoid the braces {}
> for the range case, otherwise we would be using a set with a single
> element.
>
> However,
>
> tcp dport {8000,8100} <-- valid
> tcp dport 8000,8100 <-- invalid
>
> So we should always use braces {} in the non-range case.
>
> Same seems to apply in the case of inversion.
>
> so we end with this combinations:
>
> tcp dport {x,x}
> tcp dport != {x,x}
> tcp dport x-x
> tcp dport != x-x
>
> BTW, related to this, there seems to be a bug in nftables:
>
> % nft add rule t c tcp dport != {80, 81}
> BUG: invalid expression type set
> nft: evaluate.c:1463: expr_evaluate_relational: Assertion `0' failed.
> Aborted
This is not yet supported. This requires a small kernel patch to allow
inversions in the nft_lookup.c. Then, the little extra code for
libnftnl and nft.
All tests for this usecase are disabled at the moment.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] extensions: libxt_multiport: Add translation to nft
2016-05-30 22:41 ` Pablo Neira Ayuso
@ 2016-05-31 8:23 ` Arturo Borrero Gonzalez
2016-05-31 10:03 ` Pablo Neira Ayuso
0 siblings, 1 reply; 7+ messages in thread
From: Arturo Borrero Gonzalez @ 2016-05-31 8:23 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Laura Garcia Liebana, Netfilter Development Mailing list
On 31 May 2016 at 00:41, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> This is not yet supported. This requires a small kernel patch to allow
> inversions in the nft_lookup.c. Then, the little extra code for
> libnftnl and nft.
>
> All tests for this usecase are disabled at the moment.
What is your idea of the implementation?
Perhaps adding NFTA_LOOKUP_FLAGS and also:
enum nft_lookup_flags {
NFT_LOOKUP_F_INV = (1 << 0),
};
--
Arturo Borrero González
--
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] extensions: libxt_multiport: Add translation to nft
2016-05-31 8:23 ` Arturo Borrero Gonzalez
@ 2016-05-31 10:03 ` Pablo Neira Ayuso
0 siblings, 0 replies; 7+ messages in thread
From: Pablo Neira Ayuso @ 2016-05-31 10:03 UTC (permalink / raw)
To: Arturo Borrero Gonzalez
Cc: Laura Garcia Liebana, Netfilter Development Mailing list
On Tue, May 31, 2016 at 10:23:31AM +0200, Arturo Borrero Gonzalez wrote:
> On 31 May 2016 at 00:41, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > This is not yet supported. This requires a small kernel patch to allow
> > inversions in the nft_lookup.c. Then, the little extra code for
> > libnftnl and nft.
> >
> > All tests for this usecase are disabled at the moment.
>
> What is your idea of the implementation?
>
> Perhaps adding NFTA_LOOKUP_FLAGS and also:
> enum nft_lookup_flags {
> NFT_LOOKUP_F_INV = (1 << 0),
> };
Something like that, yes.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] extensions: libxt_multiport: Add translation to nft
2016-05-30 22:08 ` Arturo Borrero Gonzalez
2016-05-30 22:41 ` Pablo Neira Ayuso
@ 2016-05-31 7:22 ` Laura Garcia
2016-05-31 8:17 ` Arturo Borrero Gonzalez
1 sibling, 1 reply; 7+ messages in thread
From: Laura Garcia @ 2016-05-31 7:22 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: Netfilter Development Mailing list
On Tue, May 31, 2016 at 12:08:57AM +0200, Arturo Borrero Gonzalez wrote:
> On 30 May 2016 at 21:47, Laura Garcia Liebana <nevola@gmail.com> wrote:
> > Add translation for multiport to nftables, which it's supported natively.
> >
> > Examples:
> >
> > $ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport --dports 80,81 -j ACCEPT
> > nft add rule ip filter INPUT ip protocol tcp tcp dport { 80,81} counter accept
> >
> > $ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport --dports 80:88 -j ACCEPT
> > nft add rule ip filter INPUT ip protocol tcp tcp dport { 80-88} counter accept
> >
> > $ sudo iptables-translate -t filter -A INPUT -p tcp -m multiport ! --dports 80:88 -j ACCEPT
> > nft add rule ip filter INPUT ip protocol tcp tcp dport != 80-88 counter accept
> >
>
> Lets clarify the syntax, this is valid:
>
> tcp dport 8000-8100
> tcp dport { 8000-8100}
> tcp dport { 8000-8100, 9000-9100}
>
> but they mean different things. It seems we should avoid the braces {}
> for the range case, otherwise we would be using a set with a single
> element.
>
Yes, you're right. I'll change it in order to allow port ranges without {}.
> However,
>
> tcp dport {8000,8100} <-- valid
> tcp dport 8000,8100 <-- invalid
>
> So we should always use braces {} in the non-range case.
>
> Same seems to apply in the case of inversion.
>
> so we end with this combinations:
>
> tcp dport {x,x}
> tcp dport != {x,x}
This is not supported.
> tcp dport x-x
> tcp dport != x-x
>
> BTW, related to this, there seems to be a bug in nftables:
>
> % nft add rule t c tcp dport != {80, 81}
> BUG: invalid expression type set
> nft: evaluate.c:1463: expr_evaluate_relational: Assertion `0' failed.
> Aborted
>
>
> > Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
> > ---
> > Changes in v2:
> > - Add curley brackets to lists and range of ports.
> >
> > extensions/libxt_multiport.c | 116 +++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 116 insertions(+)
> >
> > diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
> > index 03af5a9..25b5589 100644
> > --- a/extensions/libxt_multiport.c
> > +++ b/extensions/libxt_multiport.c
> > @@ -468,6 +468,118 @@ static void multiport_save6_v1(const void *ip_void,
> > __multiport_save_v1(match, ip->proto);
> > }
> >
> > +static int __multiport_xlate(const void *ip, const struct xt_entry_match *match,
> > + struct xt_xlate *xl, int numeric)
> > +{
> > + const struct xt_multiport *multiinfo
> > + = (const struct xt_multiport *)match->data;
> > + unsigned int i;
> > +
> > + switch (multiinfo->flags) {
> > + case XT_MULTIPORT_SOURCE:
> > + xt_xlate_add(xl, "sport ");
> > + break;
> > + case XT_MULTIPORT_DESTINATION:
> > + xt_xlate_add(xl, "dport ");
> > + break;
> > + case XT_MULTIPORT_EITHER:
> > + return 0;
> > + }
>
> this case XT_MULTIPORT_EITHER seems unsupported in nftables.
>
> Is there anything established to do in case we find an impossible
> translation? print a warning or something? I don't know right now.
> I guess we should avoid printing an invalid nftables rule as if the
> translation was 100% ok (which is not true in this case).
>
It was agreed to return 0 if the translation is not supported for
nftables. Currently, it does.
> Just wondering, I should check myself because I don't know this right now.
>
>
> > +
> > + if (multiinfo->count > 1)
> > + xt_xlate_add(xl, "{ ");
> > +
> > + for (i = 0; i < multiinfo->count; i++)
> > + xt_xlate_add(xl, "%s%u", i ? "," : "", multiinfo->ports[i]);
> > +
> > + if (multiinfo->count > 1)
> > + xt_xlate_add(xl, "}");
> > +
> > + xt_xlate_add(xl, " ");
> > +
> > + return 1;
> > +}
> > +
> > +static int multiport_xlate(const void *ip, const struct xt_entry_match *match,
> > + struct xt_xlate *xl, int numeric)
> > +{
> > + uint8_t proto = ((const struct ipt_ip *)ip)->proto;
> > +
> > + xt_xlate_add(xl, "%s ", proto_to_name(proto));
> > + return __multiport_xlate(ip, match, xl, numeric);
> > +}
> > +
> > +static int multiport_xlate6(const void *ip, const struct xt_entry_match *match,
> > + struct xt_xlate *xl, int numeric)
> > +{
> > + uint8_t proto = ((const struct ip6t_ip6 *)ip)->proto;
> > +
> > + xt_xlate_add(xl, "%s ", proto_to_name(proto));
> > + return __multiport_xlate(ip, match, xl, numeric);
> > +}
> > +
> > +static int __multiport_xlate_v1(const void *ip,
> > + const struct xt_entry_match *match,
> > + struct xt_xlate *xl, int numeric)
> > +{
> > + const struct xt_multiport_v1 *multiinfo
> > + = (const struct xt_multiport_v1 *)match->data;
> > + unsigned int i;
> > +
> > + switch (multiinfo->flags) {
> > + case XT_MULTIPORT_SOURCE:
> > + xt_xlate_add(xl, "sport ");
> > + break;
> > + case XT_MULTIPORT_DESTINATION:
> > + xt_xlate_add(xl, "dport ");
> > + break;
> > + case XT_MULTIPORT_EITHER:
> > + return 0;
> > + }
>
> same XT_MULTIPORT_EITHER here.
>
Same as before.
> > +
> > + if (multiinfo->invert) {
> > + xt_xlate_add(xl, "!= ");
> > + } else {
> > + if (multiinfo->count > 1)
> > + xt_xlate_add(xl, "{ ");
> > + }
>
> This if/else seems bogus. We only allow port sets if not inverting?
>
This should be now changed as we've to accept port ranges without {}.
> > +
> > + for (i = 0; i < multiinfo->count; i++) {
> > + xt_xlate_add(xl, "%s%u", i ? "," : "", multiinfo->ports[i]);
> > + if (i && multiinfo->invert)
> > + return 0;
>
> This return here could mean that we build an incomplete nftables rule
> (ie, missing '}')
>
Such condition cares that there is no translation in nftables for:
tcp dport != { 80,88 }
So the closed } doesn't even matter.
> > + if (multiinfo->pflags[i])
> > + xt_xlate_add(xl, "-%u", multiinfo->ports[++i]);
> > + }
> > +
If the rule needs such closed } , then it's controlled here:
> > + if (multiinfo->count > 1 && !multiinfo->invert)
> > + xt_xlate_add(xl, "}");
> > +
> > + xt_xlate_add(xl, " ");
> > +
> > + return 1;
> > +}
>
>
> --
> Arturo Borrero González
--
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] extensions: libxt_multiport: Add translation to nft
2016-05-31 7:22 ` Laura Garcia
@ 2016-05-31 8:17 ` Arturo Borrero Gonzalez
0 siblings, 0 replies; 7+ messages in thread
From: Arturo Borrero Gonzalez @ 2016-05-31 8:17 UTC (permalink / raw)
To: Laura Garcia; +Cc: Netfilter Development Mailing list
On 31 May 2016 at 09:22, Laura Garcia <nevola@gmail.com> wrote:
>> > +
>> > + for (i = 0; i < multiinfo->count; i++) {
>> > + xt_xlate_add(xl, "%s%u", i ? "," : "", multiinfo->ports[i]);
>> > + if (i && multiinfo->invert)
>> > + return 0;
>>
>> This return here could mean that we build an incomplete nftables rule
>> (ie, missing '}')
>>
>
> Such condition cares that there is no translation in nftables for:
>
> tcp dport != { 80,88 }
>
> So the closed } doesn't even matter.
>
Then, at the start of the xlate function, I would suggest to do an
early return if we are about to translate an unsupported rule.
No need to keep checking if we are in the inversion case
>> > + if (multiinfo->count > 1 && !multiinfo->invert)
>> > + xt_xlate_add(xl, "}");
>> > +
like here
--
Arturo Borrero González
--
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-05-31 10:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-30 19:47 [PATCH v2] extensions: libxt_multiport: Add translation to nft Laura Garcia Liebana
2016-05-30 22:08 ` Arturo Borrero Gonzalez
2016-05-30 22:41 ` Pablo Neira Ayuso
2016-05-31 8:23 ` Arturo Borrero Gonzalez
2016-05-31 10:03 ` Pablo Neira Ayuso
2016-05-31 7:22 ` Laura Garcia
2016-05-31 8:17 ` Arturo Borrero Gonzalez
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).