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

Commit c71e9167 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack: make print_conntrack function optional for l4protos 



Allows to remove five empty implementations.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c56cc9c0

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int ct_seq_show(struct seq_file *s, void *v) 
		      ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0)

		return -ENOSPC;



	if (l4proto->print_conntrack(s, ct))

	if (l4proto->print_conntrack && l4proto->print_conntrack(s, ct))

		return -ENOSPC;



	if (print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple,

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+0 −8
Original line number Diff line number Diff line
@@ -74,13 +74,6 @@ static int icmp_print_tuple(struct seq_file *s, 
			  ntohs(tuple->src.u.icmp.id));

}



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

static int icmp_print_conntrack(struct seq_file *s,

				const struct nf_conn *conntrack)

{

	return 0;

}



/* Returns verdict for packet, or -1 for invalid. */

static int icmp_packet(struct nf_conn *ct,

		       const struct sk_buff *skb,
@@ -309,7 +302,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = 
	.pkt_to_tuple		= icmp_pkt_to_tuple,

	.invert_tuple		= icmp_invert_tuple,

	.print_tuple		= icmp_print_tuple,

	.print_conntrack	= icmp_print_conntrack,

	.packet			= icmp_packet,

	.new			= icmp_new,

	.error			= icmp_error,

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+0 −8
Original line number Diff line number Diff line
@@ -75,13 +75,6 @@ static int icmpv6_print_tuple(struct seq_file *s, 
			  ntohs(tuple->src.u.icmp.id));

}



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

static int icmpv6_print_conntrack(struct seq_file *s,

				  const struct nf_conn *conntrack)

{

	return 0;

}



/* Returns verdict for packet, or -1 for invalid. */

static int icmpv6_packet(struct nf_conn *ct,

		       const struct sk_buff *skb,
@@ -275,7 +268,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly = 
	.pkt_to_tuple		= icmpv6_pkt_to_tuple,

	.invert_tuple		= icmpv6_invert_tuple,

	.print_tuple		= icmpv6_print_tuple,

	.print_conntrack	= icmpv6_print_conntrack,

	.packet			= icmpv6_packet,

	.new			= icmpv6_new,

	.error			= icmpv6_error,

net/netfilter/nf_conntrack_proto_generic.c

+0 −8
Original line number Diff line number Diff line
@@ -40,13 +40,6 @@ static int generic_print_tuple(struct seq_file *s, 
	return 0;

}



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

static int generic_print_conntrack(struct seq_file *s,

				   const struct nf_conn *state)

{

	return 0;

}



/* Returns verdict for packet, or -1 for invalid. */

static int packet(struct nf_conn *conntrack,

		  const struct sk_buff *skb,
@@ -104,7 +97,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_generic __read_mostly = 
	.pkt_to_tuple		= generic_pkt_to_tuple,

	.invert_tuple		= generic_invert_tuple,

	.print_tuple		= generic_print_tuple,

	.print_conntrack	= generic_print_conntrack,

	.packet			= packet,

	.new			= new,

#ifdef CONFIG_SYSCTL

net/netfilter/nf_conntrack_proto_udp.c

+0 −9
Original line number Diff line number Diff line
@@ -60,13 +60,6 @@ static int udp_print_tuple(struct seq_file *s, 
			  ntohs(tuple->dst.u.udp.port));

}



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

static int udp_print_conntrack(struct seq_file *s,

			       const struct nf_conn *conntrack)

{

	return 0;

}



/* Returns verdict for packet, and may modify conntracktype */

static int udp_packet(struct nf_conn *conntrack,

		      const struct sk_buff *skb,
@@ -193,7 +186,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly = 
	.pkt_to_tuple		= udp_pkt_to_tuple,

	.invert_tuple		= udp_invert_tuple,

	.print_tuple		= udp_print_tuple,

	.print_conntrack	= udp_print_conntrack,

	.packet			= udp_packet,

	.new			= udp_new,

	.error			= udp_error,
@@ -221,7 +213,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 __read_mostly = 
	.pkt_to_tuple		= udp_pkt_to_tuple,

	.invert_tuple		= udp_invert_tuple,

	.print_tuple		= udp_print_tuple,

	.print_conntrack	= udp_print_conntrack,

	.packet			= udp_packet,

	.new			= udp_new,

	.error			= udp_error,