From patchwork Fri Jan 15 19:47:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= X-Patchwork-Id: 568412 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 659E01401DA for ; Sat, 16 Jan 2016 06:48:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751957AbcAOTsa (ORCPT ); Fri, 15 Jan 2016 14:48:30 -0500 Received: from mail.asbjorn.biz ([185.38.24.25]:54375 "EHLO mail.asbjorn.biz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751034AbcAOTs3 (ORCPT ); Fri, 15 Jan 2016 14:48:29 -0500 Received: from x201s.roaming.asbjorn.biz (mon1.fiberby.net [193.104.135.42]) by mail.asbjorn.biz (Postfix) with ESMTPSA id 351071C001AA; Fri, 15 Jan 2016 19:48:28 +0000 (UTC) Received: by x201s.roaming.asbjorn.biz (Postfix, from userid 1000) id 8B14F2005CA; Fri, 15 Jan 2016 19:47:44 +0000 (UTC) From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= To: Pablo Neira Ayuso , pfeiffer.szilard@balabit.hu Cc: netfilter-devel@vger.kernel.org Subject: [PATCH conntrack 1/2] Revert "conntrack: fix expectation entry creation" Date: Fri, 15 Jan 2016 19:47:43 +0000 Message-Id: <1452887264-26064-1-git-send-email-ast@fiberby.dk> X-Mailer: git-send-email 2.6.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org {} is mask-src and mask-dst, [] is tuple-src and tuple-dst mask-* should be stored in mask, tuple-* should be stored in exptuple. This reverts commit 3309fdb4413cb32f9b95e05064dc9dbb56550939 since it mixed up {} and []. --- src/conntrack.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/conntrack.c b/src/conntrack.c index 3ae4527..324daf4 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -2074,8 +2074,6 @@ int main(int argc, char *argv[]) break; 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);