From a08af5d26297eb85218a3c3a9e0991001a88cf10 Mon Sep 17 00:00:00 2001 From: Yi Yang Date: Mon, 19 Oct 2020 11:04:22 +0800 Subject: conntrack: fix zone sync issue 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 Signed-off-by: Pablo Neira Ayuso --- 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 -- cgit v1.2.3