From patchwork Sun Oct 29 20:49:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831791 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WfnelHyo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8qy20wwz9t4R for ; Mon, 30 Oct 2017 07:49:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752058AbdJ2Uts (ORCPT ); Sun, 29 Oct 2017 16:49:48 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:44635 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965AbdJ2Utq (ORCPT ); Sun, 29 Oct 2017 16:49:46 -0400 Received: by mail-pg0-f66.google.com with SMTP id j3so9699363pga.1 for ; Sun, 29 Oct 2017 13:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q3FJsnuLpyfMjQ2212bY78u0SYG0+ktNiaDh7nDOfcI=; b=WfnelHyo4eQmy0BMvTthK0LNVhWwPsViB7XDWvcctnmYlVU9ln228BRYxT5CYQAZU3 1tsl1YaI81i3WtptHUpS1dB4kAcrqzlzH4DUWpDeiz4tZyN/qStpsA9QeVU1UKjbKdSj 94eH7WoKn1fKz4aNk/ipyF8jYbXI6A7SteYbb0dq2vJnfhZK1bvYKEb5qkv490UQJgBR xua3sgkz7D+bVwh77MJ7RfnUQq1z3jcOoO/SqF8pkGBkaH1YQfxYJ9QyF6ZfIxUriahr 6x8K8Pj5f64JCwD7XxE2akW0EKCatVGR+VDuorSKVjCPyMvXONlJ7DcFJDuJQruqXUzo q/EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Q3FJsnuLpyfMjQ2212bY78u0SYG0+ktNiaDh7nDOfcI=; b=DGeC7EHUzqpY+Hsu0j4oWDSneXUueH0nKCw/r05StbSITAzM4K9iwqp0zhFv/zqeoh F+0FyEDu1kXW5SlpqZGUn1HvW/VCgQSlUou5wBnURsHgxIyVGZcMIoY7kHWqpEOwjsjU H1YKeazk2yOKbm0xxpzN3vz+c3YotK6i9P4dF0JV6VzoP+W34d0/qizioNpTwUoELta+ T4aDYGea5LMWc3EEbp3W7zE9onh6d7oNSg1eLDqJTvzKY7rCgm5okNhC+DDUH1vQLciO nEHH+eNUHejJMxFNytyl1uSraJcZ/WV0lYDf8syehBQtDZehvlUAH3nnNnRP7tjGVt7S fTQQ== X-Gm-Message-State: AMCzsaWxCXC30r3lW45UKFQj2Bu/At0vp+dfotf9dqGfWONJlhll/SoR 4XMkWCEZhdkMmNw1uQIQVdA= X-Google-Smtp-Source: ABhQp+TSiMyb9RJFSOyyrrOgT8axJXdNsxlUaeYyfClS7ZuZ+xmsGxZWHbX4IA3uq+Zb0mfq4AJBEQ== X-Received: by 10.84.233.66 with SMTP id k2mr5582168plt.45.1509310185679; Sun, 29 Oct 2017 13:49:45 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.49.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:49:45 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 01/16] tests: files: Remove tests for ipv4 Date: Mon, 30 Oct 2017 02:19:16 +0530 Message-Id: <20171029204931.7792-1-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch removes test cases for ipv4 family. As they are already present in tests/shell file. Signed-off-by: Varsha Rao --- tests/files/family-ipv4 | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 tests/files/family-ipv4 diff --git a/tests/files/family-ipv4 b/tests/files/family-ipv4 deleted file mode 100644 index 0700e16..0000000 --- a/tests/files/family-ipv4 +++ /dev/null @@ -1,14 +0,0 @@ -#! nft -f - -flush chain ip filter output -delete chain ip filter output -delete table filter - -add table ip filter -add chain ip filter output { type filter hook input priority 0; } - -# IP address -add rule ip filter output ip daddr 192.168.0.1 counter - -# TCP ports -add rule ip filter output tcp dport 22 counter From patchwork Sun Oct 29 20:49:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831792 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KLRcfObV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8qz35jLz9t4R for ; Mon, 30 Oct 2017 07:49:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752060AbdJ2Utt (ORCPT ); Sun, 29 Oct 2017 16:49:49 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:55179 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965AbdJ2Uts (ORCPT ); Sun, 29 Oct 2017 16:49:48 -0400 Received: by mail-pf0-f195.google.com with SMTP id n89so9213291pfk.11 for ; Sun, 29 Oct 2017 13:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Yx/j406E8fm3BgUbT83WhOkzk5seBhCJeoOCn5imto0=; b=KLRcfObVx6BaTwZqy9LDMxDpparZ2q9aWIIoX33h8bM64wQ8FH1si8NLlx9w+I/ERG SNG1+HjHqzlcuKcI3QjkMLeOBbBE7BzYJUnuZS4CtgrF9FD0s6GbqVS8HdHfp5mzcp+S sErb4zpipgyHJo3Ofs+zic15wJgodqCHQyu4liZJiCg6lyhHvj+QWeycuerIBXTrydM9 hezzMd9w6Vy4oxBefcXvzK44fegu4rAR75UzhtCWkU0jCGQ8+Zzf0bGi7Qk0ARxqLuQT EQ74HVPIava/yV1wjigF0vZ1xKQfwGOxZEq+m9c0zORkcuPo26DAEV7Nc5FqwRJbQ/yT WYgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Yx/j406E8fm3BgUbT83WhOkzk5seBhCJeoOCn5imto0=; b=WCru6pl7VKjSAssU2vcQqw0S9wuOUA/V8enP4AbqgCwjLpaOaQ7zxCK9Djdr2mCdY9 L1BEHKRcVGA678Lqe5u6PoD1eWzx036V0w8lAzpaUV8qkXvLcVoGGYa1YS17oGiBKg3g VwfxE56SKJFJNLt1MoUdkj5S7MiIi6LnAI9121MZC6ajvYLZsCS5VE63H7puI4N90bh8 CbPK+Qip8PM9adxq9RXsBDF4GvbJ5BfHc29LMrisziF7eJtHg9WmcvYT+XuCsHGKrVK/ MufVjO6ACN24NJa6yfNzRghtBJ4mrQbuV0fhhZ5tSup3egrhAgpjU+8bFtivxI5KfHq7 tfeg== X-Gm-Message-State: AMCzsaUxJ3W9/NbkwBUOvV1yvdzuussjRumohAp8JaFwNafdPXkQjGdF NLdE9mEvpRcDW5N7LcdDOcGHzzXa X-Google-Smtp-Source: ABhQp+SqHgwGT5lqYaykC2wMybthW85yF6jpZtijZMoSzjGobKZE+pXCGR565bwQoBqeIxb4bA91LA== X-Received: by 10.84.231.2 with SMTP id f2mr5399679plk.256.1509310188223; Sun, 29 Oct 2017 13:49:48 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.49.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:49:47 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 02/16] tests: files: Remove tests for ipv6 Date: Mon, 30 Oct 2017 02:19:17 +0530 Message-Id: <20171029204931.7792-2-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch removes test cases for ipv6 family. As they are already present in tests/shell file. Signed-off-by: Varsha Rao --- tests/files/family-ipv6 | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 tests/files/family-ipv6 diff --git a/tests/files/family-ipv6 b/tests/files/family-ipv6 deleted file mode 100644 index cfc740c..0000000 --- a/tests/files/family-ipv6 +++ /dev/null @@ -1,13 +0,0 @@ -#! nft -f - -add table ip6 filter -add chain ip6 filter output { type filter hook output priority 0 ; } - -# IP address -add rule ip6 filter output ip6 daddr 2001:6f8:974::1 counter - -# Next protocol -add rule ip6 filter output ip6 nexthdr tcp - -# TCP ports -add rule ip6 filter output tcp dport 22 counter From patchwork Sun Oct 29 20:49:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831793 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MJurTPP8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8r123Nsz9t4c for ; Mon, 30 Oct 2017 07:49:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752062AbdJ2Utw (ORCPT ); Sun, 29 Oct 2017 16:49:52 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:47641 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965AbdJ2Utv (ORCPT ); Sun, 29 Oct 2017 16:49:51 -0400 Received: by mail-pf0-f195.google.com with SMTP id z11so9228599pfk.4 for ; Sun, 29 Oct 2017 13:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KjFgePoTOQPtnljFB1/u1EzbIUW1MG6CcEZHBIPgaGo=; b=MJurTPP8eE7+0N9o10cVbLi+mdkDxSu7mq23xdYfdqdfdkOAM6EczyopvBLB9AU+AV RjeIYijB/teir+vThwBtcaaUFr0nKQ1yCA80/AgXRM9fGMx02i9xxN4kLTcC/jV+WdlH T9xfi7adEziXKTJ1yqrEaenbxezs2a5I0k3EoILnOGWqve/4zomxE1bdmBuDj6/Gy6oR KFIZNQO9a/k9xIBeC6JN1V/gA+m1Fcc23Em+JGV+Ui95ahCvKEvpY6UWR3+BUrnq8p93 i2xiE+UDKvreGhjsTk33ceAE9kr05OM1htn/+hTVV2GV8vu+9g5iaRdkXQNGhNbmyJy2 eHBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KjFgePoTOQPtnljFB1/u1EzbIUW1MG6CcEZHBIPgaGo=; b=gUV2pAinQ4XYLarUQFv/eBJds0nAomqH/eJcYgd04t4NHDE0pBPkY7Cx6XZTFocUMt ETAmXaoVPlrsdndBYFNEk6EyOge6oNU/Uihg0GQ3lS68g6KsTipgAzPaaUbVGg0edzv0 4EVQdC2OJhxzfsVS2pi3GecCsp6R9SrkBliWOBnASOjyEV9zmzcpp59eKJgJVycj5JHF Ctt7e1tshXTnKkeaWlwPYCG3oVba/lnMofDHYwkXAYgU84TCVXogRD/gazr+coa6jUoU V2rQVY/4mzDwwQZht7zi7ouDgugn7BqxZksU1ypI/jt8pSA1EhVc2UYyHAGi56kyVd+k wBKQ== X-Gm-Message-State: AMCzsaWnJg7GAgwKyxAU5q5k+A5W/h4oyVG7KLDzPWF8uVf0nIN3TDHM TB2ix5VOjSSemEjnAM8STH4= X-Google-Smtp-Source: ABhQp+Q4QCkPtWhiIJdDdbHaSPosEU/HUxOoNYn8Nlk8GMoq96ZBjcrgt+U146LGexqCaPbc90w/ng== X-Received: by 10.84.131.4 with SMTP id 4mr5501305pld.146.1509310190489; Sun, 29 Oct 2017 13:49:50 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.49.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:49:50 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 03/16] tests: shell: Add test for log statement. Date: Mon, 30 Oct 2017 02:19:18 +0530 Message-Id: <20171029204931.7792-3-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Add test case for log statement. Signed-off-by: Varsha Rao --- tests/shell/testcases/optionals/log_0 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 tests/shell/testcases/optionals/log_0 diff --git a/tests/shell/testcases/optionals/log_0 b/tests/shell/testcases/optionals/log_0 new file mode 100755 index 0000000..672cff7 --- /dev/null +++ b/tests/shell/testcases/optionals/log_0 @@ -0,0 +1,22 @@ +#!/bin/bash + +set -e + +EXPECTED="table ip x { + chain y { + type filter hook output priority 0; policy accept; + tcp dport ssh log group 0 counter packets 0 bytes 0 + } +}" + +$NFT add table ip x +$NFT add chain ip x y { type filter hook output priority 0\; } +$NFT add rule ip x y tcp dport 22 log group 0 counter + +GET="$($NFT list ruleset)" + +if [ "$EXPECTED" != "$GET" ] ; then + DIFF="$(which diff)" + [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + exit 1 +fi From patchwork Sun Oct 29 20:49:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831794 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="plOZWBaf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8r30GNTz9t4R for ; Mon, 30 Oct 2017 07:49:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752064AbdJ2Uty (ORCPT ); Sun, 29 Oct 2017 16:49:54 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:56567 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965AbdJ2Utx (ORCPT ); Sun, 29 Oct 2017 16:49:53 -0400 Received: by mail-pg0-f68.google.com with SMTP id m18so9672273pgd.13 for ; Sun, 29 Oct 2017 13:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hp6TE3NNwQRU2wcqChXxc7RrSHuT0NkuYZietIpBKQg=; b=plOZWBafZlyuGDMpj1wprUmB5JCqjodFbkidmDfpU2jv0ZRA4ZUKllY0TQSVbw/8nz TOZ+/TcYSWvBrEOpg2u3r8PbcqPBx2CfjJkIrMUc26ggCcflZ1zRpPqRoG1Y189PqQFi gh3hgCBtCEXgRd9sRueWXQUitglR3O7FQLiq9t9Q+JXrMthMRDmZClPkp5/cdNc5++HO LsFwW9CZGQAXJes8ppoTEJNHfi6EjEnMKVHGs/wAVfbXOft8XgVFc50CiVBJYHWMQgWZ CHBJoW0BvlZ+DyMNtmiWlTAMuERv3Pzf6BTDYYf9dtAN8MI864Iv1Nch+0rXW8IbyE4Z rUwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hp6TE3NNwQRU2wcqChXxc7RrSHuT0NkuYZietIpBKQg=; b=Lgqv+Su1xekN2pv2IKq3YQdR9lLJpm2yaySY4zprS/If4tBWV3K+cyjCBx3sTmyKu6 8/batO6LAvDn1UmcHwArDHpHKsbq1fkg1RnfqT4SQoM6JWSjCVVSvEaK6qa8FKcpcSk8 lUH5BP/Aq1Jc5nOP/WSsw1oqzYptI3MsKqY2oij/qNuyXzTOrYggMsVUc9Wl3B/7T//t 2G6VdcueIU47fUPhxDFk11XucJxH7OqoFrgSpJbSC48QdT55VhAxNM+bHqmXeHW0lsVv osilI3oH03dU0K7HblIjA0doZ50cIvtwLEVqdAnHmshhRGqMm0f4/zNXxtcp3hJw66nJ WTCg== X-Gm-Message-State: AMCzsaUS1mRafA49DnJu735P635ZIIs7nsMnZUpdFidptsdjkRuB+mKR kzEBusOvXx9zgqUYamYycsx2A2Sf X-Google-Smtp-Source: ABhQp+T8aBc1I4pHsljtc9xP04sEzzR9zy6SgO7Eq9ty44AWJhsJzxwLQidmpu60Whaxl9v7Y/WSVw== X-Received: by 10.84.213.9 with SMTP id f9mr5368921pli.76.1509310193044; Sun, 29 Oct 2017 13:49:53 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.49.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:49:52 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 04/16] tests: files: Remove log statement tests. Date: Mon, 30 Oct 2017 02:19:19 +0530 Message-Id: <20171029204931.7792-4-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org New test case for log statement has been added to tests/shell file, so remove it. Signed-off-by: Varsha Rao --- tests/files/stmt-log | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 tests/files/stmt-log diff --git a/tests/files/stmt-log b/tests/files/stmt-log deleted file mode 100644 index 2ae7aae..0000000 --- a/tests/files/stmt-log +++ /dev/null @@ -1,6 +0,0 @@ -#! nft -f - -add table ip filter -add chain ip filter output { type filter hook output priority 0; } - -add rule ip filter output log saddr "prefix" group 0 counter From patchwork Sun Oct 29 20:49:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831795 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AwtwF3Vu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8r465dTz9t4R for ; Mon, 30 Oct 2017 07:49:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752067AbdJ2Ut4 (ORCPT ); Sun, 29 Oct 2017 16:49:56 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:48514 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965AbdJ2Utz (ORCPT ); Sun, 29 Oct 2017 16:49:55 -0400 Received: by mail-pf0-f196.google.com with SMTP id b79so9226007pfk.5 for ; Sun, 29 Oct 2017 13:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7/nVU7E0GP2sCyS80hbsqDH4KLvcp7YxVhBNWB3E+Bo=; b=AwtwF3Vu/p6/99Qz8YZRMCOLC6uMQnrqIyTjAWxw8uQAoKufi3FQnDXZOmIHE79uBT 5/Dco19d+/dv63icUKanXG7TlbbZbmIIu1UzSKZGb04FQLL/hV/nAsJIcq9/dDHAbNb+ Ea58/EnSKhPwpCodb790J7svKHunN0YfOvgcJEYDNuRh41ywXaPP2tN3v/pSa2k3w+v3 TIwZOqa5waasVszHNLDDV+LYrC+Bcux26D8iFEvkwLsK2QQ9W4WWBZa9Ij0OV8YTH4W0 ZaexIXu6pelIsTBtoE4rr9Nzo1gndO1nvk72Suvs8LFubsgDexhcSJB2hGAuRD48kH1l Z+Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7/nVU7E0GP2sCyS80hbsqDH4KLvcp7YxVhBNWB3E+Bo=; b=TcpKCbT/YJ3O2OCMV2sfcRwQxhmQo9cweJmc7CNNW24KM5+s/YdKQ9yZkvhhu3KBhu emPoQIzFzERR9cQAA3/LohWQsgs4zEl4jCVnUsG5OO0ci1wHUHhvTvCDDblIWjoBaQdD NteEEd+Ptz7N2k4lA0E8yCt8Rki7l76a6NwH6/WmQossrr25kBe26d0GTtUagyL5XkmC 61+A82s1f1aOjPoXa1HKN6dyx63Vk1eyThTV5uwgj9qYuX2HJGXgQUwb1GoKDBBC6ct2 IWcHOSqQ37A7SJKg8XpGZYcCT2u0Ui2gZq5oTj1qER1SedxeN+kT6weDbApeeYB4mhjY 3Ugw== X-Gm-Message-State: AMCzsaXSg+YJqr9oHtqb/Oga44WYtCWqPNtCnxlXl0BLHEscsERz0jCr eryqyx6NFq9PhI6RI8+RdEE= X-Google-Smtp-Source: ABhQp+SrwNuuRn/j9nkH4xloYW64PIfglLcuO1hn7ax34c35yWYPikSV8DUONy2sZh8cUpHcOk/ZUA== X-Received: by 10.99.95.139 with SMTP id t133mr5811638pgb.448.1509310195336; Sun, 29 Oct 2017 13:49:55 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.49.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:49:54 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 05/16] tests: shell: Add test for log flags. Date: Mon, 30 Oct 2017 02:19:20 +0530 Message-Id: <20171029204931.7792-5-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch adds test cases for log flags. Signed-off-by: Varsha Rao --- tests/shell/testcases/optionals/log_flags_0 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100755 tests/shell/testcases/optionals/log_flags_0 diff --git a/tests/shell/testcases/optionals/log_flags_0 b/tests/shell/testcases/optionals/log_flags_0 new file mode 100755 index 0000000..7b8550f --- /dev/null +++ b/tests/shell/testcases/optionals/log_flags_0 @@ -0,0 +1,29 @@ +#!/bin/bash + +set -e + +EXPECTED="table ip x { + chain y { + log flags tcp sequence,options + log flags ip options + log flags skuid + log flags ether + log flags all + } +}" + +$NFT add table ip x +$NFT add chain ip x y +$NFT add rule x y log flags tcp sequence,options +$NFT add rule x y log flags ip options +$NFT add rule x y log flags skuid +$NFT add rule x y log flags ether +$NFT add rule x y log flags all + +GET="$($NFT list ruleset)" + +if [ "$EXPECTED" != "$GET" ] ; then + DIFF="$(which diff)" + [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + exit 1 +fi From patchwork Sun Oct 29 20:49:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831796 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bX/lsXlC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8r75x51z9t4R for ; Mon, 30 Oct 2017 07:49:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752075AbdJ2Ut7 (ORCPT ); Sun, 29 Oct 2017 16:49:59 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:51731 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2Ut6 (ORCPT ); Sun, 29 Oct 2017 16:49:58 -0400 Received: by mail-pf0-f193.google.com with SMTP id n14so9214665pfh.8 for ; Sun, 29 Oct 2017 13:49:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rwGH1Xf+YmA6eJe0Tbh0hDYTuCfGtgbMQ12t4sXxrJI=; b=bX/lsXlCeEh+3/1ipfcVZHZWCBZiG51tgULv0ky3paOj4XCyQ7e5CXjSSiq2IRFGly 3bpqS1JJsZ2+rr5byTFjm/9qQSOOfjVzsbz20NlifsARIJZxkVbN7L49PY7IQK/xvsaq Xygl3ixRib5+FTcM4sQRxKxcFG4NhVBY9lg2lgCpYA8cIKTXep/dDWe287/D1DkLh7iG moG9YFd8+G55Axfp79+s5fVkHMP8XTRYUiHrVJWYgXwvZ7TSzPZLD+bbWEns8GQ7sykz R40T20Oxt5e3KlPsRHtYCO1tRPjNnrxIOopbFD6VCMjPWStiwcxvi1LMyfngyrkDUj3e 8qYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rwGH1Xf+YmA6eJe0Tbh0hDYTuCfGtgbMQ12t4sXxrJI=; b=WUDzFtg6R0WhpeYUa+WIGEgdv6HQOXPZWde1iXUexZF3f+Vy/lzUFwir3V3ZCy/B9r K7JXFUGE4f4yoXsPMv2l5k28K9j2yYiBTFmIHdB9r0w3DECipvL5xmN8pP/e4RcjQM0D 3Za4YrI3ecwKzEmMzkM0WHz8FlXsXK7iPpll4WVv2IEa2I/hK+N9yboBE/Nwi/OTekUw fXVIjLwuNPaznJWVgAaFHHJLsfxDgddpXVgDEC2e7got8AZYo+a2BCeG8iaMAyoqE4Kp RmMUn7Fmaog1W2dtJ0+6cr80pKcvZ7jdKDlDdkCOG66incFk8jzA8Th9UHsdHUbpXWS2 CduA== X-Gm-Message-State: AMCzsaXmPFs4fS8BqbccGDxJ8Q9okdo73z2OErLEkTQfYe9znfHbxP0Q q7+rnX0avV91Mmwqt5Bhl4E= X-Google-Smtp-Source: ABhQp+Q2EXp2oI85oQ4oF7cqS8AoSXlW3rQ+nsmOJAJMj9bAv1spEcreyq+LKr244mkHVOigSB0tKg== X-Received: by 10.101.100.216 with SMTP id t24mr1156981pgv.439.1509310198209; Sun, 29 Oct 2017 13:49:58 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.49.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:49:57 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 06/16] tests: shell: Add tests for payload expression. Date: Mon, 30 Oct 2017 02:19:21 +0530 Message-Id: <20171029204931.7792-6-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch adds test case for adjacent payload expression. Signed-off-by: Varsha Rao --- tests/shell/testcases/transactions/0024rule_0 | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 tests/shell/testcases/transactions/0024rule_0 diff --git a/tests/shell/testcases/transactions/0024rule_0 b/tests/shell/testcases/transactions/0024rule_0 new file mode 100755 index 0000000..7644ce8 --- /dev/null +++ b/tests/shell/testcases/transactions/0024rule_0 @@ -0,0 +1,44 @@ +#!/bin/bash + +# Tests for adjacent payload expressions. + +set -e + +tmpfile=$(mktemp) +if [ ! -w $tmpfile ] ; then + echo "Failed to create tmp file" >&2 + exit 0 +fi + +trap "rm -rf $tmpfile" EXIT # cleanup if aborted + +RULESET="add table x +add chain x y +add rule x y tcp sport 1024 tcp dport 22 counter +add rule x y ip saddr 192.168.0.1 ip daddr 192.168.0.100 counter +add rule x y tcp sequence 0 tcp sport 1024 tcp dport 22 +add rule x y tcp sport 1024 tcp dport 22 tcp sequence 0" + +echo "$RULESET" > $tmpfile +$NFT -f $tmpfile +if [ $? -ne 0 ] ; then + echo "E: unable to load good ruleset" >&2 + exit 1 +fi + +EXPECTED="table ip x { + chain y { + tcp sport 1024 tcp dport ssh counter packets 0 bytes 0 + ip saddr 192.168.0.1 ip daddr 192.168.0.100 counter packets 0 bytes 0 + tcp sport 1024 tcp dport ssh tcp sequence 0 + tcp sport 1024 tcp dport ssh tcp sequence 0 + } +}" + +GET="$($NFT list ruleset)" + +if [ "$EXPECTED" != "$GET" ] ; then + DIFF="$(which diff)" + [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + exit 1 +fi From patchwork Sun Oct 29 20:49:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831797 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ATW2BgFm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rB1Px5z9t4R for ; Mon, 30 Oct 2017 07:50:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752077AbdJ2UuB (ORCPT ); Sun, 29 Oct 2017 16:50:01 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:54133 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuB (ORCPT ); Sun, 29 Oct 2017 16:50:01 -0400 Received: by mail-pg0-f67.google.com with SMTP id s2so9670614pge.10 for ; Sun, 29 Oct 2017 13:50:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=grPdtzn5ej/cbXmPLXjmLV1ewI1aj3DXWkp7E/mVvA4=; b=ATW2BgFmoKy+sGrSr/ZihGLbJaiyTTjp3ZIhbEnysySE8Eo5CVHQ1XCrIMRzGRy/pB CqJ4Ego1Xu4+J7HP3Hp7sBw+hMiiKHRtJH+6Qmdw66cUQUgBubBHoIso1E4epRn46aZf a0queBaMLCVOv8dd9l/u3tZHVo0se72tOTfuCzcqG9powTc7qmnSSsIUszv6SCGA6C00 apxl0tS/VSpwy5P7eYFdxsCDA78YPUjmcY7vpTglK3f34JhWesUM5smDWljEXGjXToJ0 0ih6T1fN41XfZMhvTUuGMheRul+Ql+ILb86ksi7TcmLvZxu5aNb5LBMJc0tGt1K1TWMC GItw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=grPdtzn5ej/cbXmPLXjmLV1ewI1aj3DXWkp7E/mVvA4=; b=OypVwzYh2iF6Q7woYmb4Yg1mwEG3Gb/NMuHkhkzkmp82vpS/kqjZg8qJVb1H4SeliI fHhPJARMPHGpbwPnN+GcuhK/nv3Xi8m59lJg0Td7l79bhS7Qrdjj2mEa1K9M042SJfTY Mcc163CGKNFU1EA1vZIHMB00OyrpeLVOzAM++XCld60pF1jVS4LaC+s30fXhZR2BHPDH SFBh9EClXHb00ernP2QNNVRNUi8u83TQJsv5HL6gkZxyhSx4mX6nPdDT1Qmf7boeGJuM H7IpHa4Tm6D6et73c+WLkZdzgiRa5O1hXXhOPnellkRbVqDEkwl+RdQrag5QbMxXqzzI CtSg== X-Gm-Message-State: AMCzsaW3s5i+0q6dtUaEoDObYnM6SSn60BKNmXprTFuJgJeD+L1pWuRY p8zU5Ta+Mr/UMVmW09XxEDc= X-Google-Smtp-Source: ABhQp+TY+QkQFrBjk5RSP+iqUnot73pnRdhkpK+/Vq6GYPUfEzUfrOqfQduMnVNFI+XdIvb0mZk07Q== X-Received: by 10.98.163.2 with SMTP id s2mr6820804pfe.242.1509310200451; Sun, 29 Oct 2017 13:50:00 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.49.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:49:59 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 07/16] tests: files: Remove payload expression tests. Date: Mon, 30 Oct 2017 02:19:22 +0530 Message-Id: <20171029204931.7792-7-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Remove test for payload expression as new test has been added to tests/shell. Signed-off-by: Varsha Rao --- tests/files/feat-adjancent-load-merging | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 tests/files/feat-adjancent-load-merging diff --git a/tests/files/feat-adjancent-load-merging b/tests/files/feat-adjancent-load-merging deleted file mode 100644 index 1177174..0000000 --- a/tests/files/feat-adjancent-load-merging +++ /dev/null @@ -1,13 +0,0 @@ -#! nft -f - -# adjacent payload expressions: 4 bytes in order -add rule filter output tcp sport 1024 tcp dport 22 counter - -# adjacent payload expressions: 8 bytes in order -add rule filter output ip saddr 192.168.0.1 ip daddr 192.168.0.100 counter - -# adjacent payload expressions: 8 bytes in order -add rule filter output tcp sequence 0 tcp sport 1024 tcp dport 22 - -# adjacent payload expressions: 8 bytes in reverse order -add rule filter output tcp sport 1024 tcp dport 22 tcp sequence 0 From patchwork Sun Oct 29 20:49:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831798 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="J+/QTtpb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rD1wxDz9t4R for ; Mon, 30 Oct 2017 07:50:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752079AbdJ2UuD (ORCPT ); Sun, 29 Oct 2017 16:50:03 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:51269 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuD (ORCPT ); Sun, 29 Oct 2017 16:50:03 -0400 Received: by mail-pg0-f68.google.com with SMTP id p9so9675722pgc.8 for ; Sun, 29 Oct 2017 13:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=a9GN6sL3FlmesuP0PtMBvTAjzTzFR+MrHqYqWGRoceM=; b=J+/QTtpbCkJ8r7UE6MTcTXUWTn+e0Wp6OvtbXYMa7YFIEqSIZkGHkGLTqfYwJ9sF8Y /4PXsE0oc19tdGJ0dvFFhqlphHv/6Lt37qhCDcoRgSjN34/Qw6IDZTgqaAtdeQa4R0sk nm6JGj6B02fyZrZfRlh1warYGpfwL09E/m3doQvFBFLt0qQMNeK6IewhNV8zVvHr0oRq KGSAHSAQ2SGHJHgMnMQfP/6oRPWwa+FErHsVMM0Yyvf7Pavxgchsi6vWg1fKQe7PpPCd KnyinDmESyad23sGxIOn141GQ81cDyO6Hfs6aS2D4v4al44TiGSazn8e1Ym9tlwgY1/s KLKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=a9GN6sL3FlmesuP0PtMBvTAjzTzFR+MrHqYqWGRoceM=; b=U8i1HQo6yz0gRP1+3JhsdaFJQOG8XmVTCgzkG78gyi6tuFX2RfrPpyhX01pS8PYkxt 0Is9IElJDZM3IcwyZ/XCe+TCnlv2QbZionmqOoz5iMv62nKSsL7Op975Yf+A0Kq8RJUS SiLfh/4JCWEtzCkApIoppyESqS/q7C7zCzkH7xA/MTCAfpLavd9B8HvD/e+1NNZXeGd7 v34lHoEWbU6+oMNy02KbE+m5FRG7n6fOFBWWpQU1XmqXGmwK88ThE9ERcDFdwp4UGX3M kWm1ymfddMED8jqfL1teOwo0E0X+/LD23T+T7CelnwWLgQJ0o+/tfv+n1rSXq28xS6u9 mj+w== X-Gm-Message-State: AMCzsaUsMPwQgA6bWKsWkL7LDWTncqqcQLZIML1bJPqJSXMu/mjZLp7S 7EPhKG7ZMBji3FxbffRVq9c= X-Google-Smtp-Source: ABhQp+SBsi9VEORbclDW0aml+ajgVvoS9uRvMx9/mblFMkY+WGplPSt+XNE/hiECSEzUT4LcjsgyRw== X-Received: by 10.98.79.200 with SMTP id f69mr6607255pfj.159.1509310202699; Sun, 29 Oct 2017 13:50:02 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.50.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:50:02 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 08/16] tests: files: Remove test for syntactical errors. Date: Mon, 30 Oct 2017 02:19:23 +0530 Message-Id: <20171029204931.7792-8-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch removes test for syntax error as they are not required. Signed-off-by: Varsha Rao --- tests/files/error.1 | 9 --------- tests/files/error.2 | 18 ------------------ 2 files changed, 27 deletions(-) delete mode 100644 tests/files/error.1 delete mode 100644 tests/files/error.2 diff --git a/tests/files/error.1 b/tests/files/error.1 deleted file mode 100644 index bc3bf16..0000000 --- a/tests/files/error.1 +++ /dev/null @@ -1,9 +0,0 @@ -#! nft -f - -# mixed syntactical and non-syntactical errors -filter { -filter input -filter input tcp -filter input tcp dport -filter input tcp dport tcp -filter input tcp dport tcp dport diff --git a/tests/files/error.2 b/tests/files/error.2 deleted file mode 100644 index 744a63d..0000000 --- a/tests/files/error.2 +++ /dev/null @@ -1,18 +0,0 @@ -#! nft -f - -# mixed syntactical and non-syntactical errors in blocks -table filter { - # missing identifier - chain - - # missing chain block - chain output - - chain output { - tcp - tcp dport - tcp dport tcp - tcp dport tcp dport - tcp dport ssh - } -} From patchwork Sun Oct 29 20:49:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831799 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="citHpEX4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rG5sy5z9t50 for ; Mon, 30 Oct 2017 07:50:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752084AbdJ2UuG (ORCPT ); Sun, 29 Oct 2017 16:50:06 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:48535 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuF (ORCPT ); Sun, 29 Oct 2017 16:50:05 -0400 Received: by mail-pf0-f196.google.com with SMTP id b79so9226222pfk.5 for ; Sun, 29 Oct 2017 13:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Cww1wPM0No2vABFVjigSx7dyQj/jHMV+cFWvK56qNCo=; b=citHpEX4UlEE07eAWzbvCKiL5HaMnpUg/14kiYXsxbHjmlU+GZTPZDRr75kZY3th13 zlBbH/gjkSLKIcvBiR1J1XhyxxxoVWFhEKsrIzuMwVkN4S6QfBY/zwCYLVb2vzeMQnPZ VfD0qslNAE//5PFS+uPNF6eT8PBiWb+R9AWrfSZW+Skb0kI0Nf+fNLQesdw3YFnMb01Z v0GKDSS4XXq5mXL9ZKmtXrE+ogrYCwk84LJ9PIDUyISalVLYfmxxfP8hzM7w7AtC5nO3 HjjCUvc7ZN4J4R+GOLGsH/9KRiYLVRLjgqZF6xBq6sW8VeuV5km2oOOvoy11FdOVEyQV mpMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Cww1wPM0No2vABFVjigSx7dyQj/jHMV+cFWvK56qNCo=; b=pLjlAxMlp3JhKD0Cy/x5RZcbukIfY4UbnM0ZhF4u9MTTlq2cP9d8pssEb1/rcAqv4l gppBFEIy4SPbmdvRUT6S+gJX74iAL1MJ61Dq//Sf6Ru9ubJNPYV9KCNV2MsNgAleUjDW g0fPmclxUfYP4W14O80LZV18lOyh1w8EsB4z9eaE67dN2oPD5ThfVYSZSzK+IE4pbzQI 4rTRXTtc0hYjeG153BMqqJe5qyVcVxE9KtgX1ylwATAtOwIOgdXtLXWI5AKTz57WHn2P 3g9eqpd/pEt8taH3WaKc9J16piojvi9GIed1unPGLZ5WF6W8WPVlZ5nvmUCTh5WGu7df SwSw== X-Gm-Message-State: AMCzsaV1bP3lpoPmVs4InM2O1FCK8gGfoCjfBjvgeOqFW+OE0BcE07zD 1MELQT0TL2lOQsFu6fjRpJ+ZOLFm X-Google-Smtp-Source: ABhQp+TE4x5IEyN2FfaJHFmr1hn2tSqGRDurICKpYuh/R0TAbnRm2xJcgjTcD5sPPPFlu7ELfKqHeg== X-Received: by 10.98.130.65 with SMTP id w62mr6693881pfd.203.1509310205254; Sun, 29 Oct 2017 13:50:05 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.50.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:50:04 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 09/16] tests: shell: Add test for ct expression. Date: Mon, 30 Oct 2017 02:19:24 +0530 Message-Id: <20171029204931.7792-9-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch adds test cases for ct expression. Signed-off-by: Varsha Rao --- tests/shell/testcases/transactions/0025rule_0 | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 tests/shell/testcases/transactions/0025rule_0 diff --git a/tests/shell/testcases/transactions/0025rule_0 b/tests/shell/testcases/transactions/0025rule_0 new file mode 100755 index 0000000..b8df747 --- /dev/null +++ b/tests/shell/testcases/transactions/0025rule_0 @@ -0,0 +1,36 @@ +#!/bin/bash + +# Test for ct statements. + +set -e + +$NFT add table x +$NFT add chain x y { type filter hook output priority 0\; } +$NFT add rule x y ct state new,established +$NFT add rule x y ct direction original +$NFT add rule x y ct direction reply +$NFT add rule x y ct status expected +$NFT add rule x y ct mark 0 +$NFT add rule x y ct expiration 30 +$NFT add rule x y ct helper "ftp" + +EXPECTED="table ip x { + chain y { + type filter hook output priority 0; policy accept; + ct state established,new + ct direction original + ct direction reply + ct status expected + ct mark 0x00000000 + ct expiration 30s + ct helper \"ftp\" + } +}" + +GET="$($NFT list ruleset)" + +if [ "$EXPECTED" != "$GET" ] ; then + DIFF="$(which diff)" + [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + exit 1 +fi From patchwork Sun Oct 29 20:49:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831800 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Wvg+Fz2S"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rK09wLz9t4R for ; Mon, 30 Oct 2017 07:50:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752087AbdJ2UuI (ORCPT ); Sun, 29 Oct 2017 16:50:08 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:47677 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuI (ORCPT ); Sun, 29 Oct 2017 16:50:08 -0400 Received: by mail-pf0-f195.google.com with SMTP id z11so9228949pfk.4 for ; Sun, 29 Oct 2017 13:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SGdUbn1I1u/8pT+g+EAGkkmh5EA+XQjIWqgo8TXybF0=; b=Wvg+Fz2SQ0t4JtJ7dUD4bM9CT9xbwVn5XEeETUPDImpCWiTMjR3t1nzAnrvAVC3FNH ksseZSjN3kCr/Q1OrcS30c7ywczpA1boYjdSB9QqNwTBRb/1UuJ1AZ61b1WjOtdBqAy3 LqcLQBOWxDm6eglm4sZJbxM+8vNwacZ5Y/S4g6fWYTQpoOvXjGTQLuOrnnsDfhDIVYmS wGemOF/SVmgHWObVEOsSFXJfEP59swpYxKznBCQoGLJU/A9/fOc33NzKdItT2v+WZFEt CaArcJ+zE3hx3EUr9AkfIQt0falTRYWWHhiIcxLR/GoIZJiMQQ3qdvpT1rb8CPQx8ber vdiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SGdUbn1I1u/8pT+g+EAGkkmh5EA+XQjIWqgo8TXybF0=; b=kg6A4Ygxq9JwibI9wx6U0t4QJlmtTIV048QZHy7iFHXK2bp5QhXRIlSlaEuuXyZ/My g77zPRu8EhmXMQ5V2vR/zkYJ0knspQ02nUlPOVz7JHkKraLHYe2EvEHq4AohGeCeBh28 ZN3utasawblURVACuvUFaH/7ga4edEmk6hS6aPylu7ZL5KJJAdfEK4z8DFg5lRyk8H4E KoNtoFSMnBX3ioqlTv70eSqxVhokEtsZ51a3EsBygOliCDhyE8dAX5fOdeq2SYtTcaUR nMoHJts6otQa3OezFVYz0N8idbv9qrlYN5SmyKoXG6jHqu9aUbeuH9/XdzB9mzpqsHA7 rL5w== X-Gm-Message-State: AMCzsaUJbEynmAFkzx6WSSc4rSjoHiqlkaSSo1qBgY+nO23dLB/QRLAn r2tnTwigN29LDSXF4YcBtCo= X-Google-Smtp-Source: ABhQp+SUVAtXE4ORIdwFLi5F7l3WdMab1kCE5/SPev+HA07HaMgGBZ4A9bzvcKvrwGIEJUIuYZYT5w== X-Received: by 10.98.147.156 with SMTP id r28mr6585174pfk.325.1509310207469; Sun, 29 Oct 2017 13:50:07 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.50.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:50:07 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 10/16] tests: files: Remove test for ct expression. Date: Mon, 30 Oct 2017 02:19:25 +0530 Message-Id: <20171029204931.7792-10-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch removes test cases for ct expression. Signed-off-by: Varsha Rao --- tests/files/expr-ct | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 tests/files/expr-ct diff --git a/tests/files/expr-ct b/tests/files/expr-ct deleted file mode 100644 index 1dfc7ac..0000000 --- a/tests/files/expr-ct +++ /dev/null @@ -1,26 +0,0 @@ -#! nft -f - -add table ip filter -add chain ip filter output { type filter hook output priority 0 ; } - -# ct: state -add rule ip filter output ct state new,established counter - -# ct: direction original/reply -add rule ip filter output ct direction original counter -add rule ip filter output ct direction reply counter - -# ct: status -add rule ip filter output ct status expected counter - -# ct: mark -add rule ip filter output ct mark 0 counter - -# ct: secmark -add rule ip filter output ct secmark 0 counter - -# ct: expiration -add rule ip filter output ct expiration 30 counter - -# ct: helper ftp -add rule ip filter output ct helper "ftp" counter From patchwork Sun Oct 29 20:49:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831801 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iKLAOoO/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rM3rfXz9t4R for ; Mon, 30 Oct 2017 07:50:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752093AbdJ2UuL (ORCPT ); Sun, 29 Oct 2017 16:50:11 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:44678 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuK (ORCPT ); Sun, 29 Oct 2017 16:50:10 -0400 Received: by mail-pg0-f65.google.com with SMTP id j3so9699787pga.1 for ; Sun, 29 Oct 2017 13:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YL8zDNjnyoNfZTbxqxsMCTjfAUqvEYAwjYIlaZnzQB4=; b=iKLAOoO/SBYR3kFQ8dhUdM0Y8MfZl6qkfRzfnnjEMGAu2OUk1VKHt0WmjfBw+kmUAx 5MIlv8HOrjSuRSZd8KDQ1MSMvdeZ0f7AeUg8CeVb6fBR+cDQyOxP/JgR0I2+YX/uk2cn 88Wh3LHUvxtT1JDNk0ND3PTJ2Uq570QNxjDjfuMmjzvMffYtgP/Fs6HH91p9msVEhkk8 vsYe/gK9nVcXwtoW3FHEXlaAonbJvn2C8XabZypE7hHlX3WBnvJiVusdpMEEcCzF2EJZ yNL0P7NhZVGkL5DKLi+Dqk8Ygby1FdcmM0dAM9PJKj1ZCfXs4n4OnZ61p1k2tN32gBh0 BAAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YL8zDNjnyoNfZTbxqxsMCTjfAUqvEYAwjYIlaZnzQB4=; b=YeEridVYp1G3H3VTw0to/XfPJZOX7MdnaOg9bJH7cVtwfw8MRTW4uYbXb5PSTBCEvI znZqgKFAVMWtlq6ymQzzUDpysxFPokVuQgkI42tY4pD6iYxn2kxC4Nhj/0UAF8GWgDGn 33c/vHH8dLVGC5ZtDYR1+IIViIJfUkEQe+pemsEngWUQPIzFjWu4j3sSCXkwthbvJxeY O/1MZwXTJ/CHoI2vGTICt8l6/Bxpa7z0vb85Gd2R3fI+hmSc29ydTE6RaaEvtRtRWEbH pi9tBO9MO81kgRnBxr6ChCcwdQgrUrDYdPlqER9RiwhqwaVkM7ol6FoZ8Trohitcma54 ofjA== X-Gm-Message-State: AMCzsaWGF2VzPW/nNQQTFn19787QKQzyAf9ms+t1ZQ3QTTm2guZxZMAc hfV3s9qCKWQyqaTGORukvkM= X-Google-Smtp-Source: ABhQp+TSE8/AE0Q8zpHMi8jJCrObfebletg1h8xRdZ/xl1DxgObFw3ubSZge85eyCXvKLjMrJPHe4w== X-Received: by 10.84.248.133 with SMTP id q5mr5484287pll.419.1509310210025; Sun, 29 Oct 2017 13:50:10 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.50.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:50:09 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 11/16] tests: files: Remove prefix file. Date: Mon, 30 Oct 2017 02:19:26 +0530 Message-Id: <20171029204931.7792-11-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Test rules in prefix file are not required, so remove it. Signed-off-by: Varsha Rao --- tests/files/prefix | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 tests/files/prefix diff --git a/tests/files/prefix b/tests/files/prefix deleted file mode 100644 index bada850..0000000 --- a/tests/files/prefix +++ /dev/null @@ -1,5 +0,0 @@ -add rule filter OUTPUT meta mark 123/0x000000ff -add rule filter OUTPUT ip daddr 192.168.0.0/24 -add rule filter OUTPUT ip daddr 192.168.0.0/255.255.255.0 -add rule filter OUTPUT ip saddr . ip daddr 192.168.0.0/24 . 192.168.0.0/24 -add rule filter OUTPUT ip daddr { 192.168.0.0/24, 192.168.1.0/24} From patchwork Sun Oct 29 20:49:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831802 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UCx/muhF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rQ4Nwyz9t4R for ; Mon, 30 Oct 2017 07:50:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752097AbdJ2UuO (ORCPT ); Sun, 29 Oct 2017 16:50:14 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:54162 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuN (ORCPT ); Sun, 29 Oct 2017 16:50:13 -0400 Received: by mail-pg0-f66.google.com with SMTP id s2so9670886pge.10 for ; Sun, 29 Oct 2017 13:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cvSauH45OXFEB/dKYWYtFuzEnPiLkXlnMWafZ7MVa9k=; b=UCx/muhFNCy+d+t+MeBf/4ZaN9ESjEapv3jhpX1pOIRkT+8VDiLue78Y14PGvkaXz6 oyH7ekXWM1hCsueDVq6X52xlXCcYVqEh5M8dLyUqiF1b7tFm6nBsnB4T3jTC1Frd7++O oUgBoZO8AKb7YcL+eYcXg23W0AFc1byas3gFhcqQLnSCF5ST9sddeLXgmhoMiQcWA/Cd pwnoHrK5XGsIlAkxLhChyWgo+rDGLiQlHHRgHiRcOZ68g6X0iO9nPtsrfXNhP07uDZSH zrmikOaEsyMqXielKmrpaYGaZ+4S44sS26eHrRgBpoii+TThnsSHwCNZAJ+y8eYjGiex r2qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cvSauH45OXFEB/dKYWYtFuzEnPiLkXlnMWafZ7MVa9k=; b=BihLMbpK+aHwI49D9R0N9bEJRMWxetvWSe+ydHz2UwugBiLfHrEAF5pU8PVVbAgajO D3fPBw0ZRgAwP1HUJDRfM8BRnDdiqe3EVHOm2vPsYN33jJXzXcWYs8Emd6QPo0gbHQBR n5qklhxAeA4ioL1UP2o1vMshVmtuLuTeX/5KR9ha1kEe8cTswWceFvEGzFklA9uY8p33 QBMWHIGzEvmb73eeB6eap4HBZSkAXcXPisyyjk/k3ymEhi2auhofBUZqm/lsBnt+5QAS 9lGEciL2BjXnoDSu6btjgHYYQqdcvVNEbN0K0pVCBGjWBQQMJ3qkziObveIC3NuCpSpl VX0Q== X-Gm-Message-State: AMCzsaUocBJXEBCTlEx8PLtpkqNSUKyWS4LUPerOG/aw7opHHz8zftN6 dDWWluPljD5TnAt6rtosLeU= X-Google-Smtp-Source: ABhQp+SVZfvf2ttInz9mkzEICT917MvZH36G7x4el9L7MOx7tVn9prKa1HsdunMMKjYJoRyAz4AiXw== X-Received: by 10.84.253.23 with SMTP id z23mr5478223pll.210.1509310213031; Sun, 29 Oct 2017 13:50:13 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.50.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:50:12 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 12/16] tests: files: Test for meta expressions. Date: Mon, 30 Oct 2017 02:19:27 +0530 Message-Id: <20171029204931.7792-12-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch adds test case for meta expressions. Signed-off-by: Varsha Rao --- tests/shell/testcases/transactions/0026rule_0 | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 tests/shell/testcases/transactions/0026rule_0 diff --git a/tests/shell/testcases/transactions/0026rule_0 b/tests/shell/testcases/transactions/0026rule_0 new file mode 100755 index 0000000..4111ce9 --- /dev/null +++ b/tests/shell/testcases/transactions/0026rule_0 @@ -0,0 +1,44 @@ +#!/bin/bash + +# Test for meta expressions. + +set -e + +$NFT add table x +$NFT add chain x y { type filter hook output priority 0\; } +$NFT add rule x y meta length 1000 +$NFT add rule x y meta protocol 0x0800 +$NFT add rule x y meta mark 0 +$NFT add rule x y meta iif lo +$NFT add rule x y meta iifname "eth0" +$NFT add rule x y meta oif lo +$NFT add rule x y meta oifname "eth0" +$NFT add rule x y meta skuid 1000 +$NFT add rule x y meta nftrace set 1 +$NFT add rule x y meta rtclassid cosmos + +usr=$"$USER" + +EXPECTED="table ip x { + chain y { + type filter hook output priority 0; policy accept; + meta length 1000 + meta protocol ip + mark 0x00000000 + iif \"lo\" + iifname \"eth0\" + oif \"lo\" + oifname \"eth0\" + skuid \"$usr\" + nftrace set 1 + rtclassid \"cosmos\" + } +}" + +GET="$($NFT list ruleset)" + +if [ "$EXPECTED" != "$GET" ] ; then + DIFF="$(which diff)" + [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + exit 1 +fi From patchwork Sun Oct 29 20:49:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831803 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XI242DUl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rS70pnz9t4R for ; Mon, 30 Oct 2017 07:50:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752099AbdJ2UuQ (ORCPT ); Sun, 29 Oct 2017 16:50:16 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:46277 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuQ (ORCPT ); Sun, 29 Oct 2017 16:50:16 -0400 Received: by mail-pf0-f195.google.com with SMTP id p87so9230090pfj.3 for ; Sun, 29 Oct 2017 13:50:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kGgsnwOio7ccUSN2QWQ0JXuizw7HdgS8mVnc/49h6MI=; b=XI242DUlx2rGfP0mt+xHxVyKOBseVkwtgkEnhafed/Skv7HDZ0ZcWkovRT9dNp4+nD AIB0mRo3QjNuog777r0SEmjokSr/jBeWsf/q5D/iERxx1nJA4SbJi6dJ4yf2S2eTOJ8i h3Iqxtw5YvjzgbWMTBXhUxr/Rf1cgALEXKuL8YI8q3VQnHQTb/ah218CX4RQsDmyIXj6 FedvybtLhcnjJQ4yXdRCz1IE64Say/xtGHYmqLda4CfFTAM7mDU9GnFNSjJP+RwJvU2Z C//WItyaJ2PadCjjE1UOBtZQj0gAEwIrzUMlq2Xm+CVvLHPy10YpdQGTNi8ZiqqQmxjB UJuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kGgsnwOio7ccUSN2QWQ0JXuizw7HdgS8mVnc/49h6MI=; b=WMbAfGPvIDVgtoTCAThBBfycbQrSOkxYk0SfWckHh0mPFRqucHm+/hdyzk4cRN5JzX 70d5qXoFj0yClTC2h+6DJV7y33bs2oNJT0aEHZ4hdskYmKZbJN+tKRH/nR6QHaKl3pjG SPP1komYp2LUNOwn8a/5YiKNqVvXrKkrOVASUkOnLdml0ePcapOhMRydtBvHOtI4Dv7d PdQfxjxaFYntDkdAYG+5W+oSCjNtSunHCM3Td7qazwZjVDLRBKEBjelOkCJgk0ML9I4v C63cZNH5SPwnPoQeOMcGVZmKWscXrqImPQMzQcqze7l0t7Z4gGbn/T/9GA+phEBAFsoR C3mw== X-Gm-Message-State: AMCzsaVzBmLBL5AzeCUp2bUUGamN1aFyfQb22WYK+Pm4wshrwIbi9AiO j5YFtufFX740LSsNmhyhTxc= X-Google-Smtp-Source: ABhQp+TmAJZblHpDoE4JvIhcuYL7CfVjVotiHpTcCrKt8jh0XOrKD89JPeDFBmul5PaZU1dQSbjLXA== X-Received: by 10.99.97.147 with SMTP id v141mr5688375pgb.92.1509310215461; Sun, 29 Oct 2017 13:50:15 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.50.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:50:15 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 13/16] tests: files: Remove test for meta expression. Date: Mon, 30 Oct 2017 02:19:28 +0530 Message-Id: <20171029204931.7792-13-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch removes test cases for meta expression. As new test is added to tests/shell. Signed-off-by: Varsha Rao --- tests/files/expr-meta | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 tests/files/expr-meta diff --git a/tests/files/expr-meta b/tests/files/expr-meta deleted file mode 100644 index 360caa7..0000000 --- a/tests/files/expr-meta +++ /dev/null @@ -1,40 +0,0 @@ -#! nft -f - -add table ip filter -add chain ip filter output { type filter hook output priority 0 ; } - -# meta: skb len -add rule ip filter output meta length 1000 counter - -# meta: skb protocol -add rule ip filter output meta protocol 0x0800 counter - -# meta: skb mark -add rule ip filter output meta mark 0 counter - -# meta: skb iif -add rule ip filter output meta iif lo counter - -# meta: skb iifname -add rule ip filter output meta iifname "eth0" counter - -# meta: skb oif -add rule ip filter output meta oif lo counter - -# meta: skb oifname -add rule ip filter output meta oifname "eth0" counter - -# meta: skb sk uid -add rule ip filter output meta skuid 1000 counter - -# meta: skb sk gid -add rule ip filter output meta skgid 1000 counter - -# meta: nftrace -add rule ip filter output meta nftrace 1 counter - -# meta: rtclassid (see /etc/iproute2/rt_realms) -add rule ip filter output meta rtclassid cosmos counter - -# meta: secmark -add rule ip filter output meta secmark 0 counter From patchwork Sun Oct 29 20:49:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831804 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OF5OUdq5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rW4QKHz9t4R for ; Mon, 30 Oct 2017 07:50:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752101AbdJ2UuT (ORCPT ); Sun, 29 Oct 2017 16:50:19 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:55775 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuS (ORCPT ); Sun, 29 Oct 2017 16:50:18 -0400 Received: by mail-pf0-f193.google.com with SMTP id 17so9215242pfn.12 for ; Sun, 29 Oct 2017 13:50:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Bkfva4/uOXRu14NDDbUBUUsdO5sLF/wyCpdGHaxJMbY=; b=OF5OUdq5W+IPo64r75FbQXbF/dIQqfxGVJqaCTZPm/lDaOZ92tzDxZQt4DNB4qtPRK 9xGUtXr/l/seRBBNHOLGm5dUjDBWklkyRBHUs5Bbn6Q6pQwZpNz6VTvAPf5JRHlIspd7 uVYHTmOhCgSSWMDfNbtH2xUsHIrZ3tXvdGIGxkm0lXBPCMVnK0S/5ZHwhKw8co+5B7Jl Ye5KYAUh5yIR1MF5EKmqyPfZP54SY09POTEi7xGVNfFIur09IIjOy/BixWyWpfNIstCG HtzHqWrorV62qX3Ev2u5FNaROGP/iiYKUN8gb9FEWikjL4oBdgc27hzTl6brDaKY1R0e c6bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Bkfva4/uOXRu14NDDbUBUUsdO5sLF/wyCpdGHaxJMbY=; b=OIPA+4fAEkAzbyyi3zxvQeo5nUneSpYc8fgZKfGwseg7UVHTnZdKie1b8OKntIf5VX V+WTVmn5BxS5VZnYk03O8fdSjj4hmJSbg0sx3qspz1o4M20+oAJkDmCgkbHTmSLeE+in YAQjSuBvEtAK8awePhS9rtjo/MvlCw3dgREU8lNxwboX00KdP1gn1f6shW3EJcvKlSR/ DTkj+0wU+mzSDTgjb8etBaVSaaPhq5+eRxnul48+uSd1qS8P/VY791/Rl5RmyIkoRXz1 GdIhUQhiBH/Apu7R7Kf9rouzarM3O62zhQxl4rKNe12sk+pK87Rdl4dfArZKZ8KeY9jF OHAQ== X-Gm-Message-State: AMCzsaUsuXzdoq0Sx7OktHZR14kKmQKKwVVc0cObucWYPngIFc0SuJHp C66dLPFzAbbaxll0zGXZTnY= X-Google-Smtp-Source: ABhQp+QLtsTP7FOlffjOjJxSz4YIjwdHYeQyMrSHLquAQlMAotsdz+MVaDk1bdREZSM+icVJhVtJJQ== X-Received: by 10.99.105.71 with SMTP id e68mr5913222pgc.55.1509310218071; Sun, 29 Oct 2017 13:50:18 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.50.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:50:17 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 14/16] tests: shell: Add tests for concat expression. Date: Mon, 30 Oct 2017 02:19:29 +0530 Message-Id: <20171029204931.7792-14-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Add test cases for concat type and element mismatch. Signed-off-by: Varsha Rao --- tests/shell/testcases/transactions/0050concat_1 | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 tests/shell/testcases/transactions/0050concat_1 diff --git a/tests/shell/testcases/transactions/0050concat_1 b/tests/shell/testcases/transactions/0050concat_1 new file mode 100755 index 0000000..0e4f6e1 --- /dev/null +++ b/tests/shell/testcases/transactions/0050concat_1 @@ -0,0 +1,26 @@ +#!/bin/bash + +set -e + +tmpfile=$(mktemp) +if [ ! -w $tmpfile ] ; then + echo "Failed to create tmp file" >&2 + exit 0 +fi + +trap "rm -rf $tmpfile" EXIT # cleanup if aborted + +RULESET="add table ip x +add chain ip x y +add rule ip x y ip daddr . tcp sport . tcp dport { \ + 192.168.0.1 . 22, \ + 192.168.0.1 . 80, \ +} +add rule ip x y ip daddr . tcp dport { \ + 192.168.0.1 . 192.168.0.2, \ + 192.168.0.1 . 192.168.0.3, \ +}" + +echo "$RULESET" > $tmpfile +$NFT -f $tmpfile +echo "E: Allowed concat type and element mismatch" From patchwork Sun Oct 29 20:49:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831805 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aHXmhgzn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rZ0Lk1z9t4c for ; Mon, 30 Oct 2017 07:50:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752103AbdJ2UuV (ORCPT ); Sun, 29 Oct 2017 16:50:21 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:43728 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuV (ORCPT ); Sun, 29 Oct 2017 16:50:21 -0400 Received: by mail-pf0-f194.google.com with SMTP id a8so9238391pfc.0 for ; Sun, 29 Oct 2017 13:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0fS1B6vaGhcr1UiniVZquNwl4uEsV5CTeIM3hI4LFLc=; b=aHXmhgznfa3LKbzCuLt6UdgBw15xVOTzocfXSL/Jx8UZ+CPTA1uwK77vtZOEj8tAuM PzWEeJeti9LCtpZqovv20PkZcnmhivFqrJ7y9+tOUAUMevCMLB9jn015kzBx9ke1qotx qeD3DukMkC8JWDYHrxUV5k893tKZgkjzz5h4nrBr8i0Rd5zRXsIJuVL2AYP9SLG7kQ9i 36/nKHN4S2wkygT5CiqjE9z5iPn+teC657nb0S3vyS5d2FTsfVguYYGdWCkpGbGCsHEA 7VdfxT5wfLj8zkAILsbPZD7wulZxAvM2LM82MN3FDcqB4PUvqBvhEI493nHwirHWw28h bX2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0fS1B6vaGhcr1UiniVZquNwl4uEsV5CTeIM3hI4LFLc=; b=Y0WV11HILLV6CJqWJ34m/BvOljwq9iCy1wfC7jdOuvZTlzPD6F0geVkrcd9UhfPg3e hJLepI9NeuRO9gLnY6zRjXk5dLLuK5MY+lRwZ+uuJnktQ3v2QSUZfPVOhb5a0GUfGgUS tHXHtweYClQyB7aYnlGTOHXNyg7rXLYIxJCUBD0nuGyK4dexltYu7H7FiEI7yk5I+wNR zwYN6oUPFQb5zS2J6ti4Lgcq7Fz0kKXwp+mTIFoha3qd0BSHiCISfkNlCDdcpS5uTWZA 3pGR54OxABTeHM1z3UEWU1l7idH3ymwzxi3jEqjVoFTH1UV+oApnJrOqqYYoFfph6mjw H5Bg== X-Gm-Message-State: AMCzsaXs40tHLs22/v0akFQqiW0PVXN5QSA5UZYMtDYDNSHlVjhznEW4 ReU8mexepbkHGPuLep24Ftg= X-Google-Smtp-Source: ABhQp+RZrkcLl0wJQ8NQ7fp+ac+E0PX22iTMfgZsQjKdrRjyvzSbKPBDR2It6HQ1W3EZFZHtBl9z2Q== X-Received: by 10.101.96.68 with SMTP id b4mr3047417pgv.155.1509310220584; Sun, 29 Oct 2017 13:50:20 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.50.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:50:20 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 15/16] tests: files: Remove tests for concat expression. Date: Mon, 30 Oct 2017 02:19:30 +0530 Message-Id: <20171029204931.7792-15-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org New test cases for concat expression has been added to tests/shell file, so remove it. Signed-off-by: Varsha Rao --- tests/files/expr-concat | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 tests/files/expr-concat diff --git a/tests/files/expr-concat b/tests/files/expr-concat deleted file mode 100644 index bb284cc..0000000 --- a/tests/files/expr-concat +++ /dev/null @@ -1,19 +0,0 @@ -#! nft -f - -# Concat element mismatch -add rule ip filter output ip daddr . tcp sport . tcp dport { \ - 192.168.0.1 . 22, \ - 192.168.0.1 . 80, \ -} - -# Concat type mismatch -add rule ip filter output ip daddr . tcp dport { \ - 192.168.0.1 . 192.168.0.2, \ - 192.168.0.1 . 192.168.0.3, \ -} - -# Concat expression -add rule ip filter output ip daddr . tcp dport { \ - 192.168.0.1 . 22, \ - 192.168.0.1 . 80, \ -} From patchwork Sun Oct 29 20:49:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varsha Rao X-Patchwork-Id: 831806 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Fp32n4OQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ8rc2h5Kz9t4R for ; Mon, 30 Oct 2017 07:50:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752108AbdJ2UuY (ORCPT ); Sun, 29 Oct 2017 16:50:24 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:53770 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdJ2UuX (ORCPT ); Sun, 29 Oct 2017 16:50:23 -0400 Received: by mail-pf0-f194.google.com with SMTP id t188so9217377pfd.10 for ; Sun, 29 Oct 2017 13:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZkPs77KP/IsGwJu+hFJjkvRYkw/+doPVRbnuow4QNpg=; b=Fp32n4OQzSHRod4iT5KU/Bm/M6russlhYM8YaP9BE17f5VQw2AOplafReH2SL7/DlX iydb1oZm+m8CObtRQ/OmzFiOSxeM0EOAQRndzd9+fWvSrPFRXTTBZMP6Z5JlB7+X0iVx ASugORLz14pF0aXuuaoQvjq+SV/GPAu62w8ZMPCdobNyJrW2TSjOB6ynTsT5QAtw8+o/ GaIwjNDppZcepXNExvW54lYOQnO5lulyXV5L06eJt8Zvq5G88y5dwO5hslskVHmO67qV mlVRjEIniSBstfNarheOcKjoqxZQ7FRM/ODNHKWAl2rY709C13Urji2mxzcknoDFq8nM dabQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZkPs77KP/IsGwJu+hFJjkvRYkw/+doPVRbnuow4QNpg=; b=JCEKNzJ4mFegTLH9toHrugAw7Xe3ev6jdjvmGxil0fqBoscLksh/LAz3KXtKIljCZM bi81ren5LwOuQ8822oSRwGX0A/kioSln818n86NUqYwa2syknHA4dPUe6q0dvUQnjpO8 aeZKhVDygjSl0hXijuz1Q/bPnNYcnoWzbBU+8ZcK3ZCqeHCTyf4fpxe/1pWxo/xHnO/6 qBEp/TAXB8Md+NV2cGUTVYVJ0gMSAn42pjDLNFjsAmhmWGkXs9IPR0AcjgEUVgE9jJEs eBneBmP1WjSzuIiOCxhwRfP+xqlanKKSgrkLUbRv+ECVwtIU8/st8bIKyppMAFbIvgKs kHuQ== X-Gm-Message-State: AMCzsaXVuaSMVMmiBf+XqaNsT7hTv8qj+/+2h8mlXJd7KUgDUAJutotC 3c4VKyVw6u+14mqk1aIzhs4= X-Google-Smtp-Source: ABhQp+TYMbE8FVDay0Qap4ESrszT8nDjNteYtBs62HqBrbGF3MVESU17hbtX9UAKTYtENlhK4haFdw== X-Received: by 10.101.90.133 with SMTP id c5mr5847996pgt.441.1509310222844; Sun, 29 Oct 2017 13:50:22 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5680:ce72:86e6:660f:13e2:4a27]) by smtp.googlemail.com with ESMTPSA id f6sm19785990pgo.11.2017.10.29.13.50.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 13:50:22 -0700 (PDT) From: Varsha Rao To: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org Cc: Varsha Rao Subject: [PATCH nft 16/16] tests: shell: Add test case for map expression. Date: Mon, 30 Oct 2017 02:19:31 +0530 Message-Id: <20171029204931.7792-16-rvarsha016@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029204931.7792-1-rvarsha016@gmail.com> References: <20171029204931.7792-1-rvarsha016@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Add tests for different map expression. Signed-off-by: Varsha Rao --- tests/shell/testcases/maps/different_map_types_1 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 tests/shell/testcases/maps/different_map_types_1 diff --git a/tests/shell/testcases/maps/different_map_types_1 b/tests/shell/testcases/maps/different_map_types_1 new file mode 100755 index 0000000..4d09163 --- /dev/null +++ b/tests/shell/testcases/maps/different_map_types_1 @@ -0,0 +1,10 @@ +#!/bin/bash + +# must fail: expr MAP { expr : type1, expr : type2, .. } expr + +set -e + +$NFT add table ip filter +$NFT add chain ip filter output { type filter hook output priority 0 \; } +$NFT add rule ip filter output meta mark set tcp dport map { 22 : 1, 23 : 192.168.0.1 } +echo "E: Added two different types of expression to map"