Hi Holger,
On Sat, Mar 23, 2013 at 09:04:05PM +0100, Holger Eitzenberger wrote:
> Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
> Index: iptables/extensions/libxt_NFQUEUE.c
> ===================================================================
> --- iptables.orig/extensions/libxt_NFQUEUE.c 2013-03-23 19:43:11.000000000 +0100
> +++ iptables/extensions/libxt_NFQUEUE.c 2013-03-23 19:43:29.000000000 +0100
> @@ -13,8 +13,10 @@
> O_QUEUE_NUM = 0,
> O_QUEUE_BALANCE,
> O_QUEUE_BYPASS,
> + O_QUEUE_CPU_FANOUT,
> F_QUEUE_NUM = 1 << O_QUEUE_NUM,
> F_QUEUE_BALANCE = 1 << O_QUEUE_BALANCE,
> + F_QUEUE_CPU_FANOUT = 1 << O_QUEUE_CPU_FANOUT,
> };
>
> static void NFQUEUE_help(void)
> @@ -37,7 +39,15 @@
> {
> NFQUEUE_help_v1();
> printf(
> -" --queue-bypass Bypass Queueing if no queue instance exists.\n");
> +" --queue-bypass Bypass Queueing if no queue instance exists.\n"
> +" --queue-cpu-fanout Use current CPU (no hashing)\n");
> +}
> +
> +static void NFQUEUE_help_v3(void)
> +{
> + NFQUEUE_help_v2();
> + printf(
> +" --queue-cpu-fanout Use current CPU (no hashing)\n");
> }
>
> #define s struct xt_NFQ_info
> @@ -48,6 +58,8 @@
> {.name = "queue-balance", .id = O_QUEUE_BALANCE,
> .type = XTTYPE_UINT16RC, .excl = F_QUEUE_NUM},
> {.name = "queue-bypass", .id = O_QUEUE_BYPASS, .type = XTTYPE_NONE},
> + {.name = "queue-cpu-fanout", .id = O_QUEUE_CPU_FANOUT,
> + .type = XTTYPE_NONE, .also = O_QUEUE_BALANCE},
I think we have to add O_QUEUE_CPU_FANOUT here to make sure both
queue-balance and queue-cpu-fanout are not used both incorrectly
together. That also needs some code a new .x6_fcheck function to
validate this.
Could you also send me the corresponding manpage update for this?
Thanks!
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
