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

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

netfilter: conntrack: place print_tuple in procfs part 



CONFIG_NF_CONNTRACK_PROCFS is deprecated, no need to use a function
pointer in the trackers for this. Place the printf formatting in
the one place that uses it.

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

include/net/netfilter/nf_conntrack_l3proto.h

+0 −4
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ struct nf_conntrack_l3proto { 
	bool (*invert_tuple)(struct nf_conntrack_tuple *inverse,

			     const struct nf_conntrack_tuple *orig);



	/* Print out the per-protocol part of the tuple. */

	void (*print_tuple)(struct seq_file *s,

			    const struct nf_conntrack_tuple *);



	/*

	 * Called before tracking. 

	 *	*dataoff: offset of protocol header (TCP, UDP,...) in skb

include/net/netfilter/nf_conntrack_l4proto.h

+0 −4
Original line number Diff line number Diff line
@@ -61,10 +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 per-protocol part of the tuple. Return like seq_* */

	void (*print_tuple)(struct seq_file *s,

			    const struct nf_conntrack_tuple *);



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

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

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+0 −8
Original line number Diff line number Diff line
@@ -63,13 +63,6 @@ static bool ipv4_invert_tuple(struct nf_conntrack_tuple *tuple, 
	return true;

}



static void ipv4_print_tuple(struct seq_file *s,

			    const struct nf_conntrack_tuple *tuple)

{

	seq_printf(s, "src=%pI4 dst=%pI4 ",

		   &tuple->src.u3.ip, &tuple->dst.u3.ip);

}



static int ipv4_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,

			    unsigned int *dataoff, u_int8_t *protonum)

{
@@ -355,7 +348,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { 
	.l3proto	 = PF_INET,

	.pkt_to_tuple	 = ipv4_pkt_to_tuple,

	.invert_tuple	 = ipv4_invert_tuple,

	.print_tuple	 = ipv4_print_tuple,

	.get_l4proto	 = ipv4_get_l4proto,

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.tuple_to_nlattr = ipv4_tuple_to_nlattr,

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+0 −11
Original line number Diff line number Diff line
@@ -71,16 +71,6 @@ static bool icmp_invert_tuple(struct nf_conntrack_tuple *tuple, 
	return true;

}



/* Print out the per-protocol part of the tuple. */

static void icmp_print_tuple(struct seq_file *s,

			    const struct nf_conntrack_tuple *tuple)

{

	seq_printf(s, "type=%u code=%u id=%u ",

		   tuple->dst.u.icmp.type,

		   tuple->dst.u.icmp.code,

		   ntohs(tuple->src.u.icmp.id));

}



static unsigned int *icmp_get_timeouts(struct net *net)

{

	return &icmp_pernet(net)->timeout;
@@ -364,7 +354,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = 
	.l4proto		= IPPROTO_ICMP,

	.pkt_to_tuple		= icmp_pkt_to_tuple,

	.invert_tuple		= icmp_invert_tuple,

	.print_tuple		= icmp_print_tuple,

	.packet			= icmp_packet,

	.get_timeouts		= icmp_get_timeouts,

	.new			= icmp_new,

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+0 −8
Original line number Diff line number Diff line
@@ -67,13 +67,6 @@ static bool ipv6_invert_tuple(struct nf_conntrack_tuple *tuple, 
	return true;

}



static void ipv6_print_tuple(struct seq_file *s,

			    const struct nf_conntrack_tuple *tuple)

{

	seq_printf(s, "src=%pI6 dst=%pI6 ",

		   tuple->src.u3.ip6, tuple->dst.u3.ip6);

}



static int ipv6_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,

			    unsigned int *dataoff, u_int8_t *protonum)

{
@@ -350,7 +343,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = { 
	.l3proto		= PF_INET6,

	.pkt_to_tuple		= ipv6_pkt_to_tuple,

	.invert_tuple		= ipv6_invert_tuple,

	.print_tuple		= ipv6_print_tuple,

	.get_l4proto		= ipv6_get_l4proto,

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)

	.tuple_to_nlattr	= ipv6_tuple_to_nlattr,