From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH] extensions: libxt_statistic: Complete nft translator
Date: Mon, 13 Mar 2017 17:01:53 +0100 [thread overview]
Message-ID: <20170313160153.21120-1-phil@nwl.cc> (raw)
This was missing a translation for random mode. The substitute should
mimick what iptables and xt_statistic kernel module do:
- iptables takes p in [0.0; 1.0] as probability of a packet to pass,
then passes p' = lround(p * 0x80000000) to kernel.
- Kernel takes random r in [0; 0x7FFFFFFF] and matches packet if r < p'.
The nftables numgen expression works differently:
- nft takes 32bit int n (RHS) and 32bit modulo m and passes both to
kernel.
- Kernel takes random r in [0; m[ and compares it to n to decide if
packet matches.
So in order to replicate the r < p' condition of xt_statistic, choose
m = 0x80000000, op = OP_LT and n = p'.
In order to not generate unnecessarily big numbers, divide m and n by
gcd(m, n) before printing the nft rule.
Here are a few example translations:
$ iptables-translate -A INPUT -m statistic --mode random --probability 0.25
nft add rule ip filter INPUT numgen random mod 0x4 < 0x1 counter
$ iptables-translate -A INPUT -m statistic --mode random --probability 0.5
nft add rule ip filter INPUT numgen random mod 0x2 < 0x1 counter
$ iptables-translate -A INPUT -m statistic --mode random --probability 0.75
nft add rule ip filter INPUT numgen random mod 0x4 < 0x3 counter
$ iptables-translate -A INPUT -m statistic --mode random --probability 0.33
nft add rule ip filter INPUT numgen random mod 0x20000000 < 0xa8f5c29 counter
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
In general, I don't think the code is correct: To really match the
requested probability, an op of '<=' should be generated instead of '<'.
But if I'm not mistaken, this is actually a problem of xt_statistic and
not the converter's.
---
extensions/libxt_statistic.c | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/extensions/libxt_statistic.c b/extensions/libxt_statistic.c
index 4f3341a3d1162..9e84374257641 100644
--- a/extensions/libxt_statistic.c
+++ b/extensions/libxt_statistic.c
@@ -133,15 +133,44 @@ static void statistic_save(const void *ip, const struct xt_entry_match *match)
print_match(info, "--");
}
+/* divide *a and *b by gcd(*a, *b) */
+static void gcd_div(__u32 *a, __u32 *b)
+{
+ __u32 tmp, nom, denom;
+
+ if (a > b) {
+ nom = *a;
+ denom = *b;
+ } else {
+ nom = *b;
+ denom = *a;
+ }
+
+ while (denom != 0) {
+ tmp = nom % denom;
+ nom = denom;
+ denom = tmp;
+ }
+
+ *a /= nom;
+ *b /= nom;
+}
+
static int statistic_xlate(struct xt_xlate *xl,
const struct xt_xlate_mt_params *params)
{
const struct xt_statistic_info *info =
(struct xt_statistic_info *)params->match->data;
+ __u32 mod = 0x80000000, prob = info->u.random.probability;
switch (info->mode) {
case XT_STATISTIC_MODE_RANDOM:
- return 0;
+ gcd_div(&prob, &mod);
+ xt_xlate_add(xl, "numgen random mod 0x%x %s 0x%x",
+ mod,
+ info->flags & XT_STATISTIC_INVERT ? ">=" : "<",
+ prob);
+ break;
case XT_STATISTIC_MODE_NTH:
xt_xlate_add(xl, "numgen inc mod %u %s%u",
info->u.nth.every + 1,
--
2.11.0
next reply other threads:[~2017-03-13 16:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-13 16:01 Phil Sutter [this message]
2017-03-13 16:53 ` [iptables PATCH] extensions: libxt_statistic: Complete nft translator Pablo Neira Ayuso
2017-03-14 14:11 ` Phil Sutter
2017-03-15 11:01 ` Pablo Neira Ayuso
2017-03-22 13:27 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170313160153.21120-1-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).