From patchwork Fri Jul 27 21:09:48 2018 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: 950351 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=darbyshire-bryant.me.uk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uyP8+IJE"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="kMbXpqTO"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 41chSS4V2Bz9ryn for ; Sat, 28 Jul 2018 07:10:16 +1000 (AEST) 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=xm7v0a+o1Uay44p5L5L72m1z1fqA7/iDTq3Y9znmZ14=; b=uyP8+IJE21UGx5 Tcyz7mXKu3uKpVmYjr6tA1ZxB5SlKWh2O3DNo34X22Bjos4c9gn1I/b2BfjHp9aPdY3T9p2Fuj+If i/CZRnHyBjEI1e9pOWwJdZTZh1al5dMusYD5C7qqZW0MgR+nlryu9YjMO0OolLjbNarCIzpHwtyWB 28S69frfL4DouU1iqo50avh35dYf7cGFAHDzmM9jl5NObU+C1SI3CYuffiabcVdgGf/bLLfrhmNlY Ezk52S/FDiOJxVfhf086mee8FUFLalkvTp0WomKCPCw/syk2lha6q8bbHfG/SgXW6U7ZGoxh5lQAX 4U6SAknz/5BhptKI4bmg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fjA02-0002nC-3f; Fri, 27 Jul 2018 21:10:10 +0000 Received: from mail-ve1eur01on0072.outbound.protection.outlook.com ([104.47.1.72] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fj9zy-0001hH-LK for openwrt-devel@lists.openwrt.org; Fri, 27 Jul 2018 21:10:09 +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:X-MS-Exchange-SenderADCheck; bh=3O0OVF1CEFy6l12q8fUIYw3b0GJAXJ0e3RpOcRQPRfI=; b=kMbXpqTO0fj6R/Dfa16vo70wnMF8jdHjrM+AzIUozj/l/76XnxKBZ4ABcZjdFP7CqguNnocPDgLQ92gW3RRDTyFwjGVP0TvwKg5lJvHhNK5zSm7gk0E7+kss7xlT/touu1SuqkjCkSRvzK8GqJTwzV0notLPPNBA/twZEuNlG8Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Kevins-MBP.lan.darbyshire-bryant.me.uk (151.227.238.60) by AM0PR07MB4241.eurprd07.prod.outlook.com (2603:10a6:208:b8::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.8; Fri, 27 Jul 2018 21:09:53 +0000 From: Kevin Darbyshire-Bryant To: openwrt-devel@lists.openwrt.org Date: Fri, 27 Jul 2018 22:09:48 +0100 Message-Id: <20180727210948.37016-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) MIME-Version: 1.0 X-Originating-IP: [151.227.238.60] X-ClientProxiedBy: AM6PR0202CA0013.eurprd02.prod.outlook.com (2603:10a6:209:15::26) To AM0PR07MB4241.eurprd07.prod.outlook.com (2603:10a6:208:b8::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88dcc9a9-6219-482f-f0e3-08d5f4054c40 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM0PR07MB4241; X-Microsoft-Exchange-Diagnostics: 1; AM0PR07MB4241; 3:VE0/wT8WPWYnuaZjYtjoYfMz6uWs5PrHAC2956ENXLzO260zEjsnkszD8WTYqooMZE826DfGdrvKbXTr66+9cR8C+gVnrilpox8bpUhYQ5XGsTpMXFHqQkgN3pk056kd7eVkZJH/6nTk4oFzTI8zYwhlDWFj0YHC9fyVNI4Q5Qox6x73RhPTH5mmg8NmoQ3O+KMSRtOTSFhMPcx8hWza8OCgzI8fOUqQMwmf5kHKfXfxj3ECXsHKIgZGDfGhmEtU; 25:ZN6SXVmd4UYOPDsadkt3WR00twaL61T7nLFxzcgrEy/Cymxbse2+AmRyxQoVIxdwJjWg6aFlG3xVNj5SVBB84dsK2/PXQX9Nnnxw1sy21KO+IsGAaKMjOXoOBJjGWstokmcPmWLbwJoCLZJ8TAfev4BlaA0PBd+JcAm+FEzW5DjMkEP8B2Ed1sPEn+1oXYJODwYjLu/gVjgGFTUtY46ODixgbFXsHe6cJyfcgvKdHuIFAAWZs/oZVSzGA/y+hMrcDxxSjCYFYDf3DmeP0c0CiO1/Gs3VrrpCNEuQJbBe9Lupk4voc+ic3CdLs048Lusgsh9OudRa2YW4/zC3DDNK7w==; 31:OCfbTw206IAkaBdnqal+Jc7FUqElB3vyKotp0Mp7Tfubd57XWMs4IPNn8YfNvvMqtCRZL6d7dbDrG7LDTbf0+E349ecL7Zoi7S4/cPtFO2uZkgfwPZkR6m1TUVrhlzamO9C0jHIt73OcZqERuG19Tk8dxs5d5UtKIewsr/3AdDSb/Wis6CRL4Zk3mQAsrW5z7gdEdoHBXviKi0xrpkkbprk5Lxsu9IXl0K/fwVL2HW8= X-MS-TrafficTypeDiagnostic: AM0PR07MB4241: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(2016111802025)(6072148)(6043046)(201708071742011)(7699016); SRVR:AM0PR07MB4241; BCL:0; PCL:0; RULEID:; SRVR:AM0PR07MB4241; X-Microsoft-Exchange-Diagnostics: 1; AM0PR07MB4241; 4:S1S4rlp0RxqxwnH6esywuVGqsG6q+d02D2OjBkBK1UoZAapUThnHYtfCRa7dohb8X/60fxKoJbrD1BQQso2RwXErCVpXKdM6UoaaFcp6GojS8VOAi5Eh2ooe/0LYGG4VtZfnJtOC2YwautWamyxZuN6Ij+JW75EeRkHbnMv6M0O/D+jn1GZW6XqMyNK6AsjsoPKPVfwM7CxAfenFQzmoB+etID2c6DLkH/DpmFINu0mSPWCTkQzlZ4nB2/rbzBWzPY/d8AfPhpYVgofagkYFbQ== X-Forefront-PRVS: 07467C4D33 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(39830400003)(366004)(396003)(136003)(189003)(199004)(16586007)(25786009)(2906002)(50466002)(48376002)(105586002)(7736002)(316002)(8676002)(478600001)(4326008)(106356001)(14444005)(16526019)(186003)(386003)(305945005)(66066001)(2361001)(8936002)(1076002)(47776003)(6116002)(6666003)(26005)(6916009)(53936002)(107886003)(52116002)(551544002)(956004)(6306002)(5660300001)(2351001)(476003)(7696005)(3846002)(51416003)(50226002)(2616005)(68736007)(81166006)(36756003)(6486002)(486006)(97736004)(74482002)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR07MB4241; H:Kevins-MBP.lan.darbyshire-bryant.me.uk; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR07MB4241; 23:Q8pKVaurF5mtizJL72aR/rsx7gdG+Htu5VTwoBP6n?= vyGeT6st/YcvqMkS22t0/mEs4aX5qV1JCwA5huLBsx7wI3eQJ4IUq0NjHfp1SN2SR2TSlmJm49DK7hBeqe1uVBb1wT5exVZSDp/NjiA9WeLod4IoNFjyUCGM27RJU0pYSJ59RyRHtnlsS3dD6KsTiol5q0laWZNVnXsYpebSlILV1HBIxOEaoYjonLB8574IodJoAfVBi8kY4joH8vV2IYnghluGxiZhB/47CoO6YaeInXjmnfNHzuDDHUgz4VWPL3G1dI+wncQST+dOA6HHrUYaIFaZwtPBeWvL42f7nS9v23z5O4Jca4JjdKOONzm1jueYlqgWfGqPe1KwjfzvbbshTSah//6foOiRHnnY57eBaWAlI1iyZgGhxbGZ/ppY0nwHSp+OZ6bh8ATuGcWiS/IowRT9P1yxEs23jpbJF8nBqmyWauQIroaILb2XPz/ujdcLSEOogB882+1ePXYuXUNCiZkOyqzlJkXfSVzuEobleF8mnXvBGNHqmNtj2WuWVtJUVEMN8DwpkCXWJp6c4kI1b/7Dw3SjxZeuBPpc88bMQ6y4eGOFBNRfbB9lN+VQnyle/bSNiVEbTHFIWIOBkHDYwq+JH6C+LzpIGuLxethTXshs6jYTBZlUQY1p6jIxCxjW7756Qzz75fBh48vdNN0slpHzAvjYmCC/eeIJQ5NMxtFOWHa9SNQQWj7Znys3UbUDYnj62+BwgrqwJU6tDnGiwegKwQ4jDourH52Z9hsQs9mTAmT504DjP2bVXn1DO+J8eVFqV9oKXAQ/bQQOokRhVnUED4h23fqEpMlnru3ZIfbTxeeM8YqV+skdTuNdi6MFvKgN6e2MUUhsj7VHSj8vQeAWYw5a1W231LG4EGcTMCU738mkl7Qa6+mmAOOr2cyaVUIwmFhXhW9kE8swbsz4c+i8NU4NWKgDuAJLEfrlBl6Kp4crgY7tozAaciRUEMrw5TM0jxpWjMpRsb/JG1aN3sR1F9xxAr0AdseGIK11YP3xl3FRaj9/HXTskFVXe/PV1R1IEJZJG1Yc/h6SL8DgblUkiLoRaxb1H8df/UsfJwlMh+1r8Gb9Oz0N0pQjHnjJ7dVVv00f+9C0NjKSXphpexRbAP8jfX8Q8rjYePEX6k8e6i9VsYI5VckPuj8ck/OJqjJAmxbSDH01qA10YY++ZBOJsK4UjXRUtd6iQ59fg== X-Microsoft-Antispam-Message-Info: SwAiv8dOdnOLrDmeFhcQVb5Apt1Y3rP2QgEsup1h+bOUcYtrh54YDdfQnQm4Tl9HY+CWsZK8vLR9V2w1OmVor171LzHudWk+llNu6WwAHOljfgtLQmX7V7VZrs3KsLbE3cInlJ3HMNKTdEj9V4c7Z3YEIJB6TrpaPHW9FS1s+tgBot71TFMBDzPqtqEQGlCjCJTNT26IYmpjZuHSwyEWXi1zzw7UHo0MN2jNr5BUUtxtia0C5iWaRYx3tDnftn0HiRMHoyQBgE8H2KXX+DwB/4IEvUvUUhzG97nEB0ADwtfImMaIl7mlngbo3wE4B3fhw054pOhJIcpW5LpHUNwiZe1k0t/JcKqEeuK4XSSUCi8= X-Microsoft-Exchange-Diagnostics: 1; AM0PR07MB4241; 6:MY5YpWjp0vU8qzql3SqAkVQC20E1MzIOfSsco9ddjWcZ0+uAGQFzSZ24O+IZcUjPRT/0sBH7CKqjfq3EaPyY7nu87ngGFo+xjbED6FbEK+OA5JXfoEniU4hi16h/zLmKEUzFFp5WCG2rheXO0fzRFb/ztMzkiI+1BMbfj9z4EwmoV6X3PnPKRB10vE3gvcKgeH21mSYEOXB6djNSwwBK19yySKICjOhbg2paYZRnJ9++pEP1eo3Leybk4MBzd0KAfwacywdj08cRss4PI4f97sP2k2WrDgAmQbFWfz8rTQiJLhoCt3N8SX4GPSfYtVwrd6Ylq1yo5rXY08FGwJPX58UlyDNNWyKPUADLN16MHALToGlA1jnUXIzz54j7PNjH1Q1DGYXmyomJEsL6iz9/jH6kzq9mLmubvfv71Ttedg83ighHZdyPeTJyAEK0tzN9/shabq7yS2Hg1iy93kJHtQ==; 5:XZvTOdvkAz8NcBGhIky/yj0HpopeDaHgi2NzQF4lV+BzNWXE/Gui/MIdW/MVrcJQVJ7zCktbk8pIh66eEGsPng1kNiJVrS/4IE4wAHHse8HoMqYVS/yHo7m4XFRGGpjhemKj1CHssRm3vuwX0fhJ6R9S8+XaxykMwAcyY573Ae0=; 7:3nlsCo0uoNzvs8cjKMjou/P/XvjZ2JLqqF4zTc4Z7N9Ip3jfHoTf5CLBii+a+/+QYNkRcon985TtURU0wKnRyAWg8bWXj7W61l4x22Xywgb71u1cfI6AnUWSthY0qi4J5F5oCxEJm17q/e0M7T8Gnd45lzM4LYmQ8yMugwOT/8hlD4W9CUxkIqFYhDRkhLIM2XYc4f6IQoV0yh8Yf+Pbso9SSTYk8OsQNT439fC5vTyzNWYMvbHitXThiFjbjATl SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2018 21:09:53.3440 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88dcc9a9-6219-482f-f0e3-08d5f4054c40 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR07MB4241 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180727_141007_042959_33ACD6AA X-CRM114-Status: UNSURE ( 5.36 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.1.72 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 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 Subject: [OpenWrt-Devel] [PATCH v1] 6in4: add maxtry option to make more persistent updating HE endpoint X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Darbyshire-Bryant Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Add option 'maxtry' to 6in4 interface definition. Defaults to 3. Defines maximum number of attempts to update Hurricane Electric tunnel endpoint address. Originally unconfigurable and hard coded to 3. Each update attempt has a 5 second timeout. Signed-off-by: Kevin Darbyshire-Bryant --- package/network/ipv6/6in4/files/6in4.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh index 941dc43d68..dce37eb3b3 100755 --- a/package/network/ipv6/6in4/files/6in4.sh +++ b/package/network/ipv6/6in4/files/6in4.sh @@ -31,8 +31,8 @@ proto_6in4_setup() { local iface="$2" local link="6in4-$cfg" - local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix ip6prefixes tunlink tunnelid username password updatekey - json_get_vars mtu ttl tos ipaddr peeraddr ip6addr tunlink tunnelid username password updatekey + local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix ip6prefixes tunlink tunnelid username password updatekey maxtry + json_get_vars mtu ttl tos ipaddr peeraddr ip6addr tunlink tunnelid username password updatekey maxtry json_for_each_item proto_6in4_add_prefix ip6prefix ip6prefixes [ -z "$peeraddr" ] && { @@ -98,7 +98,7 @@ proto_6in4_setup() { local url="$http://ipv4.tunnelbroker.net/nic/update?hostname=$tunnelid" local try=0 - local max=3 + local max="${maxtry:-3}" ( set -o pipefail @@ -134,6 +134,7 @@ proto_6in4_init_config() { proto_config_add_string "username" proto_config_add_string "password" proto_config_add_string "updatekey" + proto_config_add_int "maxtry" proto_config_add_int "mtu" proto_config_add_int "ttl" proto_config_add_string "tos"