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

Commit 0f417ce9 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

[NETFILTER]: ctnetlink: add support for master tuple event notification and dumping 



This patch adds support for master tuple event notification and
dumping.  Conntrackd needs this information to recover related
connections appropriately.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13eae15a

net/netfilter/nf_conntrack_netlink.c

+28 −0
Original line number Original line Diff line number Diff line
@@ -254,6 +254,29 @@ ctnetlink_dump_mark(struct sk_buff *skb, const struct nf_conn *ct) 
#define ctnetlink_dump_mark(a, b) (0)

#define ctnetlink_dump_mark(a, b) (0)

#endif

#endif





#define master_tuple(ct) &(ct->master->tuplehash[IP_CT_DIR_ORIGINAL].tuple)



static inline int

ctnetlink_dump_master(struct sk_buff *skb, const struct nf_conn *ct)

{

	struct nlattr *nest_parms;



	if (!(ct->status & IPS_EXPECTED))

		return 0;



	nest_parms = nla_nest_start(skb, CTA_TUPLE_MASTER | NLA_F_NESTED);

	if (!nest_parms)

		goto nla_put_failure;

	if (ctnetlink_dump_tuples(skb, master_tuple(ct)) < 0)

		goto nla_put_failure;

	nla_nest_end(skb, nest_parms);



	return 0;



nla_put_failure:

	return -1;

}



#ifdef CONFIG_NF_NAT_NEEDED

#ifdef CONFIG_NF_NAT_NEEDED

static inline int

static inline int

dump_nat_seq_adj(struct sk_buff *skb, const struct nf_nat_seq *natseq, int type)

dump_nat_seq_adj(struct sk_buff *skb, const struct nf_nat_seq *natseq, int type)
@@ -371,6 +394,7 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 pid, u32 seq, 
	    ctnetlink_dump_mark(skb, ct) < 0 ||

	    ctnetlink_dump_mark(skb, ct) < 0 ||

	    ctnetlink_dump_id(skb, ct) < 0 ||

	    ctnetlink_dump_id(skb, ct) < 0 ||

	    ctnetlink_dump_use(skb, ct) < 0 ||

	    ctnetlink_dump_use(skb, ct) < 0 ||

	    ctnetlink_dump_master(skb, ct) < 0 ||

	    ctnetlink_dump_nat_seq_adj(skb, ct) < 0)

	    ctnetlink_dump_nat_seq_adj(skb, ct) < 0)

		goto nla_put_failure;

		goto nla_put_failure;
@@ -475,6 +499,10 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, 
		     ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0))

		     ctnetlink_dump_counters(skb, ct, IP_CT_DIR_REPLY) < 0))

			goto nla_put_failure;

			goto nla_put_failure;





		if (events & IPCT_RELATED &&

		    ctnetlink_dump_master(skb, ct) < 0)

			goto nla_put_failure;



		if (events & IPCT_NATSEQADJ &&

		if (events & IPCT_NATSEQADJ &&

		    ctnetlink_dump_nat_seq_adj(skb, ct) < 0)

		    ctnetlink_dump_nat_seq_adj(skb, ct) < 0)

			goto nla_put_failure;

			goto nla_put_failure;