]> git.ipfire.org Git - thirdparty/iptables.git/commit
ebtables: Merge libebt_limit.c into libxt_limit.c
authorPhil Sutter <phil@nwl.cc>
Fri, 10 Aug 2018 15:07:36 +0000 (17:07 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 16 Aug 2018 17:43:47 +0000 (19:43 +0200)
commit02b80972c43d21f899c845c7fcafa4e4fb183312
tree0d977247aed39733663b267fd0667a35966c1028
parent5de8dcf75941c533f2dae8a40bf8b6128b8287f3
ebtables: Merge libebt_limit.c into libxt_limit.c

Both extensions were very similar already, but now that they both are
translated into native nftables code, their actual difference (i.e.
match size) doesn't matter anymore.

This change comes with one caveat: Since ebtables limit match is not in
its own file anymore, match preloading automatically also loads the
NFPROTO_UNSPEC limit match. This is not a problem per se since match
lookup will prefer the family-specific one, but when parsing unknown
options, a match without 'parse' callback is encountered. Therefore
do_commandeb() has to check existence of that callback prior to
dereferencing it.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
extensions/libebt_limit.c [deleted file]
extensions/libxt_limit.c
iptables/tests/shell/testcases/ebtables/0002-ebtables-save-restore_0
iptables/tests/shell/testcases/ebtables/0003-ebtables-restore-defaults_0
iptables/xtables-eb.c