169216 2017-03-06 14:12:58 -0800 Expose WebRTC current/pending description getters 2017-03-07 11:24:24 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=169282 P2 Normal --- 1 youennf youennf achristensen alex clopez commit-queue eric.carlson oldest_to_newest 1283944 0 youennf 2017-03-06 14:12:58 -0800 Following on bug 168234, we should tie current/pending description getters to libwebrtc 1284309 1 303654 youennf 2017-03-07 08:19:06 -0800 Created attachment 303654 Patch 1284315 2 303654 achristensen 2017-03-07 08:27:11 -0800 Comment on attachment 303654 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303654&action=review > LayoutTests/webrtc/descriptionGetters-expected.txt:2 > +PASS description getters when changing description from video to video & data channel I think we should print the description in the results so we can see what the description looks like and so we can see if we accidentally change the description format or something. 1284325 3 youennf 2017-03-07 08:35:09 -0800 The description will change all the time. We could print out a sanitized SDP though. We could also reuse the SDP parser from WebCore and add directly in the tests some SDP field checks. 1284329 4 youennf 2017-03-07 08:42:17 -0800 The SDP parser is at Source/WebCore/Modules/mediastream/sdp.js It is a good idea to add some libwebrtc-specifc tests that will check more deeply the different parameters. I'll add some in LayoutTests/webrtc/libwebrtc 1284353 5 303654 commit-queue 2017-03-07 09:15:10 -0800 Comment on attachment 303654 Patch Clearing flags on attachment: 303654 Committed r213520: <http://trac.webkit.org/changeset/213520> 1284354 6 commit-queue 2017-03-07 09:15:13 -0800 All reviewed patches have been landed. Closing bug. 1284405 7 clopez 2017-03-07 10:46:38 -0800 The test webrtc/descriptionGetters.html added on r213520 it is failing on GTK+ (We use OpenWebRTC instead of libwebrtc), and it seems this test is created to match the behaviour of the the current implementation based on libwebrtc. On GTK+ we are skipping all tests under webrtc/libwebrtc. So if when you add a test for something that depends on libwebrtc, and you add it under webrtc/libwebrtc, then on the GTK+ port we won't run into new unexpected failures. So.. do you think its a good idea if we move this test from webrtc/descriptionGetters.html to webrtc/libwebrtc/descriptionGetters.html ? 1284408 8 youennf 2017-03-07 10:51:47 -0800 (In reply to comment #7) > The test webrtc/descriptionGetters.html added on r213520 it is failing on > GTK+ (We use OpenWebRTC instead of libwebrtc), and it seems this test is > created to match the behaviour of the the current implementation based on > libwebrtc. Ah right, it might be better to put it in libwebrtc for now. At the end of the day, we want that very same test, but matching the spec, and working with both libwebrtc and OpenWebRTC :) > So.. do you think its a good idea if we move this test from > webrtc/descriptionGetters.html to webrtc/libwebrtc/descriptionGetters.html ? yep 1284427 9 clopez 2017-03-07 11:06:58 -0800 (In reply to comment #8) > (In reply to comment #7) > > The test webrtc/descriptionGetters.html added on r213520 it is failing on > > GTK+ (We use OpenWebRTC instead of libwebrtc), and it seems this test is > > created to match the behaviour of the the current implementation based on > > libwebrtc. > > Ah right, it might be better to put it in libwebrtc for now. > At the end of the day, we want that very same test, but matching the spec, > and working with both libwebrtc and OpenWebRTC :) > Yes :) > > So.. do you think its a good idea if we move this test from > > webrtc/descriptionGetters.html to webrtc/libwebrtc/descriptionGetters.html ? > > yep Ok.. I will move it now. Thanks! 1284431 10 clopez 2017-03-07 11:16:20 -0800 Committed r213526: <http://trac.webkit.org/changeset/213526> 1284437 11 youennf 2017-03-07 11:24:24 -0800 Thanks! 303654 2017-03-07 08:19:06 -0800 2017-03-07 09:15:10 -0800 Patch bug-169216-20170307081905.patch text/plain 12040 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJhN2Q5NjZhMzIxMWZj OTliNmRmMDllNjM1YzU1N2Y1N2JlNjU5Mi4uYzI0Mjc0N2MwMWE1YWM1YjNhMDIwOWY5NDcxZmY2 MGRkYWJlYTMyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTAzLTA2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBFeHBvc2UgV2ViUlRDIGN1 cnJlbnQvcGVuZGluZyBkZXNjcmlwdGlvbiBnZXR0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkyMTYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiB3ZWJydGMvZGVzY3JpcHRpb25HZXR0ZXJz Lmh0bWwKKworICAgICAgICBJbXBsZW1lbnQgcGVuZGluZyBhbmQgY3VycmVudCBkZXNjcmlwdGlv biBnZXR0ZXJzIHRocm91Z2ggbGlid2VicnRjLgorICAgICAgICBUaGVzZSBnZXR0ZXJzIGRvIG5v dCB5ZXQgbWF0Y2ggdGhlIHNwZWMgYXMgY2FuIGJlIHNlZW4gZnJvbSB0aGUgdGVzdCwgd2hpY2gg aXMgd3JpdHRlbiB0byBtYXRjaCB0aGUgaW1wbGVtZW50ZWQgYmVoYXZpb3IuCisKKyAgICAgICAg KiBNb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJh Y2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNr ZW5kOjpjdXJyZW50TG9jYWxEZXNjcmlwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJS VENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmN1cnJlbnRSZW1vdGVEZXNjcmlwdGlvbik6CisgICAg ICAgIChXZWJDb3JlOjpMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnBlbmRpbmdMb2Nh bERlc2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ1BlZXJDb25uZWN0aW9u QmFja2VuZDo6cGVuZGluZ1JlbW90ZURlc2NyaXB0aW9uKToKKyAgICAgICAgKiBNb2R1bGVzL21l ZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuaDoKKwog MjAxNy0wMy0wNiAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbY3NzLWdyaWRdIFN0cmV0Y2ggc2hvdWxkIGdyb3cgYW5kIHNocmluayBpdGVtcyB0 byBmaXQgaXRzIGdyaWQgYXJlYQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBv aW50LmNwcAppbmRleCBhNmZjNTM1NjhmY2IwOGM2MTY5MTljOTA2Y2I5NTNlNTU3ZGE1MGUxLi4z YmRmMmFiNGJiMWY0MDc2ZmMzMDg4M2ZkM2FlZDE0NWMwMmM0ZGI4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVu ZHBvaW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndl YnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcApAQCAtMTAxLDkgKzEwMSwyOSBAQCBzdGF0 aWMgaW5saW5lIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IGZyb21TZXNzaW9uRGVzY3Jp cHRpb24oY29uc3Qgd2VicnRjOgogICAgIHJldHVybiBSVENTZXNzaW9uRGVzY3JpcHRpb246OmNy ZWF0ZShmcm9tU2Vzc2lvbkRlc2NyaXB0aW9uVHlwZSgqZGVzY3JpcHRpb24pLCBXVEZNb3ZlKHNk cFN0cmluZykpOwogfQogCisvLyBGSVhNRTogV2UgbWlnaHQgd2FudCB0byBjcmVhdGUgYSBuZXcg b2JqZWN0IG9ubHkgaWYgdGhlIHNlc3Npb24gYWN0dWFsbHkgY2hhbmdlZCBmb3IgYWxsIGRlc2Ny aXB0aW9uIGdldHRlcnMuCitSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBMaWJXZWJSVENN ZWRpYUVuZHBvaW50OjpjdXJyZW50TG9jYWxEZXNjcmlwdGlvbigpIGNvbnN0Cit7CisgICAgcmV0 dXJuIGZyb21TZXNzaW9uRGVzY3JpcHRpb24obV9iYWNrZW5kLT5jdXJyZW50X2xvY2FsX2Rlc2Ny aXB0aW9uKCkpOworfQorCitSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBMaWJXZWJSVENN ZWRpYUVuZHBvaW50OjpjdXJyZW50UmVtb3RlRGVzY3JpcHRpb24oKSBjb25zdAoreworICAgIHJl dHVybiBmcm9tU2Vzc2lvbkRlc2NyaXB0aW9uKG1fYmFja2VuZC0+Y3VycmVudF9yZW1vdGVfZGVz Y3JpcHRpb24oKSk7Cit9CisKK1JlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IExpYldlYlJU Q01lZGlhRW5kcG9pbnQ6OnBlbmRpbmdMb2NhbERlc2NyaXB0aW9uKCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gZnJvbVNlc3Npb25EZXNjcmlwdGlvbihtX2JhY2tlbmQtPnBlbmRpbmdfbG9jYWxfZGVz Y3JpcHRpb24oKSk7Cit9CisKK1JlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IExpYldlYlJU Q01lZGlhRW5kcG9pbnQ6OnBlbmRpbmdSZW1vdGVEZXNjcmlwdGlvbigpIGNvbnN0Cit7CisgICAg cmV0dXJuIGZyb21TZXNzaW9uRGVzY3JpcHRpb24obV9iYWNrZW5kLT5wZW5kaW5nX3JlbW90ZV9k ZXNjcmlwdGlvbigpKTsKK30KKwogUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gTGliV2Vi UlRDTWVkaWFFbmRwb2ludDo6bG9jYWxEZXNjcmlwdGlvbigpIGNvbnN0CiB7Ci0gICAgLy8gRklY TUU6IFdlIG1pZ2h0IHdhbnQgdG8gY3JlYXRlIGEgbmV3IG9iamVjdCBvbmx5IGlmIHRoZSBzZXNz aW9uIGFjdHVhbGx5IGNoYW5nZWQuCiAgICAgcmV0dXJuIGZyb21TZXNzaW9uRGVzY3JpcHRpb24o bV9iYWNrZW5kLT5sb2NhbF9kZXNjcmlwdGlvbigpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRw b2ludC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGli V2ViUlRDTWVkaWFFbmRwb2ludC5oCmluZGV4IGYyYzJmYjM1YjZmMTJjMjRhNzhjMDM1MTYzNzc2 M2Y2ZGQwN2JmZGMuLjI4ZDE5ZDg5ZTBlMGZiOWI2ZjdmMGFmYjgyOTRmZGI2OGJkYWZjM2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xp YldlYlJUQ01lZGlhRW5kcG9pbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmgKQEAgLTc0LDYgKzc0LDEw IEBAIHB1YmxpYzoKIAogICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IGxvY2FsRGVz Y3JpcHRpb24oKSBjb25zdDsKICAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiByZW1v dGVEZXNjcmlwdGlvbigpIGNvbnN0OworICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+ IGN1cnJlbnRMb2NhbERlc2NyaXB0aW9uKCkgY29uc3Q7CisgICAgUmVmUHRyPFJUQ1Nlc3Npb25E ZXNjcmlwdGlvbj4gY3VycmVudFJlbW90ZURlc2NyaXB0aW9uKCkgY29uc3Q7CisgICAgUmVmUHRy PFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gcGVuZGluZ0xvY2FsRGVzY3JpcHRpb24oKSBjb25zdDsK KyAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBwZW5kaW5nUmVtb3RlRGVzY3JpcHRp b24oKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBMaWJXZWJSVENNZWRpYUVuZHBvaW50KExpYldl YlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZCYsIExpYldlYlJUQ1Byb3ZpZGVyJik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJS VENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcAppbmRl eCAxYzI5NmI0ZGU5ODIwYTMyMDRjMmI4ZDk3MmIyN2FjMWJiMDUzYWRmLi44YmFiNmFmNTk4ZGM5 MmY3MWRlNmJiZWMwN2YyMWZlZDFhMjc0NTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tl bmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRj L0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAKQEAgLTIxOCw2ICsyMTgsMjYgQEAg c3RkOjp1bmlxdWVfcHRyPFJUQ0RhdGFDaGFubmVsSGFuZGxlcj4gTGliV2ViUlRDUGVlckNvbm5l Y3Rpb25CYWNrZW5kOjpjcmVhdGVEYXQKICAgICByZXR1cm4gbV9lbmRwb2ludC0+Y3JlYXRlRGF0 YUNoYW5uZWwobGFiZWwsIG9wdGlvbnMpOwogfQogCitSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0 aW9uPiBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmN1cnJlbnRMb2NhbERlc2NyaXB0 aW9uKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9lbmRwb2ludC0+Y3VycmVudExvY2FsRGVzY3Jp cHRpb24oKTsKK30KKworUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gTGliV2ViUlRDUGVl ckNvbm5lY3Rpb25CYWNrZW5kOjpjdXJyZW50UmVtb3RlRGVzY3JpcHRpb24oKSBjb25zdAorewor ICAgIHJldHVybiBtX2VuZHBvaW50LT5jdXJyZW50UmVtb3RlRGVzY3JpcHRpb24oKTsKK30KKwor UmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNr ZW5kOjpwZW5kaW5nTG9jYWxEZXNjcmlwdGlvbigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fZW5k cG9pbnQtPnBlbmRpbmdMb2NhbERlc2NyaXB0aW9uKCk7Cit9CisKK1JlZlB0cjxSVENTZXNzaW9u RGVzY3JpcHRpb24+IExpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZDo6cGVuZGluZ1JlbW90 ZURlc2NyaXB0aW9uKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9lbmRwb2ludC0+cGVuZGluZ1Jl bW90ZURlc2NyaXB0aW9uKCk7Cit9CisKIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IExp YldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZDo6bG9jYWxEZXNjcmlwdGlvbigpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIG1fZW5kcG9pbnQtPmxvY2FsRGVzY3JpcHRpb24oKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1Bl ZXJDb25uZWN0aW9uQmFja2VuZC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmgKaW5kZXggNjM3Mzk4 MWEyMDBiNDg3YzIxMmQzMWU2NWNhMmJhZTQ0OTMxZjhiZC4uMmU0MjFhZDBmZDAzNWRiNzg5OTgx Nzg1M2IwOTMxYTc4N2E2YjEyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmgKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRD UGVlckNvbm5lY3Rpb25CYWNrZW5kLmgKQEAgLTYwLDEyICs2MCwxMiBAQCBwcml2YXRlOgogICAg IFJlZjxSVENSdHBSZWNlaXZlcj4gY3JlYXRlUmVjZWl2ZXIoY29uc3QgU3RyaW5nJiB0cmFuc2Nl aXZlck1pZCwgY29uc3QgU3RyaW5nJiB0cmFja0tpbmQsIGNvbnN0IFN0cmluZyYgdHJhY2tJZCkg ZmluYWw7CiAKICAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBsb2NhbERlc2NyaXB0 aW9uKCkgY29uc3QgZmluYWw7Ci0gICAgUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gY3Vy cmVudExvY2FsRGVzY3JpcHRpb24oKSBjb25zdCBmaW5hbCB7IHJldHVybiBsb2NhbERlc2NyaXB0 aW9uKCk7IH0KLSAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBwZW5kaW5nTG9jYWxE ZXNjcmlwdGlvbigpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIGxvY2FsRGVzY3JpcHRpb24oKTsgfQor ICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IGN1cnJlbnRMb2NhbERlc2NyaXB0aW9u KCkgY29uc3QgZmluYWw7CisgICAgUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gcGVuZGlu Z0xvY2FsRGVzY3JpcHRpb24oKSBjb25zdCBmaW5hbDsKIAogICAgIFJlZlB0cjxSVENTZXNzaW9u RGVzY3JpcHRpb24+IHJlbW90ZURlc2NyaXB0aW9uKCkgY29uc3QgZmluYWw7Ci0gICAgUmVmUHRy PFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gY3VycmVudFJlbW90ZURlc2NyaXB0aW9uKCkgY29uc3Qg ZmluYWwgeyByZXR1cm4gcmVtb3RlRGVzY3JpcHRpb24oKTsgfQotICAgIFJlZlB0cjxSVENTZXNz aW9uRGVzY3JpcHRpb24+IHBlbmRpbmdSZW1vdGVEZXNjcmlwdGlvbigpIGNvbnN0IGZpbmFsIHsg cmV0dXJuIHJlbW90ZURlc2NyaXB0aW9uKCk7IH0KKyAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2Ny aXB0aW9uPiBjdXJyZW50UmVtb3RlRGVzY3JpcHRpb24oKSBjb25zdCBmaW5hbDsKKyAgICBSZWZQ dHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBwZW5kaW5nUmVtb3RlRGVzY3JpcHRpb24oKSBjb25z dCBmaW5hbDsKIAogICAgIC8vIEZJWE1FOiBBUEkgdG8gaW1wbGVtZW50IGZvciByZWFsCiAgICAg VmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbT4+IGdldFJlbW90ZVN0cmVhbXMoKSBjb25zdCBmaW5h bCB7IHJldHVybiB7IH07IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2MzZkMDljNGY1NWFhNmJiNTZhZWNlZjUxZjEyYWVk ZTk1YmQ5MjU5Li4zYTEzYjEyZTQ1MTc5NjVkYzA3MDYwZjliZDAyZjQwYjI4OTJjN2ZiIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMDMtMDYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBw bGUuY29tPgorCisgICAgICAgIEV4cG9zZSBXZWJSVEMgY3VycmVudC9wZW5kaW5nIGRlc2NyaXB0 aW9uIGdldHRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2OTIxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogd2VicnRjL2Rlc2NyaXB0aW9uR2V0dGVycy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIHdlYnJ0Yy9kZXNjcmlwdGlvbkdldHRlcnMuaHRtbDogQWRkZWQuCisKIDIwMTctMDMt MDYgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAg W2Nzcy1ncmlkXSBTdHJldGNoIHNob3VsZCBncm93IGFuZCBzaHJpbmsgaXRlbXMgdG8gZml0IGl0 cyBncmlkIGFyZWEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy9kZXNjcmlwdGlvbkdl dHRlcnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvd2VicnRjL2Rlc2NyaXB0aW9uR2V0dGVy cy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTdjOTk1MGMxZTk4NGJlMGYwYTA5NzQ3ZDdmNGU1 NDFlZWU1Mzc3MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy9kZXNjcmlw dGlvbkdldHRlcnMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorCitQQVNTIGRlc2NyaXB0 aW9uIGdldHRlcnMgd2hlbiBjaGFuZ2luZyBkZXNjcmlwdGlvbiBmcm9tIHZpZGVvIHRvIHZpZGVv ICYgZGF0YSBjaGFubmVsIAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvZGVzY3Jp cHRpb25HZXR0ZXJzLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvZGVzY3JpcHRpb25HZXR0ZXJz Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uNWEyMmU4NjkyYjA1YzBkNTFiYThhYjE2NWFhZmEzYzdiNDI0ZGJm MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy9kZXNjcmlwdGlvbkdldHRl cnMuaHRtbApAQCAtMCwwICsxLDg0IEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAgIDxo ZWFkPgorICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIDx0aXRsZT5UZXN0 aW5nIGJhc2ljIHZpZGVvIGV4Y2hhbmdlIGZyb20gb2ZmZXJlciB0byByZWNlaXZlcjwvdGl0bGU+ CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2Ny aXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0 LmpzIj48L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxzY3JpcHQ+ CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5zZXRVc2VyTWVkaWFQZXJt aXNzaW9uKHRydWUpOworCitwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKKyAgICAgaWYgKHdpbmRv dy5pbnRlcm5hbHMpCisgICAgIGludGVybmFscy51c2VNb2NrUlRDUGVlckNvbm5lY3Rpb25GYWN0 b3J5KCJUd29SZWFsUGVlckNvbm5lY3Rpb25zIik7CisgICAgIAorICAgICB2YXIgbG9jYWxDb25u ZWN0aW9uID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CisgICAgIHZhciByZW1vdGVDb25uZWN0 aW9uID0gbmV3IFJUQ1BlZXJDb25uZWN0aW9uKCk7CisgICAgIHZhciBjdXJyZW50U0RQOworICAg ICByZXR1cm4gbmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoeyB2aWRlbzogdHJ1 ZX0pLnRoZW4oKHN0cmVhbSkgPT4geworCisgICAgICAgIGxvY2FsQ29ubmVjdGlvbi5hZGRTdHJl YW0oc3RyZWFtKTsKKyAgICAgICAgcmV0dXJuIGxvY2FsQ29ubmVjdGlvbi5jcmVhdGVPZmZlcigp OworICAgIH0pLnRoZW4oKGRlc2MpID0+IHsKKyAgICAgICAgY3VycmVudFNEUCA9IGRlc2Muc2Rw OworCisgICAgICAgIGFzc2VydF9lcXVhbHMobG9jYWxDb25uZWN0aW9uLmN1cnJlbnRMb2NhbERl c2NyaXB0aW9uLCBudWxsKTsKKyAgICAgICAgYXNzZXJ0X2VxdWFscyhsb2NhbENvbm5lY3Rpb24u cGVuZGluZ0xvY2FsRGVzY3JpcHRpb24sIG51bGwpOworICAgICAgICBhc3NlcnRfZXF1YWxzKGxv Y2FsQ29ubmVjdGlvbi5sb2NhbERlc2NyaXB0aW9uLCBudWxsKTsKKworICAgICAgICBhc3NlcnRf ZXF1YWxzKHJlbW90ZUNvbm5lY3Rpb24uY3VycmVudFJlbW90ZURlc2NyaXB0aW9uLCBudWxsKTsK KyAgICAgICAgYXNzZXJ0X2VxdWFscyhyZW1vdGVDb25uZWN0aW9uLnBlbmRpbmdSZW1vdGVEZXNj cmlwdGlvbiwgbnVsbCk7CisgICAgICAgIGFzc2VydF9lcXVhbHMocmVtb3RlQ29ubmVjdGlvbi5y ZW1vdGVEZXNjcmlwdGlvbiwgbnVsbCk7CisKKyAgICAgICAgbG9jYWxEZXNjcmlwdGlvblByb21p c2UgPSBsb2NhbENvbm5lY3Rpb24uc2V0TG9jYWxEZXNjcmlwdGlvbihkZXNjKTsKKyAgICAgICAg cmVtb3RlRGVzY3JpcHRpb25Qcm9taXNlID0gcmVtb3RlQ29ubmVjdGlvbi5zZXRSZW1vdGVEZXNj cmlwdGlvbihkZXNjKTsKKworICAgICAgICBhc3NlcnRfZXF1YWxzKGxvY2FsQ29ubmVjdGlvbi5j dXJyZW50TG9jYWxEZXNjcmlwdGlvbiwgbnVsbCk7CisgICAgICAgIGFzc2VydF9lcXVhbHMobG9j YWxDb25uZWN0aW9uLnBlbmRpbmdMb2NhbERlc2NyaXB0aW9uLnNkcCwgY3VycmVudFNEUCk7Cisg ICAgICAgIGFzc2VydF9lcXVhbHMobG9jYWxDb25uZWN0aW9uLmxvY2FsRGVzY3JpcHRpb24uc2Rw LCBjdXJyZW50U0RQKTsKKworICAgICAgICBhc3NlcnRfZXF1YWxzKHJlbW90ZUNvbm5lY3Rpb24u Y3VycmVudFJlbW90ZURlc2NyaXB0aW9uLCBudWxsKTsKKyAgICAgICAgYXNzZXJ0X2VxdWFscyhy ZW1vdGVDb25uZWN0aW9uLnBlbmRpbmdSZW1vdGVEZXNjcmlwdGlvbi5zZHAsIGN1cnJlbnRTRFAp OworICAgICAgICBhc3NlcnRfZXF1YWxzKHJlbW90ZUNvbm5lY3Rpb24ucmVtb3RlRGVzY3JpcHRp b24uc2RwLCBjdXJyZW50U0RQKTsKKworICAgICAgICByZXR1cm4gUHJvbWlzZS5hbGwoW2xvY2Fs RGVzY3JpcHRpb25Qcm9taXNlLCByZW1vdGVEZXNjcmlwdGlvblByb21pc2VdKTsKKyAgICB9KS50 aGVuKCgpID0+IHsKKyAgICAgICAgcmV0dXJuIHJlbW90ZUNvbm5lY3Rpb24uY3JlYXRlQW5zd2Vy KCk7CisgICAgfSkudGhlbigoZGVzYykgPT4geyAgICAgICAKKyAgICAgICAgYXNzZXJ0X2VxdWFs cyhsb2NhbENvbm5lY3Rpb24uY3VycmVudExvY2FsRGVzY3JpcHRpb24sIG51bGwpOworICAgICAg ICBhc3NlcnRfZXF1YWxzKGxvY2FsQ29ubmVjdGlvbi5wZW5kaW5nTG9jYWxEZXNjcmlwdGlvbi5z ZHAsIGN1cnJlbnRTRFApOworICAgICAgICBhc3NlcnRfZXF1YWxzKGxvY2FsQ29ubmVjdGlvbi5s b2NhbERlc2NyaXB0aW9uLnNkcCwgY3VycmVudFNEUCk7CisKKyAgICAgICAgbG9jYWxDb25uZWN0 aW9uLnNldFJlbW90ZURlc2NyaXB0aW9uKGRlc2MpOworCisgICAgICAgIGFzc2VydF9lcXVhbHMo bG9jYWxDb25uZWN0aW9uLmN1cnJlbnRMb2NhbERlc2NyaXB0aW9uLnNkcCwgY3VycmVudFNEUCk7 CisgICAgICAgIGFzc2VydF9lcXVhbHMobG9jYWxDb25uZWN0aW9uLnBlbmRpbmdMb2NhbERlc2Ny aXB0aW9uLCBudWxsKTsKKyAgICAgICAgYXNzZXJ0X2VxdWFscyhsb2NhbENvbm5lY3Rpb24ubG9j YWxEZXNjcmlwdGlvbi5zZHAsIGN1cnJlbnRTRFApOworCisgICAgICAgIGFzc2VydF9lcXVhbHMo cmVtb3RlQ29ubmVjdGlvbi5jdXJyZW50UmVtb3RlRGVzY3JpcHRpb24sIG51bGwpOworICAgICAg ICBhc3NlcnRfZXF1YWxzKHJlbW90ZUNvbm5lY3Rpb24ucGVuZGluZ1JlbW90ZURlc2NyaXB0aW9u LnNkcCwgY3VycmVudFNEUCk7CisgICAgICAgIGFzc2VydF9lcXVhbHMocmVtb3RlQ29ubmVjdGlv bi5yZW1vdGVEZXNjcmlwdGlvbi5zZHAsIGN1cnJlbnRTRFApOworCisgICAgICAgIHJlbW90ZUNv bm5lY3Rpb24uc2V0TG9jYWxEZXNjcmlwdGlvbihkZXNjKTsKKworICAgICAgICBhc3NlcnRfZXF1 YWxzKHJlbW90ZUNvbm5lY3Rpb24uY3VycmVudFJlbW90ZURlc2NyaXB0aW9uLnNkcCwgY3VycmVu dFNEUCk7CisgICAgICAgIGFzc2VydF9lcXVhbHMocmVtb3RlQ29ubmVjdGlvbi5wZW5kaW5nUmVt b3RlRGVzY3JpcHRpb24sIG51bGwpOworICAgICAgICBhc3NlcnRfZXF1YWxzKHJlbW90ZUNvbm5l Y3Rpb24ucmVtb3RlRGVzY3JpcHRpb24uc2RwLCBjdXJyZW50U0RQKTsKKworICAgICAgICBsb2Nh bENvbm5lY3Rpb24uY3JlYXRlRGF0YUNoYW5uZWwoInRlc3QiKTsKKworICAgICAgICBhc3NlcnRf ZXF1YWxzKGxvY2FsQ29ubmVjdGlvbi5jdXJyZW50TG9jYWxEZXNjcmlwdGlvbi5zZHAsIGN1cnJl bnRTRFApOworICAgICAgICBhc3NlcnRfZXF1YWxzKGxvY2FsQ29ubmVjdGlvbi5wZW5kaW5nTG9j YWxEZXNjcmlwdGlvbiwgbnVsbCk7CisgICAgICAgIGFzc2VydF9lcXVhbHMobG9jYWxDb25uZWN0 aW9uLmxvY2FsRGVzY3JpcHRpb24uc2RwLCBjdXJyZW50U0RQKTsKKworICAgICAgICBhc3NlcnRf ZXF1YWxzKHJlbW90ZUNvbm5lY3Rpb24uY3VycmVudFJlbW90ZURlc2NyaXB0aW9uLnNkcCwgY3Vy cmVudFNEUCk7CisgICAgICAgIGFzc2VydF9lcXVhbHMocmVtb3RlQ29ubmVjdGlvbi5wZW5kaW5n UmVtb3RlRGVzY3JpcHRpb24sIG51bGwpOworICAgICAgICBhc3NlcnRfZXF1YWxzKHJlbW90ZUNv bm5lY3Rpb24ucmVtb3RlRGVzY3JpcHRpb24uc2RwLCBjdXJyZW50U0RQKTsKKyAgICB9KTsKK30s ICJkZXNjcmlwdGlvbiBnZXR0ZXJzIHdoZW4gY2hhbmdpbmcgZGVzY3JpcHRpb24gZnJvbSB2aWRl byB0byB2aWRlbyAmIGRhdGEgY2hhbm5lbCIpOworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2Jv ZHk+Cis8L2h0bWw+Cg==