From patchwork Mon Feb 5 08:57:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Dedecker X-Patchwork-Id: 869201 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="n3SIq5AW"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kH/8gQjP"; 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 3zZhMQ6wCSz9s1h for ; Mon, 5 Feb 2018 19:58:26 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5VLeloRW4lkggx5XuSFz8a0KhteOX51YQEgoYTmJxc8=; b=n3SIq5AWE0prWo wHyjsWqbsJoNemQnp6F6RAgcfGUsIWb2aQLE7CCBMEqCKxbhOdRz060rsRND7yiSJd1C/jqR29HAv smvJ5W6QnPDRPEIVG0uR8ArKODd3RUL/iM6zf7fQSBFid86VdFllcMHWxrX8ROnTVqX6CzN0TEuKX XfJWgDNQIUkwEBy0Ap2SnYKqo+F8RbM99XJ0vSp9hAP7pvoxe4U39ZZ+kAgoSAYIcQ9eEWRY2P2u8 IVXl7ddfnueaItJZgiCMOfgwyv2k6jPV3LKBJU2jnCsop9ywey0q8SGkDK/xu5qnZ/WayRDsrZimM /IXgqHTWQL4MMQg+Jw6w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eicbX-00040f-2l; Mon, 05 Feb 2018 08:58:23 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eicbS-0003sC-EV for lede-dev@lists.infradead.org; Mon, 05 Feb 2018 08:58:22 +0000 Received: by mail-wm0-x242.google.com with SMTP id r71so24588706wmd.1 for ; Mon, 05 Feb 2018 00:58:07 -0800 (PST) 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=L0zAF+/w0eQCMfplDdiGNUMvHDqhSzdjQDJWEysbwVs=; b=kH/8gQjPkKCabsjt924EXkGMTAVXOt58F3wIUW/IZqXommSeOLiUhVORmfrpZruF1J 7kSQYAnfLZ+pQitNT+9nztRWJDzNGM8oLXZJqA3xxAbArX5HwU+XRbGYBufqKyfZQcS3 umygNXhQWuRDYRecy7N2yNiwqikW+ZRBbbBlK7Oh9ICUVaqbG+12Y2Iy+ZGrevEFlbfm t8+KfgZ48WrtkvSbpj+HAMLM0OMYibJDXuCuJhTDJjajhCPfoRK7YT+4iZiHyzWHLH7G ZrcIEyJSjjBOUXrhVeUM/coqxwvJSjg013XAViplHSYKsJ9stGjgHz2Nbky7cXD/g1nl pjMA== 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=L0zAF+/w0eQCMfplDdiGNUMvHDqhSzdjQDJWEysbwVs=; b=Y5ZgTkN9Rk1Ga9iGFzqaTRUQwahrKtimMhZ3CT3p5PSyc1Wz44cckxqtdhJpsZIoVz js192fEEbXklhh3pZEtPtau9Mhv/KCe8l9uLVsJ07u1W22ZSj4U9yDMukh827aJYHrWr tiOgyVNwq1MHnHPaikPCifEUN7eTovafs7CzGE8LIuOS8Rzd5ucn24h04veq0BV0rN62 CJ/ZPuwK4fsEaPrRgVfVoVCEwEtbpHl+QxyKYVW4lPXXmkIlAWzUL0SzEkvbIKvrERy6 zQ86MiuzoWlfG5EPDMR7mc13zQJiXMUUZwvM+EyIRvjUsTZQIAQRj75wk/mWKwXpsPiQ 2TxQ== X-Gm-Message-State: AKwxytcIlFHoGnEx97GZDZI6TUkbAQmREoGsRWPPIMP7ZJ2CtPi6ap/q 4GsJmkTyEVkkF7SF1jAbwx8GJA== X-Google-Smtp-Source: AH8x225qq3syw28PQH7MVuU88XUCDf4Ul6bjL/RWzPag3Jz52ZrMzP6elllTF3OLdMujv/GYUowHkw== X-Received: by 10.80.170.69 with SMTP id p5mr79909126edc.10.1517821086229; Mon, 05 Feb 2018 00:58:06 -0800 (PST) Received: from linux-5g1g.lan (ptr-fvl7vteb6vjd542m2s0.18120a2.ip6.access.telenet.be. [2a02:1812:1128:fb00:ffc7:aef4:4f01:1990]) by smtp.gmail.com with ESMTPSA id h56sm7569891ede.5.2018.02.05.00.58.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 00:58:05 -0800 (PST) From: Hans Dedecker To: lede-dev@lists.infradead.org, nbd@nbd.name, jow@mein.io Date: Mon, 5 Feb 2018 09:57:48 +0100 Message-Id: <20180205085749.13647-2-dedeckeh@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180205085749.13647-1-dedeckeh@gmail.com> References: <20180205085749.13647-1-dedeckeh@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dedeckeh[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 2.0 LONGWORDS Long string of long words Subject: [LEDE-DEV] [PATCH] odhcp6c: change sendopts option into list 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: Hans Dedecker MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Commit a26045049b added support for sendopts as a string; since multiple sendopts values can be specified it makes more sense to model it as a list of strings. Signed-off-by: Hans Dedecker --- package/network/ipv6/odhcp6c/Makefile | 2 +- package/network/ipv6/odhcp6c/files/dhcpv6.sh | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index 674d12fc6e..ac793f1ad2 100644 --- a/package/network/ipv6/odhcp6c/Makefile +++ b/package/network/ipv6/odhcp6c/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcp6c -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh index 82b329de9b..bc7f01d322 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh @@ -27,7 +27,7 @@ proto_dhcpv6_init_config() { proto_config_add_string 'ifaceid:ip6addr' proto_config_add_string "userclass" proto_config_add_string "vendorclass" - proto_config_add_string "sendopts" + proto_config_add_array "sendopts:list(string)" proto_config_add_boolean delegate proto_config_add_int "soltimeout" proto_config_add_boolean fakeroutes @@ -41,8 +41,7 @@ proto_dhcpv6_setup() { local iface="$2" local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff - json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff - + json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff # Configure local opts="" @@ -76,9 +75,12 @@ proto_dhcpv6_setup() { append opts "-r$opt" done - for opt in $sendopts; do - append opts "-x$opt" - done + sendopts_cb() { + local val="$1" + append opts "-x$val" + } + + json_for_each_item sendopts_cb sendopts append opts "-t${soltimeout:-120}"