Skip to content

: Netfilter update

Patrick McHardy netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest19 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19: nfnetlink: make subsystem and callbacks constinclude/linux/netfilter/nfnetlink.h net/netfilter/nf_conntrack_netlink.c net/netfilter/nfnetlink.c +2 more+22 -220 replies
2/19: nfnetlink: convert to generic netlink attribute functionsinclude/linux/netfilter/Kbuild include/linux/netfilter/nfnetlink.h include/linux/netfilter/nfnetlink_compat.h +14 more+527 -5320 replies
3/19: nfnetlink: rename functions containing 'nfattr'include/linux/netfilter/nfnetlink.h include/net/netfilter/nf_conntrack_helper.h include/net/netfilter/nf_conntrack_l3proto.h +19 more+101 -1010 replies
4/19: nfnetlink: use nlmsg_notify()net/netfilter/nfnetlink.c+1 -100 replies
5/19: nfnetlink: support attribute policiesinclude/linux/netfilter/nfnetlink.h net/netfilter/nfnetlink.c+15 -360 replies
6/19: nfnetlink_log: use netlink policynet/netfilter/nfnetlink_log.c+9 -290 replies
7/19: nfnetlink_queue: use netlink policynet/netfilter/nfnetlink_queue.c+11 -190 replies
8/19: ctnetlink: use netlink policyinclude/net/netfilter/nf_conntrack_l3proto.h include/net/netfilter/nf_conntrack_l4proto.h net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +9 more+97 -1000 replies
9/19: nfnetlink: kill nlattr_bad_sizeinclude/linux/netfilter/nfnetlink.h+0 -130 replies
10/19: nf_conntrack: kill unique IDinclude/net/netfilter/nf_conntrack.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_netlink.c+2 -70 replies
11/19: nf_conntrack_expect: kill unique IDinclude/net/netfilter/nf_conntrack_expect.h net/netfilter/nf_conntrack_expect.c net/netfilter/nf_conntrack_netlink.c+3 -80 replies
12/19: nf_conntrack_netlink: add support to related connectionsinclude/linux/netfilter/nfnetlink_conntrack.h net/netfilter/nf_conntrack_netlink.c+41 -30 replies
13/19: nfnetlink_log: kill duplicate codenet/netfilter/nfnetlink_log.c+14 -160 replies
14/19: nfnetlink_log: flush queue earlynet/netfilter/nfnetlink_log.c+5 -40 replies
15/19: nfnetlink_log: fix stylenet/netfilter/nfnetlink_log.c+4 -30 replies
16/19: nfnetlink_log: fix instance_create() failure pathnet/netfilter/nfnetlink_log.c+5 -50 replies
17/19: nfnetlink_log: fix some constantsnet/netfilter/nfnetlink_log.c+5 -70 replies
18/19: x_tables: add xt_time matchinclude/linux/netfilter/xt_time.h net/netfilter/Kconfig net/netfilter/Makefile +1 more+309 -00 replies
19/19: bridge: remove broken netfilter binary sysctlsnet/bridge/br_netfilter.c+0 -50 replies

Reviews trailers per patch

1 of 19 patches has a Reviewed-by or Acked-by.

PatchEric W. Biederman
1/19
2/19
3/19
4/19
5/19
6/19
7/19
8/19
9/19
10/19
11/19
12/19
13/19
14/19
15/19
16/19
17/19
18/19
19/19A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [NETFILTER 00/19]: Netfilter update

Hi Dave,

following is a netfilter update for 2.6.24, containing a set of patches to use the generic netlink functions for nfnetlink, a new "time" match, some nfnetlink_log cleanups and some minor other stuff.

Please apply, thanks.

 include/linux/netfilter/Kbuild                 |    1 +
 include/linux/netfilter/nfnetlink.h            |   98 +----
 include/linux/netfilter/nfnetlink_compat.h     |   61 +++
 include/linux/netfilter/nfnetlink_conntrack.h  |    1 +
 include/linux/netfilter/xt_time.h              |   25 ++
 include/net/netfilter/nf_conntrack.h           |    3 -
 include/net/netfilter/nf_conntrack_expect.h    |    3 -
 include/net/netfilter/nf_conntrack_helper.h    |    2 +-
 include/net/netfilter/nf_conntrack_l3proto.h   |    9 +-
 include/net/netfilter/nf_conntrack_l4proto.h   |   17 +-
 include/net/netfilter/nf_nat_protocol.h        |    8 +-
 net/bridge/br_netfilter.c                      |    5 -
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |   30 +-
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c   |   40 +-
 net/ipv4/netfilter/nf_nat_core.c               |   22 +-
 net/ipv4/netfilter/nf_nat_proto_gre.c          |    4 +-
 net/ipv4/netfilter/nf_nat_proto_icmp.c         |    4 +-
 net/ipv4/netfilter/nf_nat_proto_tcp.c          |    4 +-
 net/ipv4/netfilter/nf_nat_proto_udp.c          |    4 +-
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |   30 +-
 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c |   40 +-
 net/netfilter/Kconfig                          |   14 +
 net/netfilter/Makefile                         |    1 +
 net/netfilter/nf_conntrack_core.c              |   33 +-
 net/netfilter/nf_conntrack_expect.c            |    2 -
 net/netfilter/nf_conntrack_netlink.c           |  551 +++++++++++++-----------
 net/netfilter/nf_conntrack_proto_gre.c         |    5 +-
 net/netfilter/nf_conntrack_proto_tcp.c         |   87 ++--
 net/netfilter/nf_conntrack_proto_udp.c         |   10 +-
 net/netfilter/nf_conntrack_proto_udplite.c     |   10 +-
 net/netfilter/nfnetlink.c                      |  106 +----
 net/netfilter/nfnetlink_log.c                  |  221 +++++------
 net/netfilter/nfnetlink_queue.c                |  133 +++---
 net/netfilter/xt_time.c                        |  269 ++++++++++++
 34 files changed, 1052 insertions(+), 801 deletions(-)
 create mode 100644 include/linux/netfilter/nfnetlink_compat.h
 create mode 100644 include/linux/netfilter/xt_time.h
 create mode 100644 net/netfilter/xt_time.c

Jan Engelhardt (1):
[NETFILTER]: x_tables: add xt_time match

Joseph Fannin (1):
[NETFILTER]: bridge: remove broken netfilter binary sysctls

Michal Miroslaw (5):
[NETFILTER]: nfnetlink_log: kill duplicate code [NETFILTER]: nfnetlink_log: flush queue early [NETFILTER]: nfnetlink_log: fix style
[NETFILTER]: nfnetlink_log: fix instance_create() failure path [NETFILTER]: nfnetlink_log: fix some constants

Pablo Neira Ayuso (1):
[NETFILTER]: nf_conntrack_netlink: add support to related connections

Patrick McHardy (11):
[NETFILTER]: nfnetlink: make subsystem and callbacks const [NETFILTER]: nfnetlink: convert to generic netlink attribute functions [NETFILTER]: nfnetlink: rename functions containing 'nfattr' [NETFILTER]: nfnetlink: use nlmsg_notify()
[NETFILTER]: nfnetlink: support attribute policies [NETFILTER]: nfnetlink_log: use netlink policy [NETFILTER]: nfnetlink_queue: use netlink policy [NETFILTER]: ctnetlink: use netlink policy
[NETFILTER]: nfnetlink: kill nlattr_bad_size
[NETFILTER]: nf_conntrack: kill unique ID
[NETFILTER]: nf_conntrack_expect: kill unique ID