extensions: libxt_NFQUEUE: Add translation to nft

Add translation for NF queue to nftables.

Examples:

$ sudo iptables-translate -t nat -A PREROUTING -p tcp --dport 80 -j NFQUEUE --queue-num 30
nft add rule ip nat PREROUTING tcp dport 80 counter queue num 30

$ sudo iptables-translate -A FORWARD -j NFQUEUE --queue-num 0 --queue-bypass -p TCP --sport 80
nft add rule ip filter FORWARD tcp sport 80 counter queue num 0 bypass

$ sudo iptables-translate -A FORWARD -j NFQUEUE --queue-bypass -p TCP --sport 80 --queue-balance 0:3 --queue-cpu-fanout
nft add rule ip filter FORWARD tcp sport 80 counter queue num 0-3 bypass,fanout

Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c
index 0c869187abf38a02235f0f310fbacb071e48c8e0..fe005cb290cff9cd06e3e1e8df3cd60c440a5122 100644 (file)
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
@@ -205,6 +205,58 @@ static void NFQUEUE_init_v1(struct xt_entry_target *t)
        tinfo->queues_total = 1;
 }
 
+static int NFQUEUE_xlate(const struct xt_entry_target *target,
+                        struct xt_xlate *xl, int numeric)
+{
+       const struct xt_NFQ_info *tinfo =
+               (const struct xt_NFQ_info *)target->data;
+
+       xt_xlate_add(xl, "queue num %u ", tinfo->queuenum);
+
+       return 1;
+}
+
+static int NFQUEUE_xlate_v1(const struct xt_entry_target *target,
+                           struct xt_xlate *xl, int numeric)
+{
+       const struct xt_NFQ_info_v1 *tinfo = (const void *)target->data;
+       unsigned int last = tinfo->queues_total;
+
+       if (last > 1) {
+               last += tinfo->queuenum - 1;
+               xt_xlate_add(xl, "queue num %u-%u ", tinfo->queuenum, last);
+       } else {
+               xt_xlate_add(xl, "queue num %u ", tinfo->queuenum);
+       }
+
+       return 1;
+}
+
+static int NFQUEUE_xlate_v2(const struct xt_entry_target *target,
+                           struct xt_xlate *xl, int numeric)
+{
+       const struct xt_NFQ_info_v2 *info = (void *) target->data;
+
+       NFQUEUE_xlate_v1(target, xl, numeric);
+
+       if (info->bypass & NFQ_FLAG_BYPASS)
+               xt_xlate_add(xl, "bypass");
+
+       return 1;
+}
+
+static int NFQUEUE_xlate_v3(const struct xt_entry_target *target,
+                           struct xt_xlate *xl, int numeric)
+{
+       const struct xt_NFQ_info_v3 *info = (void *)target->data;
+
+       NFQUEUE_xlate_v2(target, xl, numeric);
+       if (info->flags & NFQ_FLAG_CPU_FANOUT)
+               xt_xlate_add(xl, "%sfanout ", info->flags & NFQ_FLAG_BYPASS ? "," : "");
+
+       return 1;
+}
+
 static struct xtables_target nfqueue_targets[] = {
 {
        .family         = NFPROTO_UNSPEC,
@@ -216,7 +268,8 @@ static struct xtables_target nfqueue_targets[] = {
        .print          = NFQUEUE_print,
        .save           = NFQUEUE_save,
        .x6_parse       = NFQUEUE_parse,
-       .x6_options     = NFQUEUE_opts
+       .x6_options     = NFQUEUE_opts,
+       .xlate          = NFQUEUE_xlate,
 },{
        .family         = NFPROTO_UNSPEC,
        .revision       = 1,
@@ -230,6 +283,7 @@ static struct xtables_target nfqueue_targets[] = {
        .save           = NFQUEUE_save_v1,
        .x6_parse       = NFQUEUE_parse_v1,
        .x6_options     = NFQUEUE_opts,
+       .xlate          = NFQUEUE_xlate_v1,
 },{
        .family         = NFPROTO_UNSPEC,
        .revision       = 2,
@@ -243,6 +297,7 @@ static struct xtables_target nfqueue_targets[] = {
        .save           = NFQUEUE_save_v2,
        .x6_parse       = NFQUEUE_parse_v2,
        .x6_options     = NFQUEUE_opts,
+       .xlate          = NFQUEUE_xlate_v2,
 },{
        .family         = NFPROTO_UNSPEC,
        .revision       = 3,
@@ -256,6 +311,7 @@ static struct xtables_target nfqueue_targets[] = {
        .save           = NFQUEUE_save_v3,
        .x6_parse       = NFQUEUE_parse_v3,
        .x6_options     = NFQUEUE_opts,
+       .xlate          = NFQUEUE_xlate_v3,
 }
 };