189477 2018-09-10 11:47:43 -0700 ontrack events should be fired even if an existing transceiver exists 2018-09-10 15:48:44 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1458169 0 youennf 2018-09-10 11:47:43 -0700 ontrack events should be fired even if an existing transceiver exists 1458173 1 349320 youennf 2018-09-10 12:00:08 -0700 Created attachment 349320 Patch 1458274 2 349320 commit-queue 2018-09-10 15:47:16 -0700 Comment on attachment 349320 Patch Clearing flags on attachment: 349320 Committed r235869: <https://trac.webkit.org/changeset/235869> 1458275 3 commit-queue 2018-09-10 15:47:18 -0700 All reviewed patches have been landed. Closing bug. 1458277 4 webkit-bug-importer 2018-09-10 15:48:44 -0700 <rdar://problem/44320894> 349320 2018-09-10 12:00:08 -0700 2018-09-10 15:47:16 -0700 Patch bug-189477-20180910120007.patch text/plain 11781 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGQyMTBlZjE5MTBjMDNk MDkxZWJiZDc4MTg5MWM4YzNlMjUxMmYzMS4uODNkOTRlMWViZDBjZWY4MzE5NTQyMjlhMjdkZWMy OTYxZjMxYWViMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA5LTEwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBvbnRyYWNrIGV2ZW50cyBz aG91bGQgYmUgZmlyZWQgZXZlbiBpZiBhbiBleGlzdGluZyB0cmFuc2NlaXZlciBleGlzdHMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTQ3NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNhc2Ugb2Yg YW4gT25UcmFjayBjYWxsYmFjayBmcm9tIGxpYndlYnJ0YywgbWFrZSBzdXJlIHRoZSBvbnRyYWNr IGV2ZW50IGlzIGNhbGxlZCBldmVuIGlmIGEgdHJhbnNjZWl2ZXIgYWxyZWFkeSBleGlzdHMgZm9y IHRoYXQgdHJhY2suCisKKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVkIHZpZGVvLWFkZFRyYW5z Y2VpdmVyLmh0bWwKKyAgICAgICAgTmV3IHRlc3QgdmlkZW8tYWRkTGVnYWN5VHJhbnNjZWl2ZXIu aHRtbCBrZWVwcyB0ZXN0aW5nIHRoZSBvbGQgdHJhbnNjZWl2ZXIgYmVoYXZpb3IuCisgICAgICAg IFRlc3Q6IHdlYnJ0Yy92aWRlby1hZGRMZWdhY3lUcmFuc2NlaXZlci5odG1sCisKKyAgICAgICAg KiBNb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6Om5ld1RyYW5zY2Vp dmVyKToKKwogMjAxOC0wOS0xMCAgQWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gRml4IG92ZXJmbG93IGluIGJ1ZmZlcmVkIHJhbmdl cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJy dGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAppbmRleCAwMWI0 YWEyZGM1OTVmY2MxZGZlMTZlOTk4ZTNjOTYwYTQ4NTFhMGQ3Li4zZTA3YWY1NzUzYTYzZGY0M2E1 M2E2ZTk4ODYyN2Y4YmUxNTUzNTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRp YUVuZHBvaW50LmNwcApAQCAtNDI3LDcgKzQyNyw5IEBAIHZvaWQgTGliV2ViUlRDTWVkaWFFbmRw b2ludDo6bmV3VHJhbnNjZWl2ZXIocnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6UnRwVHJhbnNj CiAgICAgICAgIHJldHVybiBydGNUcmFuc2NlaXZlci5nZXQoKSA9PSB0cmFuc2NlaXZlckJhY2tl bmQucnRjVHJhbnNjZWl2ZXIoKTsKICAgICB9KTsKICAgICBpZiAodHJhbnNjZWl2ZXIpIHsKLSAg ICAgICAgc2V0RXhpc3RpbmdSZWNlaXZlclNvdXJjZVRyYWNrKHRyYW5zY2VpdmVyLT5yZWNlaXZl cigpLnRyYWNrKCkuc291cmNlKCksICpydGNUcmFuc2NlaXZlci0+cmVjZWl2ZXIoKSk7CisgICAg ICAgIGF1dG8gcnRjUmVjZWl2ZXIgPSBydGNUcmFuc2NlaXZlci0+cmVjZWl2ZXIoKTsKKyAgICAg ICAgc2V0RXhpc3RpbmdSZWNlaXZlclNvdXJjZVRyYWNrKHRyYW5zY2VpdmVyLT5yZWNlaXZlcigp LnRyYWNrKCkuc291cmNlKCksICpydGNSZWNlaXZlcik7CisgICAgICAgIGZpcmVUcmFja0V2ZW50 KG1ha2VSZWYodHJhbnNjZWl2ZXItPnJlY2VpdmVyKCkpLCB0cmFuc2NlaXZlci0+cmVjZWl2ZXIo KS50cmFjaygpLCBydGNSZWNlaXZlci0+c3RyZWFtcygpLCBtYWtlUmVmKCp0cmFuc2NlaXZlcikp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjA4YzNkNjQ1YmZiNTFlZDk4MWQy NGJmNjhhZDBhNGFjN2NiNWYxZC4uZjI3ZmJkYjE4OWRjZTFkMzBiNmZlNzkxNDczOTM5NThkZTdm Y2JkYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE4LTA5LTEwICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBvbnRyYWNrIGV2ZW50cyBzaG91bGQgYmUgZmly ZWQgZXZlbiBpZiBhbiBleGlzdGluZyB0cmFuc2NlaXZlciBleGlzdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTQ3NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2VicnRjL3ZpZGVvLWFkZExlZ2Fj eVRyYW5zY2VpdmVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogd2VicnRjL3ZpZGVv LWFkZExlZ2FjeVRyYW5zY2VpdmVyLmh0bWw6IENvcGllZCBmcm9tIExheW91dFRlc3RzL3dlYnJ0 Yy92aWRlby1hZGRUcmFuc2NlaXZlci5odG1sLgorICAgICAgICAqIHdlYnJ0Yy92aWRlby1hZGRU cmFuc2NlaXZlci5odG1sOgorCiAyMDE4LTA5LTEwICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luZG93c10gTGF5b3V0IFRlc3Qgd2ViYW5pbWF0aW9u cy9hY2NlbGVyYXRlZC10cmFuc2l0aW9uLWludGVycnVwdGVkLW9uLWNvbXBvc2l0ZWQtZWxlbWVu dC5odG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1h ZGRMZWdhY3lUcmFuc2NlaXZlci1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlk ZW8tYWRkTGVnYWN5VHJhbnNjZWl2ZXItZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjg3OTBlNmI4 YjQxMDRkYTIyNjAyODYyOTA3NzZkNDMzMDc4OGQ4YzYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy93ZWJydGMvdmlkZW8tYWRkTGVnYWN5VHJhbnNjZWl2ZXItZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsNiBAQAorCisKK1BBU1MgU2V0dGluZyB1cCBjYWxscyB3aXRoIGFkZFRyYW5zY2Vp dmVyIGJ1dCB3aXRoIG5vIHRyYWNrIAorUEFTUyBTZXR0aW5nIHVwIGNhbGxzIHdpdGggYWRkVHJh bnNjZWl2ZXIgd2l0aCBhIHRyYWNrIAorUEFTUyBCYXNpYyB2aWRlbyBleGNoYW5nZSBzZXQgdXAg d2l0aCBhZGRUcmFuc2NlaXZlciAKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3Zp ZGVvLWFkZExlZ2FjeVRyYW5zY2VpdmVyLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8t YWRkTGVnYWN5VHJhbnNjZWl2ZXIuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zY2E3NTRjNmU2OTJmODQ2ODkw OWJkODg4ZWM4ODM2YTNlYzRhMzg4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvd2Vi cnRjL3ZpZGVvLWFkZExlZ2FjeVRyYW5zY2VpdmVyLmh0bWwKQEAgLTAsMCArMSwxMDEgQEAKKzwh ZG9jdHlwZSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxtZXRhIGNoYXJzZXQ9 InV0Zi04Ij4KKyAgICAgICAgPHRpdGxlPlRlc3RpbmcgYmFzaWMgdmlkZW8gZXhjaGFuZ2UgZnJv bSBvZmZlcmVyIHRvIHJlY2VpdmVyPC90aXRsZT4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uL3Jl c291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIu Li9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorICAgIDwvaGVhZD4K KyAgICA8Ym9keT4KKyAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbyIgYXV0b3BsYXk9IiI+PC92aWRl bz4KKyAgICAgICAgPGNhbnZhcyBpZD0iY2FudmFzIiB3aWR0aD0iNjQwIiBoZWlnaHQ9IjQ4MCI+ PC9jYW52YXM+CisgICAgICAgIDxzY3JpcHQgc3JjID0icm91dGluZXMuanMiPjwvc2NyaXB0Pgor ICAgICAgICA8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIu c2V0V2ViUlRDVW5pZmllZFBsYW5FbmFibGVkKGZhbHNlKTsKKworcHJvbWlzZV90ZXN0KCh0ZXN0 KSA9PiB7CisgICAgdmFyIHBjID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CisgICAgcGMuYWRk VHJhbnNjZWl2ZXIoInZpZGVvIik7CisKKyAgICByZXR1cm4gcGMuY3JlYXRlT2ZmZXIoKS50aGVu KChvZmZlcikgPT4geworICAgICAgICBhc3NlcnRfdHJ1ZShvZmZlci5zZHAuaW5kZXhPZigibWlk OnZpZGVvIikgIT09IC0xKTsKKyAgICAgICAgYXNzZXJ0X3RydWUob2ZmZXIuc2RwLmluZGV4T2Yo ImE9cmVjdm9ubHkiKSAhPT0gLTEpOworCisgICAgICAgIHBjLmFkZFRyYW5zY2VpdmVyKCJhdWRp byIpOworICAgICAgICByZXR1cm4gcGMuY3JlYXRlT2ZmZXIoKTsKKyAgICB9KS50aGVuKChvZmZl cikgPT4geworICAgICAgICBhc3NlcnRfdHJ1ZShvZmZlci5zZHAuaW5kZXhPZigibWlkOmF1ZGlv IikgIT09IC0xKTsKKyAgICB9KTsKK30sICJTZXR0aW5nIHVwIGNhbGxzIHdpdGggYWRkVHJhbnNj ZWl2ZXIgYnV0IHdpdGggbm8gdHJhY2siKTsKKworcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7Cisg ICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLnNldFVzZXJNZWRp YVBlcm1pc3Npb24odHJ1ZSk7CisKKyAgICByZXR1cm4gbmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5n ZXRVc2VyTWVkaWEoeyB2aWRlbzogdHJ1ZSB9KS50aGVuKChzdHJlYW0pID0+IHsKKyAgICAgICAg dmFyIHBjID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CisgICAgICAgIHBjLmFkZFRyYW5zY2Vp dmVyKCJ2aWRlbyIpOworICAgICAgICBwYy5nZXRTZW5kZXJzKClbMF0ucmVwbGFjZVRyYWNrKHN0 cmVhbS5nZXRWaWRlb1RyYWNrcygpWzBdKTsKKworICAgICAgICByZXR1cm4gcGMuY3JlYXRlT2Zm ZXIoKS50aGVuKChvZmZlcikgPT4geworICAgICAgICAgICAgYXNzZXJ0X3RydWUob2ZmZXIuc2Rw LmluZGV4T2YoIm1pZDp2aWRlbyIpICE9PSAtMSk7CisgICAgICAgICAgICAvLyBSZXBsYWNpbmcg dGhlIHRyYWNrIGlzIG5vdCBkb25lIHlldCBzbyB3ZSBzdGlsbCBzZXQgaXQgYXMgYSByZWN2b25s eS4KKyAgICAgICAgICAgIGFzc2VydF90cnVlKG9mZmVyLnNkcC5pbmRleE9mKCJhPXJlY3Zvbmx5 IikgIT09IC0xKTsKKyAgICAgICAgfSk7CisgICAgfSk7Cit9LCAiU2V0dGluZyB1cCBjYWxscyB3 aXRoIGFkZFRyYW5zY2VpdmVyIHdpdGggYSB0cmFjayIpOworCitmdW5jdGlvbiB0ZXN0SW1hZ2Uo KQoreworICAgIGNhbnZhcy53aWR0aCA9IHZpZGVvLnZpZGVvV2lkdGg7CisgICAgY2FudmFzLmhl aWdodCA9IHZpZGVvLnZpZGVvSGVpZ2h0OworICAgIGNhbnZhcy5nZXRDb250ZXh0KCcyZCcpLmRy YXdJbWFnZSh2aWRlbywgMCwgMCwgY2FudmFzLndpZHRoLCBjYW52YXMuaGVpZ2h0KTsKKworICAg IGltYWdlRGF0YSA9IGNhbnZhcy5nZXRDb250ZXh0KCcyZCcpLmdldEltYWdlRGF0YSgxMCwgMzI1 LCAyNTAsIDEpOworICAgIGRhdGEgPSBpbWFnZURhdGEuZGF0YTsKKworICAgIHZhciBpbmRleCA9 IDIwOworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXhdIDwgMTAwKTsKKyAgICBhc3NlcnRfdHJ1 ZShkYXRhW2luZGV4ICsgMV0gPCAxMDApOworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXggKyAy XSA8IDEwMCk7CisKKyAgICBpbmRleCA9IDgwOworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXhd ID4gMjAwKTsKKyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4ICsgMV0gPiAyMDApOworICAgIGFz c2VydF90cnVlKGRhdGFbaW5kZXggKyAyXSA+IDIwMCk7CisKKyAgICBpbmRleCArPSA4MDsKKyAg ICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4XSA+IDIwMCk7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtp bmRleCArIDFdID4gMjAwKTsKKyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4ICsgMl0gPCAxMDAp OworfQorCitwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKKyAgICBpZiAod2luZG93LnRlc3RSdW5u ZXIpCisgICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1lZGlhUGVybWlzc2lvbih0cnVlKTsKKwor ICAgIHJldHVybiBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IHZpZGVvOiB0 cnVlfSkudGhlbigoc3RyZWFtKSA9PiB7CisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVz b2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICBjcmVhdGVDb25uZWN0aW9ucygoZmlyc3RD b25uZWN0aW9uKSA9PiB7CisgICAgICAgICAgICAgICAgdmFyIHRyYWNrID0gc3RyZWFtLmdldFZp ZGVvVHJhY2tzKClbMF07CisgICAgICAgICAgICAgICAgZmlyc3RDb25uZWN0aW9uLmFkZFRyYW5z Y2VpdmVyKCJ2aWRlbyIpOworICAgICAgICAgICAgICAgIHJldHVybiBmaXJzdENvbm5lY3Rpb24u Z2V0U2VuZGVycygpWzBdLnJlcGxhY2VUcmFjayhzdHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXSk7 CisgICAgICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikgPT4geworICAgICAgICAgICAgICAg IHNlY29uZENvbm5lY3Rpb24ub250cmFjayA9ICh0cmFja0V2ZW50KSA9PiB7CisgICAgICAgICAg ICAgICAgICAgIHJlc29sdmUodHJhY2tFdmVudC5zdHJlYW1zWzBdKTsKKyAgICAgICAgICAgICAg ICB9OworICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHJlamVj dCgiVGVzdCB0aW1lZCBvdXQiKSwgNTAwMCk7CisgICAgICAgIH0pOworICAgIH0pLnRoZW4oKHN0 cmVhbSkgPT4geworICAgICAgICB2aWRlby5zcmNPYmplY3QgPSBzdHJlYW07CisgICAgICAgIHJl dHVybiB2aWRlby5wbGF5KCk7CisgICAgfSkudGhlbigoKSA9PiB7CisgICAgICAgIHRlc3RJbWFn ZSgpOworICAgIH0pOworfSwgIkJhc2ljIHZpZGVvIGV4Y2hhbmdlIHNldCB1cCB3aXRoIGFkZFRy YW5zY2VpdmVyIik7CisKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWFkZFRyYW5zY2VpdmVyLmh0bWwg Yi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYWRkVHJhbnNjZWl2ZXIuaHRtbAppbmRleCAzY2E3 NTRjNmU2OTJmODQ2ODkwOWJkODg4ZWM4ODM2YTNlYzRhMzg4Li40MmM3Yzk5M2VlNjI0ZjJjZTIz ZGJmZjA5Njk1YTRlZTU0YTY2NTBlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJydGMvdmlk ZW8tYWRkVHJhbnNjZWl2ZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYWRk VHJhbnNjZWl2ZXIuaHRtbApAQCAtMTEsMzkgKzExLDMyIEBACiAgICAgICAgIDxjYW52YXMgaWQ9 ImNhbnZhcyIgd2lkdGg9IjY0MCIgaGVpZ2h0PSI0ODAiPjwvY2FudmFzPgogICAgICAgICA8c2Ny aXB0IHNyYyA9InJvdXRpbmVzLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KLWlmICh3 aW5kb3cudGVzdFJ1bm5lcikKLSAgICB0ZXN0UnVubmVyLnNldFdlYlJUQ1VuaWZpZWRQbGFuRW5h YmxlZChmYWxzZSk7Ci0KLXByb21pc2VfdGVzdCgodGVzdCkgPT4geworcHJvbWlzZV90ZXN0KGFz eW5jICh0ZXN0KSA9PiB7CiAgICAgdmFyIHBjID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CiAg ICAgcGMuYWRkVHJhbnNjZWl2ZXIoInZpZGVvIik7CiAKLSAgICByZXR1cm4gcGMuY3JlYXRlT2Zm ZXIoKS50aGVuKChvZmZlcikgPT4gewotICAgICAgICBhc3NlcnRfdHJ1ZShvZmZlci5zZHAuaW5k ZXhPZigibWlkOnZpZGVvIikgIT09IC0xKTsKLSAgICAgICAgYXNzZXJ0X3RydWUob2ZmZXIuc2Rw LmluZGV4T2YoImE9cmVjdm9ubHkiKSAhPT0gLTEpOworICAgIGxldCBvZmZlciA9IGF3YWl0IHBj LmNyZWF0ZU9mZmVyKCk7CisgICAgYXNzZXJ0X3RydWUob2ZmZXIuc2RwLmluZGV4T2YoIm09dmlk ZW8iKSAhPT0gLTEsICJtaWQiKTsKKyAgICBhc3NlcnRfdHJ1ZShvZmZlci5zZHAuaW5kZXhPZigi YT1zZW5kcmVjdiIpICE9PSAtMSwgInJlY3Zvbmx5Iik7CiAKLSAgICAgICAgcGMuYWRkVHJhbnNj ZWl2ZXIoImF1ZGlvIik7Ci0gICAgICAgIHJldHVybiBwYy5jcmVhdGVPZmZlcigpOwotICAgIH0p LnRoZW4oKG9mZmVyKSA9PiB7Ci0gICAgICAgIGFzc2VydF90cnVlKG9mZmVyLnNkcC5pbmRleE9m KCJtaWQ6YXVkaW8iKSAhPT0gLTEpOwotICAgIH0pOworICAgIHBjLmFkZFRyYW5zY2VpdmVyKCJh dWRpbyIpOworICAgIG9mZmVyID0gYXdhaXQgcGMuY3JlYXRlT2ZmZXIoKTsKKyAgICBhc3NlcnRf dHJ1ZShvZmZlci5zZHAuaW5kZXhPZigibT1hdWRpbyIpICE9PSAtMSwgIm09YXVkaW8iKTsKIH0s ICJTZXR0aW5nIHVwIGNhbGxzIHdpdGggYWRkVHJhbnNjZWl2ZXIgYnV0IHdpdGggbm8gdHJhY2si KTsKIAotcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7Citwcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3Qp ID0+IHsKICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCiAgICAgICAgIHRlc3RSdW5uZXIuc2V0 VXNlck1lZGlhUGVybWlzc2lvbih0cnVlKTsKIAotICAgIHJldHVybiBuYXZpZ2F0b3IubWVkaWFE ZXZpY2VzLmdldFVzZXJNZWRpYSh7IHZpZGVvOiB0cnVlIH0pLnRoZW4oKHN0cmVhbSkgPT4gewot ICAgICAgICB2YXIgcGMgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKLSAgICAgICAgcGMuYWRk VHJhbnNjZWl2ZXIoInZpZGVvIik7Ci0gICAgICAgIHBjLmdldFNlbmRlcnMoKVswXS5yZXBsYWNl VHJhY2soc3RyZWFtLmdldFZpZGVvVHJhY2tzKClbMF0pOworICAgIGNvbnN0IHN0cmVhbSA9IGF3 YWl0IG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsgdmlkZW86IHRydWUgfSk7 CisgICAgdmFyIHBjID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CisgICAgcGMuYWRkVHJhbnNj ZWl2ZXIoInZpZGVvIiwge2RpcmVjdGlvbjoicmVjdm9ubHkifSk7CisgICAgcGMuZ2V0U2VuZGVy cygpWzBdLnJlcGxhY2VUcmFjayhzdHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXSk7CiAKLSAgICAg ICAgcmV0dXJuIHBjLmNyZWF0ZU9mZmVyKCkudGhlbigob2ZmZXIpID0+IHsKLSAgICAgICAgICAg IGFzc2VydF90cnVlKG9mZmVyLnNkcC5pbmRleE9mKCJtaWQ6dmlkZW8iKSAhPT0gLTEpOwotICAg ICAgICAgICAgLy8gUmVwbGFjaW5nIHRoZSB0cmFjayBpcyBub3QgZG9uZSB5ZXQgc28gd2Ugc3Rp bGwgc2V0IGl0IGFzIGEgcmVjdm9ubHkuCi0gICAgICAgICAgICBhc3NlcnRfdHJ1ZShvZmZlci5z ZHAuaW5kZXhPZigiYT1yZWN2b25seSIpICE9PSAtMSk7Ci0gICAgICAgIH0pOwotICAgIH0pOwor ICAgIGNvbnN0IG9mZmVyID0gYXdhaXQgcGMuY3JlYXRlT2ZmZXIoKTsKKyAgICBhc3NlcnRfdHJ1 ZShvZmZlci5zZHAuaW5kZXhPZigibT12aWRlbyIpICE9PSAtMSwgIm09dmlkZW8iKTsKKyAgICAv LyBSZXBsYWNpbmcgdGhlIHRyYWNrIGlzIG5vdCBkb25lIHlldCBzbyB3ZSBzdGlsbCBzZXQgaXQg YXMgYSByZWN2b25seS4KKyAgICBhc3NlcnRfdHJ1ZShvZmZlci5zZHAuaW5kZXhPZigiYT1yZWN2 b25seSIpICE9PSAtMSwgImE9cmVjdm9ubHkiKTsKIH0sICJTZXR0aW5nIHVwIGNhbGxzIHdpdGgg YWRkVHJhbnNjZWl2ZXIgd2l0aCBhIHRyYWNrIik7CiAKIGZ1bmN0aW9uIHRlc3RJbWFnZSgpCkBA IC03MSwyOSArNjQsMjcgQEAgZnVuY3Rpb24gdGVzdEltYWdlKCkKICAgICBhc3NlcnRfdHJ1ZShk YXRhW2luZGV4ICsgMl0gPCAxMDApOwogfQogCi1wcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKK3By b21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4gewogICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikK ICAgICAgICAgdGVzdFJ1bm5lci5zZXRVc2VyTWVkaWFQZXJtaXNzaW9uKHRydWUpOwogCi0gICAg cmV0dXJuIG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsgdmlkZW86IHRydWV9 KS50aGVuKChzdHJlYW0pID0+IHsKLSAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZl LCByZWplY3QpID0+IHsKLSAgICAgICAgICAgIGNyZWF0ZUNvbm5lY3Rpb25zKChmaXJzdENvbm5l Y3Rpb24pID0+IHsKLSAgICAgICAgICAgICAgICB2YXIgdHJhY2sgPSBzdHJlYW0uZ2V0VmlkZW9U cmFja3MoKVswXTsKLSAgICAgICAgICAgICAgICBmaXJzdENvbm5lY3Rpb24uYWRkVHJhbnNjZWl2 ZXIoInZpZGVvIik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIGZpcnN0Q29ubmVjdGlvbi5nZXRT ZW5kZXJzKClbMF0ucmVwbGFjZVRyYWNrKHN0cmVhbS5nZXRWaWRlb1RyYWNrcygpWzBdKTsKLSAg ICAgICAgICAgIH0sIChzZWNvbmRDb25uZWN0aW9uKSA9PiB7Ci0gICAgICAgICAgICAgICAgc2Vj b25kQ29ubmVjdGlvbi5vbnRyYWNrID0gKHRyYWNrRXZlbnQpID0+IHsKLSAgICAgICAgICAgICAg ICAgICAgcmVzb2x2ZSh0cmFja0V2ZW50LnN0cmVhbXNbMF0pOwotICAgICAgICAgICAgICAgIH07 Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4gcmVqZWN0KCJU ZXN0IHRpbWVkIG91dCIpLCA1MDAwKTsKKyAgICBjb25zdCBzdHJlYW0gPSBhd2FpdCBuYXZpZ2F0 b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IHZpZGVvOiB0cnVlfSk7CisgICAgY29uc3Qg dHJhY2sgPSBhd2FpdCBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAg IGNyZWF0ZUNvbm5lY3Rpb25zKChmaXJzdENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgIHZh ciB0cmFjayA9IHN0cmVhbS5nZXRWaWRlb1RyYWNrcygpWzBdOworICAgICAgICAgICAgZmlyc3RD b25uZWN0aW9uLmFkZFRyYW5zY2VpdmVyKCJ2aWRlbyIpOworICAgICAgICAgICAgcmV0dXJuIGZp cnN0Q29ubmVjdGlvbi5nZXRTZW5kZXJzKClbMF0ucmVwbGFjZVRyYWNrKHN0cmVhbS5nZXRWaWRl b1RyYWNrcygpWzBdKTsKKyAgICAgICAgfSwgKHNlY29uZENvbm5lY3Rpb24pID0+IHsKKyAgICAg ICAgICAgIHNlY29uZENvbm5lY3Rpb24uYWRkVHJhbnNjZWl2ZXIoInZpZGVvIik7CisgICAgICAg ICAgICBzZWNvbmRDb25uZWN0aW9uLm9udHJhY2sgPSAodHJhY2tFdmVudCkgPT4geworICAgICAg ICAgICAgICAgIHJlc29sdmUodHJhY2tFdmVudC50cmFjayk7CisgICAgICAgICAgICB9OwogICAg ICAgICB9KTsKLSAgICB9KS50aGVuKChzdHJlYW0pID0+IHsKLSAgICAgICAgdmlkZW8uc3JjT2Jq ZWN0ID0gc3RyZWFtOwotICAgICAgICByZXR1cm4gdmlkZW8ucGxheSgpOwotICAgIH0pLnRoZW4o KCkgPT4gewotICAgICAgICB0ZXN0SW1hZ2UoKTsKKyAgICAgICAgc2V0VGltZW91dCgoKSA9PiBy ZWplY3QoIlRlc3QgdGltZWQgb3V0IiksIDUwMDApOwogICAgIH0pOworICAgIHZpZGVvLnNyY09i amVjdCA9IG5ldyBNZWRpYVN0cmVhbShbdHJhY2tdKTsKKyAgICBhd2FpdCB2aWRlby5wbGF5KCk7 CisgICAgdGVzdEltYWdlKCk7CiB9LCAiQmFzaWMgdmlkZW8gZXhjaGFuZ2Ugc2V0IHVwIHdpdGgg YWRkVHJhbnNjZWl2ZXIiKTsKIAogICAgICAgICA8L3NjcmlwdD4K