From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id E2CBD1FF15C for ; Fri, 19 Sep 2025 11:41:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9C05F1271E; Fri, 19 Sep 2025 11:41:36 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Fri, 19 Sep 2025 11:41:15 +0200 Message-ID: <20250919094122.73373-4-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250919094122.73373-1-g.goller@proxmox.com> References: <20250919094122.73373-1-g.goller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758274878449 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH ve-rs 3/4] ve-config: fabrics: use new proxmox-frr structs to generate frr config X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" VGhlIHByb3htb3gtZnJyIEZyckNvbmZpZyBzdHJ1Y3RzIGNoYW5nZWQgYSBiaXQgc28gdGhhdCB3 ZSBjYW4gc2VyaWFsaXplCnRoZW0gbmljZWx5IHVzaW5nIHRlbXBsYXRlcyAtLSB0aGlzIG1lYW5z IHdlIGFsc28gbmVlZCB0byBjaGFuZ2UgdGhlCkZyckNvbmZpZyBnZW5lcmF0aW9uIGNvZGUgYSBi aXQuCgpEdWUgdG8gdGhlIGRlY2lzaW9uIHRoYXQgZXZlcnkgcHJvdG9jb2wgY29ycmVzcG9uZHMg dG8gYSBzaW5nbGUgdGVtcGxhdGUKZmlsZSAod2l0aCBhIGZldyBleGNlcHRpb25zLCBlLmcuIGNv bW1vbiBpbnRlcmZhY2Ugb3B0aW9ucyBldGMuKSB3ZSBhbHNvCmhhdmUgcGVyLXByb3RvY29sIHN0 cnVjdHMgdGhhdCBjb250YWluIGFsbCB0aGUgc3RydWN0cyBuZWVkZWQgZm9yIHRoYXQKZmFicmlj IHRvIHdvcmsuCgpTbyB3ZSBubyBsb25nZXIgaGF2ZToKCmNvbmZpZy8K4pSc4pSAIGludGVyZmFj ZXMvCuKUgiAg4pSc4pSAIG9wZW5mYWJyaWMK4pSCICDilJzilIAgb3NwZgrilJzilIAgcm91dGVy cy8K4pSCICDilJzilIAgb3BlbmZhYnJpYwrilIIgIOKUnOKUgCBvc3BmCgpidXQ6Cgpjb25maWcv CuKUnOKUgCBvcGVuZmFicmljLwrilIIgIOKUnOKUgCBpbnRlcmZhY2VzCuKUgiAg4pSc4pSAIHJv dXRlcnMK4pSc4pSAIG9zcGYvCuKUgiAg4pSc4pSAIGludGVyZmFjZXMK4pSCICDilJzilIAgcm91 dGVycwoKVGhvdWdodCBob25lc3RseSBJIGRvbid0IHRoaW5rIHRoaXMgY2hhbmdlIGlzIHNvIGlt cGFjdGluZyAtLSBleGNlcHQgYQpmZXcgZW51bXMgdGhhdCB3ZSBjYW4gcmVtb3ZlLgoKU2lnbmVk LW9mZi1ieTogR2FicmllbCBHb2xsZXIgPGcuZ29sbGVyQHByb3htb3guY29tPgotLS0KIHByb3ht b3gtdmUtY29uZmlnL3NyYy9zZG4vZmFicmljL2Zyci5ycyB8IDE0NSArKysrKysrKysrKysrLS0t LS0tLS0tLS0KIHByb3htb3gtdmUtY29uZmlnL3NyYy9zZG4vZnJyLnJzICAgICAgICB8ICAxMSAr LQogMiBmaWxlcyBjaGFuZ2VkLCA4MSBpbnNlcnRpb25zKCspLCA3NSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9wcm94bW94LXZlLWNvbmZpZy9zcmMvc2RuL2ZhYnJpYy9mcnIucnMgYi9wcm94 bW94LXZlLWNvbmZpZy9zcmMvc2RuL2ZhYnJpYy9mcnIucnMKaW5kZXggNDg2ZjdkYzUxZGNiLi44 NmM3N2I4YjRjNTcgMTAwNjQ0Ci0tLSBhL3Byb3htb3gtdmUtY29uZmlnL3NyYy9zZG4vZmFicmlj L2Zyci5ycworKysgYi9wcm94bW94LXZlLWNvbmZpZy9zcmMvc2RuL2ZhYnJpYy9mcnIucnMKQEAg LTEsMTcgKzEsMjAgQEAKIHVzZSBzdGQ6Om5ldDo6e0lwQWRkciwgSXB2NEFkZHJ9OworCiB1c2Ug dHJhY2luZzsKIAotdXNlIHByb3htb3hfZnJyOjpvc3BmOjp7c2VsZiwgTmV0d29ya1R5cGV9Owor dXNlIHByb3htb3hfZnJyOjpvcGVuZmFicmljOjp7T3BlbmZhYnJpY0ludGVyZmFjZSwgT3BlbmZh YnJpY1JvdXRlciwgT3BlbmZhYnJpY1JvdXRlck5hbWV9OwordXNlIHByb3htb3hfZnJyOjpvc3Bm Ojp7c2VsZiwgTmV0d29ya1R5cGUsIE9zcGZJbnRlcmZhY2UsIE9zcGZSb3V0ZXIsIE9zcGZSb3V0 ZXJOYW1lfTsKIHVzZSBwcm94bW94X2Zycjo6cm91dGVfbWFwOjp7Ci0gICAgQWNjZXNzQWN0aW9u LCBBY2Nlc3NMaXN0LCBBY2Nlc3NMaXN0TmFtZSwgQWNjZXNzTGlzdFJ1bGUsIFByb3RvY29sUm91 dGVNYXAsIFByb3RvY29sVHlwZSwKLSAgICBSb3V0ZU1hcCwgUm91dGVNYXBNYXRjaCwgUm91dGVN YXBNYXRjaElubmVyLCBSb3V0ZU1hcE5hbWUsIFJvdXRlTWFwU2V0LAorICAgIEFjY2Vzc0FjdGlv biwgQWNjZXNzTGlzdCwgQWNjZXNzTGlzdE5hbWUsIEFjY2Vzc0xpc3RSdWxlLCBQcm90b2NvbFJv dXRlTWFwLCBSb3V0ZU1hcCwKKyAgICBSb3V0ZU1hcE1hdGNoLCBSb3V0ZU1hcE1hdGNoSW5uZXIs IFJvdXRlTWFwTmFtZSwgUm91dGVNYXBTZXQsCit9OwordXNlIHByb3htb3hfZnJyOjp7CisgICAg RnJyQ29uZmlnLCBGcnJXb3JkLCBJbnRlcmZhY2UsIEludGVyZmFjZU5hbWUsIE9wZW5mYWJyaWNG cnJDb25maWcsIE9zcGZGcnJDb25maWcsCiB9OwotdXNlIHByb3htb3hfZnJyOjp7RnJyQ29uZmln LCBGcnJXb3JkLCBJbnRlcmZhY2UsIEludGVyZmFjZU5hbWUsIFJvdXRlciwgUm91dGVyTmFtZX07 CiB1c2UgcHJveG1veF9uZXR3b3JrX3R5cGVzOjppcF9hZGRyZXNzOjpDaWRyOwogdXNlIHByb3ht b3hfc2RuX3R5cGVzOjpuZXQ6Ok5ldDsKIAogdXNlIGNyYXRlOjpjb21tb246OnZhbGlkOjpWYWxp ZDsKLQogdXNlIGNyYXRlOjpzZG46OmZhYnJpYzo6c2VjdGlvbl9jb25maWc6OnByb3RvY29sOjp7 CiAgICAgb3BlbmZhYnJpYzo6e09wZW5mYWJyaWNJbnRlcmZhY2VQcm9wZXJ0aWVzLCBPcGVuZmFi cmljUHJvcGVydGllc30sCiAgICAgb3NwZjo6T3NwZkludGVyZmFjZVByb3BlcnRpZXMsCkBAIC0z MSw2ICszNCw4IEBAIHB1YiBmbiBidWlsZF9mYWJyaWMoCiAgICAgbGV0IG11dCByb3V0ZW1hcF9z ZXEgPSAxMDA7CiAgICAgbGV0IG11dCBjdXJyZW50X3JvdXRlcl9pZDogT3B0aW9uPElwdjRBZGRy PiA9IE5vbmU7CiAgICAgbGV0IG11dCBjdXJyZW50X25ldDogT3B0aW9uPE5ldD4gPSBOb25lOwor ICAgIGxldCBtdXQgbmV3X29wZW5mYWJyaWNfY29uZmlnID0gT3BlbmZhYnJpY0ZyckNvbmZpZzo6 ZGVmYXVsdCgpOworICAgIGxldCBtdXQgbmV3X29zcGZfY29uZmlnID0gT3NwZkZyckNvbmZpZzo6 ZGVmYXVsdCgpOwogCiAgICAgZm9yIChmYWJyaWNfaWQsIGVudHJ5KSBpbiBjb25maWcuaW50b19p bm5lcigpLml0ZXIoKSB7CiAgICAgICAgIG1hdGNoIGVudHJ5IHsKQEAgLTUzLDcgKzU4LDkgQEAg cHViIGZuIGJ1aWxkX2ZhYnJpYygKICAgICAgICAgICAgICAgICAgICAgLmFzX3JlZigpCiAgICAg ICAgICAgICAgICAgICAgIC5va19vcl9lbHNlKHx8IGFueWhvdzo6YW55aG93ISgibm8gSVB2NCBv ciBJUHY2IHNldCBmb3Igbm9kZSIpKT87CiAgICAgICAgICAgICAgICAgbGV0IChyb3V0ZXJfbmFt ZSwgcm91dGVyX2l0ZW0pID0gYnVpbGRfb3BlbmZhYnJpY19yb3V0ZXIoZmFicmljX2lkLCBuZXQu Y2xvbmUoKSk/OwotICAgICAgICAgICAgICAgIGZycl9jb25maWcucm91dGVyLmluc2VydChyb3V0 ZXJfbmFtZSwgcm91dGVyX2l0ZW0pOworICAgICAgICAgICAgICAgIG5ld19vcGVuZmFicmljX2Nv bmZpZworICAgICAgICAgICAgICAgICAgICAucm91dGVyCisgICAgICAgICAgICAgICAgICAgIC5p bnNlcnQocm91dGVyX25hbWUsIHJvdXRlcl9pdGVtKTsKIAogICAgICAgICAgICAgICAgIC8vIENy ZWF0ZSBkdW1teSBpbnRlcmZhY2UgZm9yIGZhYnJpYwogICAgICAgICAgICAgICAgIGxldCAoaW50 ZXJmYWNlLCBpbnRlcmZhY2VfbmFtZSkgPSBidWlsZF9vcGVuZmFicmljX2R1bW15X2ludGVyZmFj ZSgKQEAgLTYyLDcgKzY5LDcgQEAgcHViIGZuIGJ1aWxkX2ZhYnJpYygKICAgICAgICAgICAgICAg ICAgICAgbm9kZS5pcDYoKS5pc19zb21lKCksCiAgICAgICAgICAgICAgICAgKT87CiAKLSAgICAg ICAgICAgICAgICBpZiBmcnJfY29uZmlnCisgICAgICAgICAgICAgICAgaWYgbmV3X29wZW5mYWJy aWNfY29uZmlnCiAgICAgICAgICAgICAgICAgICAgIC5pbnRlcmZhY2VzCiAgICAgICAgICAgICAg ICAgICAgIC5pbnNlcnQoaW50ZXJmYWNlX25hbWUsIGludGVyZmFjZSkKICAgICAgICAgICAgICAg ICAgICAgLmlzX3NvbWUoKQpAQCAtODMsNyArOTAsNyBAQCBwdWIgZm4gYnVpbGRfZmFicmljKAog ICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5pcDYoKS5pc19zb21lKCksCiAgICAgICAgICAg ICAgICAgICAgICk/OwogCi0gICAgICAgICAgICAgICAgICAgIGlmIGZycl9jb25maWcKKyAgICAg ICAgICAgICAgICAgICAgaWYgbmV3X29wZW5mYWJyaWNfY29uZmlnCiAgICAgICAgICAgICAgICAg ICAgICAgICAuaW50ZXJmYWNlcwogICAgICAgICAgICAgICAgICAgICAgICAgLmluc2VydChpbnRl cmZhY2VfbmFtZSwgaW50ZXJmYWNlKQogICAgICAgICAgICAgICAgICAgICAgICAgLmlzX3NvbWUo KQpAQCAtOTYsMTEgKzEwMywxMiBAQCBwdWIgZm4gYnVpbGRfZmFicmljKAogICAgICAgICAgICAg ICAgICAgICBsZXQgcnVsZSA9IEFjY2Vzc0xpc3RSdWxlIHsKICAgICAgICAgICAgICAgICAgICAg ICAgIGFjdGlvbjogQWNjZXNzQWN0aW9uOjpQZXJtaXQsCiAgICAgICAgICAgICAgICAgICAgICAg ICBuZXR3b3JrOiBDaWRyOjpmcm9tKGlwdjRjaWRyKSwKKyAgICAgICAgICAgICAgICAgICAgICAg IGlzX2lwdjY6IGZhbHNlLAogICAgICAgICAgICAgICAgICAgICAgICAgc2VxOiBOb25lLAogICAg ICAgICAgICAgICAgICAgICB9OwogICAgICAgICAgICAgICAgICAgICBsZXQgYWNjZXNzX2xpc3Rf bmFtZSA9CiAgICAgICAgICAgICAgICAgICAgICAgICBBY2Nlc3NMaXN0TmFtZTo6bmV3KGZvcm1h dCEoInB2ZV9vcGVuZmFicmljX3t9X2lwcyIsIGZhYnJpY19pZCkpOwotICAgICAgICAgICAgICAg ICAgICBmcnJfY29uZmlnLmFjY2Vzc19saXN0cy5wdXNoKEFjY2Vzc0xpc3QgeworICAgICAgICAg ICAgICAgICAgICBuZXdfb3BlbmZhYnJpY19jb25maWcuYWNjZXNzX2xpc3RzLnB1c2goQWNjZXNz TGlzdCB7CiAgICAgICAgICAgICAgICAgICAgICAgICBuYW1lOiBhY2Nlc3NfbGlzdF9uYW1lLAog ICAgICAgICAgICAgICAgICAgICAgICAgcnVsZXM6IHZlYyFbcnVsZV0sCiAgICAgICAgICAgICAg ICAgICAgIH0pOwpAQCAtMTA5LDExICsxMTcsMTIgQEAgcHViIGZuIGJ1aWxkX2ZhYnJpYygKICAg ICAgICAgICAgICAgICAgICAgbGV0IHJ1bGUgPSBBY2Nlc3NMaXN0UnVsZSB7CiAgICAgICAgICAg ICAgICAgICAgICAgICBhY3Rpb246IEFjY2Vzc0FjdGlvbjo6UGVybWl0LAogICAgICAgICAgICAg ICAgICAgICAgICAgbmV0d29yazogQ2lkcjo6ZnJvbShpcHY2Y2lkciksCisgICAgICAgICAgICAg ICAgICAgICAgICBpc19pcHY2OiB0cnVlLAogICAgICAgICAgICAgICAgICAgICAgICAgc2VxOiBO b25lLAogICAgICAgICAgICAgICAgICAgICB9OwogICAgICAgICAgICAgICAgICAgICBsZXQgYWNj ZXNzX2xpc3RfbmFtZSA9CiAgICAgICAgICAgICAgICAgICAgICAgICBBY2Nlc3NMaXN0TmFtZTo6 bmV3KGZvcm1hdCEoInB2ZV9vcGVuZmFicmljX3t9X2lwNnMiLCBmYWJyaWNfaWQpKTsKLSAgICAg ICAgICAgICAgICAgICAgZnJyX2NvbmZpZy5hY2Nlc3NfbGlzdHMucHVzaChBY2Nlc3NMaXN0IHsK KyAgICAgICAgICAgICAgICAgICAgbmV3X29wZW5mYWJyaWNfY29uZmlnLmFjY2Vzc19saXN0cy5w dXNoKEFjY2Vzc0xpc3QgewogICAgICAgICAgICAgICAgICAgICAgICAgbmFtZTogYWNjZXNzX2xp c3RfbmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bGVzOiB2ZWMhW3J1bGVdLAogICAg ICAgICAgICAgICAgICAgICB9KTsKQEAgLTEyMSwzNyArMTMwLDQzIEBAIHB1YiBmbiBidWlsZF9m YWJyaWMoCiAKICAgICAgICAgICAgICAgICBpZiBsZXQgU29tZShpcHY0KSA9IG5vZGUuaXAoKSB7 CiAgICAgICAgICAgICAgICAgICAgIC8vIGNyZWF0ZSByb3V0ZS1tYXAKLSAgICAgICAgICAgICAg ICAgICAgZnJyX2NvbmZpZy5yb3V0ZW1hcHMucHVzaChidWlsZF9vcGVuZmFicmljX3JvdXRlbWFw KAotICAgICAgICAgICAgICAgICAgICAgICAgZmFicmljX2lkLAotICAgICAgICAgICAgICAgICAg ICAgICAgSXBBZGRyOjpWNChpcHY0KSwKLSAgICAgICAgICAgICAgICAgICAgICAgIHJvdXRlbWFw X3NlcSwKLSAgICAgICAgICAgICAgICAgICAgKSk7CisgICAgICAgICAgICAgICAgICAgIG5ld19v cGVuZmFicmljX2NvbmZpZworICAgICAgICAgICAgICAgICAgICAgICAgLnJvdXRlbWFwcworICAg ICAgICAgICAgICAgICAgICAgICAgLnB1c2goYnVpbGRfb3BlbmZhYnJpY19yb3V0ZW1hcCgKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmYWJyaWNfaWQsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgSXBBZGRyOjpWNChpcHY0KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBy b3V0ZW1hcF9zZXEsCisgICAgICAgICAgICAgICAgICAgICAgICApKTsKICAgICAgICAgICAgICAg ICAgICAgcm91dGVtYXBfc2VxICs9IDEwOwogCiAgICAgICAgICAgICAgICAgICAgIGxldCBwcm90 b2NvbF9yb3V0ZW1hcCA9IFByb3RvY29sUm91dGVNYXAgewogICAgICAgICAgICAgICAgICAgICAg ICAgaXNfaXB2NjogZmFsc2UsCi0gICAgICAgICAgICAgICAgICAgICAgICBwcm90b2NvbDogUHJv dG9jb2xUeXBlOjpPcGVuZmFicmljLAogICAgICAgICAgICAgICAgICAgICAgICAgcm91dGVtYXBf bmFtZTogUm91dGVNYXBOYW1lOjpuZXcoInB2ZV9vcGVuZmFicmljIi50b19vd25lZCgpKSwKICAg ICAgICAgICAgICAgICAgICAgfTsKIAotICAgICAgICAgICAgICAgICAgICBmcnJfY29uZmlnLnBy b3RvY29sX3JvdXRlbWFwcy5pbnNlcnQocHJvdG9jb2xfcm91dGVtYXApOworICAgICAgICAgICAg ICAgICAgICBuZXdfb3BlbmZhYnJpY19jb25maWcKKyAgICAgICAgICAgICAgICAgICAgICAgIC5w cm90b2NvbF9yb3V0ZW1hcHMKKyAgICAgICAgICAgICAgICAgICAgICAgIC5pbnNlcnQocHJvdG9j b2xfcm91dGVtYXApOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiBsZXQg U29tZShpcHY2KSA9IG5vZGUuaXA2KCkgewogICAgICAgICAgICAgICAgICAgICAvLyBjcmVhdGUg cm91dGUtbWFwCi0gICAgICAgICAgICAgICAgICAgIGZycl9jb25maWcucm91dGVtYXBzLnB1c2go YnVpbGRfb3BlbmZhYnJpY19yb3V0ZW1hcCgKLSAgICAgICAgICAgICAgICAgICAgICAgIGZhYnJp Y19pZCwKLSAgICAgICAgICAgICAgICAgICAgICAgIElwQWRkcjo6VjYoaXB2NiksCi0gICAgICAg ICAgICAgICAgICAgICAgICByb3V0ZW1hcF9zZXEsCi0gICAgICAgICAgICAgICAgICAgICkpOwor ICAgICAgICAgICAgICAgICAgICBuZXdfb3BlbmZhYnJpY19jb25maWcKKyAgICAgICAgICAgICAg ICAgICAgICAgIC5yb3V0ZW1hcHMKKyAgICAgICAgICAgICAgICAgICAgICAgIC5wdXNoKGJ1aWxk X29wZW5mYWJyaWNfcm91dGVtYXAoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmFicmlj X2lkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIElwQWRkcjo6VjYoaXB2NiksCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcm91dGVtYXBfc2VxLAorICAgICAgICAgICAgICAgICAg ICAgICAgKSk7CiAgICAgICAgICAgICAgICAgICAgIHJvdXRlbWFwX3NlcSArPSAxMDsKIAogICAg ICAgICAgICAgICAgICAgICBsZXQgcHJvdG9jb2xfcm91dGVtYXAgPSBQcm90b2NvbFJvdXRlTWFw IHsKICAgICAgICAgICAgICAgICAgICAgICAgIGlzX2lwdjY6IHRydWUsCi0gICAgICAgICAgICAg ICAgICAgICAgICBwcm90b2NvbDogUHJvdG9jb2xUeXBlOjpPcGVuZmFicmljLAogICAgICAgICAg ICAgICAgICAgICAgICAgcm91dGVtYXBfbmFtZTogUm91dGVNYXBOYW1lOjpuZXcoInB2ZV9vcGVu ZmFicmljNiIudG9fb3duZWQoKSksCiAgICAgICAgICAgICAgICAgICAgIH07CiAKLSAgICAgICAg ICAgICAgICAgICAgZnJyX2NvbmZpZy5wcm90b2NvbF9yb3V0ZW1hcHMuaW5zZXJ0KHByb3RvY29s X3JvdXRlbWFwKTsKKyAgICAgICAgICAgICAgICAgICAgbmV3X29wZW5mYWJyaWNfY29uZmlnCisg ICAgICAgICAgICAgICAgICAgICAgICAucHJvdG9jb2xfcm91dGVtYXBzCisgICAgICAgICAgICAg ICAgICAgICAgICAuaW5zZXJ0KHByb3RvY29sX3JvdXRlbWFwKTsKICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBGYWJyaWNFbnRyeTo6T3NwZihvc3BmX2VudHJ5 KSA9PiB7CkBAIC0xNjcsMTMgKzE4MiwxMyBAQCBwdWIgZm4gYnVpbGRfZmFicmljKAogICAgICAg ICAgICAgICAgIGxldCBmcnJfd29yZF9hcmVhID0gRnJyV29yZDo6bmV3KGZhYnJpYy5wcm9wZXJ0 aWVzKCkuYXJlYS50b19zdHJpbmcoKSk/OwogICAgICAgICAgICAgICAgIGxldCBmcnJfYXJlYSA9 IG9zcGY6OkFyZWE6Om5ldyhmcnJfd29yZF9hcmVhKT87CiAgICAgICAgICAgICAgICAgbGV0IChy b3V0ZXJfbmFtZSwgcm91dGVyX2l0ZW0pID0gYnVpbGRfb3NwZl9yb3V0ZXIoKnJvdXRlcl9pZCk/ OwotICAgICAgICAgICAgICAgIGZycl9jb25maWcucm91dGVyLmluc2VydChyb3V0ZXJfbmFtZSwg cm91dGVyX2l0ZW0pOworICAgICAgICAgICAgICAgIG5ld19vc3BmX2NvbmZpZy5yb3V0ZXIuaW5z ZXJ0KHJvdXRlcl9uYW1lLCByb3V0ZXJfaXRlbSk7CiAKICAgICAgICAgICAgICAgICAvLyBBZGQg ZHVtbXkgaW50ZXJmYWNlCiAgICAgICAgICAgICAgICAgbGV0IChpbnRlcmZhY2UsIGludGVyZmFj ZV9uYW1lKSA9CiAgICAgICAgICAgICAgICAgICAgIGJ1aWxkX29zcGZfZHVtbXlfaW50ZXJmYWNl KGZhYnJpY19pZCwgZnJyX2FyZWEuY2xvbmUoKSk/OwogCi0gICAgICAgICAgICAgICAgaWYgZnJy X2NvbmZpZworICAgICAgICAgICAgICAgIGlmIG5ld19vc3BmX2NvbmZpZwogICAgICAgICAgICAg ICAgICAgICAuaW50ZXJmYWNlcwogICAgICAgICAgICAgICAgICAgICAuaW5zZXJ0KGludGVyZmFj ZV9uYW1lLCBpbnRlcmZhY2UpCiAgICAgICAgICAgICAgICAgICAgIC5pc19zb21lKCkKQEAgLTE4 Nyw3ICsyMDIsNyBAQCBwdWIgZm4gYnVpbGRfZmFicmljKAogICAgICAgICAgICAgICAgICAgICBs ZXQgKGludGVyZmFjZSwgaW50ZXJmYWNlX25hbWUpID0KICAgICAgICAgICAgICAgICAgICAgICAg IGJ1aWxkX29zcGZfaW50ZXJmYWNlKGZycl9hcmVhLmNsb25lKCksIGludGVyZmFjZSk/OwogCi0g ICAgICAgICAgICAgICAgICAgIGlmIGZycl9jb25maWcKKyAgICAgICAgICAgICAgICAgICAgaWYg bmV3X29zcGZfY29uZmlnCiAgICAgICAgICAgICAgICAgICAgICAgICAuaW50ZXJmYWNlcwogICAg ICAgICAgICAgICAgICAgICAgICAgLmluc2VydChpbnRlcmZhY2VfbmFtZSwgaW50ZXJmYWNlKQog ICAgICAgICAgICAgICAgICAgICAgICAgLmlzX3NvbWUoKQpAQCAtMjAzLDEwICsyMTgsMTEgQEAg cHViIGZuIGJ1aWxkX2ZhYnJpYygKICAgICAgICAgICAgICAgICAgICAgbmV0d29yazogQ2lkcjo6 ZnJvbSgKICAgICAgICAgICAgICAgICAgICAgICAgIGZhYnJpYy5pcF9wcmVmaXgoKS5leHBlY3Qo ImZhYnJpYyBtdXN0IGhhdmUgYSBpcHY0IHByZWZpeCIpLAogICAgICAgICAgICAgICAgICAgICAp LAorICAgICAgICAgICAgICAgICAgICBpc19pcHY2OiBmYWxzZSwKICAgICAgICAgICAgICAgICAg ICAgc2VxOiBOb25lLAogICAgICAgICAgICAgICAgIH07CiAKLSAgICAgICAgICAgICAgICBmcnJf Y29uZmlnLmFjY2Vzc19saXN0cy5wdXNoKEFjY2Vzc0xpc3QgeworICAgICAgICAgICAgICAgIG5l d19vc3BmX2NvbmZpZy5hY2Nlc3NfbGlzdHMucHVzaChBY2Nlc3NMaXN0IHsKICAgICAgICAgICAg ICAgICAgICAgbmFtZTogYWNjZXNzX2xpc3RfbmFtZSwKICAgICAgICAgICAgICAgICAgICAgcnVs ZXM6IHZlYyFbcnVsZV0sCiAgICAgICAgICAgICAgICAgfSk7CkBAIC0yMTgsMjYgKzIzNCwyNiBA QCBwdWIgZm4gYnVpbGRfZmFicmljKAogICAgICAgICAgICAgICAgICk/OwogCiAgICAgICAgICAg ICAgICAgcm91dGVtYXBfc2VxICs9IDEwOwotICAgICAgICAgICAgICAgIGZycl9jb25maWcucm91 dGVtYXBzLnB1c2gocm91dGVtYXApOworICAgICAgICAgICAgICAgIG5ld19vc3BmX2NvbmZpZy5y b3V0ZW1hcHMucHVzaChyb3V0ZW1hcCk7CiAKICAgICAgICAgICAgICAgICBsZXQgcHJvdG9jb2xf cm91dGVtYXAgPSBQcm90b2NvbFJvdXRlTWFwIHsKICAgICAgICAgICAgICAgICAgICAgaXNfaXB2 NjogZmFsc2UsCi0gICAgICAgICAgICAgICAgICAgIHByb3RvY29sOiBQcm90b2NvbFR5cGU6Ok9z cGYsCiAgICAgICAgICAgICAgICAgICAgIHJvdXRlbWFwX25hbWU6IFJvdXRlTWFwTmFtZTo6bmV3 KCJwdmVfb3NwZiIudG9fb3duZWQoKSksCiAgICAgICAgICAgICAgICAgfTsKIAotICAgICAgICAg ICAgICAgIGZycl9jb25maWcucHJvdG9jb2xfcm91dGVtYXBzLmluc2VydChwcm90b2NvbF9yb3V0 ZW1hcCk7CisgICAgICAgICAgICAgICAgbmV3X29zcGZfY29uZmlnLnByb3RvY29sX3JvdXRlbWFw cy5pbnNlcnQocHJvdG9jb2xfcm91dGVtYXApOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAg ICAgfQorICAgIGZycl9jb25maWcub3NwZiA9IG5ld19vc3BmX2NvbmZpZzsKKyAgICBmcnJfY29u ZmlnLm9wZW5mYWJyaWMgPSBuZXdfb3BlbmZhYnJpY19jb25maWc7CiAgICAgT2soKCkpCiB9CiAK IC8vLyBIZWxwZXIgdGhhdCBidWlsZHMgYSBPU1BGIHJvdXRlciB3aXRoIGEgdGhlIHJvdXRlcl9p ZC4KLWZuIGJ1aWxkX29zcGZfcm91dGVyKHJvdXRlcl9pZDogSXB2NEFkZHIpIC0+IFJlc3VsdDwo Um91dGVyTmFtZSwgUm91dGVyKSwgYW55aG93OjpFcnJvcj4gewotICAgIGxldCBvc3BmX3JvdXRl ciA9IHByb3htb3hfZnJyOjpvc3BmOjpPc3BmUm91dGVyIHsgcm91dGVyX2lkIH07Ci0gICAgbGV0 IHJvdXRlcl9pdGVtID0gUm91dGVyOjpPc3BmKG9zcGZfcm91dGVyKTsKLSAgICBsZXQgcm91dGVy X25hbWUgPSBSb3V0ZXJOYW1lOjpPc3BmKHByb3htb3hfZnJyOjpvc3BmOjpPc3BmUm91dGVyTmFt ZSk7CitmbiBidWlsZF9vc3BmX3JvdXRlcihyb3V0ZXJfaWQ6IElwdjRBZGRyKSAtPiBSZXN1bHQ8 KE9zcGZSb3V0ZXJOYW1lLCBPc3BmUm91dGVyKSwgYW55aG93OjpFcnJvcj4geworICAgIGxldCBy b3V0ZXJfaXRlbSA9IHByb3htb3hfZnJyOjpvc3BmOjpPc3BmUm91dGVyIHsgcm91dGVyX2lkIH07 CisgICAgbGV0IHJvdXRlcl9uYW1lID0gcHJveG1veF9mcnI6Om9zcGY6Ok9zcGZSb3V0ZXJOYW1l OwogICAgIE9rKChyb3V0ZXJfbmFtZSwgcm91dGVyX2l0ZW0pKQogfQogCkBAIC0yNDUsMTEgKzI2 MSwxMCBAQCBmbiBidWlsZF9vc3BmX3JvdXRlcihyb3V0ZXJfaWQ6IElwdjRBZGRyKSAtPiBSZXN1 bHQ8KFJvdXRlck5hbWUsIFJvdXRlciksIGFueWhvdwogZm4gYnVpbGRfb3BlbmZhYnJpY19yb3V0 ZXIoCiAgICAgZmFicmljX2lkOiAmRmFicmljSWQsCiAgICAgbmV0OiBOZXQsCi0pIC0+IFJlc3Vs dDwoUm91dGVyTmFtZSwgUm91dGVyKSwgYW55aG93OjpFcnJvcj4gewotICAgIGxldCBvZnIgPSBw cm94bW94X2Zycjo6b3BlbmZhYnJpYzo6T3BlbmZhYnJpY1JvdXRlciB7IG5ldCB9OwotICAgIGxl dCByb3V0ZXJfaXRlbSA9IFJvdXRlcjo6T3BlbmZhYnJpYyhvZnIpOworKSAtPiBSZXN1bHQ8KE9w ZW5mYWJyaWNSb3V0ZXJOYW1lLCBPcGVuZmFicmljUm91dGVyKSwgYW55aG93OjpFcnJvcj4gewor ICAgIGxldCByb3V0ZXJfaXRlbSA9IHByb3htb3hfZnJyOjpvcGVuZmFicmljOjpPcGVuZmFicmlj Um91dGVyIHsgbmV0IH07CiAgICAgbGV0IGZycl93b3JkX2lkID0gRnJyV29yZDo6bmV3KGZhYnJp Y19pZC50b19zdHJpbmcoKSk/OwotICAgIGxldCByb3V0ZXJfbmFtZSA9IFJvdXRlck5hbWU6Ok9w ZW5mYWJyaWMoZnJyX3dvcmRfaWQuaW50bygpKTsKKyAgICBsZXQgcm91dGVyX25hbWUgPSBmcnJf d29yZF9pZC5pbnRvKCk7CiAgICAgT2soKHJvdXRlcl9uYW1lLCByb3V0ZXJfaXRlbSkpCiB9CiAK QEAgLTI1NywxMCArMjcyLDEwIEBAIGZuIGJ1aWxkX29wZW5mYWJyaWNfcm91dGVyKAogZm4gYnVp bGRfb3NwZl9pbnRlcmZhY2UoCiAgICAgYXJlYTogb3NwZjo6QXJlYSwKICAgICBpbnRlcmZhY2U6 ICZPc3BmSW50ZXJmYWNlUHJvcGVydGllcywKLSkgLT4gUmVzdWx0PChJbnRlcmZhY2UsIEludGVy ZmFjZU5hbWUpLCBhbnlob3c6OkVycm9yPiB7CispIC0+IFJlc3VsdDwoSW50ZXJmYWNlPE9zcGZJ bnRlcmZhY2U+LCBJbnRlcmZhY2VOYW1lKSwgYW55aG93OjpFcnJvcj4gewogICAgIGxldCBmcnJf aW50ZXJmYWNlID0gcHJveG1veF9mcnI6Om9zcGY6Ok9zcGZJbnRlcmZhY2UgewogICAgICAgICBh cmVhLAotICAgICAgICAvLyBJbnRlcmZhY2VzIGFyZSBhbHdheXMgbm9uZS1wYXNzaXZlCisgICAg ICAgIC8vIEludGVyZmFjZXMgYXJlIGFsd2F5cyBub24tcGFzc2l2ZQogICAgICAgICBwYXNzaXZl OiBOb25lLAogICAgICAgICBuZXR3b3JrX3R5cGU6IGlmIGludGVyZmFjZS5pcC5pc19zb21lKCkg ewogICAgICAgICAgICAgTm9uZQpAQCAtMjY5LDcgKzI4NCw3IEBAIGZuIGJ1aWxkX29zcGZfaW50 ZXJmYWNlKAogICAgICAgICB9LAogICAgIH07CiAKLSAgICBsZXQgaW50ZXJmYWNlX25hbWUgPSBJ bnRlcmZhY2VOYW1lOjpPc3BmKGludGVyZmFjZS5uYW1lLmFzX3N0cigpLnRyeV9pbnRvKCk/KTsK KyAgICBsZXQgaW50ZXJmYWNlX25hbWUgPSBpbnRlcmZhY2UubmFtZS5hc19zdHIoKS50cnlfaW50 bygpPzsKICAgICBPaygoZnJyX2ludGVyZmFjZS5pbnRvKCksIGludGVyZmFjZV9uYW1lKSkKIH0K IApAQCAtMjc3LDEzICsyOTIsMTIgQEAgZm4gYnVpbGRfb3NwZl9pbnRlcmZhY2UoCiBmbiBidWls ZF9vc3BmX2R1bW15X2ludGVyZmFjZSgKICAgICBmYWJyaWNfaWQ6ICZGYWJyaWNJZCwKICAgICBh cmVhOiBvc3BmOjpBcmVhLAotKSAtPiBSZXN1bHQ8KEludGVyZmFjZSwgSW50ZXJmYWNlTmFtZSks IGFueWhvdzo6RXJyb3I+IHsKLSAgICBsZXQgZnJyX2ludGVyZmFjZSA9IHByb3htb3hfZnJyOjpv c3BmOjpPc3BmSW50ZXJmYWNlIHsKLSAgICAgICAgYXJlYSwKLSAgICAgICAgcGFzc2l2ZTogU29t ZSh0cnVlKSwKLSAgICAgICAgbmV0d29ya190eXBlOiBOb25lLAotICAgIH07Ci0gICAgbGV0IGlu dGVyZmFjZV9uYW1lID0gSW50ZXJmYWNlTmFtZTo6T3BlbmZhYnJpYyhmb3JtYXQhKCJkdW1teV97 fSIsIGZhYnJpY19pZCkudHJ5X2ludG8oKT8pOworKSAtPiBSZXN1bHQ8KEludGVyZmFjZTxPc3Bm SW50ZXJmYWNlPiwgSW50ZXJmYWNlTmFtZSksIGFueWhvdzo6RXJyb3I+IHsKKyAgICBsZXQgZnJy X2ludGVyZmFjZSA9IHByb3htb3hfZnJyOjpvc3BmOjpPc3BmSW50ZXJmYWNlOjpidWlsZGVyKCkK KyAgICAgICAgLmFyZWEoYXJlYSkKKyAgICAgICAgLnBhc3NpdmUodHJ1ZSkKKyAgICAgICAgLmJ1 aWxkKCk7CisgICAgbGV0IGludGVyZmFjZV9uYW1lID0gZm9ybWF0ISgiZHVtbXlfe30iLCBmYWJy aWNfaWQpLnRyeV9pbnRvKCk/OwogICAgIE9rKChmcnJfaW50ZXJmYWNlLmludG8oKSwgaW50ZXJm YWNlX25hbWUpKQogfQogCkBAIC0yOTcsNyArMzExLDcgQEAgZm4gYnVpbGRfb3BlbmZhYnJpY19p bnRlcmZhY2UoCiAgICAgZmFicmljX2NvbmZpZzogJk9wZW5mYWJyaWNQcm9wZXJ0aWVzLAogICAg IGlzX2lwdjQ6IGJvb2wsCiAgICAgaXNfaXB2NjogYm9vbCwKLSkgLT4gUmVzdWx0PChJbnRlcmZh Y2UsIEludGVyZmFjZU5hbWUpLCBhbnlob3c6OkVycm9yPiB7CispIC0+IFJlc3VsdDwoSW50ZXJm YWNlPE9wZW5mYWJyaWNJbnRlcmZhY2U+LCBJbnRlcmZhY2VOYW1lKSwgYW55aG93OjpFcnJvcj4g ewogICAgIGxldCBmcnJfd29yZCA9IEZycldvcmQ6Om5ldyhmYWJyaWNfaWQudG9fc3RyaW5nKCkp PzsKICAgICBsZXQgbXV0IGZycl9pbnRlcmZhY2UgPSBwcm94bW94X2Zycjo6b3BlbmZhYnJpYzo6 T3BlbmZhYnJpY0ludGVyZmFjZSB7CiAgICAgICAgIGZhYnJpY19pZDogZnJyX3dvcmQuaW50bygp LApAQCAtMzE1LDcgKzMyOSw3IEBAIGZuIGJ1aWxkX29wZW5mYWJyaWNfaW50ZXJmYWNlKAogICAg IGlmIGZycl9pbnRlcmZhY2UuaGVsbG9faW50ZXJ2YWwuaXNfbm9uZSgpIHsKICAgICAgICAgZnJy X2ludGVyZmFjZS5oZWxsb19pbnRlcnZhbCA9IGZhYnJpY19jb25maWcuaGVsbG9faW50ZXJ2YWw7 CiAgICAgfQotICAgIGxldCBpbnRlcmZhY2VfbmFtZSA9IEludGVyZmFjZU5hbWU6Ok9wZW5mYWJy aWMoaW50ZXJmYWNlLm5hbWUuYXNfc3RyKCkudHJ5X2ludG8oKT8pOworICAgIGxldCBpbnRlcmZh Y2VfbmFtZSA9IGludGVyZmFjZS5uYW1lLmFzX3N0cigpLnRyeV9pbnRvKCk/OwogICAgIE9rKChm cnJfaW50ZXJmYWNlLmludG8oKSwgaW50ZXJmYWNlX25hbWUpKQogfQogCkBAIC0zMjQsMTggKzMz OCwxNSBAQCBmbiBidWlsZF9vcGVuZmFicmljX2R1bW15X2ludGVyZmFjZSgKICAgICBmYWJyaWNf aWQ6ICZGYWJyaWNJZCwKICAgICBpc19pcHY0OiBib29sLAogICAgIGlzX2lwdjY6IGJvb2wsCi0p IC0+IFJlc3VsdDwoSW50ZXJmYWNlLCBJbnRlcmZhY2VOYW1lKSwgYW55aG93OjpFcnJvcj4gewor KSAtPiBSZXN1bHQ8KEludGVyZmFjZTxPcGVuZmFicmljSW50ZXJmYWNlPiwgSW50ZXJmYWNlTmFt ZSksIGFueWhvdzo6RXJyb3I+IHsKICAgICBsZXQgZnJyX3dvcmQgPSBGcnJXb3JkOjpuZXcoZmFi cmljX2lkLnRvX3N0cmluZygpKT87Ci0gICAgbGV0IGZycl9pbnRlcmZhY2UgPSBwcm94bW94X2Zy cjo6b3BlbmZhYnJpYzo6T3BlbmZhYnJpY0ludGVyZmFjZSB7Ci0gICAgICAgIGZhYnJpY19pZDog ZnJyX3dvcmQuaW50bygpLAotICAgICAgICBoZWxsb19pbnRlcnZhbDogTm9uZSwKLSAgICAgICAg cGFzc2l2ZTogU29tZSh0cnVlKSwKLSAgICAgICAgY3NucF9pbnRlcnZhbDogTm9uZSwKLSAgICAg ICAgaGVsbG9fbXVsdGlwbGllcjogTm9uZSwKLSAgICAgICAgaXNfaXB2NCwKLSAgICAgICAgaXNf aXB2NiwKLSAgICB9OwotICAgIGxldCBpbnRlcmZhY2VfbmFtZSA9IEludGVyZmFjZU5hbWU6Ok9w ZW5mYWJyaWMoZm9ybWF0ISgiZHVtbXlfe30iLCBmYWJyaWNfaWQpLnRyeV9pbnRvKCk/KTsKKyAg ICBsZXQgZnJyX2ludGVyZmFjZSA9IHByb3htb3hfZnJyOjpvcGVuZmFicmljOjpPcGVuZmFicmlj SW50ZXJmYWNlOjpidWlsZGVyKCkKKyAgICAgICAgLmZhYnJpY19pZChmcnJfd29yZC5pbnRvKCkp CisgICAgICAgIC5wYXNzaXZlKHRydWUpCisgICAgICAgIC5pc19pcHY0KGlzX2lwdjQpCisgICAg ICAgIC5pc19pcHY2KGlzX2lwdjYpCisgICAgICAgIC5idWlsZCgpOworICAgIGxldCBpbnRlcmZh Y2VfbmFtZSA9IGZvcm1hdCEoImR1bW15X3t9IiwgZmFicmljX2lkKS50cnlfaW50bygpPzsKICAg ICBPaygoZnJyX2ludGVyZmFjZS5pbnRvKCksIGludGVyZmFjZV9uYW1lKSkKIH0KIApAQCAtMzUw LDE0ICszNjEsMTQgQEAgZm4gYnVpbGRfb3BlbmZhYnJpY19yb3V0ZW1hcChmYWJyaWNfaWQ6ICZG YWJyaWNJZCwgcm91dGVyX2lwOiBJcEFkZHIsIHNlcTogdTMyKQogICAgICAgICBzZXEsCiAgICAg ICAgIGFjdGlvbjogQWNjZXNzQWN0aW9uOjpQZXJtaXQsCiAgICAgICAgIG1hdGNoZXM6IHZlYyFb bWF0Y2ggcm91dGVyX2lwIHsKLSAgICAgICAgICAgIElwQWRkcjo6VjQoXykgPT4gUm91dGVNYXBN YXRjaDo6VjQoUm91dGVNYXBNYXRjaElubmVyOjpJcEFkZHJlc3MoQWNjZXNzTGlzdE5hbWU6Om5l dygKKyAgICAgICAgICAgIElwQWRkcjo6VjQoXykgPT4gUm91dGVNYXBNYXRjaDo6VjQoUm91dGVN YXBNYXRjaElubmVyOjpBZGRyZXNzKEFjY2Vzc0xpc3ROYW1lOjpuZXcoCiAgICAgICAgICAgICAg ICAgZm9ybWF0ISgicHZlX29wZW5mYWJyaWNfe2ZhYnJpY19pZH1faXBzIiksCiAgICAgICAgICAg ICApKSksCi0gICAgICAgICAgICBJcEFkZHI6OlY2KF8pID0+IFJvdXRlTWFwTWF0Y2g6OlY2KFJv dXRlTWFwTWF0Y2hJbm5lcjo6SXBBZGRyZXNzKEFjY2Vzc0xpc3ROYW1lOjpuZXcoCisgICAgICAg ICAgICBJcEFkZHI6OlY2KF8pID0+IFJvdXRlTWFwTWF0Y2g6OlY2KFJvdXRlTWFwTWF0Y2hJbm5l cjo6QWRkcmVzcyhBY2Nlc3NMaXN0TmFtZTo6bmV3KAogICAgICAgICAgICAgICAgIGZvcm1hdCEo InB2ZV9vcGVuZmFicmljX3tmYWJyaWNfaWR9X2lwNnMiKSwKICAgICAgICAgICAgICkpKSwKICAg ICAgICAgfV0sCi0gICAgICAgIHNldHM6IHZlYyFbUm91dGVNYXBTZXQ6OklwU3JjKHJvdXRlcl9p cCldLAorICAgICAgICBzZXRzOiB2ZWMhW1JvdXRlTWFwU2V0OjpTcmMocm91dGVyX2lwKV0sCiAg ICAgfQogfQogCkBAIC0zNzMsMTAgKzM4NCwxMCBAQCBmbiBidWlsZF9vc3BmX2R1bW15X3JvdXRl bWFwKAogICAgICAgICBuYW1lOiByb3V0ZW1hcF9uYW1lLmNsb25lKCksCiAgICAgICAgIHNlcSwK ICAgICAgICAgYWN0aW9uOiBBY2Nlc3NBY3Rpb246OlBlcm1pdCwKLSAgICAgICAgbWF0Y2hlczog dmVjIVtSb3V0ZU1hcE1hdGNoOjpWNChSb3V0ZU1hcE1hdGNoSW5uZXI6OklwQWRkcmVzcygKKyAg ICAgICAgbWF0Y2hlczogdmVjIVtSb3V0ZU1hcE1hdGNoOjpWNChSb3V0ZU1hcE1hdGNoSW5uZXI6 OkFkZHJlc3MoCiAgICAgICAgICAgICBBY2Nlc3NMaXN0TmFtZTo6bmV3KGZvcm1hdCEoInB2ZV9v c3BmX3tmYWJyaWNfaWR9X2lwcyIpKSwKICAgICAgICAgKSldLAotICAgICAgICBzZXRzOiB2ZWMh W1JvdXRlTWFwU2V0OjpJcFNyYyhJcEFkZHI6OmZyb20ocm91dGVyX2lwKSldLAorICAgICAgICBz ZXRzOiB2ZWMhW1JvdXRlTWFwU2V0OjpTcmMoSXBBZGRyOjpmcm9tKHJvdXRlcl9pcCkpXSwKICAg ICB9OwogCiAgICAgT2socm91dGVtYXApCmRpZmYgLS1naXQgYS9wcm94bW94LXZlLWNvbmZpZy9z cmMvc2RuL2Zyci5ycyBiL3Byb3htb3gtdmUtY29uZmlnL3NyYy9zZG4vZnJyLnJzCmluZGV4IGY3 OTI5YzFmNmMxNi4uYmM5ODQ0MGI5OTEyIDEwMDY0NAotLS0gYS9wcm94bW94LXZlLWNvbmZpZy9z cmMvc2RuL2Zyci5ycworKysgYi9wcm94bW94LXZlLWNvbmZpZy9zcmMvc2RuL2Zyci5ycwpAQCAt MSw2ICsxLDQgQEAKLXVzZSBzdGQ6OmNvbGxlY3Rpb25zOjp7QlRyZWVNYXAsIEJUcmVlU2V0fTsK LQotdXNlIHByb3htb3hfZnJyOjpGcnJDb25maWc7Cit1c2UgcHJveG1veF9mcnI6OntGcnJDb25m aWcsIE9wZW5mYWJyaWNGcnJDb25maWcsIE9zcGZGcnJDb25maWd9OwogCiB1c2UgY3JhdGU6OmNv bW1vbjo6dmFsaWQ6OlZhbGlkOwogdXNlIGNyYXRlOjpzZG46OmZhYnJpYzo6e3NlY3Rpb25fY29u ZmlnOjpub2RlOjpOb2RlSWQsIEZhYnJpY0NvbmZpZ307CkBAIC0yOCwxMSArMjYsOCBAQCBpbXBs IEZyckNvbmZpZ0J1aWxkZXIgewogICAgIC8vLyBpbnRlcmZhY2UgaWYgdGhlcmUgaXNuJ3QgYSBt b3JlIHNwZWNpZmljIG9uZS4pCiAgICAgcHViIGZuIGJ1aWxkKHNlbGYsIGN1cnJlbnRfbm9kZTog Tm9kZUlkKSAtPiBSZXN1bHQ8RnJyQ29uZmlnLCBhbnlob3c6OkVycm9yPiB7CiAgICAgICAgIGxl dCBtdXQgZnJyX2NvbmZpZyA9IEZyckNvbmZpZyB7Ci0gICAgICAgICAgICByb3V0ZXI6IEJUcmVl TWFwOjpuZXcoKSwKLSAgICAgICAgICAgIGludGVyZmFjZXM6IEJUcmVlTWFwOjpuZXcoKSwKLSAg ICAgICAgICAgIGFjY2Vzc19saXN0czogVmVjOjpuZXcoKSwKLSAgICAgICAgICAgIHJvdXRlbWFw czogVmVjOjpuZXcoKSwKLSAgICAgICAgICAgIHByb3RvY29sX3JvdXRlbWFwczogQlRyZWVTZXQ6 Om5ldygpLAorICAgICAgICAgICAgb3BlbmZhYnJpYzogT3BlbmZhYnJpY0ZyckNvbmZpZzo6ZGVm YXVsdCgpLAorICAgICAgICAgICAgb3NwZjogT3NwZkZyckNvbmZpZzo6ZGVmYXVsdCgpLAogICAg ICAgICB9OwogCiAgICAgICAgIGNyYXRlOjpzZG46OmZhYnJpYzo6ZnJyOjpidWlsZF9mYWJyaWMo Y3VycmVudF9ub2RlLCBzZWxmLmZhYnJpY3MsICZtdXQgZnJyX2NvbmZpZyk/OwotLSAKMi40Ny4z CgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCnB2ZS1k ZXZlbCBtYWlsaW5nIGxpc3QKcHZlLWRldmVsQGxpc3RzLnByb3htb3guY29tCmh0dHBzOi8vbGlz dHMucHJveG1veC5jb20vY2dpLWJpbi9tYWlsbWFuL2xpc3RpbmZvL3B2ZS1kZXZlbAo=