Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea48cc83 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: print_conntrack only needed if CONFIG_NF_CONNTRACK_PROCFS 



Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 91950833

include/net/netfilter/nf_conntrack_l4proto.h

+4 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ struct nf_conntrack_l4proto { 
	/* called by gc worker if table is full */

	bool (*can_early_drop)(const struct nf_conn *ct);



	/* Print out the private part of the conntrack. */

	void (*print_conntrack)(struct seq_file *s, struct nf_conn *);



	/* Return the array of timeouts for this protocol. */

	unsigned int *(*get_timeouts)(struct net *net);
@@ -96,6 +93,10 @@ struct nf_conntrack_l4proto { 
		u16 nlattr_max;

		const struct nla_policy *nla_policy;

	} ctnl_timeout;

#endif

#ifdef CONFIG_NF_CONNTRACK_PROCFS

	/* Print out the private part of the conntrack. */

	void (*print_conntrack)(struct seq_file *s, struct nf_conn *);

#endif

	unsigned int	*net_id;

	/* Init l4proto pernet data */

net/netfilter/nf_conntrack_proto_dccp.c

+6 −0
Original line number Diff line number Diff line
@@ -623,10 +623,12 @@ static bool dccp_can_early_drop(const struct nf_conn *ct) 
	return false;

}



#ifdef CONFIG_NF_CONNTRACK_PROCFS

static void dccp_print_conntrack(struct seq_file *s, struct nf_conn *ct)

{

	seq_printf(s, "%s ", dccp_state_names[ct->proto.dccp.state]);

}

#endif



#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

static int dccp_to_nlattr(struct sk_buff *skb, struct nlattr *nla,
@@ -879,7 +881,9 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4 __read_mostly = { 
	.get_timeouts		= dccp_get_timeouts,

	.error			= dccp_error,

	.can_early_drop		= dccp_can_early_drop,

#ifdef CONFIG_NF_CONNTRACK_PROCFS

	.print_conntrack	= dccp_print_conntrack,

#endif

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.to_nlattr		= dccp_to_nlattr,

	.nlattr_size		= dccp_nlattr_size,
@@ -913,7 +917,9 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6 __read_mostly = { 
	.get_timeouts		= dccp_get_timeouts,

	.error			= dccp_error,

	.can_early_drop		= dccp_can_early_drop,

#ifdef CONFIG_NF_CONNTRACK_PROCFS

	.print_conntrack	= dccp_print_conntrack,

#endif

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.to_nlattr		= dccp_to_nlattr,

	.nlattr_size		= dccp_nlattr_size,

net/netfilter/nf_conntrack_proto_gre.c

+4 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ static bool gre_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff, 
	return true;

}



#ifdef CONFIG_NF_CONNTRACK_PROCFS

/* print private data for conntrack */

static void gre_print_conntrack(struct seq_file *s, struct nf_conn *ct)

{
@@ -231,6 +232,7 @@ static void gre_print_conntrack(struct seq_file *s, struct nf_conn *ct) 
		   (ct->proto.gre.timeout / HZ),

		   (ct->proto.gre.stream_timeout / HZ));

}

#endif



static unsigned int *gre_get_timeouts(struct net *net)

{
@@ -357,7 +359,9 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 __read_mostly = { 
	.l4proto	 = IPPROTO_GRE,

	.pkt_to_tuple	 = gre_pkt_to_tuple,

	.invert_tuple	 = gre_invert_tuple,

#ifdef CONFIG_NF_CONNTRACK_PROCFS

	.print_conntrack = gre_print_conntrack,

#endif

	.get_timeouts    = gre_get_timeouts,

	.packet		 = gre_packet,

	.new		 = gre_new,

net/netfilter/nf_conntrack_proto_sctp.c

+6 −0
Original line number Diff line number Diff line
@@ -174,11 +174,13 @@ static bool sctp_invert_tuple(struct nf_conntrack_tuple *tuple, 
	return true;

}



#ifdef CONFIG_NF_CONNTRACK_PROCFS

/* Print out the private part of the conntrack. */

static void sctp_print_conntrack(struct seq_file *s, struct nf_conn *ct)

{

	seq_printf(s, "%s ", sctp_conntrack_names[ct->proto.sctp.state]);

}

#endif



#define for_each_sctp_chunk(skb, sch, _sch, offset, dataoff, count)	\

for ((offset) = (dataoff) + sizeof(struct sctphdr), (count) = 0;	\
@@ -784,7 +786,9 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 __read_mostly = { 
	.l4proto 		= IPPROTO_SCTP,

	.pkt_to_tuple 		= sctp_pkt_to_tuple,

	.invert_tuple 		= sctp_invert_tuple,

#ifdef CONFIG_NF_CONNTRACK_PROCFS

	.print_conntrack	= sctp_print_conntrack,

#endif

	.packet 		= sctp_packet,

	.get_timeouts		= sctp_get_timeouts,

	.new 			= sctp_new,
@@ -819,7 +823,9 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = { 
	.l4proto 		= IPPROTO_SCTP,

	.pkt_to_tuple 		= sctp_pkt_to_tuple,

	.invert_tuple 		= sctp_invert_tuple,

#ifdef CONFIG_NF_CONNTRACK_PROCFS

	.print_conntrack	= sctp_print_conntrack,

#endif

	.packet 		= sctp_packet,

	.get_timeouts		= sctp_get_timeouts,

	.new 			= sctp_new,

net/netfilter/nf_conntrack_proto_tcp.c

+6 −0
Original line number Diff line number Diff line
@@ -301,11 +301,13 @@ static bool tcp_invert_tuple(struct nf_conntrack_tuple *tuple, 
	return true;

}



#ifdef CONFIG_NF_CONNTRACK_PROCFS

/* Print out the private part of the conntrack. */

static void tcp_print_conntrack(struct seq_file *s, struct nf_conn *ct)

{

	seq_printf(s, "%s ", tcp_conntrack_names[ct->proto.tcp.state]);

}

#endif



static unsigned int get_conntrack_index(const struct tcphdr *tcph)

{
@@ -1549,7 +1551,9 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4 __read_mostly = 
	.l4proto 		= IPPROTO_TCP,

	.pkt_to_tuple 		= tcp_pkt_to_tuple,

	.invert_tuple 		= tcp_invert_tuple,

#ifdef CONFIG_NF_CONNTRACK_PROCFS

	.print_conntrack 	= tcp_print_conntrack,

#endif

	.packet 		= tcp_packet,

	.get_timeouts		= tcp_get_timeouts,

	.new 			= tcp_new,
@@ -1585,7 +1589,9 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6 __read_mostly = 
	.l4proto 		= IPPROTO_TCP,

	.pkt_to_tuple 		= tcp_pkt_to_tuple,

	.invert_tuple 		= tcp_invert_tuple,

#ifdef CONFIG_NF_CONNTRACK_PROCFS

	.print_conntrack 	= tcp_print_conntrack,

#endif

	.packet 		= tcp_packet,

	.get_timeouts		= tcp_get_timeouts,

	.new 			= tcp_new,