Skip to content

Merge NAT extensions

Phil Sutter netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6extensions: DNAT: Fix bad IP address error reportingextensions/libxt_DNAT.c+1 -10 replies
2/6extensions: *NAT: Drop NF_NAT_RANGE_PROTO_RANDOM* flag checksextensions/libip6t_SNAT.c extensions/libipt_SNAT.c extensions/libxt_DNAT.c +2 more+19 -490 replies
3/6extensions: DNAT: Use __DNAT_xlate for REDIRECT, tooextensions/libxt_DNAT.c+11 -220 replies
4/6extensions: DNAT: Generate print, save and xlate callbacksextensions/libxt_DNAT.c+86 -1800 replies
5/6extensions: DNAT: Rename some symbolsextensions/libxt_DNAT.c+14 -140 replies
6/6extensions: Merge SNAT, DNAT, REDIRECT and MASQUERADEextensions/GNUmakefile.in extensions/libip6t_MASQUERADE.c extensions/libip6t_MASQUERADE.txlate +7 more+163 -9540 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/6] Merge NAT extensions

Besides the three different data structures in use to store different revisions' extensions data, the actual code is pretty similar in all the different NAT "flavors".

Patch 1 fixes a minor bug introduced by a previous commit. Patch 2 eliminates some needless checks and some that seem not necessary. Patches 3 to 5 prepare DNAT extension code for the actual merge happening in patch 6.

Phil Sutter (6):
extensions: DNAT: Fix bad IP address error reporting
extensions: *NAT: Drop NF_NAT_RANGE_PROTO_RANDOM* flag checks
extensions: DNAT: Use __DNAT_xlate for REDIRECT, too
extensions: DNAT: Generate print, save and xlate callbacks
extensions: DNAT: Rename some symbols
extensions: Merge SNAT, DNAT, REDIRECT and MASQUERADE

 extensions/GNUmakefile.in                |  10 +-
 extensions/libip6t_MASQUERADE.c          | 188 ----------
 extensions/libip6t_MASQUERADE.txlate     |   9 +
 extensions/libip6t_SNAT.c                | 308 ----------------
 extensions/libip6t_SNAT.t                |   6 +
 extensions/libipt_MASQUERADE.c           | 190 ----------
 extensions/libipt_MASQUERADE.txlate      |   9 +
 extensions/libipt_SNAT.c                 | 280 ---------------
 extensions/libipt_SNAT.t                 |   6 +
 extensions/{libxt_DNAT.c => libxt_NAT.c} | 440 +++++++++++------------
 extensions/libxt_REDIRECT.t              |   1 +
 extensions/libxt_REDIRECT.txlate         |   3 +
 12 files changed, 262 insertions(+), 1188 deletions(-)
 delete mode 100644 extensions/libip6t_MASQUERADE.c
 delete mode 100644 extensions/libip6t_SNAT.c
 delete mode 100644 extensions/libipt_MASQUERADE.c
 delete mode 100644 extensions/libipt_SNAT.c
 rename extensions/{libxt_DNAT.c => libxt_NAT.c} (59%)
Signature · 1 line
2.38.0