diff options
| author | Yi Yang <yangyi01@inspur.com> | 2020-10-19 11:04:22 +0800 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-10-20 12:56:25 +0200 |
| commit | a08af5d26297eb85218a3c3a9e0991001a88cf10 (patch) | |
| tree | 7acd43fe6de3d3a309bd3fb60c309cac6bc98f11 | |
| parent | e6adde47e34b02085b4cc474a5dc9750c91832dc (diff) | |
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 <yangyi01@inspur.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | include/network.h | 1 | ||||
| -rw-r--r-- | src/build.c | 3 | ||||
| -rw-r--r-- | src/parse.c | 5 |
3 files changed, 9 insertions, 0 deletions
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 |