* [PATCH] netfilter: ctnetlink: add zone size to length
@ 2014-06-11 23:34 Ken-ichirou MATSUZAWA
2014-06-16 11:56 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Ken-ichirou MATSUZAWA @ 2014-06-11 23:34 UTC (permalink / raw)
To: The netfilter developer mailinglist; +Cc: Pablo Neira Ayuso
Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
---
net/netfilter/nf_conntrack_netlink.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/netfilter/nf_conntrack_netlink.c
b/net/netfilter/nf_conntrack_netlink.c
index 5857963..e279b76 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -597,6 +597,9 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct)
#ifdef CONFIG_NF_CONNTRACK_MARK
+ nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */
#endif
+#ifdef CONFIG_NF_CONNTRACK_ZONES
+ + nla_total_size(sizeof(u_int16_t)) /* CTA_ZONE */
+#endif
+ ctnetlink_proto_size(ct)
+ ctnetlink_label_size(ct)
;
@@ -2040,6 +2043,9 @@ ctnetlink_nfqueue_build_size(const struct nf_conn *ct)
#ifdef CONFIG_NF_CONNTRACK_MARK
+ nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */
#endif
+#ifdef CONFIG_NF_CONNTRACK_ZONES
+ + nla_total_size(sizeof(u_int16_t)) /* CTA_ZONE */
+#endif
+ ctnetlink_proto_size(ct)
;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] netfilter: ctnetlink: add zone size to length
2014-06-11 23:34 [PATCH] netfilter: ctnetlink: add zone size to length Ken-ichirou MATSUZAWA
@ 2014-06-16 11:56 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2014-06-16 11:56 UTC (permalink / raw)
To: Ken-ichirou MATSUZAWA; +Cc: The netfilter developer mailinglist
On Thu, Jun 12, 2014 at 08:34:55AM +0900, Ken-ichirou MATSUZAWA wrote:
> Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Applied, thanks.
> net/netfilter/nf_conntrack_netlink.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/netfilter/nf_conntrack_netlink.c
> b/net/netfilter/nf_conntrack_netlink.c
> index 5857963..e279b76 100644
> --- a/net/netfilter/nf_conntrack_netlink.c
> +++ b/net/netfilter/nf_conntrack_netlink.c
> @@ -597,6 +597,9 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct)
> #ifdef CONFIG_NF_CONNTRACK_MARK
> + nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */
> #endif
> +#ifdef CONFIG_NF_CONNTRACK_ZONES
> + + nla_total_size(sizeof(u_int16_t)) /* CTA_ZONE */
> +#endif
> + ctnetlink_proto_size(ct)
> + ctnetlink_label_size(ct)
> ;
> @@ -2040,6 +2043,9 @@ ctnetlink_nfqueue_build_size(const struct nf_conn *ct)
> #ifdef CONFIG_NF_CONNTRACK_MARK
> + nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */
> #endif
> +#ifdef CONFIG_NF_CONNTRACK_ZONES
> + + nla_total_size(sizeof(u_int16_t)) /* CTA_ZONE */
> +#endif
> + ctnetlink_proto_size(ct)
> ;
> }
> --
> 1.7.10.4
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-16 11:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-11 23:34 [PATCH] netfilter: ctnetlink: add zone size to length Ken-ichirou MATSUZAWA
2014-06-16 11:56 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).