From a6ac89adfb5c7a6c72ed0fe5be0be48464250764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= Date: Fri, 15 Jan 2016 19:47:44 +0000 Subject: conntrack: fix expectation entry creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Store tuple-src and tuple-dst in exptuple, as used by the EXP_CREATE case. Verified with doc/cli/test.sh Also reorder the cases, so the netmask case is last. Reported-by: Szilárd Pfeiffer Signed-off-by: Asbjørn Sloth Tønnesen Signed-off-by: Pablo Neira Ayuso --- src/conntrack.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/conntrack.c b/src/conntrack.c index 324daf4..45b8822 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -2072,10 +2072,12 @@ int main(int argc, char *argv[]) case 'q': nfct_set_addr_from_opt(c, tmpl.ct, &ad, &family); break; - case '{': - case '}': case '[': case ']': + nfct_set_addr_from_opt(c, tmpl.exptuple, &ad, &family); + break; + case '{': + case '}': nfct_set_addr_from_opt(c, tmpl.mask, &ad, &family); break; case 'p': -- cgit v1.2.3