153010 2016-01-12 06:07:15 -0800 WebRTC: Update RTCPeerConnection.add/removeTrack() and add test 2016-01-12 12:20:30 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143211 1 adam.bergkvist webkit-unassigned commit-queue eric.carlson oldest_to_newest 1154668 0 adam.bergkvist 2016-01-12 06:07:15 -0800 RTCPeerConnection.add/removeTrack() has been updated in the spec [1]. We currently lack test coverage too. [1] https://w3c.github.io/webrtc-pc/archives/20151222/webrtc.html 1154678 1 268762 adam.bergkvist 2016-01-12 06:29:07 -0800 Created attachment 268762 Proposed patch 1154827 2 268762 commit-queue 2016-01-12 12:20:28 -0800 Comment on attachment 268762 Proposed patch Clearing flags on attachment: 268762 Committed r194918: <http://trac.webkit.org/changeset/194918> 1154828 3 commit-queue 2016-01-12 12:20:30 -0800 All reviewed patches have been landed. Closing bug. 268762 2016-01-12 06:29:07 -0800 2016-01-12 12:20:28 -0800 Proposed patch pc-add-remove-track_0.patch text/plain 13203 adam.bergkvist ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlMTUxMGI2Li4yOGNmYzBhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTYtMDEt MTIgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgorCisgICAg ICAgIFdlYlJUQzogVXBkYXRlIFJUQ1BlZXJDb25uZWN0aW9uLmFkZC9yZW1vdmVUcmFjaygpIGFu ZCBhZGQgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUzMDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIHRlc3QgZm9yIFJUQ1BlZXJDb25uZWN0aW9uLmFkZC9yZW1vdmVUcmFjaygpIChjdXJy ZW50bHkgbm90IGNvdmVyZWQgYnkgb3RoZXIgdGVzdHMpLgorICAgICAgICBUaGlzIHRlc3QgYWxz byBjb3ZlcnMgc29tZSBvZiB0aGUgZnVuY3Rpb25hbGl0eSBvZiBSVENSdHBTZW5kZXIuCisKKyAg ICAgICAgKiBmYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZC1yZW1vdmVUcmFj ay1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vUlRDUGVl ckNvbm5lY3Rpb24tYWRkLXJlbW92ZVRyYWNrLmh0bWw6IEFkZGVkLgorCiAyMDE2LTAxLTA3ICBC cmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIElu ZGV4ZWREQiB0ZXN0IGdhcmRlbmluZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbWVk aWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkLXJlbW92ZVRyYWNrLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkLXJlbW92 ZVRyYWNrLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5m YTMzOTU5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9S VENQZWVyQ29ubmVjdGlvbi1hZGQtcmVtb3ZlVHJhY2stZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs MjcgQEAKK1Rlc3QgYmFzaWMgYmVoYXZpb3Igb2YgUlRDUGVlckNvbm5lY3Rpb24uYWRkL3JlbW92 ZVRyYWNrKCkKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBt ZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgcGMuZ2V0U2Vu ZGVycygpLmxlbmd0aCBpcyAwCitQQVNTIHNlbmRlciA9IHBjLmFkZFRyYWNrKHRyYWNrLCBzdHJl YW0pIGRpZCBub3QgdGhyb3cgZXhjZXB0aW9uLgorUEFTUyBzZW5kZXIgaXMgYW4gaW5zdGFuY2Ug b2YgUlRDUnRwU2VuZGVyCitQQVNTIHNlbmRlci50cmFjayBpcyB0cmFjaworUEFTUyBwYy5nZXRT ZW5kZXJzKCkubGVuZ3RoIGlzIDEKK1BBU1MgcGMuZ2V0U2VuZGVycygpWzBdIGlzIHNlbmRlcgor VHJ5IHRvIGFkZCBzYW1lIHRyYWNrIGFnYWluCitQQVNTIHNlbmRlciA9IHBjLmFkZFRyYWNrKHRy YWNrLCBzdHJlYW0pIHRocmV3IGV4Y2VwdGlvbiBFcnJvcjogSW52YWxpZE1vZGlmaWNhdGlvbkVy cm9yOiBET00gRXhjZXB0aW9uIDEzLgorUEFTUyBzZW5kZXIyID0gcGMuYWRkVHJhY2sodHJhY2sy LCBzdHJlYW0sIHN0cmVhbTIpIGRpZCBub3QgdGhyb3cgZXhjZXB0aW9uLgorUEFTUyBwYy5nZXRT ZW5kZXJzKCkubGVuZ3RoIGlzIDIKK1BBU1MgcGMuZ2V0U2VuZGVycygpWzBdIGlzIHNlbmRlcgor UEFTUyBwYy5nZXRTZW5kZXJzKClbMV0gaXMgc2VuZGVyMgorUEFTUyBwYy5yZW1vdmVUcmFjayhz ZW5kZXIpIGRpZCBub3QgdGhyb3cgZXhjZXB0aW9uLgorU2VuZGVyIGlzIHN0aWxsIGluIGdldFNl bmRlcnMoKSBsaXN0CitQQVNTIHBjLmdldFNlbmRlcnMoKS5sZW5ndGggaXMgMgorUEFTUyBzZW5k ZXJGcm9tUGMyID0gcGMyLmFkZFRyYWNrKHRyYWNrLCBzdHJlYW0pIGRpZCBub3QgdGhyb3cgZXhj ZXB0aW9uLgorcmVtb3ZlVHJhY2soKSB3aXRoICdmb3JlaWduJyBzZW5kZXIgbXVzdCBiZSBpZ25v cmVkIChub3QgdGhyb3cpCitQQVNTIHBjLnJlbW92ZVRyYWNrKHNlbmRlckZyb21QYzIpIGRpZCBu b3QgdGhyb3cgZXhjZXB0aW9uLgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitU RVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0v UlRDUGVlckNvbm5lY3Rpb24tYWRkLXJlbW92ZVRyYWNrLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZC1yZW1vdmVUcmFjay5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQxZWQ1YTMKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZC1yZW1v dmVUcmFjay5odG1sCkBAIC0wLDAgKzEsODAgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8v SUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2NyaXB0 IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKyAgICA8L2hl YWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICB2YXIgc3RyZWFt OworICAgICAgICAgICAgdmFyIHN0cmVhbTI7CisgICAgICAgICAgICB2YXIgdHJhY2s7CisgICAg ICAgICAgICB2YXIgdHJhY2syOworICAgICAgICAgICAgdmFyIHNlbmRlcjsKKyAgICAgICAgICAg IHZhciBzZW5kZXIyOworICAgICAgICAgICAgdmFyIHNlbmRlckZyb21QYzIKKworICAgICAgICAg ICAgZGVzY3JpcHRpb24oIlRlc3QgYmFzaWMgYmVoYXZpb3Igb2YgUlRDUGVlckNvbm5lY3Rpb24u YWRkL3JlbW92ZVRyYWNrKCkiKTsKKworICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVy KQorICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1lZGlhUGVybWlzc2lvbih0cnVl KTsKKyAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgIGRlYnVnKCJUaGlzIHRlc3Qg Y2FuIG5vdCBiZSBydW4gd2l0aG91dCB0aGUgdGVzdFJ1bm5lciIpOworICAgICAgICAgICAgICAg IGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICB2YXIgcGMgPSBu ZXcgd2Via2l0UlRDUGVlckNvbm5lY3Rpb24oe2ljZVNlcnZlcnM6W3t1cmxzOidzdHVuOmZvby5j b20nfV19KTsKKyAgICAgICAgICAgIHZhciBwYzIgPSBuZXcgd2Via2l0UlRDUGVlckNvbm5lY3Rp b24oe2ljZVNlcnZlcnM6W3t1cmxzOidzdHVuOmZvby5jb20nfV19KTsKKworICAgICAgICAgICAg bmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoeyAidmlkZW8iOiB0cnVlIH0pCisg ICAgICAgICAgICAudGhlbihmdW5jdGlvbiAocykgeworICAgICAgICAgICAgICAgIHN0cmVhbSA9 IHM7CisgICAgICAgICAgICAgICAgdHJhY2sgPSBzdHJlYW0uZ2V0VHJhY2tzKClbMF07CisKKyAg ICAgICAgICAgICAgICBzaG91bGRCZSgicGMuZ2V0U2VuZGVycygpLmxlbmd0aCIsICIwIik7CisK KyAgICAgICAgICAgICAgICBzaG91bGROb3RUaHJvdygic2VuZGVyID0gcGMuYWRkVHJhY2sodHJh Y2ssIHN0cmVhbSkiKTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZVR5cGUoInNlbmRlciIsICJS VENSdHBTZW5kZXIiKTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgic2VuZGVyLnRyYWNrIiwg InRyYWNrIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoInBjLmdldFNlbmRlcnMoKS5sZW5n dGgiLCAiMSIpOworICAgICAgICAgICAgICAgIHNob3VsZEJlKCJwYy5nZXRTZW5kZXJzKClbMF0i LCAic2VuZGVyIik7CisKKyAgICAgICAgICAgICAgICBkZWJ1ZygiVHJ5IHRvIGFkZCBzYW1lIHRy YWNrIGFnYWluIik7CisgICAgICAgICAgICAgICAgc2hvdWxkVGhyb3coInNlbmRlciA9IHBjLmFk ZFRyYWNrKHRyYWNrLCBzdHJlYW0pIik7CisKKyAgICAgICAgICAgICAgICB0cmFjazIgPSB0cmFj ay5jbG9uZSgpOworICAgICAgICAgICAgICAgIHN0cmVhbTIgPSBzdHJlYW0uY2xvbmUoKTsKKwor ICAgICAgICAgICAgICAgIHNob3VsZE5vdFRocm93KCJzZW5kZXIyID0gcGMuYWRkVHJhY2sodHJh Y2syLCBzdHJlYW0sIHN0cmVhbTIpIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoInBjLmdl dFNlbmRlcnMoKS5sZW5ndGgiLCAiMiIpOworCisgICAgICAgICAgICAgICAgLy8gT3JkZXIgaW4g bGlzdCByZXR1cm5lZCBieSBnZXRTZW5kZXJzKCkgaXMgdW5zcGVjaWZpZWQuCisgICAgICAgICAg ICAgICAgaWYgKHBjLmdldFNlbmRlcnMoKVswXSA9PSBzZW5kZXIpIHsKKyAgICAgICAgICAgICAg ICAgICAgc2hvdWxkQmUoInBjLmdldFNlbmRlcnMoKVswXSIsICJzZW5kZXIiKTsKKyAgICAgICAg ICAgICAgICAgICAgc2hvdWxkQmUoInBjLmdldFNlbmRlcnMoKVsxXSIsICJzZW5kZXIyIik7Cisg ICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkQmUoInBj LmdldFNlbmRlcnMoKVswXSIsICJzZW5kZXIyIik7CisgICAgICAgICAgICAgICAgICAgIHNob3Vs ZEJlKCJwYy5nZXRTZW5kZXJzKClbMV0iLCAic2VuZGVyMSIpOworICAgICAgICAgICAgICAgIH0K KworICAgICAgICAgICAgICAgIHNob3VsZE5vdFRocm93KCJwYy5yZW1vdmVUcmFjayhzZW5kZXIp Iik7CisgICAgICAgICAgICAgICAgZGVidWcoIlNlbmRlciBpcyBzdGlsbCBpbiBnZXRTZW5kZXJz KCkgbGlzdCIpCisgICAgICAgICAgICAgICAgc2hvdWxkQmUoInBjLmdldFNlbmRlcnMoKS5sZW5n dGgiLCAiMiIpOworCisgICAgICAgICAgICAgICAgc2hvdWxkTm90VGhyb3coInNlbmRlckZyb21Q YzIgPSBwYzIuYWRkVHJhY2sodHJhY2ssIHN0cmVhbSkiKTsKKyAgICAgICAgICAgICAgICBkZWJ1 ZygicmVtb3ZlVHJhY2soKSB3aXRoICdmb3JlaWduJyBzZW5kZXIgbXVzdCBiZSBpZ25vcmVkIChu b3QgdGhyb3cpIik7CisgICAgICAgICAgICAgICAgc2hvdWxkTm90VGhyb3coInBjLnJlbW92ZVRy YWNrKHNlbmRlckZyb21QYzIpIik7CisKKyAgICAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsK KyAgICAgICAgICAgIH0pCisgICAgICAgICAgICAuY2F0Y2goZnVuY3Rpb24gKGVycm9yKSB7Cisg ICAgICAgICAgICAgICAgdGVzdEZhaWxlZCgiRXJyb3IgY2F1Z2h0IGluIHByb21pc2UgY2hhaW46 ICIgKyBlcnJvcik7CisgICAgICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgICAg ICB9KTsKKworICAgICAgICAgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworICAgICAg ICAgICAgd2luZG93LnN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CisKKyAgICAgICAgPC9zY3Jp cHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0Lmpz Ij48L3NjcmlwdD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTgxYzUwNy4u ZWFmNTk4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTAxLTEyICBBZGFtIEJl cmdrdmlzdCAgPGFkYW0uYmVyZ2t2aXN0QGVyaWNzc29uLmNvbT4KKworICAgICAgICBXZWJSVEM6 IFVwZGF0ZSBSVENQZWVyQ29ubmVjdGlvbi5hZGQvcmVtb3ZlVHJhY2soKSBhbmQgYWRkIHRlc3QK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzAxMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJUQ1BlZXJD b25uZWN0aW9uLmFkZC9yZW1vdmVUcmFjaygpIGFyZSBub3QgZnVsbHkgc3BlYyBjb21wbGlhbnQg eWV0LCBzaW5jZSB0aGF0IHdvdWxkCisgICAgICAgIHJlcXVpcmUgc3VwcG9ydCBmb3IgUlRDUnRw VHJhbnNjZWl2ZXIgd2hpY2ggaXMgYSBuZXcgd29yay1pbi1wcm9ncmVzcyBmZWF0dXJlLiBVc2UK KyAgICAgICAgVmVjdG9yLCBpbnN0ZWFkIG9mIG1hcCwgZm9yIHNlbmRlcnMgYW5kIHJlY2VpdmVy cyBzaW5jZSBub3RoaW5nIGlzIHJlbW92ZWQgZnJvbSB0aGVzZQorICAgICAgICBzZXRzIGFueW1v cmUuCisKKyAgICAgICAgVGVzdDogZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1h ZGQtcmVtb3ZlVHJhY2suaHRtbAorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQ ZWVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbjo6 YWRkVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb246OnJlbW92ZVRy YWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uOjpxdWV1ZWRDcmVhdGVP ZmZlcik6IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29u bmVjdGlvbi5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1J0cFNlbmRlcjo6UlRDUnRwU2VuZGVyKToKKyAgICAg ICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNlbmRlci5oOgorICAgICAgICAoV2ViQ29y ZTo6UlRDUnRwU2VuZGVyOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUnRwU2VuZGVy OjptZWRpYVN0cmVhbUlkcyk6CisKIDIwMTYtMDEtMDcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBNb3ZlIGNvbXB1dGVMaW5lQm91bmRzRm9yVGV4dCBmcm9tIEdy YXBoaWNzQ29udGV4dCogdG8gR3JhcGhpY3NDb250ZXh0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcAppbmRleCAy MTIyYWFhLi4xZGQ2NWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcApAQCAtNDksOCArNDksNiBAQAogI2lu Y2x1ZGUgIlJUQ0ljZUNhbmRpZGF0ZS5oIgogI2luY2x1ZGUgIlJUQ0ljZUNhbmRpZGF0ZUV2ZW50 LmgiCiAjaW5jbHVkZSAiUlRDT2ZmZXJBbnN3ZXJPcHRpb25zLmgiCi0jaW5jbHVkZSAiUlRDUnRw UmVjZWl2ZXIuaCIKLSNpbmNsdWRlICJSVENSdHBTZW5kZXIuaCIKICNpbmNsdWRlICJSVENTZXNz aW9uRGVzY3JpcHRpb24uaCIKICNpbmNsdWRlICJSVENUcmFja0V2ZW50LmgiCiAjaW5jbHVkZSA8 d3RmL01haW5UaHJlYWQuaD4KQEAgLTEwNCwyNCArMTAyLDYgQEAgUlRDUGVlckNvbm5lY3Rpb246 On5SVENQZWVyQ29ubmVjdGlvbigpCiAgICAgc3RvcCgpOwogfQogCi1WZWN0b3I8UmVmUHRyPFJU Q1J0cFNlbmRlcj4+IFJUQ1BlZXJDb25uZWN0aW9uOjpnZXRTZW5kZXJzKCkgY29uc3QKLXsKLSAg ICBWZWN0b3I8UmVmUHRyPFJUQ1J0cFNlbmRlcj4+IHNlbmRlcnM7Ci0gICAgc2VuZGVycy5yZXNl cnZlQ2FwYWNpdHkobV9zZW5kZXJTZXQuc2l6ZSgpKTsKLSAgICBjb3B5VmFsdWVzVG9WZWN0b3Io bV9zZW5kZXJTZXQsIHNlbmRlcnMpOwotCi0gICAgcmV0dXJuIHNlbmRlcnM7Ci19Ci0KLVZlY3Rv cjxSZWZQdHI8UlRDUnRwUmVjZWl2ZXI+PiBSVENQZWVyQ29ubmVjdGlvbjo6Z2V0UmVjZWl2ZXJz KCkgY29uc3QKLXsKLSAgICBWZWN0b3I8UmVmUHRyPFJUQ1J0cFJlY2VpdmVyPj4gcmVjZWl2ZXJz OwotICAgIHJlY2VpdmVycy5yZXNlcnZlQ2FwYWNpdHkobV9yZWNlaXZlclNldC5zaXplKCkpOwot ICAgIGNvcHlWYWx1ZXNUb1ZlY3RvcihtX3JlY2VpdmVyU2V0LCByZWNlaXZlcnMpOwotCi0gICAg cmV0dXJuIHJlY2VpdmVyczsKLX0KLQogUmVmUHRyPFJUQ1J0cFNlbmRlcj4gUlRDUGVlckNvbm5l Y3Rpb246OmFkZFRyYWNrKFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPiYmIHRyYWNrLCBWZWN0b3I8 TWVkaWFTdHJlYW0qPiBzdHJlYW1zLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICBpZiAoIXRy YWNrKSB7CkBAIC0xNDAsMTUgKzEyMCwyMCBAQCBSZWZQdHI8UlRDUnRwU2VuZGVyPiBSVENQZWVy Q29ubmVjdGlvbjo6YWRkVHJhY2soUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+JiYgdHJhYwogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKLSAgICBpZiAobV9zZW5kZXJTZXQuY29udGFp bnModHJhY2stPmlkKCkpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBTcGVjIHNheXMgSW52YWxpZFBh cmFtZXRlcgotICAgICAgICBlYyA9IElOVkFMSURfTU9ESUZJQ0FUSU9OX0VSUjsKLSAgICAgICAg cmV0dXJuIG51bGxwdHI7CisgICAgZm9yIChhdXRvJiBzZW5kZXIgOiBtX3NlbmRlclNldCkgewor ICAgICAgICBpZiAoc2VuZGVyLT50cmFjaygpLT5pZCgpID09IHRyYWNrLT5pZCgpKSB7CisgICAg ICAgICAgICAvLyBGSVhNRTogU3BlYyBzYXlzIEludmFsaWRQYXJhbWV0ZXIKKyAgICAgICAgICAg IGVjID0gSU5WQUxJRF9NT0RJRklDQVRJT05fRVJSOworICAgICAgICAgICAgcmV0dXJuIG51bGxw dHI7CisgICAgICAgIH0KICAgICB9CiAKLSAgICBjb25zdCBTdHJpbmcmIHRyYWNrSWQgPSB0cmFj ay0+aWQoKTsKLSAgICBSZWZQdHI8UlRDUnRwU2VuZGVyPiBzZW5kZXIgPSBSVENSdHBTZW5kZXI6 OmNyZWF0ZShXVEZNb3ZlKHRyYWNrKSwgc3RyZWFtc1swXS0+aWQoKSk7Ci0gICAgbV9zZW5kZXJT ZXQuYWRkKHRyYWNrSWQsIHNlbmRlcik7CisgICAgVmVjdG9yPFN0cmluZz4gbWVkaWFTdHJlYW1J ZHM7CisgICAgZm9yIChhdXRvIHN0cmVhbSA6IHN0cmVhbXMpCisgICAgICAgIG1lZGlhU3RyZWFt SWRzLmFwcGVuZChzdHJlYW0tPmlkKCkpOworCisgICAgUmVmUHRyPFJUQ1J0cFNlbmRlcj4gc2Vu ZGVyID0gUlRDUnRwU2VuZGVyOjpjcmVhdGUoV1RGTW92ZSh0cmFjayksIFdURk1vdmUobWVkaWFT dHJlYW1JZHMpKTsKKyAgICBtX3NlbmRlclNldC5hcHBlbmQoc2VuZGVyKTsKIAogICAgIG1fYmFj a2VuZC0+bWFya0FzTmVlZGluZ05lZ290aWF0aW9uKCk7CiAKQEAgLTE2Nyw3ICsxNTIsNyBAQCB2 b2lkIFJUQ1BlZXJDb25uZWN0aW9uOjpyZW1vdmVUcmFjayhSVENSdHBTZW5kZXIqIHNlbmRlciwg RXhjZXB0aW9uQ29kZSYgZWMpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoIW1f c2VuZGVyU2V0LnJlbW92ZShzZW5kZXItPnRyYWNrKCktPmlkKCkpKQorICAgIGlmICghbV9zZW5k ZXJTZXQuY29udGFpbnMoc2VuZGVyKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9iYWNrZW5k LT5tYXJrQXNOZWVkaW5nTmVnb3RpYXRpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaAppbmRleCBhNGY5MDI1Li45 ZjllODc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JU Q1BlZXJDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9SVENQZWVyQ29ubmVjdGlvbi5oCkBAIC00MSw2ICs0MSw4IEBACiAvLyBGSVhNRTogV29ya2Fy b3VuZCBmb3IgYmluZGluZ3MgYnVnIGh0dHA6Ly93ZWJraXQub3JnL2IvMTUwMTIxCiAjaW5jbHVk ZSAiSlNNZWRpYVN0cmVhbS5oIgogI2luY2x1ZGUgIlBlZXJDb25uZWN0aW9uQmFja2VuZC5oIgor I2luY2x1ZGUgIlJUQ1J0cFJlY2VpdmVyLmgiCisjaW5jbHVkZSAiUlRDUnRwU2VuZGVyLmgiCiAj aW5jbHVkZSAiU2NyaXB0V3JhcHBhYmxlLmgiCiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNp bmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgpAQCAtNTQsOCArNTYsNiBAQCBjbGFzcyBSVENDb25m aWd1cmF0aW9uOwogY2xhc3MgUlRDRGF0YUNoYW5uZWw7CiBjbGFzcyBSVENJY2VDYW5kaWRhdGU7 CiBjbGFzcyBSVENQZWVyQ29ubmVjdGlvbkVycm9yQ2FsbGJhY2s7Ci1jbGFzcyBSVENSdHBSZWNl aXZlcjsKLWNsYXNzIFJUQ1J0cFNlbmRlcjsKIGNsYXNzIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjsK IGNsYXNzIFJUQ1N0YXRzQ2FsbGJhY2s7CiAKQEAgLTY0LDggKzY0LDggQEAgcHVibGljOgogICAg IHN0YXRpYyBSZWZQdHI8UlRDUGVlckNvbm5lY3Rpb24+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25D b250ZXh0JiwgY29uc3QgRGljdGlvbmFyeSYgcnRjQ29uZmlndXJhdGlvbiwgRXhjZXB0aW9uQ29k ZSYpOwogICAgIH5SVENQZWVyQ29ubmVjdGlvbigpOwogCi0gICAgVmVjdG9yPFJlZlB0cjxSVENS dHBTZW5kZXI+PiBnZXRTZW5kZXJzKCkgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgVmVjdG9yPFJlZlB0 cjxSVENSdHBSZWNlaXZlcj4+IGdldFJlY2VpdmVycygpIGNvbnN0OworICAgIFZlY3RvcjxSZWZQ dHI8UlRDUnRwU2VuZGVyPj4gZ2V0U2VuZGVycygpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1f c2VuZGVyU2V0OyB9CisgICAgVmVjdG9yPFJlZlB0cjxSVENSdHBSZWNlaXZlcj4+IGdldFJlY2Vp dmVycygpIGNvbnN0IHsgcmV0dXJuIG1fcmVjZWl2ZXJTZXQ7IH0KIAogICAgIFJlZlB0cjxSVENS dHBTZW5kZXI+IGFkZFRyYWNrKFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPiYmLCBWZWN0b3I8TWVk aWFTdHJlYW0qPiwgRXhjZXB0aW9uQ29kZSYpOwogICAgIHZvaWQgcmVtb3ZlVHJhY2soUlRDUnRw U2VuZGVyKiwgRXhjZXB0aW9uQ29kZSYpOwpAQCAtMTM1LDggKzEzNSw4IEBAIHByaXZhdGU6CiAg ICAgUGVlckNvbm5lY3Rpb25TdGF0ZXM6OkljZUdhdGhlcmluZ1N0YXRlIG1faWNlR2F0aGVyaW5n U3RhdGU7CiAgICAgUGVlckNvbm5lY3Rpb25TdGF0ZXM6OkljZUNvbm5lY3Rpb25TdGF0ZSBtX2lj ZUNvbm5lY3Rpb25TdGF0ZTsKIAotICAgIEhhc2hNYXA8U3RyaW5nLCBSZWZQdHI8UlRDUnRwU2Vu ZGVyPj4gbV9zZW5kZXJTZXQ7Ci0gICAgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxSVENSdHBSZWNl aXZlcj4+IG1fcmVjZWl2ZXJTZXQ7CisgICAgVmVjdG9yPFJlZlB0cjxSVENSdHBTZW5kZXI+PiBt X3NlbmRlclNldDsKKyAgICBWZWN0b3I8UmVmUHRyPFJUQ1J0cFJlY2VpdmVyPj4gbV9yZWNlaXZl clNldDsKIAogICAgIFZlY3RvcjxSZWZQdHI8UlRDRGF0YUNoYW5uZWw+PiBtX2RhdGFDaGFubmVs czsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENS dHBTZW5kZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBT ZW5kZXIuY3BwCmluZGV4IGUwMDdkYmUuLjY2ZDM3NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNlbmRlci5jcHAKQEAgLTM1LDkgKzM1LDkg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1SVENSdHBTZW5kZXI6OlJUQ1J0cFNlbmRlcihS ZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4mJiB0cmFjaywgY29uc3QgU3RyaW5nJiBtZWRpYVN0cmVh bUlkKQorUlRDUnRwU2VuZGVyOjpSVENSdHBTZW5kZXIoUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+ JiYgdHJhY2ssIFZlY3RvcjxTdHJpbmc+JiYgbWVkaWFTdHJlYW1JZHMpCiAgICAgOiBSVENSdHBT ZW5kZXJSZWNlaXZlckJhc2UoV1RGTW92ZSh0cmFjaykpCi0gICAgLCBtX21lZGlhU3RyZWFtSWQo bWVkaWFTdHJlYW1JZCkKKyAgICAsIG1fbWVkaWFTdHJlYW1JZHMoV1RGTW92ZShtZWRpYVN0cmVh bUlkcykpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUlRDUnRwU2VuZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L1JUQ1J0cFNlbmRlci5oCmluZGV4IGY0NDk3MzkuLjI1N2QzMjYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTZW5kZXIuaApAQCAtNDAsMTcgKzQw LDE3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgUlRDUnRwU2VuZGVyIDogcHVibGlj IFJUQ1J0cFNlbmRlclJlY2VpdmVyQmFzZSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxSVENS dHBTZW5kZXI+IGNyZWF0ZShSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4mJiB0cmFjaywgY29uc3Qg U3RyaW5nJiBtZWRpYVN0cmVhbUlkKQorICAgIHN0YXRpYyBSZWY8UlRDUnRwU2VuZGVyPiBjcmVh dGUoUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+JiYgdHJhY2ssIFZlY3RvcjxTdHJpbmc+JiYgbWVk aWFTdHJlYW1JZHMpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBSVENSdHBT ZW5kZXIoV1RGTW92ZSh0cmFjayksIG1lZGlhU3RyZWFtSWQpKTsKKyAgICAgICAgcmV0dXJuIGFk b3B0UmVmKCpuZXcgUlRDUnRwU2VuZGVyKFdURk1vdmUodHJhY2spLCBXVEZNb3ZlKG1lZGlhU3Ry ZWFtSWRzKSkpOwogICAgIH0KIAotICAgIGNvbnN0IFN0cmluZyYgbWVkaWFTdHJlYW1JZCgpIGNv bnN0IHsgcmV0dXJuIG1fbWVkaWFTdHJlYW1JZDsgfQorICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBtZWRpYVN0cmVhbUlkcygpIGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFTdHJlYW1JZHM7IH0KIAog cHJpdmF0ZToKLSAgICBSVENSdHBTZW5kZXIoUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+JiYsIGNv bnN0IFN0cmluZyYgbWVkaWFTdHJlYW1JZCk7CisgICAgUlRDUnRwU2VuZGVyKFJlZlB0cjxNZWRp YVN0cmVhbVRyYWNrPiYmLCBWZWN0b3I8U3RyaW5nPiYmIG1lZGlhU3RyZWFtSWRzKTsKIAotICAg IFN0cmluZyBtX21lZGlhU3RyZWFtSWQ7CisgICAgVmVjdG9yPFN0cmluZz4gbV9tZWRpYVN0cmVh bUlkczsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK