iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net/netfilter
History
Florian Westphal dd2934a957 netfilter: conntrack: remove l3->l4 mapping information 
l4 protocols are demuxed by l3num, l4num pair.

However, almost all l4 trackers are l3 agnostic.

Only exceptions are:
 - gre, icmp (ipv4 only)
 - icmpv6 (ipv6 only)

This commit gets rid of the l3 mapping, l4 trackers can now be looked up
by their IPPROTO_XXX value alone, which gets rid of the additional l3
indirection.

For icmp, ipcmp6 and gre, add a check on state->pf and
return -NF_ACCEPT in case we're asked to track e.g. icmpv6-in-ipv4,
this seems more fitting than using the generic tracker.

Additionally we can kill the 2nd l4proto definitions that were needed
for v4/v6 split -- they are now the same so we can use single l4proto
struct for each protocol, rather than two.

The EXPORT_SYMBOLs can be removed as all these object files are
part of nf_conntrack with no external references.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2018-09-20 18:07:35 +02:00
..
ipset
netfilter: ipset: forbid family for hash:mac sets
2018-06-06 14:01:00 +02:00
ipvs
treewide: convert ISO_8859-1 text comments to utf-8
2018-08-23 18:48:43 -07:00
core.c
netfilter: Add nf_ct_get_tuple_skb global lookup function
2018-07-10 20:06:34 -07:00
Kconfig
netfilter: nf_tables: add xfrm expression
2018-09-17 11:40:08 +02:00
Makefile
netfilter: nf_tables: add xfrm expression
2018-09-17 11:40:08 +02:00
nf_conncount.c
netfilter: nf_conncount: Add list lock and gc worker, and RCU for init tree search
2018-07-18 11:26:37 +02:00
nf_conntrack_acct.c
netfilter: Replace printk() with pr_*() and define pr_fmt()
2018-03-20 13:44:14 +01:00
nf_conntrack_amanda.c
netfilter: use nf_conntrack_helpers_register when possible
2017-06-19 19:13:21 +02:00
nf_conntrack_broadcast.c
netfilter: check if the socket netns is correct.
2018-06-28 22:21:32 +09:00
nf_conntrack_core.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_ecache.c
netfilter: Replace printk() with pr_*() and define pr_fmt()
2018-03-20 13:44:14 +01:00
nf_conntrack_expect.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_extend.c
netfilter: conntrack: include kmemleak.h for kmemleak_not_leak()
2018-04-17 10:59:43 +02:00
nf_conntrack_ftp.c
netfilter: add __exit mark to helper modules
2018-04-24 10:29:14 +02:00
nf_conntrack_h323_asn1.c
netfilter: nf_conntrack_h323: Remove unwanted comments.
2018-01-08 18:01:05 +01:00
nf_conntrack_h323_main.c
netfilter: move route indirection to struct nf_ipv6_ops
2018-01-08 18:01:26 +01:00
nf_conntrack_h323_types.c
…
nf_conntrack_helper.c
netfilter: use kvmalloc_array to allocate memory for hashtable
2018-08-03 18:37:55 +02:00
nf_conntrack_irc.c
netfilter: add __exit mark to helper modules
2018-04-24 10:29:14 +02:00
nf_conntrack_labels.c
netfilter: conntrack: mark extension structs as const
2017-04-26 09:30:22 +02:00
nf_conntrack_netbios_ns.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-03-30 11:41:18 -04:00
nf_conntrack_netlink.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_pptp.c
netfilter: Remove duplicated rcu_read_lock.
2017-07-24 13:24:46 +02:00
nf_conntrack_proto_dccp.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_proto_generic.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_proto_gre.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_proto_icmp.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_proto_icmpv6.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_proto_sctp.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_proto_tcp.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_proto_udp.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_proto.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_sane.c
netfilter: add __exit mark to helper modules
2018-04-24 10:29:14 +02:00
nf_conntrack_seqadj.c
netfilter: conntrack: mark extension structs as const
2017-04-26 09:30:22 +02:00
nf_conntrack_sip.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-05-06 21:51:37 -04:00
nf_conntrack_snmp.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-03-30 11:41:18 -04:00
nf_conntrack_standalone.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_conntrack_tftp.c
netfilter: add __exit mark to helper modules
2018-04-24 10:29:14 +02:00
nf_conntrack_timeout.c
netfilter: cttimeout: decouple timeout policy from nfnetlink_cttimeout object
2018-08-07 17:14:15 +02:00
nf_conntrack_timestamp.c
netfilter: Replace printk() with pr_*() and define pr_fmt()
2018-03-20 13:44:14 +01:00
nf_dup_netdev.c
netfilter: dup: resolve warnings about missing prototypes
2017-05-29 11:32:36 +02:00
nf_flow_table_core.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nf_flow_table_inet.c
netfilter: nf_flow_table: move init code to nf_flow_table_core.c
2018-04-24 10:28:45 +02:00
nf_flow_table_ip.c
netfilter: nf_flow_table: attach dst to skbs
2018-06-01 09:47:36 +02:00
nf_internals.h
netfilter: core: export raw versions of add/delete hook functions
2018-05-23 09:14:05 +02:00
nf_log_common.c
netfilter: check if the socket netns is correct.
2018-06-28 22:21:32 +09:00
nf_log_netdev.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
nf_log.c
netfilter: nf_log: don't hold nf_log_mutex during user access
2018-06-26 16:48:40 +02:00
nf_nat_amanda.c
netfilter: nat: nf_nat_mangle_{udp,tcp}_packet returns boolean
2017-04-06 22:01:38 +02:00
nf_nat_core.c
netfilter: use kvmalloc_array to allocate memory for hashtable
2018-08-03 18:37:55 +02:00
nf_nat_ftp.c
netfilter: Replace printk() with pr_*() and define pr_fmt()
2018-03-20 13:44:14 +01:00
nf_nat_helper.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
nf_nat_irc.c
netfilter: Replace printk() with pr_*() and define pr_fmt()
2018-03-20 13:44:14 +01:00
nf_nat_proto_common.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
nf_nat_proto_dccp.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
nf_nat_proto_sctp.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
nf_nat_proto_tcp.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
nf_nat_proto_udp.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
nf_nat_proto_unknown.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
nf_nat_redirect.c
netfilter: nat: remove unnecessary rcu_read_lock in nf_nat_redirect_ipv{4/6}
2018-09-17 16:11:14 +02:00
nf_nat_sip.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
nf_nat_tftp.c
…
nf_queue.c
netfilter: remove duplicated include
2018-01-10 15:32:15 +01:00
nf_sockopt.c
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
nf_synproxy_core.c
proc: introduce proc_create_net{,_data}
2018-05-16 07:24:30 +02:00
nf_tables_api.c
netfilter: nf_tables: avoid BUG_ON usage
2018-09-17 16:11:12 +02:00
nf_tables_core.c
netfilter: nf_tables: handle meta/lookup with direct call
2018-07-30 11:52:02 +02:00
nf_tables_set_core.c
netfilter: nf_tables: place all set backends in one single module
2018-07-06 19:31:53 +02:00
nf_tables_trace.c
netfilter: nf_tables: Allow chain name of up to 255 chars
2017-07-31 20:41:57 +02:00
nfnetlink_acct.c
netfilter: fix memory leaks on netlink_dump_start error
2018-08-16 19:37:00 +02:00
nfnetlink_cthelper.c
treewide: kzalloc() -> kcalloc()
2018-06-12 16:19:22 -07:00
nfnetlink_cttimeout.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nfnetlink_log.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2018-06-06 18:39:49 -07:00
nfnetlink_osf.c
netfilter: nfnetlink_osf: fix using plain integer as NULL warning
2018-08-08 19:05:39 +02:00
nfnetlink_queue.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-09-12 22:22:42 -07:00
nfnetlink.c
netfilter: nf_tables: use dedicated mutex to guard transactions
2018-07-18 11:26:48 +02:00
nft_bitwise.c
netfilter: nf_tables: revisit chain/object refcounting from elements
2017-05-15 12:51:41 +02:00
nft_byteorder.c
netfilter: nf_tables: simplify the basic expressions' init routine
2016-11-09 23:42:23 +01:00
nft_chain_filter.c
netfilter: nf_tables: don't prevent event handler from device cleanup on netns exit
2018-08-16 19:37:03 +02:00
nft_cmp.c
netfilter: nf_tables: avoid BUG_ON usage
2018-09-17 16:11:12 +02:00
nft_compat.c
netfilter: nft_compat: explicitly reject ERROR and standard target
2018-07-09 16:06:19 +02:00
nft_connlimit.c
netfilter: nf_conncount: Add list lock and gc worker, and RCU for init tree search
2018-07-18 11:26:37 +02:00
nft_counter.c
netfilter: nf_tables: add destroy_clone expression
2018-06-03 00:02:11 +02:00
nft_ct.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
nft_dup_netdev.c
netfilter: nf_tables: add packet duplication to the netdev family
2016-01-03 21:04:23 +01:00
nft_dynset.c
netfilter: nf_tables: split set destruction in deactivate and destroy phase
2018-09-17 11:29:49 +02:00
nft_exthdr.c
netfilter: nf_tables: merge exthdr expression into nft core
2018-04-27 00:00:56 +02:00
nft_fib_inet.c
netfilter: nf_tables: use hook state from xt_action_param structure
2016-11-03 11:52:34 +01:00
nft_fib_netdev.c
netfilter: nf_tables: add fib expression to the netdev family
2017-07-31 19:01:40 +02:00
nft_fib.c
netfilter: nft_fib: Support existence check
2017-03-13 13:45:36 +01:00
nft_flow_offload.c
netfilter: nf_tables: simplify lookup functions
2018-04-24 10:29:09 +02:00
nft_fwd_netdev.c
netfilter: nft_fwd_netdev: allow to forward packets via neighbour layer
2018-06-01 10:35:47 +02:00
nft_hash.c
netfilter: fix ptr_ret.cocci warnings
2018-06-01 09:38:40 +02:00
nft_immediate.c
netfilter: nf_tables: fix jumpstack depth validation
2018-07-17 20:48:24 +02:00
nft_limit.c
netfilter: nft_limit: fix packet ratelimiting
2018-05-23 09:50:28 +02:00
nft_log.c
netfilter: nf_tables: add NFT_LOGLEVEL_* enumeration and use it
2018-06-07 16:14:00 -04:00
nft_lookup.c
netfilter: nf_tables: split set destruction in deactivate and destroy phase
2018-09-17 11:29:49 +02:00
nft_masq.c
netfilter: nf_tables: add single table list for all families
2018-01-10 15:32:08 +01:00
nft_meta.c
netfilter: nf_tables: handle meta/lookup with direct call
2018-07-30 11:52:02 +02:00
nft_nat.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
nft_numgen.c
netfilter: use PTR_ERR_OR_ZERO()
2018-07-30 14:07:09 +02:00
nft_objref.c
netfilter: nf_tables: split set destruction in deactivate and destroy phase
2018-09-17 11:29:49 +02:00
nft_osf.c
netfilter: nft_osf: use NFT_OSF_MAXGENRELEN instead of IFNAMSIZ
2018-08-07 17:14:04 +02:00
nft_payload.c
netfilter: fix a few (harmless) sparse warnings
2017-08-28 17:42:56 +02:00
nft_queue.c
netfilter: Remove exceptional & on function name
2017-04-07 18:24:47 +02:00
nft_quota.c
netfilter: nf_tables: add select_ops for stateful objects
2017-09-04 13:25:09 +02:00
nft_range.c
netfilter: nf_tables: revisit chain/object refcounting from elements
2017-05-15 12:51:41 +02:00
nft_redir.c
netfilter: nf_tables: add single table list for all families
2018-01-10 15:32:08 +01:00
nft_reject_inet.c
netfilter: nf_tables: validate the expr explicitly after init successfully
2017-03-06 18:22:12 +01:00
nft_reject.c
netfilter: nf_tables: avoid BUG_ON usage
2018-09-17 16:11:12 +02:00
nft_rt.c
netfilter: nf_tables: rt: allow checking if dst has xfrm attached
2018-09-17 11:29:49 +02:00
nft_set_bitmap.c
netfilter: nft_set: fix allocation size overflow in privsize callback.
2018-08-16 19:36:59 +02:00
nft_set_hash.c
netfilter: nft_set: fix allocation size overflow in privsize callback.
2018-08-16 19:36:59 +02:00
nft_set_rbtree.c
netfilter: nft_set: fix allocation size overflow in privsize callback.
2018-08-16 19:36:59 +02:00
nft_socket.c
netfilter: nft_socket: Expose socket mark
2018-07-18 11:26:52 +02:00
nft_tproxy.c
netfilter: nft_tproxy: Fix missing-braces warning
2018-08-16 19:37:10 +02:00
nft_tunnel.c
netfilter: nft_tunnel: fix sparse errors
2018-08-04 00:53:29 +02:00
nft_xfrm.c
netfilter: nf_tables: add xfrm expression
2018-09-17 11:40:08 +02:00
utils.c
netfilter: utils: move nf_ip6_checksum* from ipv6 to utils
2018-07-16 17:51:48 +02:00
x_tables.c
netfilter: x_tables: do not fail xt_alloc_table_info too easilly
2018-08-16 19:37:05 +02:00
xt_addrtype.c
netfilter: x_tables: use pr ratelimiting in matches/targets
2018-02-14 21:05:37 +01:00
xt_AUDIT.c
audit: eliminate audit_enabled magic number comparison
2018-06-19 10:43:55 -04:00
xt_bpf.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_cgroup.c
netfilter: xt_cgroup: shrink size of v2 path
2018-09-17 16:11:03 +02:00
xt_CHECKSUM.c
netfilter: xt_checksum: ignore gso skbs
2018-08-24 09:58:16 +02:00
xt_CLASSIFY.c
…
xt_cluster.c
netfilter: xt_cluster: add dependency on conntrack module
2018-08-23 20:26:53 +02:00
xt_comment.c
…
xt_connbytes.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_connlabel.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_connlimit.c
netfilter: use PTR_ERR_OR_ZERO()
2018-07-30 14:07:09 +02:00
xt_connmark.c
netfilter: xt_connmark: fix list corruption on rmmod
2018-06-12 19:35:52 +02:00
xt_CONNSECMARK.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_conntrack.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_cpu.c
…
xt_CT.c
netfilter: conntrack: remove l3->l4 mapping information
2018-09-20 18:07:35 +02:00
xt_dccp.c
…
xt_devgroup.c
netfilter: x_tables: move hook state into xt_action_param structure
2016-11-03 10:56:21 +01:00
xt_dscp.c
netfilter: x_tables: remove pr_info where possible
2018-02-14 21:05:33 +01:00
xt_DSCP.c
netfilter: x_tables: remove pr_info where possible
2018-02-14 21:05:33 +01:00
xt_ecn.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_esp.c
…
xt_hashlimit.c
netfilter: xt_hashlimit: use s->file instead of s->private
2018-09-11 01:35:32 +02:00
xt_helper.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_hl.c
…
xt_HL.c
netfilter: x_tables: remove pr_info where possible
2018-02-14 21:05:33 +01:00
xt_HMARK.c
netfilter: x_tables: use pr ratelimiting in matches/targets
2018-02-14 21:05:37 +01:00
xt_IDLETIMER.c
netfilter: xtables: avoid BUG_ON
2018-09-17 16:11:12 +02:00
xt_ipcomp.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_iprange.c
…
xt_ipvs.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_l2tp.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_LED.c
netfilter: x_tables: fix missing timer initialization in xt_LED
2018-02-14 21:05:39 +01:00
xt_length.c
…
xt_limit.c
netfilter: xt_limit: Spelling s/maxmum/maximum/
2018-03-05 23:15:50 +01:00
xt_LOG.c
netfilter: x_tables: move hook state into xt_action_param structure
2016-11-03 10:56:21 +01:00
xt_mac.c
…
xt_mark.c
netfilter: xt_MARK: Add ARP support
2015-05-14 13:00:27 +02:00
xt_multiport.c
netfilter: xt_multiport: Fix wrong unmatch result with multiple ports
2016-12-06 21:48:20 +01:00
xt_nat.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
xt_NETMAP.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
xt_nfacct.c
netfilter: nfnetlink_acct: remove useless parameter
2018-03-05 23:15:43 +01:00
xt_NFLOG.c
netfilter: xt_NFLOG: use nf_log_packet instead of nfulnl_log_packet.
2018-04-19 13:02:44 +02:00
xt_NFQUEUE.c
netfilter: xt_NFQUEUE: use pr ratelimiting
2018-02-14 21:05:35 +01:00
xt_osf.c
netfilter: nfnetlink_osf: extract nfnetlink_subsystem code from xt_osf.c
2018-07-30 14:07:11 +02:00
xt_owner.c
netfilter: check if the socket netns is correct.
2018-06-28 22:21:32 +09:00
xt_physdev.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_pkttype.c
netfilter: pkttype: unnecessary to check ipv6 multicast address
2017-01-18 20:32:43 +01:00
xt_policy.c
netfilter: x_tables: use pr ratelimiting in matches/targets
2018-02-14 21:05:37 +01:00
xt_quota.c
xtables: extend matches and targets with .usersize
2017-01-09 17:24:55 +01:00
xt_rateest.c
netfilter: make xt_rateest hash table per net
2018-03-05 23:15:44 +01:00
xt_RATEEST.c
netfilter: make xt_rateest hash table per net
2018-03-05 23:15:44 +01:00
xt_realm.c
…
xt_recent.c
netfilter: check if the socket netns is correct.
2018-06-28 22:21:32 +09:00
xt_REDIRECT.c
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
xt_repldata.h
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xt_sctp.c
sctp: remove the typedef sctp_chunkhdr_t
2017-07-01 09:08:41 -07:00
xt_SECMARK.c
netfilter: xtables: avoid BUG_ON
2018-09-17 16:11:12 +02:00
xt_set.c
netfilter: ipset: Limit max timeout value
2018-06-06 14:00:54 +02:00
xt_socket.c
netfilter: check if the socket netns is correct.
2018-06-28 22:21:32 +09:00
xt_state.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_statistic.c
netfilter: x_tables: fix pointer leaks to userspace
2018-01-31 14:59:24 +01:00
xt_string.c
netfilter: ebtables: Add string filter
2018-03-30 11:04:12 +02:00
xt_tcpmss.c
…
xt_TCPMSS.c
netfilter: x_tables: use pr ratelimiting in all remaining spots
2018-02-14 21:05:38 +01:00
xt_TCPOPTSTRIP.c
net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool
2015-08-17 21:33:06 -07:00
xt_tcpudp.c
netfilter: Convert FWINV<[foo]> macros and uses to NF_INVF
2016-07-03 10:55:07 +02:00
xt_TEE.c
netfilter: Kconfig: Change select IPv6 dependencies
2018-07-17 15:27:54 +02:00
xt_time.c
netfilter: Replace printk() with pr_*() and define pr_fmt()
2018-03-20 13:44:14 +01:00
xt_TPROXY.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-07-20 22:28:28 -07:00
xt_TRACE.c
netfilter: xt_TRACE: add explicitly nf_logger_find_get call
2016-06-23 13:26:49 +02:00
xt_u32.c
…