diff options
author | Asbjørn Sloth Tønnesen <ast@fiberby.dk> | 2016-01-15 19:47:44 +0000 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-01-19 19:38:50 +0100 |
commit | a6ac89adfb5c7a6c72ed0fe5be0be48464250764 (patch) | |
tree | eb8fcb83f188e80474cd93fc7536c32a9c6bf2cf /src | |
parent | cdb85228850af5e672853dff780751a3a52ee599 (diff) |
conntrack: fix expectation entry creation
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 <pfeiffer.szilard@balabit.hu>
Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.dk>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/conntrack.c | 6 |
1 files changed, 4 insertions, 2 deletions
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': |