From patchwork Sun Oct 25 08:11:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Harding X-Patchwork-Id: 1387132 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 Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=v2fB54n7; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=living180.net header.i=@living180.net header.a=rsa-sha256 header.s=fm1 header.b=p0KNdCCR; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm1 header.b=MPBUrlut; dkim-atps=neutral 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 4CJrNn2dWFz9sTD for ; Sun, 25 Oct 2020 19:14:49 +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: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:In-Reply-To:References:List-Owner; bh=7ncFUO3SGJjMts81W+I+isLSNghGHOnirgmB6ZUnKnY=; b=v2fB54n7HA2MjcdYE6sws92hWp 7cqy+EuLeffPKpti6TQw7Q4ZaK+OXQXMDSJkF9r6cX01K8TxqIuqd8H4uNa+FkCqXCE7mY78EJlQf U7RgUl4T6pkb1+Y4+Tz2hGG1f6FX5/p+vFJAt+fey7VYMsSmR6+6pQxtxVstFJ+xSJ5Gz4V4lZBoq Uj50SstvlZ2GJu3hn6K4dKrdhgsoVWW6DJ3lnYGSJZGnIMPxMz/VpSEoKp443vNkZOXJYFWfxbnm8 BVbWGIlpiuuFso9t0j62PM3SJXoHcwN4KOdIex3E1TIqK19/WLHGhaqHbOkCw2rxVg98m77mOpg9Y O+RZzRYA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kWb8M-0001Yu-FY; Sun, 25 Oct 2020 08:12:10 +0000 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kWb8J-0001YU-V3 for openwrt-devel@lists.openwrt.org; Sun, 25 Oct 2020 08:12:08 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 73C55536; Sun, 25 Oct 2020 04:12:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 25 Oct 2020 04:12:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=living180.net; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=Ga9rTZx+wIgq6CI/kvAtyGB4bY 28LFSp4MDlLiD3Lyw=; b=p0KNdCCRWBOU75i4MfS3J/E9kiSJnJbZiHCXjidLQx napHNa1x8yDyFfY84Wc6WqfuL5otqTCwDCLXvyGbU9Q8/eSrSpdKd57TezwuB0/V IaD51GsrVHrJBY9auqlA3iZM22yvnuSZtRNpZ9wkebhigycfLFeLjd8SNEJsNY3s rNesaz/zAZzppMO7QDQtvwEU/+Bpmkf+gL+lE90unoSKOZ53LAvpbhSdI1HncKiZ xqp4S7zJLk6wgdVYZXahpi+In8shbQvFMNhlskuh18j8IlxY+3oWdqjY53aGSemx Hfo5jhIZD9OKicF6AEJ3Y+wcHfCuzksz+4pgOhVG97QQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=Ga9rTZx+wIgq6CI/k vAtyGB4bY28LFSp4MDlLiD3Lyw=; b=MPBUrlut+pApV9B2pT5NVGXbVnKYNvXKL zLc6gWxwxDEGR+AsuQ6sFDc7dG1nvog2mKu4nCnuqnmTYbkPUw4y8J9l8rV1K80w ZKTn5d6VpWXMuY6EuhK9nL7/DiBbt1kdlXecuzAPyRhUkXkXKs/deqdqRVb6pJJX lKqyt+ApG3Y30WkK3/wExMosKC3zRW+P3OX1PxQY3aRObdEZCpzS8UjsJaSPxxA4 +W5ahmKVATy6Wz/qz70uMTp50RsKzrPCATegnQIlSk5GoOwTsyGZA3NxRJsrtOZ8 321JL7sL183eLM8kZwNSDUWhcPzsJ1Vz6fm7sxEPE0xWbPm7vpj5Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeefgddufedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepffgrnhhivghlucfjrghrughinhhguceoughhrghrughinhhgsehl ihhvihhnghdukedtrdhnvghtqeenucggtffrrghtthgvrhhnpeffieehkeejleevudffff fgledtledvteekheeviefhlefgjeduuddvkeegtdevtdenucfkphepudejiedrvdekrddu keejrddukeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpeguhhgrrhguihhngheslhhivhhinhhgudektddrnhgvth X-ME-Proxy: Received: from localhost (unknown [176.28.187.18]) by mail.messagingengine.com (Postfix) with ESMTPA id 14C4E3280059; Sun, 25 Oct 2020 04:12:00 -0400 (EDT) From: Daniel Harding To: openwrt-devel@lists.openwrt.org Subject: [PATCH firewall3] ipsets: allow commented lines with loadfile Date: Sun, 25 Oct 2020 11:11:37 +0300 Message-Id: <20201025081137.1780179-1-dharding@living180.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201025_041208_168128_8A560438 X-CRM114-Status: UNSURE ( 8.98 ) 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.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -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.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.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [64.147.123.25 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [64.147.123.25 listed in wl.mailspike.net] -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: 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 '#'. Signed-off-by: Daniel Harding --- ipsets.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ipsets.c b/ipsets.c index 280845b..720f8c8 100644 --- a/ipsets.c +++ b/ipsets.c @@ -351,7 +351,8 @@ load_file(struct fw3_ipset *ipset) } while (fgets(line, sizeof(line), f)) - fw3_pr("add %s %s", ipset->name, line); + if (line[0] != '#') + fw3_pr("add %s %s", ipset->name, line); fclose(f); }