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

Commit f2f3e38c authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by pablo
Browse files

netfilter: ctnetlink: rename tuple() by nf_ct_tuple() macro definition 



This patch move the internal tuple() macro definition to the
header file as nf_ct_tuple().

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 8b0a231d

include/net/netfilter/nf_conntrack.h

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ static inline u_int8_t nf_ct_protonum(const struct nf_conn *ct) 
	return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum;

}



#define nf_ct_tuple(ct, dir) (&(ct)->tuplehash[dir].tuple)



/* get master conntrack via master expectation */

#define master_ct(conntr) (conntr->master)

net/netfilter/nf_conntrack_netlink.c

+6 −7
Original line number Diff line number Diff line
@@ -346,8 +346,6 @@ ctnetlink_dump_use(struct sk_buff *skb, const struct nf_conn *ct) 
	return -1;

}



#define tuple(ct, dir) (&(ct)->tuplehash[dir].tuple)



static int

ctnetlink_fill_info(struct sk_buff *skb, u32 pid, u32 seq,

		    int event, const struct nf_conn *ct)
@@ -369,14 +367,14 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 pid, u32 seq, 
	nest_parms = nla_nest_start(skb, CTA_TUPLE_ORIG | NLA_F_NESTED);

	if (!nest_parms)

		goto nla_put_failure;

	if (ctnetlink_dump_tuples(skb, tuple(ct, IP_CT_DIR_ORIGINAL)) < 0)

	if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_ORIGINAL)) < 0)

		goto nla_put_failure;

	nla_nest_end(skb, nest_parms);



	nest_parms = nla_nest_start(skb, CTA_TUPLE_REPLY | NLA_F_NESTED);

	if (!nest_parms)

		goto nla_put_failure;

	if (ctnetlink_dump_tuples(skb, tuple(ct, IP_CT_DIR_REPLY)) < 0)

	if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_REPLY)) < 0)

		goto nla_put_failure;

	nla_nest_end(skb, nest_parms);
@@ -509,7 +507,8 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, 
	if (!item->report && !nfnetlink_has_listeners(group))

		return NOTIFY_DONE;



	skb = ctnetlink_alloc_skb(tuple(ct, IP_CT_DIR_ORIGINAL), GFP_ATOMIC);

	skb = ctnetlink_alloc_skb(nf_ct_tuple(ct, IP_CT_DIR_ORIGINAL),

				  GFP_ATOMIC);

	if (!skb)

		goto errout;
@@ -528,14 +527,14 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, 
	nest_parms = nla_nest_start(skb, CTA_TUPLE_ORIG | NLA_F_NESTED);

	if (!nest_parms)

		goto nla_put_failure;

	if (ctnetlink_dump_tuples(skb, tuple(ct, IP_CT_DIR_ORIGINAL)) < 0)

	if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_ORIGINAL)) < 0)

		goto nla_put_failure;

	nla_nest_end(skb, nest_parms);



	nest_parms = nla_nest_start(skb, CTA_TUPLE_REPLY | NLA_F_NESTED);

	if (!nest_parms)

		goto nla_put_failure;

	if (ctnetlink_dump_tuples(skb, tuple(ct, IP_CT_DIR_REPLY)) < 0)

	if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_REPLY)) < 0)

		goto nla_put_failure;

	nla_nest_end(skb, nest_parms);