ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: Update obsolete comments referring to ip_conntrack

Browse Source 
In 9fb9cbb108 ("[NETFILTER]: Add nf_conntrack subsystem.") the new
generic nf_conntrack was introduced, and it came to supersede the old
ip_conntrack.

This change updates (some) of the obsolete comments referring to old
file/function names of the ip_conntrack mechanism, as well as removes a
few self-referencing comments that we shouldn't maintain anymore.

I did not update any comments referring to historical actions (e.g,
comments like "this file was derived from ..." were left untouched, even
if the referenced file is no longer here).

Signed-off-by: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Yonatan Goldschmidt
2019-07-08 15:57:09 -07:00
committed by Pablo Neira Ayuso
parent 3c00fb0bf0
commit 05ba4c8953
8 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/netfilter/nf_conntrack_h323_asn1.h
View File

@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/**************************************************************************** /****************************************************************************
* ip_conntrack_h323_asn1.h - BER and PER decoding library for H.323 * BER and PER decoding library for H.323 conntrack/NAT module.
* conntrack/NAT module.
* *
* Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net> * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net>
* *

4
net/ipv4/netfilter/ipt_CLUSTERIP.c
View File

@@ -416,8 +416,8 @@ clusterip_tg(struct sk_buff *skb, const struct xt_action_param *par)
ctinfo == IP_CT_RELATED_REPLY)) ctinfo == IP_CT_RELATED_REPLY))
return XT_CONTINUE; return XT_CONTINUE;
/* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO, /* nf_conntrack_proto_icmp guarantees us that we only have ICMP_ECHO,
* TIMESTAMP, INFO_REQUEST or ADDRESS type icmp packets from here * TIMESTAMP, INFO_REQUEST or ICMP_ADDRESS type icmp packets from here
* on, which all have an ID field [relevant for hashing]. */ * on, which all have an ID field [relevant for hashing]. */
hash = clusterip_hashfn(skb, cipinfo->config); hash = clusterip_hashfn(skb, cipinfo->config);

6
net/netfilter/Kconfig
View File

@@ -223,8 +223,6 @@ config NF_CONNTRACK_FTP
of Network Address Translation on them. of Network Address Translation on them.
This is FTP support on Layer 3 independent connection tracking. This is FTP support on Layer 3 independent connection tracking.
Layer 3 independent connection tracking is experimental scheme
which generalize ip_conntrack to support other layer 3 protocols.
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
@@ -338,7 +336,7 @@ config NF_CONNTRACK_SIP
help help
SIP is an application-layer control protocol that can establish, SIP is an application-layer control protocol that can establish,
modify, and terminate multimedia sessions (conferences) such as modify, and terminate multimedia sessions (conferences) such as
Internet telephony calls. With the ip_conntrack_sip and Internet telephony calls. With the nf_conntrack_sip and
the nf_nat_sip modules you can support the protocol on a connection the nf_nat_sip modules you can support the protocol on a connection
tracking/NATing firewall. tracking/NATing firewall.
@@ -1313,7 +1311,7 @@ config NETFILTER_XT_MATCH_HELPER
depends on NETFILTER_ADVANCED depends on NETFILTER_ADVANCED
help help
Helper matching allows you to match packets in dynamic connections Helper matching allows you to match packets in dynamic connections
tracked by a conntrack-helper, ie. ip_conntrack_ftp tracked by a conntrack-helper, ie. nf_conntrack_ftp
To compile it as a module, choose M here. If unsure, say Y. To compile it as a module, choose M here. If unsure, say Y.

4
net/netfilter/nf_conntrack_core.c
View File

@@ -1817,9 +1817,7 @@ EXPORT_SYMBOL_GPL(nf_ct_kill_acct);
#include <linux/netfilter/nfnetlink_conntrack.h> #include <linux/netfilter/nfnetlink_conntrack.h>
#include <linux/mutex.h> #include <linux/mutex.h>
/* Generic function for tcp/udp/sctp/dccp and alike. This needs to be /* Generic function for tcp/udp/sctp/dccp and alike. */
* in ip_conntrack_core, since we don't want the protocols to autoload
* or depend on ctnetlink */
int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,
const struct nf_conntrack_tuple *tuple) const struct nf_conntrack_tuple *tuple)
{ {

5
net/netfilter/nf_conntrack_h323_asn1.c
View File

@@ -1,11 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* ip_conntrack_helper_h323_asn1.c - BER and PER decoding library for H.323 * BER and PER decoding library for H.323 conntrack/NAT module.
* conntrack/NAT module.
* *
* Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net> * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net>
* *
* See ip_conntrack_helper_h323_asn1.h for details. * See nf_conntrack_helper_h323_asn1.h for details.
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__

2
net/netfilter/nf_conntrack_proto_gre.c
View File

@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* ip_conntrack_proto_gre.c - Version 3.0
*
* Connection tracking protocol helper module for GRE. * Connection tracking protocol helper module for GRE.
* *
* GRE is a generic encapsulation protocol, which is generally not very * GRE is a generic encapsulation protocol, which is generally not very

2
net/netfilter/nf_conntrack_proto_icmp.c
View File

@@ -215,7 +215,7 @@ int nf_conntrack_icmpv4_error(struct nf_conn *tmpl,
return -NF_ACCEPT; return -NF_ACCEPT;
} }
/* See ip_conntrack_proto_tcp.c */ /* See nf_conntrack_proto_tcp.c */
if (state->net->ct.sysctl_checksum && if (state->net->ct.sysctl_checksum &&
state->hook == NF_INET_PRE_ROUTING && state->hook == NF_INET_PRE_ROUTING &&
nf_ip_checksum(skb, state->hook, dataoff, IPPROTO_ICMP)) { nf_ip_checksum(skb, state->hook, dataoff, IPPROTO_ICMP)) {

2
net/netfilter/nf_nat_core.c
View File

@@ -519,7 +519,7 @@ another_round:
* and NF_INET_LOCAL_OUT, we change the destination to map into the * and NF_INET_LOCAL_OUT, we change the destination to map into the
* range. It might not be possible to get a unique tuple, but we try. * range. It might not be possible to get a unique tuple, but we try.
* At worst (or if we race), we will end up with a final duplicate in * At worst (or if we race), we will end up with a final duplicate in
* __ip_conntrack_confirm and drop the packet. */ * __nf_conntrack_confirm and drop the packet. */
static void static void
get_unique_tuple(struct nf_conntrack_tuple *tuple, get_unique_tuple(struct nf_conntrack_tuple *tuple,
const struct nf_conntrack_tuple *orig_tuple, const struct nf_conntrack_tuple *orig_tuple,