Skip to content

Restore libxtables ABI compatibility

Phil Sutter netfilter-devel 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5extensions: MARK: Drop extra newline at end of helpextensions/libxt_MARK.c+1 -20 replies
2/5xshared: Move arp_opcodes into shared spaceextensions/libarpt_mangle.c iptables/nft-arp.c iptables/nft-arp.h +5 more+21 -290 replies
3/5xshared: Extend xtables_printhelp() for arptablesinclude/xtables.h iptables/ip6tables.c iptables/iptables.c +4 more+43 -1190 replies
4/5libxtables: Drop xtables_globals 'optstring' fieldinclude/xtables.h iptables/ip6tables.c iptables/iptables.c +5 more+20 -80 replies
5/5libxtables: Revert change to struct xtables_pprotinclude/xtables.h+1 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [iptables PATCH 0/5] Restore libxtables ABI compatibility

First three patches eliminate the 'print_help' callback added to struct xtables_globals by making xtables_printhelp() do the right thing for arptables as well. Due to the shared parser there are only a few distinct options left anyway. While doing so, help output is aligned with legacy arptables which prints all extensions' help texts even if not requested for.

Patch four changes how the different optstrings are passed to the shared parser. Via central storage in xshared.h and a helper function which maps from afinfo->family value, struct xtables_global's 'optstring' field may be dropped again.

The last patch just undoes the "fix" to struct xtables_pprot. It is not a problem which may occur during run-time and the compiler complains if code changes would trigger the bug.

Phil Sutter (5):
extensions: MARK: Drop extra newline at end of help
xshared: Move arp_opcodes into shared space
xshared: Extend xtables_printhelp() for arptables
libxtables: Drop xtables_globals 'optstring' field
libxtables: Revert change to struct xtables_pprot

 extensions/libarpt_mangle.c |   1 -
 extensions/libxt_MARK.c     |   3 +-
 include/xtables.h           |   4 +-
 iptables/ip6tables.c        |   2 -
 iptables/iptables.c         |   2 -
 iptables/nft-arp.c          |  22 ++------
 iptables/nft-arp.h          |   7 ---
 iptables/xshared.c          |  84 ++++++++++++++++++++++++----
 iptables/xshared.h          |   7 ++-
 iptables/xtables-arp.c      | 106 ------------------------------------
 iptables/xtables-eb.c       |   3 +-
 iptables/xtables-monitor.c  |   1 -
 iptables/xtables.c          |   3 -
 13 files changed, 86 insertions(+), 159 deletions(-)
 delete mode 100644 iptables/nft-arp.h
Signature · 1 line
2.34.1