From patchwork Tue Nov 28 11:38:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin 'ldir' Darbyshire-Bryant X-Patchwork-Id: 842092 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=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kf6FhXWD"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="AA63SLbT"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ymMCd5KG5z9rxm for ; Tue, 28 Nov 2017 22:39:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date: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=uFyf9+6cSt/2Y4NZNAcEtyobjdz8cqXH2x6EecYtKi0=; b=kf6FhXWDJaIi9+ /0t3u7CFOPMfNbe/1qYUgVdAEA2V/YgF9aRLQu627E2QzcvLWU/IOv5EoWJkLG1WPQLsJLyXu3McA euZzJlwouW8L7lvaUyxNYFanbfRC/NnYTT8q5Kfl5/9hd6S2U/9yXTH+Do8CE+tR6o73LEkUlbOfV dcInYzxm8TggUJYoJtQRBQXz6g65HCarf53Y3wIqyje3YUkLOQCnYvWWxbqHIuXFsPIZhh0hRnOo6 OLqXdfbnVQhEcbyG/ISq5W5f+20yPY/EAtIlR9Tuwo8o5Oa7eYMdjrm9eMZHiMUs8kvrXCKJwm7KP SGskTn+GWQMsM24bzTCQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eJeEn-0000zF-RA; Tue, 28 Nov 2017 11:39:41 +0000 Received: from mail-ve1eur01on0056.outbound.protection.outlook.com ([104.47.1.56] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eJeEJ-0000xp-MH for lede-dev@lists.infradead.org; Tue, 28 Nov 2017 11:39:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=WNf4afuHoD8uwOsSAjzl+GlmOy1T6ULLKk/yc3rLTNs=; b=AA63SLbTsqR19wsXo8P7xTRNEIsCmChOmdkw8CjGL1bpQdayjEPxyQtMQnjDVT2N+aEi73PXDg4uG3vOguPh2Krk4vy6VIMxBADlfMGOCGvP4rozHL9wpQktGYlenBJ1atl7yOerjrFZ070KMi8P6C8J3hvUk/CfXMsSVfm8Gcg= Received: from Rowlf.darbyshire-bryant.me.uk (151.229.110.196) by DB5PR07MB1029.eurprd07.prod.outlook.com (2a01:111:e400:510d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.3; Tue, 28 Nov 2017 11:38:47 +0000 From: Kevin Darbyshire-Bryant To: lede-dev@lists.infradead.org Date: Tue, 28 Nov 2017 11:38:40 +0000 Message-Id: <20171128113840.52061-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.13.6 (Apple Git-96) MIME-Version: 1.0 X-Originating-IP: [151.229.110.196] X-ClientProxiedBy: CWLP265CA0040.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:11::28) To DB5PR07MB1029.eurprd07.prod.outlook.com (2a01:111:e400:510d::22) X-MS-Office365-Filtering-Correlation-Id: e64fda9c-11fe-44f6-302d-08d536549684 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4603075)(4627115)(201702281549075)(2017052603258); SRVR:DB5PR07MB1029; X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1029; 3:tx93VvNe9YQwUSBNpRFM0LPQNrxasy2TkudWKHCE9anVBMhdA3YSI4r1Na7Uasxl4LgCBLFvN7MnFGBoZhD5UTdaxZDteYFJ6RaDc1XvyF+9w9PbmT8DhLuh6QdpNXZCuYZICTlrqq3BXXPUytSSBswElNhPVDK3HE0PXlZ4AWRj9lEoBjKyh3wUr9xyfyhZ5v7E0CWv8kLeJhYYp6AlIj5Ar2azfLemyb1uGey1yeVlKgZXIwUQJFlV8brNEwWY; 25:J11qQ8uRl5GmdLNzf3dy0hNljbPn6RwF3Qv5l49Jji8pxxIitW44aLHM6XMQGKOR8N0XRWUFQSI0I9Vnj9otj+YuX2sl1Df2jUISVtSGP8TDYJsnc0sDB/dnnTt0Yk8ehjU4p+ICmjgMeAqk979im2E4dqOkEtkcWczoW9FQY+JFwPxdxDtbqCGX9CNUUUG0hGgPa5yEIsjeKQiE0kX1IBS1C/wOzYYc50tMWN45BEl4wfxj9XQYq/RfFDIDSLR2zzE8DBhYFNxUgS535MSFWR9iPtuOdH0BIga1sLFmsq//URLZe7DChdtVnn1FUsyZqDAKJFKxOdfr4C4nU+FHiFm6Tdfvi18jYcvaOy4WRf8=; 31:k2zetd/xD+fgx4FM98iHMFK5pes3WaDWMfOA17xv3QtoMS22pGFcoubPY6yudncfRPeDhl9SGI8EQV2MTIp6ptyTkk3kDzc/QCb6YYfK/nFjtA0Q8gtb8I6A9MXlRaEld5ecggueoswtDIvttH2duJuYts4vjhvbMeC+FXiCH+DljKiNxUtlG3M4eXJihWsIq27h2juUBcNiWOYHa+dkYO8EaKa1SrdQ1usYrKhUEDM= X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5PR07MB1029: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231022)(6041248)(2016111802025)(20161123560025)(201703131423075)(201703061421075)(20161123555025)(20161123564025)(20161123562025)(20161123558100)(6072148)(6043046)(201708071742011); SRVR:DB5PR07MB1029; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB5PR07MB1029; X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1029; 4:/TD/LhZr1JLal1gL4lAZac6vppKnww0Lxd/cRPDdVvyFITF34XzdGmlPkVWeYNNettuocUBYyd8I+HPz/WLKjBklKBOSWTP+q57AapTq9qS+NbN1SMhJa711ZgmOcwsEcdvWYpwYfrt05y2kjz4/ZnXHChihABoyoRCaAopJRkgG+z1eDTbEYRR//2HD+9nB7yMo464cyp68w+tOJwP92safMqgqJbvCeIJnde8tbEQUC2K5vbonr5YeR0DkZdIgcHESbghCj1PCN5Znet5huA== X-Forefront-PRVS: 0505147DDB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(366004)(199003)(189002)(51416003)(25786009)(6486002)(69596002)(74482002)(50226002)(305945005)(101416001)(105586002)(106356001)(2361001)(50986999)(7736002)(47776003)(66066001)(2351001)(8936002)(68736007)(81166006)(48376002)(8676002)(33646002)(508600001)(53416004)(50466002)(81156014)(53936002)(36756003)(16526018)(4326008)(52116002)(6116002)(97736004)(2906002)(16586007)(42882006)(6666003)(7696005)(1076002)(3846002)(189998001)(6916009)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR07MB1029; H:Rowlf.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR07MB1029; 23:ft2YMls9G2GDJ2ed8LhbcG42e87FfjtZmF18fcD7e?= 7bFsXIpDE+8o876gJLYD+n1UO7U6lccT1LEt0z5q87hvdSEwh7tl9OD8tsPYQhER+Ar/dLpTBzBFm9YIu1vojyNk1pDVwAfN5BIqIWFLjudXh9qbUiqN/ckbRJIXURGKycdOE6PSekjWNDOe5DeJcqMvh09seN0sqLeohGZDUMMifu2CjVSgi+go0TSpjaMZvCLO1bNx+bS/FEwwAi+ERhRCFoTHDv7K5tgZm5X/2KC3cGkW4/LAMjWHB8M5Fqe/jy4oPNslbZe7pkurTNNa/dZfHS2OM7DLuK5Q5ARI+Ayi/QQiEtA0+XQVNdYVfF9FxlczAKOzmHb12ERfCeSTIXUjpCd80e8nvebpS2ad/kHDoG+hQEabJoYNLPqoza7rhssyLdzUuJeCJ1I2yWuvH5/B88Dq6KYq25Jqap4bge5zdUBJoIoG0jaJWLfYoXBI44zRDn/EmlhAnMtjdsxMW0xxGSc5pdhQbPCxjJZrrcwenqE1QXC3wbfJA65OLyE3s8aue3HfqQBqkvCLDZLsmDxjkGsRBSS4SUOkDC/BcbMhCXSWh9FOp4ErGF8/Efe35u09HIMRZc9UXd68Cyyxmjw9zpHa0UF09s/hXi4+ffQVpDKI+PjXnMj8gJVm03IK5KVf2zWcKTyzmt5Y5m+dqZHoRzWy8GRdJ9GNluD+W7BBV0c1XfM8B0Fs53MEyB++nGAYFBVuMFQictA76sh7ttlyIDDzRcUggxEcQ3W+Yqnhk24KQZd4FmqNGb+1AHCRNNJlMrN/PZTorOZAL2+h8LpqntjYL5JltYtdjhvyfdMz+Z0bnhbnr43YRVK7xTwtx2jGqvUZwX+0QXErC8Kf9lRweGXHxMMjIcg7WNEnsmQ2+W0908LCH8TaMz6BJr0A6yCDXujHCZMCk3aEme0IW3bS8rI9V49u/5ihaGB+/At7IiIzq3SVwjeJVkzdo5yPFH7BzwOPnABSLbwiSXGqi1b8JmhTqrqUAsWcNxlyLoE1X8Fnw5WUsWiqj1mM7gXqfItabyflemsh+aO7+ss6fTiyIkIHCjVa0IC6x1vTkDmlpdWg+fYihrXgaxjE/OOgqQ= X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1029; 6:A5WRIJG8SxpCdGuiKmwXISDbHsu82SWZJGWwy8VTqNNTQQklaqpY2RdOJ7tQYY47hv3QiHdBxAIteHcyBefjMl25OVAL7cX8W4D4kKGuxZVdd49IqcPD8eVH2WFZiu/aympZLPfLHq6Ju1xS1eTELzNzHloz/K96LGm8XnEaib3PboP59rUN1bXXbw7sMo1Yis9d3C8vgqvobytsKDwg8VT4lP7FyTcd39z+KfwswI5KmkzCLFkqAb/s2VFlHCwRfkSztChCuVdUaqD7vkxiNws/nAMiDYh/Hd24uo4mtaKkyO9we9PK0F7Mi2NCr/owRTdB17x3+mgEUy1CtLqZ1GbTDJjsJFN128W4wWwb7LE=; 5:E7WFlhx2u8AimVZs77NHNWWWNc76Ty1G7wcP1PAA7t53iKaCQELycsQOvjB0ING0ggOcWurtbA4pPMdZ79d2xKviSrmB7oNWx+GIMFEJGqHXiSTupmG/7DZbh/qpYK7E3PxGqfn2O3Xz1Ajymm0+tKKb/7UZNKTZvFYNYvw/AfU=; 24:87a11ATv3i3+sXU2zIVp0159Nb25Pu8Nn5XoVO66puwYdJRXzzGX47W1/Hd7bTdsv8KJN8J5GI3vBgDHplEyCTOmPxKQ8wV+pBZ3KHMATiQ=; 7:bcOWzCESPz6SgDZVA2f1ONj9JP5XpxIPe/4TRgUeknLFIrzRk5Goiqr2S6uBQmwaUe7BnzSQPHdO7bnO3uB2/cU97FdLnsSviz4uBa9epzSeCalxQDhUGDQ0MeepL5FMi5XrZUC/PnAAzzazSJ0Z+m43OGm92dblDesztpxELdXqmVFLzuDEXoaVOqTC82HZDSQ4+7xBen4w22GaBXRqNsRTDLmU4QFMSDIDzAY6ntrqDTkAvgKYOqOuTyFY5VJ5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2017 11:38:47.1160 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e64fda9c-11fe-44f6-302d-08d536549684 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR07MB1029 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171128_033912_346282_FB0AB156 X-CRM114-Status: UNSURE ( 7.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.1.56 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [104.47.1.56 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH v1] dnsmasq: fix dhcp-host entries with empty macs X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jo-Philipp Wich Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Jo-Philipp Wich Due to improper localization of helper variables, "config host" entries without a given mac address may inherit the mac address of a preceeding, leading to invalid generated netive configuration. Fix the issue by marking the "macs" and "tags" helper variables in dhcp_host_add() local, avoiding the need for explicitely resetting them with each invocation. Reported-by: Russell Senior Tested-by: Kevin Darbyshire-Bryant Signed-off-by: Jo-Philipp Wich --- jow has this patch lurking in his tree but not yet made it to master, this is an effort to prompt/remind/encourage before it gets forgotten package/network/services/dnsmasq/files/dnsmasq.init | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 396d3867d4..86291f484d 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -253,7 +253,7 @@ dhcp_match_add() { dhcp_host_add() { local cfg="$1" - local hosttag nametime addrs duids + local hosttag nametime addrs duids macs tags config_get_bool force "$cfg" force 0 @@ -281,7 +281,6 @@ dhcp_host_add() { if [ -n "$mac" ]; then # --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap # many MAC are possible to track a laptop ON/OFF dock - macs="" for m in $mac; do append macs "$m" ","; done fi @@ -302,7 +301,6 @@ dhcp_host_add() { hex_to_hostid hostid "$hostid" fi - tags="" if [ -n "$tag" ]; then for t in $tag; do append tags "$t" ",set:"; done fi