From patchwork Tue Sep 25 12:24:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 974370 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; dmarc=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42KKyG3wmsz9s47 for ; Tue, 25 Sep 2018 22:24:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728915AbeIYSb4 (ORCPT ); Tue, 25 Sep 2018 14:31:56 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:44550 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728738AbeIYSb4 (ORCPT ); Tue, 25 Sep 2018 14:31:56 -0400 Received: from localhost ([::1]:52084 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.90_1) (envelope-from ) id 1g4mOL-0007Fe-4X; Tue, 25 Sep 2018 14:24:37 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [nft PATCH 4/5] tests: shell: Improve gen_chains() in 0021prio_0 Date: Tue, 25 Sep 2018 14:24:15 +0200 Message-Id: <20180925122416.15224-5-phil@nwl.cc> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180925122416.15224-1-phil@nwl.cc> References: <20180925122416.15224-1-phil@nwl.cc> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Enhance the function to accept an optional fourth parameter specifying the device name, then use it for netdev family. Also remove dubled empty lines and instead put together what belongs together. Signed-off-by: Phil Sutter --- tests/shell/testcases/chains/0021prio_0 | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/shell/testcases/chains/0021prio_0 b/tests/shell/testcases/chains/0021prio_0 index 82f52e33cc2af..b54b6fae32c63 100755 --- a/tests/shell/testcases/chains/0021prio_0 +++ b/tests/shell/testcases/chains/0021prio_0 @@ -27,11 +27,13 @@ gen_chains () { local family=$1 local hook=$2 local prioname=$3 + local device=${4:+device $4} for i in -11 -10 0 10 11 do local offset=`format_offset $i` - $NFT add chain $family x `chainname $hook $prioname $offset` "{ type filter hook $hook priority $prioname $offset; }" + local chainname=`chainname $hook $prioname $offset` + $NFT add chain $family x $chainname "{ type filter hook $hook $device priority $prioname $offset; }" done } @@ -50,7 +52,6 @@ do gen_chains $family postrouting srcnat done - family=arp $NFT add table $family x for hook in input output @@ -58,16 +59,9 @@ do gen_chains $family $hook filter done - family=netdev $NFT add table $family x -hook=ingress -prioname=filter -for i in -11 -10 0 10 11 -do - offset=`format_offset $i` - $NFT add chain $family x `chainname $hook $prioname $offset` "{ type filter hook $hook device lo priority $prioname $offset; }" -done +gen_chains $family ingress filter lo family=bridge $NFT add table $family x @@ -75,7 +69,6 @@ for hook in prerouting input forward output postrouting do gen_chains $family $hook filter done - gen_chains $family prerouting dstnat gen_chains $family output out gen_chains $family postrouting srcnat