Commit 6c89dac5 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: ctnetlink: missing counters and timestamp in nfnetlink_{log,queue} 



Add counters and timestamps (if available) to the conntrack object
that is represented in nfnetlink_log and _queue messages.

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

net/netfilter/nf_conntrack_netlink.c

+6 −0
Original line number Diff line number Diff line
@@ -2669,6 +2669,8 @@ ctnetlink_glue_build_size(const struct nf_conn *ct) 
	       + nla_total_size(0) /* CTA_HELP */

	       + nla_total_size(NF_CT_HELPER_NAME_LEN) /* CTA_HELP_NAME */

	       + ctnetlink_secctx_size(ct)

	       + ctnetlink_acct_size(ct)

	       + ctnetlink_timestamp_size(ct)

#if IS_ENABLED(CONFIG_NF_NAT)

	       + 2 * nla_total_size(0) /* CTA_NAT_SEQ_ADJ_ORIG|REPL */

	       + 6 * nla_total_size(sizeof(u_int32_t)) /* CTA_NAT_SEQ_OFFSET */
@@ -2726,6 +2728,10 @@ static int __ctnetlink_glue_build(struct sk_buff *skb, struct nf_conn *ct) 
	if (ctnetlink_dump_protoinfo(skb, ct, false) < 0)

		goto nla_put_failure;



	if (ctnetlink_dump_acct(skb, ct, IPCTNL_MSG_CT_GET) < 0 ||

	    ctnetlink_dump_timestamp(skb, ct) < 0)

		goto nla_put_failure;



	if (ctnetlink_dump_helpinfo(skb, ct) < 0)

		goto nla_put_failure;