158690 2016-06-13 05:24:20 -0700 WebRTC: Imlement MediaEndpointPeerConnection::addIceCandidate() 2016-06-14 09:39:44 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143211 1 adam.bergkvist webkit-unassigned commit-queue oldest_to_newest 1201820 0 adam.bergkvist 2016-06-13 05:24:20 -0700 MediaEndpointPeerConnection::addIceCandidate() provides an implementation for RTCPeerConnection.addIceCandidate [1]. [1] https://w3c.github.io/webrtc-pc/archives/20160513/webrtc.html#dom-peerconnection-addicecandidate 1202161 1 281252 adam.bergkvist 2016-06-14 06:38:43 -0700 Created attachment 281252 Proposed patch 1202202 2 281252 adam.bergkvist 2016-06-14 09:17:41 -0700 Comment on attachment 281252 Proposed patch Thanks for reviewing 1202208 3 281252 commit-queue 2016-06-14 09:39:41 -0700 Comment on attachment 281252 Proposed patch Clearing flags on attachment: 281252 Committed r202048: <http://trac.webkit.org/changeset/202048> 1202209 4 commit-queue 2016-06-14 09:39:44 -0700 All reviewed patches have been landed. Closing bug. 281252 2016-06-14 06:38:43 -0700 2016-06-14 09:39:41 -0700 Proposed patch mepc-add-ice-candidate_0.patch text/plain 17892 adam.bergkvist ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlMDBiNjE3Li5mZWQ0Y2ZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTYtMDYt MTQgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgorCisgICAg ICAgIFdlYlJUQzogSW1sZW1lbnQgTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uOjphZGRJY2VD YW5kaWRhdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU4NjkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIHRlc3QgZm9yIFJUQ1BlZXJDb25uZWN0aW9uLmFkZEljZUNhbmRpZGF0ZSgpIHRoYXQg dmVyaWZpZXM6CisgICAgICAgIC0gQ2FuZGlkYXRlIGxpbmUgcGFyc2luZworICAgICAgICAtIFRo YXQgYSB1bmRlcmx5aW5nIG1lZGlhIGRlc2NyaXB0aW9uIGNhbiBiZSBpZGVudGlmaWVkIHVzaW5n IGVpdGhlciBzZHBNaWQgb3Igc2RwTUxpbmVJbmRleAorICAgICAgICAtIFRoYXQgc2RwTWlkIHRh a2VzIHByZWNlZGVuY2Ugb3ZlciBzZHBNTGluZUluZGV4CisKKyAgICAgICAgKiBmYXN0L21lZGlh c3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZEljZUNhbmRpZGF0ZS1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkSWNl Q2FuZGlkYXRlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9UZXN0RXhwZWN0 YXRpb25zOgorICAgICAgICBUaGUgbWFjIHBvcnQgaXMgbm90IGJ1aWxkaW5nIHdpdGggV0VCX1JU QyB5ZXQuCisKIDIwMTYtMDYtMTMgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJp Y3Nzb24uY29tPgogCiAgICAgICAgIFdlYlJUQzogSW1sZW1lbnQgTWVkaWFFbmRwb2ludFBlZXJD b25uZWN0aW9uOjpyZXBsYWNlVHJhY2soKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9t ZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1hZGRJY2VDYW5kaWRhdGUtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1hZGRJY2VD YW5kaWRhdGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmVjYzNjYjcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFt L1JUQ1BlZXJDb25uZWN0aW9uLWFkZEljZUNhbmRpZGF0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSwzNCBAQAorVGVzdCBiZWhhdmlvciBvZiBSVENQZWVyQ29ubmVjdGlvbi5hZGRJY2VDYW5kaWRh dGUKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdl cywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKKworKioqIEEgcmVtb3RlIGRlc2Ny aXB0aW9uIGlzIG5lZWRlZCBiZWZvcmUgYSBjYW5kaWRhdGUgY2FuIGJlIGFkZGVkCitQQVNTIHBj LnJlbW90ZURlc2NyaXB0aW9uIGlzIG51bGwKK1BBU1MgcHJvbWlzZSBwYy5hZGRJY2VDYW5kaWRh dGUobmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiAnZm9vJywgc2RwTWlkOiAwfSkpIHJl amVjdGVkIHdpdGggRXJyb3I6IEludmFsaWRTdGF0ZUVycm9yOiBET00gRXhjZXB0aW9uIDExCitQ QVNTIFJlbW90ZSBkZXNjcmlwdGlvbiBzZXQKKworKioqIERlZmluZSBzZHBNaWQsIGJhZFNkcE1p ZCwgc2RwTUxpbmVJbmRleCBhbmQgYmFkU2RwTUxpbmVJbmRleCBmb3IgdGVzdGluZworUEFTUyBz ZHBNTGluZUluZGV4IGlzIG5vdCBiYWRTZHBNTGluZUluZGV4CitQQVNTIHNkcE1pZCBpcyBub3Qg bnVsbAorUEFTUyBzZHBNaWQgaXMgbm90IGJhZFNkcE1pZAorUEFTUyBwcm9taXNlIHBjLmFkZElj ZUNhbmRpZGF0ZShuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6IHZhbGlkQ2FuZGlkYXRl LCBzZHBNaWQ6IGJhZFNkcE1pZH0pKSByZWplY3RlZCB3aXRoIEVycm9yOiBPcGVyYXRpb25FcnJv cjogRE9NIEV4Y2VwdGlvbiAzNAorUEFTUyBwcm9taXNlIHBjLmFkZEljZUNhbmRpZGF0ZShuZXcg UlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6IHZhbGlkQ2FuZGlkYXRlLCBzZHBNTGluZUluZGV4 OiBiYWRTZHBNTGluZUluZGV4fSkpIHJlamVjdGVkIHdpdGggRXJyb3I6IE9wZXJhdGlvbkVycm9y OiBET00gRXhjZXB0aW9uIDM0CisqKiogQSAoYmFkKSBzZHBNaWQgdGFrZXMgcHJlY2VkZXNjZSBv dmVyIHZhbGlkIHNkcE1MaW5lSW5kZXgKK1BBU1MgcHJvbWlzZSBwYy5hZGRJY2VDYW5kaWRhdGUo bmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiB2YWxpZENhbmRpZGF0ZSwgc2RwTWlkOiBi YWRTZHBNaWQsIHNkcE1MaW5lSW5kZXg6IHNkcE1MaW5lSW5kZXh9KSkgcmVqZWN0ZWQgd2l0aCBF cnJvcjogT3BlcmF0aW9uRXJyb3I6IERPTSBFeGNlcHRpb24gMzQKKyoqKiBUZXN0IGJhZCBjYW5k aWRhdGUgY29udGVudCB3aXRoIHZhbGlkIHNkcE1pZAorUEFTUyBwcm9taXNlIHBjLmFkZEljZUNh bmRpZGF0ZShuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ICdiYWQgY29udGVudCcsIHNk cE1pZDogc2RwTWlkfSkpIHJlamVjdGVkIHdpdGggRXJyb3I6IE9wZXJhdGlvbkVycm9yOiBET00g RXhjZXB0aW9uIDM0CisqKiogVGVzdCBiYWQgY2FuZGlkYXRlIGNvbnRlbnQgd2l0aCB2YWxpZCBz ZHBNTGluZUluZGV4CitQQVNTIHByb21pc2UgcGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VD YW5kaWRhdGUoe2NhbmRpZGF0ZTogJ2JhZCBjb250ZW50Jywgc2RwTUxpbmVJbmRleDogc2RwTUxp bmVJbmRleH0pKSByZWplY3RlZCB3aXRoIEVycm9yOiBPcGVyYXRpb25FcnJvcjogRE9NIEV4Y2Vw dGlvbiAzNAorCisqKiogVGVzdCBzb21lIE9LIGlucHV0CitQQVNTIHByb21pc2UgcGMuYWRkSWNl Q2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUs IHNkcE1pZDogc2RwTWlkfSkpIGZ1bGZpbGxlZCB3aXRoIHVuZGVmaW5lZAorUEFTUyBwcm9taXNl IHBjLmFkZEljZUNhbmRpZGF0ZShuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6IHZhbGlk Q2FuZGlkYXRlLCBzZHBNTGluZUluZGV4OiBzZHBNTGluZUluZGV4fSkpIGZ1bGZpbGxlZCB3aXRo IHVuZGVmaW5lZAorKioqIEEgdmFsaWQgc2RwTWlkIHRha2VzIHByZWNlZGVzY2Ugb3ZlciBhIGJh ZCBzZHBNTGluZUluZGV4CitQQVNTIHByb21pc2UgcGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJ Y2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1pZDogc2RwTWlkLCBz ZHBNTGluZUluZGV4OiBiYWRTZHBNTGluZUluZGV4fSkpIGZ1bGZpbGxlZCB3aXRoIHVuZGVmaW5l ZAorUEFTUyBFbmQgb2YgdGVzdCBwcm9taXNlIGNoYWluCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNl ZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1hZGRJY2VDYW5kaWRhdGUuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkSWNlQ2FuZGlk YXRlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNmJkMDU0MAotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5l Y3Rpb24tYWRkSWNlQ2FuZGlkYXRlLmh0bWwKQEAgLTAsMCArMSwxMDEgQEAKKzwhRE9DVFlQRSBo dG1sPgorCis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jl c291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSJy ZXNvdXJjZXMvcHJvbWlzZS11dGlscy5qcyI+PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxi b2R5PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgbGV0IHN0cmVhbTsKKyAgICAgICAg ICAgIGxldCB0cmFjazsKKworICAgICAgICAgICAgbGV0IHNkcE1MaW5lSW5kZXggPSAwOworICAg ICAgICAgICAgbGV0IGJhZFNkcE1MaW5lSW5kZXg7CisgICAgICAgICAgICBsZXQgc2RwTWlkID0g bnVsbDsKKyAgICAgICAgICAgIGxldCBiYWRTZHBNaWQ7CisgICAgICAgICAgICBjb25zdCB2YWxp ZENhbmRpZGF0ZSA9ICJjYW5kaWRhdGU6MSAxIFVEUCAyMDEzMjY2NDMxIDE3Mi4xNy4wLjEgNDQ0 NzQgdHlwIGhvc3QiOworCisgICAgICAgICAgICBkZXNjcmlwdGlvbigiVGVzdCBiZWhhdmlvciBv ZiBSVENQZWVyQ29ubmVjdGlvbi5hZGRJY2VDYW5kaWRhdGUiKTsKKworICAgICAgICAgICAgaWYg KHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1l ZGlhUGVybWlzc2lvbih0cnVlKTsKKyAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAg IGRlYnVnKCJUaGlzIHRlc3QgY2FuIG5vdCBiZSBydW4gd2l0aG91dCB0aGUgdGVzdFJ1bm5lciIp OworICAgICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgfQorCisgICAg ICAgICAgICBjb25zdCBwYyA9IG5ldyB3ZWJraXRSVENQZWVyQ29ubmVjdGlvbih7aWNlU2VydmVy czpbe3VybHM6J3N0dW46Zm9vLmNvbSd9XX0pOworICAgICAgICAgICAgY29uc3QgcmVtb3RlUGMg PSBuZXcgd2Via2l0UlRDUGVlckNvbm5lY3Rpb24oe2ljZVNlcnZlcnM6W3t1cmxzOidzdHVuOmZv by5jb20nfV19KTsKKworICAgICAgICAgICAgZGVidWcoIjxicj4qKiogQSByZW1vdGUgZGVzY3Jp cHRpb24gaXMgbmVlZGVkIGJlZm9yZSBhIGNhbmRpZGF0ZSBjYW4gYmUgYWRkZWQiKTsKKyAgICAg ICAgICAgIHNob3VsZEJlKCJwYy5yZW1vdGVEZXNjcmlwdGlvbiIsICJudWxsIik7CisgICAgICAg ICAgICBwcm9taXNlU2hvdWxkUmVqZWN0KCJwYy5hZGRJY2VDYW5kaWRhdGUobmV3IFJUQ0ljZUNh bmRpZGF0ZSh7Y2FuZGlkYXRlOiAnZm9vJywgc2RwTWlkOiAwfSkpIikudGhlbihmdW5jdGlvbiAo KSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNl ck1lZGlhKHsgImF1ZGlvIjogdHJ1ZSwgInZpZGVvIjogdHJ1ZSB9KTsKKyAgICAgICAgICAgIH0p CisgICAgICAgICAgICAudGhlbihmdW5jdGlvbiAocykgeworICAgICAgICAgICAgICAgIHN0cmVh bSA9IHM7CisgICAgICAgICAgICAgICAgdHJhY2sgPSBzdHJlYW0uZ2V0VHJhY2tzKClbMF07CisK KyAgICAgICAgICAgICAgICByZW1vdGVQYy5hZGRUcmFjayh0cmFjaywgc3RyZWFtKTsKKyAgICAg ICAgICAgICAgICByZXR1cm4gcmVtb3RlUGMuY3JlYXRlT2ZmZXIoKTsKKyAgICAgICAgICAgIH0p CisgICAgICAgICAgICAudGhlbihmdW5jdGlvbiAocmVtb3RlT2ZmZXIpIHsKKyAgICAgICAgICAg ICAgICByZXR1cm4gcGMuc2V0UmVtb3RlRGVzY3JpcHRpb24ocmVtb3RlT2ZmZXIpOworICAgICAg ICAgICAgfSkKKyAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgICAg ICB0ZXN0UGFzc2VkKCJSZW1vdGUgZGVzY3JpcHRpb24gc2V0Iik7CisKKyAgICAgICAgICAgICAg ICBkZWJ1ZygiPGJyPioqKiBEZWZpbmUgc2RwTWlkLCBiYWRTZHBNaWQsIHNkcE1MaW5lSW5kZXgg YW5kIGJhZFNkcE1MaW5lSW5kZXggZm9yIHRlc3RpbmciKTsKKyAgICAgICAgICAgICAgICBiYWRT ZHBNTGluZUluZGV4ID0gc2RwTUxpbmVJbmRleCArIHBjLmdldFRyYW5zY2VpdmVycygpLmxlbmd0 aCArIDEwOworICAgICAgICAgICAgICAgIHNob3VsZE5vdEJlKCJzZHBNTGluZUluZGV4IiwgImJh ZFNkcE1MaW5lSW5kZXgiKTsKKworICAgICAgICAgICAgICAgIHNkcE1pZCA9IHBjLmdldFRyYW5z Y2VpdmVycygpWzBdLm1pZDsKKyAgICAgICAgICAgICAgICBzaG91bGROb3RCZSgic2RwTWlkIiwg Im51bGwiKTsKKyAgICAgICAgICAgICAgICBiYWRTZHBNaWQgPSBzZHBNaWQgKyAiX2ZvbyI7Cisg ICAgICAgICAgICAgICAgc2hvdWxkTm90QmUoInNkcE1pZCIsICJiYWRTZHBNaWQiKTsKKworICAg ICAgICAgICAgICAgIHJldHVybiBwcm9taXNlU2hvdWxkUmVqZWN0KCJwYy5hZGRJY2VDYW5kaWRh dGUobmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiB2YWxpZENhbmRpZGF0ZSwgc2RwTWlk OiBiYWRTZHBNaWR9KSkiKTsKKyAgICAgICAgICAgIH0pCisgICAgICAgICAgICAudGhlbihmdW5j dGlvbiAoKSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIHByb21pc2VTaG91bGRSZWplY3QoInBj LmFkZEljZUNhbmRpZGF0ZShuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6IHZhbGlkQ2Fu ZGlkYXRlLCBzZHBNTGluZUluZGV4OiBiYWRTZHBNTGluZUluZGV4fSkpIik7CisgICAgICAgICAg ICB9KQorICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgICAgIGRl YnVnKCIqKiogQSAoYmFkKSBzZHBNaWQgdGFrZXMgcHJlY2VkZXNjZSBvdmVyIHZhbGlkIHNkcE1M aW5lSW5kZXgiKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcHJvbWlzZVNob3VsZFJlamVjdCgi cGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRD YW5kaWRhdGUsIHNkcE1pZDogYmFkU2RwTWlkLCBzZHBNTGluZUluZGV4OiBzZHBNTGluZUluZGV4 fSkpIik7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24gKCkgewor ICAgICAgICAgICAgICAgIGRlYnVnKCIqKiogVGVzdCBiYWQgY2FuZGlkYXRlIGNvbnRlbnQgd2l0 aCB2YWxpZCBzZHBNaWQiKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcHJvbWlzZVNob3VsZFJl amVjdCgicGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTog J2JhZCBjb250ZW50Jywgc2RwTWlkOiBzZHBNaWR9KSkiKTsKKyAgICAgICAgICAgIH0pCisgICAg ICAgICAgICAudGhlbihmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICAgICAgZGVidWcoIioqKiBU ZXN0IGJhZCBjYW5kaWRhdGUgY29udGVudCB3aXRoIHZhbGlkIHNkcE1MaW5lSW5kZXgiKTsKKyAg ICAgICAgICAgICAgICByZXR1cm4gcHJvbWlzZVNob3VsZFJlamVjdCgicGMuYWRkSWNlQ2FuZGlk YXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogJ2JhZCBjb250ZW50Jywgc2RwTUxp bmVJbmRleDogc2RwTUxpbmVJbmRleH0pKSIpOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAg IC50aGVuKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgICAgICBkZWJ1ZygiPGJyPioqKiBUZXN0 IHNvbWUgT0sgaW5wdXQiKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcHJvbWlzZVNob3VsZFJl c29sdmUoInBjLmFkZEljZUNhbmRpZGF0ZShuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6 IHZhbGlkQ2FuZGlkYXRlLCBzZHBNaWQ6IHNkcE1pZH0pKSIpOworICAgICAgICAgICAgfSkKKyAg ICAgICAgICAgIC50aGVuKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gcHJv bWlzZVNob3VsZFJlc29sdmUoInBjLmFkZEljZUNhbmRpZGF0ZShuZXcgUlRDSWNlQ2FuZGlkYXRl KHtjYW5kaWRhdGU6IHZhbGlkQ2FuZGlkYXRlLCBzZHBNTGluZUluZGV4OiBzZHBNTGluZUluZGV4 fSkpIik7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24gKCkgewor ICAgICAgICAgICAgICAgIGRlYnVnKCIqKiogQSB2YWxpZCBzZHBNaWQgdGFrZXMgcHJlY2VkZXNj ZSBvdmVyIGEgYmFkIHNkcE1MaW5lSW5kZXgiKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcHJv bWlzZVNob3VsZFJlc29sdmUoInBjLmFkZEljZUNhbmRpZGF0ZShuZXcgUlRDSWNlQ2FuZGlkYXRl KHtjYW5kaWRhdGU6IHZhbGlkQ2FuZGlkYXRlLCBzZHBNaWQ6IHNkcE1pZCwgc2RwTUxpbmVJbmRl eDogYmFkU2RwTUxpbmVJbmRleH0pKSIpOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC50 aGVuKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAgICAgICB0ZXN0UGFzc2VkKCJFbmQgb2YgdGVz dCBwcm9taXNlIGNoYWluIik7CisgICAgICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAg ICAgICAgICB9KQorICAgICAgICAgICAgLmNhdGNoKGZ1bmN0aW9uIChlcnJvcikgeworICAgICAg ICAgICAgICAgIHRlc3RGYWlsZWQoIkVycm9yIGluIHByb21pc2UgY2hhaW46ICIgKyBlcnJvcik7 CisgICAgICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgICAgICB9KTsKKworICAg ICAgICAgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworICAgICAgICAgICAgd2luZG93 LnN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CisKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgICAg IDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K KyAgICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0 YXRpb25zCmluZGV4IDRlOGMzZGQuLjI5NzVlZTEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTc1LDYgKzE3NSw3IEBAIGZhc3QvbWVkaWFzdHJlYW0v UlRDUGVlckNvbm5lY3Rpb24taGF2ZS1sb2NhbC1wcmFuc3dlci5odG1sCiBmYXN0L21lZGlhc3Ry ZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWhhdmUtcmVtb3RlLW9mZmVyLmh0bWwKIGZhc3QvbWVkaWFz dHJlYW0vUlRDUGVlckNvbm5lY3Rpb24taGF2ZS1yZW1vdGUtcHJhbnN3ZXIuaHRtbAogZmFzdC9t ZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1pY2UuaHRtbAorZmFzdC9tZWRpYXN0cmVhbS9S VENQZWVyQ29ubmVjdGlvbi1hZGRJY2VDYW5kaWRhdGUuaHRtbAogZmFzdC9tZWRpYXN0cmVhbS9S VENQZWVyQ29ubmVjdGlvbi1sb2NhbERlc2NyaXB0aW9uLmh0bWwKIGZhc3QvbWVkaWFzdHJlYW0v UlRDUGVlckNvbm5lY3Rpb24tb25uZWdvdGlhdGlvbm5lZWRlZC5odG1sCiBmYXN0L21lZGlhc3Ry ZWFtL1JUQ1BlZXJDb25uZWN0aW9uLXJlbW90ZURlc2NyaXB0aW9uLmh0bWwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCBkZjMyY2E5Li44M2UwYmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTYtMDYt MTQgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgorCisgICAg ICAgIFdlYlJUQzogSW1sZW1lbnQgTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uOjphZGRJY2VD YW5kaWRhdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU4NjkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW1wbGVtZW50IE1lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbjo6YWRkSWNlQ2FuZGlkYXRl KCkgdGhhdCBpcyB0aGUgTWVkaWFFbmRwb2ludAorICAgICAgICBpbXBsZW1lbnRhdGlvbiBvZiBS VENQZWVyQ29ubmVjdGlvbi5hZGRJY2VDYW5kaWRhdGUoKSBbMV0uCisKKyAgICAgICAgWzFdIGh0 dHBzOi8vdzNjLmdpdGh1Yi5pby93ZWJydGMtcGMvYXJjaGl2ZXMvMjAxNjA1MTMvd2VicnRjLmh0 bWwjZG9tLXBlZXJjb25uZWN0aW9uLWFkZGljZWNhbmRpZGF0ZQorCisgICAgICAgIFRlc3Q6IGZh c3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkSWNlQ2FuZGlkYXRlLmh0bWwKKwor ICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbjo6YWRk SWNlQ2FuZGlkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhRW5kcG9pbnRQZWVyQ29ubmVj dGlvbjo6YWRkSWNlQ2FuZGlkYXRlVGFzayk6CisgICAgICAgIEltcGxlbWVudGVkLgorICAgICAg ICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmg6Cisg ICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludC5oOgorICAgICAgICBV c2UgbWlkIGluc3RlYWQgb2YgbWRlc2NJbmRleCB0byBpZGVudGlmeSB0aGUgdGFyZ2V0IG1lZGlh IGRlc2NyaXB0aW9uIGluIHRoZSBiYWNrZW5kLgorICAgICAgICAqIHBsYXRmb3JtL21vY2svTW9j a01lZGlhRW5kcG9pbnQuY3BwOgorICAgICAgICBVcGRhdGUgbW9jayBtZXRob2Qgc2lnbmF0dXJl IGFjY29yZGluZ2x5LgorICAgICAgICAoV2ViQ29yZTo6TW9ja01lZGlhRW5kcG9pbnQ6OmFkZFJl bW90ZUNhbmRpZGF0ZSk6CisgICAgICAgICogcGxhdGZvcm0vbW9jay9Nb2NrTWVkaWFFbmRwb2lu dC5oOgorCiAyMDE2LTA2LTEzICBBZGFtIEJlcmdrdmlzdCAgPGFkYW0uYmVyZ2t2aXN0QGVyaWNz c29uLmNvbT4KIAogICAgICAgICBXZWJSVEM6IEltbGVtZW50IE1lZGlhRW5kcG9pbnRQZWVyQ29u bmVjdGlvbjo6cmVwbGFjZVRyYWNrKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNw cAppbmRleCBiOGNhNDhkLi45ZWUwZjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL01lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYUVuZHBvaW50UGVlckNvbm5lY3Rp b24uY3BwCkBAIC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSAiTWVkaWFTdHJlYW0uaCIKICNpbmNs dWRlICJNZWRpYVN0cmVhbVRyYWNrLmgiCiAjaW5jbHVkZSAiUGVlck1lZGlhRGVzY3JpcHRpb24u aCIKKyNpbmNsdWRlICJSVENJY2VDYW5kaWRhdGUuaCIKICNpbmNsdWRlICJSVENPZmZlckFuc3dl ck9wdGlvbnMuaCIKICNpbmNsdWRlICJSVENSdHBUcmFuc2NlaXZlci5oIgogI2luY2x1ZGUgIlJU Q1RyYWNrRXZlbnQuaCIKQEAgLTU5OSwxMSArNjAwLDY3IEBAIHZvaWQgTWVkaWFFbmRwb2ludFBl ZXJDb25uZWN0aW9uOjpzZXRDb25maWd1cmF0aW9uKFJUQ0NvbmZpZ3VyYXRpb24mIGNvbmZpZ3Vy YXRpCiAKIHZvaWQgTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uOjphZGRJY2VDYW5kaWRhdGUo UlRDSWNlQ2FuZGlkYXRlJiBydGNDYW5kaWRhdGUsIFBlZXJDb25uZWN0aW9uOjpWb2lkUHJvbWlz ZSYmIHByb21pc2UpCiB7Ci0gICAgVU5VU0VEX1BBUkFNKHJ0Y0NhbmRpZGF0ZSk7CisgICAgcnVu VGFzayhbdGhpcywgcHJvdGVjdGVkQ2FuZGlkYXRlID0gUmVmUHRyPFJUQ0ljZUNhbmRpZGF0ZT4o JnJ0Y0NhbmRpZGF0ZSksIHByb3RlY3RlZFByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXSgpIG11 dGFibGUgeworICAgICAgICBhZGRJY2VDYW5kaWRhdGVUYXNrKCpwcm90ZWN0ZWRDYW5kaWRhdGUs IHByb3RlY3RlZFByb21pc2UpOworICAgIH0pOworfQogCi0gICAgbm90SW1wbGVtZW50ZWQoKTsK K3ZvaWQgTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uOjphZGRJY2VDYW5kaWRhdGVUYXNrKFJU Q0ljZUNhbmRpZGF0ZSYgcnRjQ2FuZGlkYXRlLCBQZWVyQ29ubmVjdGlvbjo6Vm9pZFByb21pc2Um IHByb21pc2UpCit7CisgICAgaWYgKG1fY2xpZW50LT5pbnRlcm5hbFNpZ25hbGluZ1N0YXRlKCkg PT0gU2lnbmFsaW5nU3RhdGU6OkNsb3NlZCkKKyAgICAgICAgcmV0dXJuOwogCi0gICAgcHJvbWlz ZS5yZWplY3QoTk9UX1NVUFBPUlRFRF9FUlIpOworICAgIGlmICghaW50ZXJuYWxSZW1vdGVEZXNj cmlwdGlvbigpKSB7CisgICAgICAgIHByb21pc2UucmVqZWN0KElOVkFMSURfU1RBVEVfRVJSLCAi Tm8gcmVtb3RlIGRlc2NyaXB0aW9uIHNldCIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisg ICAgY29uc3QgTWVkaWFEZXNjcmlwdGlvblZlY3RvciYgcmVtb3RlTWVkaWFEZXNjcmlwdGlvbnMg PSBpbnRlcm5hbFJlbW90ZURlc2NyaXB0aW9uKCktPmNvbmZpZ3VyYXRpb24oKS0+bWVkaWFEZXNj cmlwdGlvbnMoKTsKKyAgICBQZWVyTWVkaWFEZXNjcmlwdGlvbiogdGFyZ2V0TWVkaWFEZXNjcmlw dGlvbiA9IG51bGxwdHI7CisKKyAgICAvLyBXaGVuIGlkZW50aWZ5aW5nIHRoZSB0YXJnZXQgbWVk aWEgZGVzY3JpcHRpb24sIHNkcE1pZCB0YWtlcyBwcmVjZWRlbmNlIG92ZXIgc2RwTUxpbmVJbmRl eAorICAgIC8vIGlmIGJvdGggYXJlIHByZXNlbnQuCisgICAgaWYgKCFydGNDYW5kaWRhdGUuc2Rw TWlkKCkuaXNOdWxsKCkpIHsKKyAgICAgICAgY29uc3QgU3RyaW5nJiBtaWQgPSBydGNDYW5kaWRh dGUuc2RwTWlkKCk7CisgICAgICAgIGZvciAoYXV0byYgZGVzY3JpcHRpb24gOiByZW1vdGVNZWRp YURlc2NyaXB0aW9ucykgeworICAgICAgICAgICAgaWYgKGRlc2NyaXB0aW9uLT5taWQoKSA9PSBt aWQpIHsKKyAgICAgICAgICAgICAgICB0YXJnZXRNZWRpYURlc2NyaXB0aW9uID0gZGVzY3JpcHRp b24uZ2V0KCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAg IH0KKworICAgICAgICBpZiAoIXRhcmdldE1lZGlhRGVzY3JpcHRpb24pIHsKKyAgICAgICAgICAg IHByb21pc2UucmVqZWN0KE9wZXJhdGlvbkVycm9yLCAic2RwTWlkIGRpZCBub3QgbWF0Y2ggYW55 IG1lZGlhIGRlc2NyaXB0aW9uIik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICB9IGVsc2UgaWYgKHJ0Y0NhbmRpZGF0ZS5zZHBNTGluZUluZGV4KCkpIHsKKyAgICAgICAgdW5z aWduZWQgc2hvcnQgc2RwTUxpbmVJbmRleCA9IHJ0Y0NhbmRpZGF0ZS5zZHBNTGluZUluZGV4KCku dmFsdWUoKTsKKyAgICAgICAgaWYgKHNkcE1MaW5lSW5kZXggPj0gcmVtb3RlTWVkaWFEZXNjcmlw dGlvbnMuc2l6ZSgpKSB7CisgICAgICAgICAgICBwcm9taXNlLnJlamVjdChPcGVyYXRpb25FcnJv ciwgInNkcE1MaW5lSW5kZXggaXMgb3V0IG9mIHJhbmdlIik7CisgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIH0KKyAgICAgICAgdGFyZ2V0TWVkaWFEZXNjcmlwdGlvbiA9IHJlbW90ZU1lZGlh RGVzY3JpcHRpb25zW3NkcE1MaW5lSW5kZXhdLmdldCgpOworICAgIH0gZWxzZSB7CisgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgUmVm UHRyPEljZUNhbmRpZGF0ZT4gY2FuZGlkYXRlOworICAgIFNEUFByb2Nlc3Nvcjo6UmVzdWx0IHJl c3VsdCA9IG1fc2RwUHJvY2Vzc29yLT5wYXJzZUNhbmRpZGF0ZUxpbmUocnRjQ2FuZGlkYXRlLmNh bmRpZGF0ZSgpLCBjYW5kaWRhdGUpOworICAgIGlmIChyZXN1bHQgIT0gU0RQUHJvY2Vzc29yOjpS ZXN1bHQ6OlN1Y2Nlc3MpIHsKKyAgICAgICAgaWYgKHJlc3VsdCA9PSBTRFBQcm9jZXNzb3I6OlJl c3VsdDo6UGFyc2VFcnJvcikKKyAgICAgICAgICAgIHByb21pc2UucmVqZWN0KE9wZXJhdGlvbkVy cm9yLCAiSW52YWxpZCBjYW5kaWRhdGUgY29udGVudCIpOworICAgICAgICBlbHNlCisgICAgICAg ICAgICBMT0dfRVJST1IoIlNEUFByb2Nlc3NvciBpbnRlcm5hbCBlcnJvciIpOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgdGFyZ2V0TWVkaWFEZXNjcmlwdGlvbi0+YWRkSWNlQ2FuZGlk YXRlKGNhbmRpZGF0ZS5jb3B5UmVmKCkpOworCisgICAgbV9tZWRpYUVuZHBvaW50LT5hZGRSZW1v dGVDYW5kaWRhdGUoKmNhbmRpZGF0ZSwgdGFyZ2V0TWVkaWFEZXNjcmlwdGlvbi0+bWlkKCksIHRh cmdldE1lZGlhRGVzY3JpcHRpb24tPmljZVVmcmFnKCksCisgICAgICAgIHRhcmdldE1lZGlhRGVz Y3JpcHRpb24tPmljZVBhc3N3b3JkKCkpOworCisgICAgcHJvbWlzZS5yZXNvbHZlKG51bGxwdHIp OwogfQogCiB2b2lkIE1lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbjo6Z2V0U3RhdHMoTWVkaWFT dHJlYW1UcmFjayosIFBlZXJDb25uZWN0aW9uOjpTdGF0c1Byb21pc2UmJiBwcm9taXNlKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYUVuZHBvaW50 UGVlckNvbm5lY3Rpb24uaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVk aWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmgKaW5kZXggZGYxZTlkMi4uY2Y3NmI1ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYUVuZHBvaW50UGVl ckNvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01l ZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbi5oCkBAIC05Miw2ICs5Miw4IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZXRMb2NhbERlc2NyaXB0aW9uVGFzayhSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0 aW9uPiYmLCBQZWVyQ29ubmVjdGlvbjo6Vm9pZFByb21pc2UmKTsKICAgICB2b2lkIHNldFJlbW90 ZURlc2NyaXB0aW9uVGFzayhSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiYmLCBQZWVyQ29u bmVjdGlvbjo6Vm9pZFByb21pc2UmKTsKIAorICAgIHZvaWQgYWRkSWNlQ2FuZGlkYXRlVGFzayhS VENJY2VDYW5kaWRhdGUmLCBQZWVyQ29ubmVjdGlvbjo6Vm9pZFByb21pc2UmKTsKKwogICAgIHZv aWQgcmVwbGFjZVRyYWNrVGFzayhSVENSdHBTZW5kZXImLCBjb25zdCBTdHJpbmcmIG1pZCwgUmVm UHRyPE1lZGlhU3RyZWFtVHJhY2s+JiYsIFBlZXJDb25uZWN0aW9uOjpWb2lkUHJvbWlzZSYpOwog CiAgICAgYm9vbCBsb2NhbERlc2NyaXB0aW9uVHlwZVZhbGlkRm9yU3RhdGUoUlRDU2Vzc2lvbkRl c2NyaXB0aW9uOjpTZHBUeXBlKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL01lZGlhRW5kcG9pbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL01lZGlhRW5kcG9pbnQuaAppbmRleCAzZGJmMDBhLi42ZDJkNjFiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYUVuZHBv aW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFFbmRw b2ludC5oCkBAIC04MCw3ICs4MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFVwZGF0ZVJlc3Vs dCB1cGRhdGVSZWNlaXZlQ29uZmlndXJhdGlvbihNZWRpYUVuZHBvaW50U2Vzc2lvbkNvbmZpZ3Vy YXRpb24qLCBib29sIGlzSW5pdGlhdG9yKSA9IDA7CiAgICAgdmlydHVhbCBVcGRhdGVSZXN1bHQg dXBkYXRlU2VuZENvbmZpZ3VyYXRpb24oTWVkaWFFbmRwb2ludFNlc3Npb25Db25maWd1cmF0aW9u KiwgY29uc3QgUmVhbHRpbWVNZWRpYVNvdXJjZU1hcCYsIGJvb2wgaXNJbml0aWF0b3IpID0gMDsK IAotICAgIHZpcnR1YWwgdm9pZCBhZGRSZW1vdGVDYW5kaWRhdGUoSWNlQ2FuZGlkYXRlJiwgdW5z aWduZWQgbWRlc2NJbmRleCwgY29uc3QgU3RyaW5nJiB1ZnJhZywgY29uc3QgU3RyaW5nJiBwYXNz d29yZCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBhZGRSZW1vdGVDYW5kaWRhdGUoSWNlQ2FuZGlk YXRlJiwgY29uc3QgU3RyaW5nJiBtaWQsIGNvbnN0IFN0cmluZyYgdWZyYWcsIGNvbnN0IFN0cmlu ZyYgcGFzc3dvcmQpID0gMDsKIAogICAgIHZpcnR1YWwgUmVmPFJlYWx0aW1lTWVkaWFTb3VyY2U+ IGNyZWF0ZU11dGVkUmVtb3RlU291cmNlKGNvbnN0IFN0cmluZyYgbWlkLCBSZWFsdGltZU1lZGlh U291cmNlOjpUeXBlKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHJlcGxhY2VTZW5kU291cmNlKFJl YWx0aW1lTWVkaWFTb3VyY2UmLCBjb25zdCBTdHJpbmcmIG1pZCkgPSAwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9Nb2NrTWVkaWFFbmRwb2ludC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tNZWRpYUVuZHBvaW50LmNwcAppbmRleCA4OWU4 NGJhLi4xNzc2NTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01v Y2tNZWRpYUVuZHBvaW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01v Y2tNZWRpYUVuZHBvaW50LmNwcApAQCAtMTczLDEwICsxNzMsMTAgQEAgTWVkaWFFbmRwb2ludDo6 VXBkYXRlUmVzdWx0IE1vY2tNZWRpYUVuZHBvaW50Ojp1cGRhdGVTZW5kQ29uZmlndXJhdGlvbihN ZWRpYUVuZHAKICAgICByZXR1cm4gVXBkYXRlUmVzdWx0OjpTdWNjZXNzOwogfQogCi12b2lkIE1v Y2tNZWRpYUVuZHBvaW50OjphZGRSZW1vdGVDYW5kaWRhdGUoSWNlQ2FuZGlkYXRlJiBjYW5kaWRh dGUsIHVuc2lnbmVkIG1kZXNjSW5kZXgsIGNvbnN0IFN0cmluZyYgdWZyYWcsIGNvbnN0IFN0cmlu ZyYgcGFzc3dvcmQpCit2b2lkIE1vY2tNZWRpYUVuZHBvaW50OjphZGRSZW1vdGVDYW5kaWRhdGUo SWNlQ2FuZGlkYXRlJiBjYW5kaWRhdGUsIGNvbnN0IFN0cmluZyYgbWlkLCBjb25zdCBTdHJpbmcm IHVmcmFnLCBjb25zdCBTdHJpbmcmIHBhc3N3b3JkKQogewogICAgIFVOVVNFRF9QQVJBTShjYW5k aWRhdGUpOwotICAgIFVOVVNFRF9QQVJBTShtZGVzY0luZGV4KTsKKyAgICBVTlVTRURfUEFSQU0o bWlkKTsKICAgICBVTlVTRURfUEFSQU0odWZyYWcpOwogICAgIFVOVVNFRF9QQVJBTShwYXNzd29y ZCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tNZWRp YUVuZHBvaW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tNZWRpYUVuZHBv aW50LmgKaW5kZXggYTFiOGU5ZS4uYTE1ZGIzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbW9jay9Nb2NrTWVkaWFFbmRwb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21vY2svTW9ja01lZGlhRW5kcG9pbnQuaApAQCAtNTQsNyArNTQsNyBAQCBwdWJsaWM6 CiAgICAgVXBkYXRlUmVzdWx0IHVwZGF0ZVJlY2VpdmVDb25maWd1cmF0aW9uKE1lZGlhRW5kcG9p bnRTZXNzaW9uQ29uZmlndXJhdGlvbiosIGJvb2wgaXNJbml0aWF0b3IpIG92ZXJyaWRlOwogICAg IFVwZGF0ZVJlc3VsdCB1cGRhdGVTZW5kQ29uZmlndXJhdGlvbihNZWRpYUVuZHBvaW50U2Vzc2lv bkNvbmZpZ3VyYXRpb24qLCBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlTWFwJiwgYm9vbCBpc0lu aXRpYXRvcikgb3ZlcnJpZGU7CiAKLSAgICB2b2lkIGFkZFJlbW90ZUNhbmRpZGF0ZShJY2VDYW5k aWRhdGUmLCB1bnNpZ25lZCBtZGVzY0luZGV4LCBjb25zdCBTdHJpbmcmIHVmcmFnLCBjb25zdCBT dHJpbmcmIHBhc3N3b3JkKSBvdmVycmlkZTsKKyAgICB2b2lkIGFkZFJlbW90ZUNhbmRpZGF0ZShJ Y2VDYW5kaWRhdGUmLCBjb25zdCBTdHJpbmcmIG1pZCwgY29uc3QgU3RyaW5nJiB1ZnJhZywgY29u c3QgU3RyaW5nJiBwYXNzd29yZCkgb3ZlcnJpZGU7CiAKICAgICBSZWY8UmVhbHRpbWVNZWRpYVNv dXJjZT4gY3JlYXRlTXV0ZWRSZW1vdGVTb3VyY2UoY29uc3QgU3RyaW5nJiBtaWQsIFJlYWx0aW1l TWVkaWFTb3VyY2U6OlR5cGUpIG92ZXJyaWRlOwogICAgIHZvaWQgcmVwbGFjZVNlbmRTb3VyY2Uo UmVhbHRpbWVNZWRpYVNvdXJjZSYsIGNvbnN0IFN0cmluZyYgbWlkKSBvdmVycmlkZTsK