From: yang_y_yi@163.com
To: netfilter-devel@vger.kernel.org
Cc: yangyi01@inspur.com, yang_y_yi@163.com
Subject: [PATCH] conntrack: fix zone sync issue
Date: Mon, 19 Oct 2020 11:04:22 +0800 [thread overview]
Message-ID: <20201019030422.396340-1-yang_y_yi@163.com> (raw)
From: Yi Yang <yangyi01@inspur.com>
In some use cases, zone is used to differentiate different
conntrack state tables, so zone also should be synchronized
if it is set.
Signed-off-by: Yi Yang <yangyi01@inspur.com>
---
include/network.h | 1 +
src/build.c | 3 +++
src/parse.c | 5 +++++
3 files changed, 9 insertions(+)
diff --git a/include/network.h b/include/network.h
index 95aad82..20def34 100644
--- a/include/network.h
+++ b/include/network.h
@@ -232,6 +232,7 @@ enum nta_attr {
NTA_SNAT_IPV6, /* uint32_t * 4 */
NTA_DNAT_IPV6, /* uint32_t * 4 */
NTA_SYNPROXY, /* struct nft_attr_synproxy */
+ NTA_ZONE, /* uint16_t */
NTA_MAX
};
diff --git a/src/build.c b/src/build.c
index 99ff230..4771997 100644
--- a/src/build.c
+++ b/src/build.c
@@ -315,6 +315,9 @@ void ct2msg(const struct nf_conntrack *ct, struct nethdr *n)
nfct_attr_is_set(ct, ATTR_SYNPROXY_ITS) &&
nfct_attr_is_set(ct, ATTR_SYNPROXY_TSOFF))
ct_build_synproxy(ct, n);
+
+ if (nfct_attr_is_set(ct, ATTR_ZONE))
+ ct_build_u16(ct, ATTR_ZONE, n, NTA_ZONE);
}
static void
diff --git a/src/parse.c b/src/parse.c
index 7e524ed..e97a721 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -205,6 +205,11 @@ static struct ct_parser h[NTA_MAX] = {
.parse = ct_parse_synproxy,
.size = NTA_SIZE(sizeof(struct nta_attr_synproxy)),
},
+ [NTA_ZONE] = {
+ .parse = ct_parse_u16,
+ .attr = ATTR_ZONE,
+ .size = NTA_SIZE(sizeof(uint16_t)),
+ },
};
static void
--
1.8.3.1
next reply other threads:[~2020-10-19 3:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 3:04 yang_y_yi [this message]
2020-10-20 10:57 ` [PATCH] conntrack: fix zone sync issue Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2020-10-19 2:53 yang_y_yi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201019030422.396340-1-yang_y_yi@163.com \
--to=yang_y_yi@163.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=yangyi01@inspur.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).