From patchwork Mon Oct 26 06:28:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Harding X-Patchwork-Id: 1387481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=living180.net Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CKQ5l2Byxz9sPB for ; Mon, 26 Oct 2020 17:33:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OELfkA8Z/PuNtLI5xjCmO7kNykXsR+9jtBl6+uFh0dc=; b=L9mS9Zv3McJQTEkQg/m53bWYA KRabaMIotuvc39Lh4N7Su2r4pmZ/BLv3acp2jCIUZBHKyqJedwP1HU+sy0QQB6t001bgrmkSDj5e3 zxI+FJXjILeTgcshfmj72pTpQed8oFsfUtwKtrpJ9T1kfR71SSv5FLzoBlGDVASe1KdQjVhPmNpSE idj+8m3uBE1VETxBf3DBeM1VWOdCG4DVPafJ5ilIx/EaIBiry0yQt2iIGQOVLsBBwm9f4M9cA9Lkz BPQkI5AlmXzsdRIBvbGHrfHZEoIKLi+f2Pp9d4bRIxzdyopMG/DSesPiNDOHRB1vPaGHuUlb1yNP9 S6pXelEiA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kWw1q-0002xM-3U; Mon, 26 Oct 2020 06:30:50 +0000 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kWw1n-0002vx-MP for openwrt-devel@lists.openwrt.org; Mon, 26 Oct 2020 06:30:48 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 8AFEF5C010B; Mon, 26 Oct 2020 02:30:43 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 26 Oct 2020 02:30:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=living180.net; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=XfOZEoiE1SEZN ixTCkjGpOa/gnAD48yw/CzopcZuGfY=; b=LLdzYWBNSPM3wcSeiavBPZHLSCEeS Fagmrpa2PlW1SrLoBARv5q6EVQNsa/0h1ul5gMwJz3vA6RS3Vixf0pFPt+8qI9fF XBGTH5tVn4FB5mZDuXhMH04M6loCR7uUARaxTfUGcICs2kwrPnVxKlWDpZEcc4vQ 7sYsuRGJwOeNun2b8SNLMoF9SerQnXA3zMss5/TpdQiYRqum7xq/OqgQpPFW/TOw 6JW/D0psruijVyPO/60qfMaK7Qph+QKFCW1NscD9mn7yD21xzVZXT3jUtdaAA00+ 9pCgCULehPsphUDLgGQaZIDgnvnG4idN92Expx2CfM5nwLf67YZ9oXAxA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=XfOZEoiE1SEZNixTCkjGpOa/gnAD48yw/CzopcZuGfY=; b=X0Zbyqoh 2w6abPMkvp+C96UYOf/DGd3kzZ3fGVnuSGW/jAf5wRPgyrVSCsBroz1ELt+xo8Yx 91WgsCsfuoFoNkrwHBIF/DNLrOiR7AXOaU246yI0bb26e1xDgS82h3kLizer8qiS pVxtr9ws0uLycRT2FJV0e2hKA6obl23epk1OwErNKosin6zDuMum/MVD21tP4QHD +az2GpYkrbQlCA3TDpsKxS/LCLa3M/U4U1bBjnAopRop8vbv6GlZ7S8dm8Qxk/+V qeolrqKFYYrQkSmihc0cn93BKVJbAs+OKcyjMe20wknG/Jx+28m+JVWehE3T86Ha /onqICS+2lXBLQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeehgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepffgrnhhivghl ucfjrghrughinhhguceoughhrghrughinhhgsehlihhvihhnghdukedtrdhnvghtqeenuc ggtffrrghtthgvrhhnpeejjeeuieffteffhfeviefhueetffduvdfgfedvveetteeiveei feelhfefueelieenucfkphepudejiedrvdekrddukeejrddukeenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeguhhgrrhguihhngheslhhivhhi nhhgudektddrnhgvth X-ME-Proxy: Received: from localhost (unknown [176.28.187.18]) by mail.messagingengine.com (Postfix) with ESMTPA id 8177C306467E; Mon, 26 Oct 2020 02:30:42 -0400 (EDT) From: Daniel Harding To: openwrt-devel@lists.openwrt.org Subject: [PATCH firewall3 v2] ipsets: allow commented lines with loadfile Date: Mon, 26 Oct 2020 09:28:35 +0300 Message-Id: <20201026062835.1968632-1-dharding@living180.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <51c38ccc-9281-5515-1be4-5d759194685e@nic.br> References: <51c38ccc-9281-5515-1be4-5d759194685e@nic.br> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_023047_863478_86EA0C9C X-CRM114-Status: UNSURE ( 9.91 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [66.111.4.26 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [66.111.4.26 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Henrique de Moraes Holschuh , Daniel Harding , Jo-Philipp Wich Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org When loading ipset files using the loadfile option, skip lines that start with '#' (disregarding any leading whitespace). Signed-off-by: Daniel Harding --- ipsets.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ipsets.c b/ipsets.c index 280845b..7af795d 100644 --- a/ipsets.c +++ b/ipsets.c @@ -16,6 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include "ipsets.h" @@ -337,6 +339,7 @@ load_file(struct fw3_ipset *ipset) { FILE *f; char line[128]; + char *p; if (!ipset->loadfile) return; @@ -350,8 +353,13 @@ load_file(struct fw3_ipset *ipset) return; } - while (fgets(line, sizeof(line), f)) - fw3_pr("add %s %s", ipset->name, line); + while (fgets(line, sizeof(line), f)) { + p = line; + while (isblank(*p)) + p++; + if (*p != '#') + fw3_pr("add %s %s", ipset->name, line); + } fclose(f); }