From patchwork Sat Jun 13 18:51:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 483910 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 1A1D61401AD for ; Sun, 14 Jun 2015 04:46:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751870AbbFMSqE (ORCPT ); Sat, 13 Jun 2015 14:46:04 -0400 Received: from mail.us.es ([193.147.175.20]:39865 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751387AbbFMSqC (ORCPT ); Sat, 13 Jun 2015 14:46:02 -0400 Received: (qmail 32487 invoked from network); 13 Jun 2015 20:45:58 +0200 Received: from unknown (HELO us.es) (192.168.2.16) by us.es with SMTP; 13 Jun 2015 20:45:58 +0200 Received: (qmail 1145 invoked by uid 507); 13 Jun 2015 18:45:58 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus6 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.7/20565. spamassassin: 3.4.0. Clear:RC:1(127.0.0.1):SA:0(-103.2/7.5):. Processed in 4.075721 secs); 13 Jun 2015 18:45:58 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on antivirus6 X-Spam-Level: X-Spam-Status: No, score=-103.2 required=7.5 tests=BAYES_50,SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.4.0 X-Spam-ASN: AS12715 87.216.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus6) (127.0.0.1) by us.es with SMTP; 13 Jun 2015 18:45:54 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus6 (F-Secure/fsigk_smtp/412/antivirus6); Sat, 13 Jun 2015 20:45:54 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus6) Received: (qmail 9221 invoked from network); 13 Jun 2015 20:45:54 +0200 Received: from 77.166.216.87.static.jazztel.es (HELO salvia.here) (pneira@us.es@87.216.166.77) by mail.us.es with SMTP; 13 Jun 2015 20:45:54 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net Subject: [PATCH nft] tests: regression: ip6: reduce warning noise Date: Sat, 13 Jun 2015 20:51:09 +0200 Message-Id: <1434221469-15380-1-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org getnameinfo() displays this: ::1234:1234:1234:1234:1234:1234:1234 as: 0:1234:1234:1234:1234:1234:1234:1234 which is basically equivalent. nft accepts both inputs. So add some exceptions to the tests to reduce the amount of noise in the tests, so we can focus on real problems. Signed-off-by: Pablo Neira Ayuso --- tests/regression/ip6/ip6.t | 21 +++++++++++---------- tests/regression/ip6/vmap.t | 26 +++++++++++++------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/tests/regression/ip6/ip6.t b/tests/regression/ip6/ip6.t index 529a068..d4c5c7e 100644 --- a/tests/regression/ip6/ip6.t +++ b/tests/regression/ip6/ip6.t @@ -59,21 +59,22 @@ ip6 hoplimit {33-55};ok # v680 (({hex4}:){7}{hex4}) ip6 saddr 1234:1234:1234:1234:1234:1234:1234:1234;ok # v670 ((:)(:{hex4}{7})) -ip6 saddr ::1234:1234:1234:1234:1234:1234:1234;ok +ip6 saddr ::1234:1234:1234:1234:1234:1234:1234;ok;ip6 saddr 0:1234:1234:1234:1234:1234:1234:1234 # v671 ((({hex4}:){1})(:{hex4}{6})) -ip6 saddr 1234::1234:1234:1234:1234:1234:1234;ok +ip6 saddr 1234::1234:1234:1234:1234:1234:1234;ok;ip6 saddr 1234:0:1234:1234:1234:1234:1234:1234 # v672 ((({hex4}:){2})(:{hex4}{5})) -ip6 saddr 1234:1234::1234:1234:1234:1234:1234;ok +ip6 saddr 1234:1234::1234:1234:1234:1234:1234;ok;ip6 saddr 1234:1234:0:1234:1234:1234:1234:1234 +ip6 saddr 1234:1234:0:1234:1234:1234:1234:1234;ok # v673 ((({hex4}:){3})(:{hex4}{4})) -ip6 saddr 1234:1234:1234::1234:1234:1234:1234;ok +ip6 saddr 1234:1234:1234::1234:1234:1234:1234;ok;ip6 saddr 1234:1234:1234:0:1234:1234:1234:1234 # v674 ((({hex4}:){4})(:{hex4}{3})) -ip6 saddr 1234:1234:1234:1234::1234:1234:1234;ok +ip6 saddr 1234:1234:1234:1234:0:1234:1234:1234;ok # v675 ((({hex4}:){5})(:{hex4}{2})) -ip6 saddr 1234:1234:1234:1234:1234::1234:1234;ok +ip6 saddr 1234:1234:1234:1234:1234::1234:1234;ok;ip6 saddr 1234:1234:1234:1234:1234:0:1234:1234 # v676 ((({hex4}:){6})(:{hex4}{1})) -ip6 saddr 1234:1234:1234:1234:1234:1234::1234;ok +ip6 saddr 1234:1234:1234:1234:1234:1234:0:1234;ok # v677 ((({hex4}:){7})(:)) -ip6 saddr 1234:1234:1234:1234:1234:1234:1234::;ok +ip6 saddr 1234:1234:1234:1234:1234:1234:1234::;ok;ip6 saddr 1234:1234:1234:1234:1234:1234:1234:0 # v67 ({v670}|{v671}|{v672}|{v673}|{v674}|{v675}|{v676}|{v677}) # v660 ((:)(:{hex4}{6})) ip6 saddr ::1234:1234:1234:1234:1234:1234;ok @@ -124,7 +125,7 @@ ip6 saddr 1234:1234::1234;ok ip6 saddr 1234:1234:1234::;ok # v63 ({v630}|{v631}|{v632}|{v633}) # v620 ((:)(:{hex4}{2})) -ip6 saddr ::1234:1234;ok +ip6 saddr ::1234:1234;ok;ip6 saddr ::18.52.18.52 # v621 ((({hex4}:){1})(:{hex4}{1})) ip6 saddr 1234::1234;ok # v622 ((({hex4}:){2})(:)) @@ -139,4 +140,4 @@ ip6 saddr 1234::;ok ip6 saddr ::/64;ok - ip6 daddr != {::1234:1234:1234:1234:1234:1234:1234, 1234:1234::1234:1234:1234:1234:1234 };ok -ip6 daddr != ::1234:1234:1234:1234:1234:1234:1234-1234:1234::1234:1234:1234:1234:1234;ok +ip6 daddr != ::1234:1234:1234:1234:1234:1234:1234-1234:1234::1234:1234:1234:1234:1234;ok;ip6 daddr != 0:1234:1234:1234:1234:1234:1234:1234-1234:1234:0:1234:1234:1234:1234:1234 diff --git a/tests/regression/ip6/vmap.t b/tests/regression/ip6/vmap.t index 705f369..301a28a 100644 --- a/tests/regression/ip6/vmap.t +++ b/tests/regression/ip6/vmap.t @@ -8,14 +8,14 @@ ip6 saddr 1234:1234:1234:1234:1234:1234:1234:1234:1234;fail # Ipv6 address combinations # from src/scanner.l ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:1234 : accept};ok -ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept};ok -ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept};ok -ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept};ok -ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept};ok -ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept};ok -ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept};ok -ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept};ok -ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept};ok +ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept};ok;ip6 saddr vmap { 0:1234:1234:1234:1234:1234:1234:1234 : accept} +ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept};ok;ip6 saddr vmap { 1234:0:1234:1234:1234:1234:1234:1234 : accept} +ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept};ok;ip6 saddr vmap { 1234:1234:0:1234:1234:1234:1234:1234 : accept} +ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept};ok;ip6 saddr vmap { 1234:1234:1234:0:1234:1234:1234:1234 : accept} +ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept};ok;ip6 saddr vmap { 1234:1234:1234:1234:0:1234:1234:1234 : accept} +ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept};ok;ip6 saddr vmap { 1234:1234:1234:1234:1234:0:1234:1234 : accept} +ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept};ok;ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:0:1234 : accept} +ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept};ok;ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:0 : accept} ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234 : accept};ok ip6 saddr vmap { 1234::1234:1234:1234:1234:1234 : accept};ok ip6 saddr vmap { 1234:1234::1234:1234:1234:1234 : accept};ok @@ -38,17 +38,17 @@ ip6 saddr vmap { ::1234:1234:1234 : accept};ok ip6 saddr vmap { 1234::1234:1234 : accept};ok ip6 saddr vmap { 1234:1234::1234 : accept};ok ip6 saddr vmap { 1234:1234:1234:: : accept};ok -ip6 saddr vmap { ::1234:1234 : accept};ok +ip6 saddr vmap { ::1234:1234 : accept};ok;ip6 saddr vmap { ::18.52.18.52 : accept} ip6 saddr vmap { 1234::1234 : accept};ok ip6 saddr vmap { 1234:1234:: : accept};ok ip6 saddr vmap { ::1234 : accept};ok ip6 saddr vmap { 1234:: : accept};ok ip6 saddr vmap { ::/64 : accept};ok -ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop};ok -ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop};ok -ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop};ok -ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop};ok +ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop};ok;ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:0 : accept, ::aaaa : drop} +ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop};ok;ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:0 : accept, ::bbbb : drop} +ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop};ok;ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:0 : accept, ::cccc : drop} +ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop};ok;ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:0 : accept, ::dddd: drop} # rule without comma: filter-input ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:bbbb:::accept::adda : drop};fail