Commit 05ba4c89 authored by Yonatan Goldschmidt's avatar Yonatan Goldschmidt Committed by Pablo Neira Ayuso
Browse files

netfilter: Update obsolete comments referring to ip_conntrack 



In 9fb9cbb1 ("[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: default avatarYonatan Goldschmidt <yon.goldschmidt@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3c00fb0b

include/linux/netfilter/nf_conntrack_h323_asn1.h

+1 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/****************************************************************************

 * ip_conntrack_h323_asn1.h - BER and PER decoding library for H.323

 * 			      conntrack/NAT module.

 * BER and PER decoding library for H.323 conntrack/NAT module.

 *

 * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net>

 *

net/ipv4/netfilter/ipt_CLUSTERIP.c

+2 −2
Original line number Diff line number Diff line
@@ -416,8 +416,8 @@ clusterip_tg(struct sk_buff *skb, const struct xt_action_param *par) 
	     ctinfo == IP_CT_RELATED_REPLY))

		return XT_CONTINUE;



	/* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO,

	 * TIMESTAMP, INFO_REQUEST or ADDRESS type icmp packets from here

	/* nf_conntrack_proto_icmp guarantees us that we only have ICMP_ECHO,

	 * TIMESTAMP, INFO_REQUEST or ICMP_ADDRESS type icmp packets from here

	 * on, which all have an ID field [relevant for hashing]. */



	hash = clusterip_hashfn(skb, cipinfo->config);

net/netfilter/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -223,8 +223,6 @@ config NF_CONNTRACK_FTP 
	  of Network Address Translation on them.



	  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.
@@ -338,7 +336,7 @@ config NF_CONNTRACK_SIP 
	help

	  SIP is an application-layer control protocol that can establish,

	  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

	  tracking/NATing firewall.
@@ -1313,7 +1311,7 @@ config NETFILTER_XT_MATCH_HELPER 
	depends on NETFILTER_ADVANCED

	help

	  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.

net/netfilter/nf_conntrack_core.c

+1 −3
Original line number Diff line number Diff line
@@ -1817,9 +1817,7 @@ EXPORT_SYMBOL_GPL(nf_ct_kill_acct); 
#include <linux/netfilter/nfnetlink_conntrack.h>

#include <linux/mutex.h>



/* Generic function for tcp/udp/sctp/dccp and alike. This needs to be

 * in ip_conntrack_core, since we don't want the protocols to autoload

 * or depend on ctnetlink */

/* Generic function for tcp/udp/sctp/dccp and alike. */

int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,

			       const struct nf_conntrack_tuple *tuple)

{

net/netfilter/nf_conntrack_h323_asn1.c

+2 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * ip_conntrack_helper_h323_asn1.c - BER and PER decoding library for H.323

 * 			      	     conntrack/NAT module.

 * BER and PER decoding library for H.323 conntrack/NAT module.

 *

 * 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__