Kernel 4.1.0 broke the TARPIT & DELUGE targets in xtables-addons-2.6

[Alexander Petrenas <zeracles@zeracles.net.ru>]

Hi!

Netfilter changes in the recent 4.1.0 kernel update included removal of the BRNF_BRIDGED flag:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=40451fd013878b005ccae767dfebc07dfecf85d9

Unfortunately, getting rid of BRNF_BRIDGED flag broke the xtables-addons-2.6 package, which now fails to build TARPIT & DELUGE targets with the following errors:

xtables-addons-2.6/extensions/xt_TARPIT.c:253:30: error: ‘BRNF_BRIDGED’ undeclared (first use in this function)
      nskb->nf_bridge->mask & BRNF_BRIDGED))
                              ^

xtables-addons-2.6/extensions/xt_TARPIT.c:282:2: error: too few arguments to function ‘NF_HOOK’
  NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, nskb, NULL,
  ^

xtables-addons-2.6/extensions/xt_TARPIT.c:397:2: error: too few arguments to function ‘NF_HOOK’
  NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, nskb, NULL,
  ^

scripts/Makefile.build:264: recipe for target 'xtables-addons-2.6/work/xtables-addons-2.6/extensions/xt_TARPIT.o' failed

My kernel hacking skills are non-existant (as well as my C skills), so I expectedly failed to come up with any patch that would replace BRNF_BRIDGED flag with nf_bridge->physoutdev in the following xt_TARPIT.c code:

#ifdef CONFIG_BRIDGE_NETFILTER
	if (hook != NF_INET_FORWARD || (nskb->nf_bridge != NULL &&
	    nskb->nf_bridge->mask & BRNF_BRIDGED))
#else

http://sourceforge.net/p/xtables-addons/xtables-addons/ci/master/tree/extensions/xt_TARPIT.c#l253

Can someone please show me how it can be fixed? (and hopefully update xtables package with the fix?)

Yours, Alexander Petrenas.

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in