netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Subject: [PATCH nf-next 0/3] netfilter: masquerade: unify ip/ip6 notifier registration
Date: Tue,  9 Apr 2019 10:44:05 +0200	[thread overview]
Message-ID: <20190409084408.23730-1-fw@strlen.de> (raw)

This series merges the ip/ip6 masquerade helpers.
The xtables masquerade modules are merged into a single module.

Florian Westphal (3):
      netfilter: nf_nat: merge ip/ip6 masquerade headers
      netfilter: x_tables: merge ip and ipv6 masquerade modules
      netfilter: nf_nat_masquerade: unify ipv4/6 notifier registration

 include/net/netfilter/nf_nat_masquerade.h    |   19 ++++
 net/ipv4/netfilter/Kconfig                   |   12 --
 net/ipv4/netfilter/Makefile                  |    1 
 net/ipv6/netfilter/Kconfig                   |   11 --
 net/ipv6/netfilter/Makefile                  |    1 
 net/netfilter/Kconfig                        |   14 +++
 net/netfilter/Makefile                       |    1 
 net/netfilter/nf_nat_masquerade.c            |  104 +++++++++----------------
 net/netfilter/nft_masq.c                     |   19 ----
 net/netfilter/xt_MASQUERADE.c                |   84 +++++++++++++-------
 include/net/netfilter/ipv4/nf_nat_masquerade.h |   15 ---
 include/net/netfilter/ipv6/nf_nat_masquerade.h |   11 --
 net/ipv6/netfilter/ip6t_MASQUERADE.c           |   81 -------------------
 13 files changed, 139 insertions(+), 234 deletions(-)


             reply	other threads:[~2019-04-09  8:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-09  8:44 Florian Westphal [this message]
2019-04-09  8:44 ` [PATCH nf-next 1/3] netfilter: nf_nat: merge ip/ip6 masquerade headers Florian Westphal
2019-04-09  8:44 ` [PATCH nf-next 2/3] netfilter: x_tables: merge ip and ipv6 masquerade modules Florian Westphal
2019-04-09  8:44 ` [PATCH nf-next 3/3] netfilter: nf_nat_masquerade: unify ipv4/6 notifier registration Florian Westphal
2019-04-11 19:01 ` [PATCH nf-next 0/3] netfilter: masquerade: unify ip/ip6 " Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190409084408.23730-1-fw@strlen.de \
    --to=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).