From 367ebb13c9a21d59633d307fafc12337b46888eb Mon Sep 17 00:00:00 2001 From: Arturo Borrero Date: Wed, 18 May 2016 19:05:12 +0200 Subject: conntrackd: add support for NTA_(S|D)NAT_IPV6 So we can properly sync NATed IPv6 connections. Thanks to Florian Westphal for originally ponting me to this lack of support in conntrackd, which saved me a lot of time. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/parse.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/parse.c') diff --git a/src/parse.c b/src/parse.c index 919d36c..d5d9b59 100644 --- a/src/parse.c +++ b/src/parse.c @@ -29,6 +29,7 @@ static void ct_parse_u8(struct nf_conntrack *ct, int attr, void *data); static void ct_parse_u16(struct nf_conntrack *ct, int attr, void *data); static void ct_parse_u32(struct nf_conntrack *ct, int attr, void *data); +static void ct_parse_u128(struct nf_conntrack *ct, int attr, void *data); static void ct_parse_str(struct nf_conntrack *ct, const struct netattr *, void *data); static void ct_parse_group(struct nf_conntrack *ct, int attr, void *data); @@ -189,6 +190,16 @@ static struct ct_parser h[NTA_MAX] = { .attr = ATTR_CONNLABELS, .max_size = NTA_SIZE(NTA_LABELS_MAX_SIZE), }, + [NTA_SNAT_IPV6] = { + .parse = ct_parse_u128, + .attr = ATTR_SNAT_IPV6, + .size = NTA_SIZE(sizeof(uint32_t) * 4), + }, + [NTA_DNAT_IPV6] = { + .parse = ct_parse_u128, + .attr = ATTR_DNAT_IPV6, + .size = NTA_SIZE(sizeof(uint32_t) * 4), + }, }; static void @@ -212,6 +223,12 @@ ct_parse_u32(struct nf_conntrack *ct, int attr, void *data) nfct_set_attr_u32(ct, h[attr].attr, ntohl(*value)); } +static void +ct_parse_u128(struct nf_conntrack *ct, int attr, void *data) +{ + nfct_set_attr(ct, h[attr].attr, data); +} + static void ct_parse_str(struct nf_conntrack *ct, const struct netattr *attr, void *data) { -- cgit v1.2.3