netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: pablo@netfilter.org
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, netfilter-devel@vger.kernel.org
Subject: [PATCH 0/7] netfilter updates for net-next
Date: Tue, 19 Feb 2013 01:10:44 +0100	[thread overview]
Message-ID: <1361232651-5626-1-git-send-email-pablo@netfilter.org> (raw)

From: Pablo Neira Ayuso <pablo@netfilter.org>

Hi David,

The following patchset contain updates for your net-next tree, they are:

* Fix (for just added) connlabel dependencies, from Florian Westphal.

* Add aliasing support for conntrack, thus users can either use -m state
  or -m conntrack from iptables while using the same kernel module, from
  Jozsef Kadlecsik.

* Some code refactoring for the CT target to merge common code in
  revision 0 and 1, from myself.

* Add aliasing support for CT, based on patch from Jozsef Kadlecsik.

* Add one mutex per nfnetlink subsystem, from myself.

* Improved logging for packets that are dropped by helpers, from myself.

You can pull these changes from:

git://1984.lsi.us.es/nf-next master

Thanks!

Florian Westphal (1):
  netfilter: fix missing dependencies for NETFILTER_XT_MATCH_CONNLABEL

Jozsef Kadlecsik (1):
  netfilter: xt_conntrack: Add flag to support aliases

Pablo Neira Ayuso (4):
  netfilter: xt_CT: merge common code of revision 0 and 1
  netfilter: xt_CT: add alias flag
  netfilter: nfnetlink: add mutex per subsystem
  netfilter: nf_ct_helper: better logging for dropped packets

Reese Moore (1):
  netfilter: nf_ct_pptp: Fix comment referring to incorrect RFC

 include/linux/netfilter/nfnetlink.h            |    4 +-
 include/net/netfilter/nf_conntrack_helper.h    |    3 +
 include/uapi/linux/netfilter/xt_CT.h           |    6 +-
 include/uapi/linux/netfilter/xt_conntrack.h    |    1 +
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |   10 +-
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |    8 +-
 net/netfilter/Kconfig                          |    1 +
 net/netfilter/ipset/ip_set_core.c              |   26 ++--
 net/netfilter/nf_conntrack_amanda.c            |    5 +-
 net/netfilter/nf_conntrack_ftp.c               |   10 +-
 net/netfilter/nf_conntrack_h323_main.c         |    6 +-
 net/netfilter/nf_conntrack_helper.c            |   18 +++
 net/netfilter/nf_conntrack_irc.c               |    7 +-
 net/netfilter/nf_conntrack_netlink.c           |   12 +-
 net/netfilter/nf_conntrack_pptp.c              |    2 +-
 net/netfilter/nf_conntrack_sane.c              |    5 +-
 net/netfilter/nf_conntrack_sip.c               |   80 ++++++++---
 net/netfilter/nf_conntrack_tftp.c              |    8 +-
 net/netfilter/nf_nat_amanda.c                  |    8 +-
 net/netfilter/nf_nat_ftp.c                     |    5 +-
 net/netfilter/nf_nat_irc.c                     |    8 +-
 net/netfilter/nf_nat_sip.c                     |   49 +++++--
 net/netfilter/nf_nat_tftp.c                    |    4 +-
 net/netfilter/nfnetlink.c                      |   52 ++++---
 net/netfilter/xt_CT.c                          |  177 ++++++++++++------------
 25 files changed, 315 insertions(+), 200 deletions(-)

-- 
1.7.10.4

             reply	other threads:[~2013-02-19  0:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-19  0:10 pablo [this message]
2013-02-19  0:10 ` [PATCH 1/7] netfilter: fix missing dependencies for NETFILTER_XT_MATCH_CONNLABEL pablo
2013-02-19  0:10 ` [PATCH 2/7] netfilter: xt_conntrack: Add flag to support aliases pablo
2013-02-19  0:10 ` [PATCH 3/7] netfilter: xt_CT: merge common code of revision 0 and 1 pablo
2013-02-19  0:10 ` [PATCH 4/7] netfilter: xt_CT: add alias flag pablo
2013-02-19  0:10 ` [PATCH 5/7] netfilter: nfnetlink: add mutex per subsystem pablo
2013-02-19  0:10 ` [PATCH 6/7] netfilter: nf_ct_pptp: Fix comment referring to incorrect RFC pablo
2013-02-19  0:10 ` [PATCH 7/7] netfilter: nf_ct_helper: better logging for dropped packets pablo
2013-02-19  0:22   ` Joe Perches
2013-02-19  1:11     ` Pablo Neira Ayuso
2013-02-19  1:23       ` Joe Perches
2013-02-19  1:43         ` Pablo Neira Ayuso
2013-02-19  1:33       ` Joe Perches
2013-02-19  1:50         ` Pablo Neira Ayuso
2013-02-19  7:51           ` [PATCH 7/7] netfilter: nf_ct_helper: Fix " Joe Perches
2013-02-19 20:17             ` Pablo Neira Ayuso
2013-02-19  5:44 ` [PATCH 0/7] netfilter updates for net-next David Miller
2020-08-02 18:31 [PATCH 0/7] Netfilter " Pablo Neira Ayuso
2020-08-03 23:03 ` David Miller

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=1361232651-5626-1-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --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).