| Message ID | 1452887264-26064-2-git-send-email-ast@fiberby.dk |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
On Fri, Jan 15, 2016 at 07:47:44PM +0000, Asbjørn Sloth Tønnesen wrote: > 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. Also applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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':
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> --- src/conntrack.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)