190329 2018-10-06 07:29:22 -0700 Add support for IceCandidate stats 2018-10-09 08:45:30 -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 1466861 0 youennf 2018-10-06 07:29:22 -0700 IceCandidate stats are defined in https://w3c.github.io/webrtc-stats/#icecandidate-dict and complements https://w3c.github.io/webrtc-stats/#candidatepair-dict that we already expose. For now, we might not want to expose address and networkType which might be sensitive information. 1466862 1 351722 youennf 2018-10-06 07:35:16 -0700 Created attachment 351722 Patch 1467407 2 351722 commit-queue 2018-10-09 08:44:41 -0700 Comment on attachment 351722 Patch Clearing flags on attachment: 351722 Committed r236963: <https://trac.webkit.org/changeset/236963> 1467408 3 commit-queue 2018-10-09 08:44:42 -0700 All reviewed patches have been landed. Closing bug. 1467409 4 webkit-bug-importer 2018-10-09 08:45:30 -0700 <rdar://problem/45127045> 351722 2018-10-06 07:35:16 -0700 2018-10-09 08:44:41 -0700 Patch bug-190329-20181006073515.patch text/plain 14560 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA4YTIwNzg3NzEzMDc4YTYyNTkwM2Q0M2MyZjE5YmYzNDQxOGEyNDc4Li40ZmI0 OWZmYzkyZGM3YmE2NzA0NWQ3YzM1YTJlMmQ5ZTc2MDRiNTEyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0xMC0wNiAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIEljZUNh bmRpZGF0ZSBzdGF0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTkwMzI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRXhwb3J0IG5ldyBzdGF0cyBrVHlwZSB2YWx1ZXMuCisKKyAgICAgICAgKiBDb25maWd1 cmF0aW9ucy9saWJ3ZWJydGMuaU9TLmV4cDoKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9saWJ3 ZWJydGMuaU9Tc2ltLmV4cDoKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9saWJ3ZWJydGMubWFj LmV4cDoKKwogMjAxOC0xMC0wMyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAK ICAgICAgICAgQWRkIFZQOCBzdXBwb3J0IHRvIFdlYlJUQwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGI5ODdlMDUz OTc5NjM4NTZlODhlODEzNzVkZmFiY2ZhZTNmMWE2YjMuLjFlN2QwYThmY2RjNWFiNDFjYjM5NjM3 OWNkOGU1MjEyZDNjMDE4NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxOC0xMC0w NiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBv cnQgZm9yIEljZUNhbmRpZGF0ZSBzdGF0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMzI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ29udmVydCBJY2VDYW5kaWRhdGUgc3RhdHMgZ2F0aGVyZWQgYnkg bGlid2VicnRjLgorICAgICAgICBTaW5jZSBuZXR3b3JrVHlwZSBtaWdodCBiZSBzZW5zaXRpdmUg aW5mb3JtYXRpb24sIHdlIGN1cnJlbnRseSBkbyBub3QgZXhwb3NlIGl0LgorICAgICAgICBXZSBk byBub3QgZXhwb3NlIGFkZHJlc3MgZWl0aGVyIGlmIGl0IGlzIGEgaG9zdCBvciBwcmZseCBjYW5k aWRhdGUuCisKKyAgICAgICAgVGVzdDogd2VicnRjL2NhbmRpZGF0ZS1zdGF0cy5odG1sCisKKyAg ICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRzUmVwb3J0Lmg6CisgICAgICAgICog TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENTdGF0c1JlcG9ydC5pZGw6CisgICAgICAgICogTW9kdWxl cy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDU3RhdHNDb2xsZWN0b3IuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6aWNlQ2FuZGlkYXRlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Zmls bFJUQ0ljZUNhbmRpZGF0ZVN0YXRzKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ1N0YXRz Q29sbGVjdG9yOjpPblN0YXRzRGVsaXZlcmVkKToKKwogMjAxOC0xMC0wMyAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIFZQOCBzdXBwb3J0IHRvIFdlYlJU QwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25z L2xpYndlYnJ0Yy5pT1MuZXhwIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3Vy YXRpb25zL2xpYndlYnJ0Yy5pT1MuZXhwCmluZGV4IDE0NmVlYmFkNTI3ZDNjOTBhYTYxMDdhYjc5 MmVmNDA5NGYzMGYwNjIuLmNmNTJkMzEwZWNmNmQzODUzZTgzNjkzZDM1OGNjYzM0NTg0MWJmMWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Db25maWd1cmF0aW9ucy9s aWJ3ZWJydGMuaU9TLmV4cAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ29uZmln dXJhdGlvbnMvbGlid2VicnRjLmlPUy5leHAKQEAgLTIxNiwzICsyMTYsNSBAQCBfX1pONndlYnJ0 YzE4UnRwVHJhbnNjZWl2ZXJJbml0QzFFdgogX19aTjZ3ZWJydGMxOFJ0cFRyYW5zY2VpdmVySW5p dEQxRXYKIF9fWk42d2VicnRjOVJ0cFNvdXJjZUQxRXYKIF9fWk42d2VicnRjMTFmaWVsZF90cmlh bDI1SW5pdEZpZWxkVHJpYWxzRnJvbVN0cmluZ0VQS2MKK19fWk42d2VicnRjMjVSVENMb2NhbElj ZUNhbmRpZGF0ZVN0YXRzNWtUeXBlRQorX19aTjZ3ZWJydGMyNlJUQ1JlbW90ZUljZUNhbmRpZGF0 ZVN0YXRzNWtUeXBlRQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0Nv bmZpZ3VyYXRpb25zL2xpYndlYnJ0Yy5pT1NzaW0uZXhwIGIvU291cmNlL1RoaXJkUGFydHkvbGli d2VicnRjL0NvbmZpZ3VyYXRpb25zL2xpYndlYnJ0Yy5pT1NzaW0uZXhwCmluZGV4IDAzZGUyNjFh NzFiMDlhMzk1M2Y1Y2ViYmFmYTViOWU1OTM1NDc4YTUuLjE2ZTZjYWJlZDE1ZmFjMDU4ODg0Y2Ew YTJhYjljNDk4ZjUxYTA2NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0 Yy9Db25maWd1cmF0aW9ucy9saWJ3ZWJydGMuaU9Tc2ltLmV4cAorKysgYi9Tb3VyY2UvVGhpcmRQ YXJ0eS9saWJ3ZWJydGMvQ29uZmlndXJhdGlvbnMvbGlid2VicnRjLmlPU3NpbS5leHAKQEAgLTIx NywzICsyMTcsNSBAQCBfX1pONndlYnJ0YzE4UnRwVHJhbnNjZWl2ZXJJbml0QzFFdgogX19aTjZ3 ZWJydGMxOFJ0cFRyYW5zY2VpdmVySW5pdEQxRXYKIF9fWk42d2VicnRjOVJ0cFNvdXJjZUQxRXYK IF9fWk42d2VicnRjMTFmaWVsZF90cmlhbDI1SW5pdEZpZWxkVHJpYWxzRnJvbVN0cmluZ0VQS2MK K19fWk42d2VicnRjMjVSVENMb2NhbEljZUNhbmRpZGF0ZVN0YXRzNWtUeXBlRQorX19aTjZ3ZWJy dGMyNlJUQ1JlbW90ZUljZUNhbmRpZGF0ZVN0YXRzNWtUeXBlRQpkaWZmIC0tZ2l0IGEvU291cmNl L1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25zL2xpYndlYnJ0Yy5tYWMuZXhwIGIv U291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NvbmZpZ3VyYXRpb25zL2xpYndlYnJ0Yy5tYWMu ZXhwCmluZGV4IDAzZGUyNjFhNzFiMDlhMzk1M2Y1Y2ViYmFmYTViOWU1OTM1NDc4YTUuLjE2ZTZj YWJlZDE1ZmFjMDU4ODg0Y2EwYTJhYjljNDk4ZjUxYTA2NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9U aGlyZFBhcnR5L2xpYndlYnJ0Yy9Db25maWd1cmF0aW9ucy9saWJ3ZWJydGMubWFjLmV4cAorKysg Yi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ29uZmlndXJhdGlvbnMvbGlid2VicnRjLm1h Yy5leHAKQEAgLTIxNywzICsyMTcsNSBAQCBfX1pONndlYnJ0YzE4UnRwVHJhbnNjZWl2ZXJJbml0 QzFFdgogX19aTjZ3ZWJydGMxOFJ0cFRyYW5zY2VpdmVySW5pdEQxRXYKIF9fWk42d2VicnRjOVJ0 cFNvdXJjZUQxRXYKIF9fWk42d2VicnRjMTFmaWVsZF90cmlhbDI1SW5pdEZpZWxkVHJpYWxzRnJv bVN0cmluZ0VQS2MKK19fWk42d2VicnRjMjVSVENMb2NhbEljZUNhbmRpZGF0ZVN0YXRzNWtUeXBl RQorX19aTjZ3ZWJydGMyNlJUQ1JlbW90ZUljZUNhbmRpZGF0ZVN0YXRzNWtUeXBlRQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENTdGF0c1JlcG9ydC5o IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENTdGF0c1JlcG9ydC5oCmlu ZGV4IGJhYzU4MzE5ODg4N2YxMDFjN2M3NDllYmJkOGQ3ZjZiMDg2MjVkYjYuLmNkMjc1ODczYmI5 OGVlMjVlYzMxZmQ4N2EzYzlmYTQ2OGM3NGQ3ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXBvcnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRzUmVwb3J0LmgKQEAgLTE3Nyw2ICsxNzcsMTkg QEAgcHVibGljOgogICAgICAgICB1bnNpZ25lZCBsb25nIGxvbmcgY29uc2VudFJlc3BvbnNlc1Nl bnQgeyAwIH07CiAgICAgfTsKIAorICAgIGVudW0gY2xhc3MgSWNlQ2FuZGlkYXRlVHlwZSB7IEhv c3QsIFNyZmx4LCBQcmZseCwgUmVsYXkgfTsKKworICAgIHN0cnVjdCBJY2VDYW5kaWRhdGVTdGF0 cyA6IFN0YXRzIHsKKyAgICAgICAgU3RyaW5nIHRyYW5zcG9ydElkOworICAgICAgICBTdHJpbmcg YWRkcmVzczsKKyAgICAgICAgc3RkOjpvcHRpb25hbDxpbnQzMl90PiBwb3J0OworICAgICAgICBT dHJpbmcgcHJvdG9jb2w7CisgICAgICAgIHN0ZDo6b3B0aW9uYWw8SWNlQ2FuZGlkYXRlVHlwZT4g Y2FuZGlkYXRlVHlwZTsKKyAgICAgICAgc3RkOjpvcHRpb25hbDxpbnQzMl90PiBwcmlvcml0eTsK KyAgICAgICAgU3RyaW5nIHVybDsKKyAgICAgICAgYm9vbCBkZWxldGVkIHsgZmFsc2UgfTsKKyAg ICB9OworCiAgICAgc3RydWN0IENlcnRpZmljYXRlU3RhdHMgOiBTdGF0cyB7CiAgICAgICAgIENl cnRpZmljYXRlU3RhdHMoKSB7IHR5cGUgPSBSVENTdGF0c1JlcG9ydDo6VHlwZTo6Q2VydGlmaWNh dGU7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9S VENTdGF0c1JlcG9ydC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JU Q1N0YXRzUmVwb3J0LmlkbAppbmRleCAwZTdkMzMzN2JjY2RkMTIwZDgxNGJkZDYwNTY0NTQ0MjFj OTFjYWI0Li5jMmYyZDhkM2RjNWNkMzFjZWNmZjFhNzU0NjNmOWI3Y2MyZjM1ZDc3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRzUmVwb3J0Lmlk bAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRzUmVwb3J0 LmlkbApAQCAtMTY1LDYgKzE2NSwyNyBAQCBkaWN0aW9uYXJ5IFJUQ0ljZUNhbmRpZGF0ZVBhaXJT dGF0cyA6IFJUQ1N0YXRzIHsKICAgICAvLyBGSVhNRTogRXhwb3NlIG90aGVyIGZpZWxkcyBvbmNl IGxpYndlYnJ0YyBzdXBwb3J0IHRoZW0uCiB9OwogCitlbnVtIFJUQ0ljZUNhbmRpZGF0ZVR5cGUg eworICAgICJob3N0IiwKKyAgICAic3JmbHgiLAorICAgICJwcmZseCIsCisgICAgInJlbGF5Igor fTsKKworWyBKU0dlbmVyYXRlVG9KU09iamVjdCBdCitkaWN0aW9uYXJ5IFJUQ0ljZUNhbmRpZGF0 ZVN0YXRzIDogUlRDU3RhdHMgeworICAgIERPTVN0cmluZyB0cmFuc3BvcnRJZDsKKyAgICAvLyBG SVhNRTogZGVjaWRlIHdoZXRoZXIgdG8gZXhwb3NlIG5ldHdvcmtUeXBlCisgICAgLy8gRklYTUU6 IEV4cG9zZSByZWxheVByb3RvY29sCisgICAgRE9NU3RyaW5nIGFkZHJlc3M7CisgICAgbG9uZyBw b3J0OworICAgIERPTVN0cmluZyBwcm90b2NvbDsKKyAgICBSVENJY2VDYW5kaWRhdGVUeXBlIGNh bmRpZGF0ZVR5cGU7CisgICAgbG9uZyBwcmlvcml0eTsKKyAgICBET01TdHJpbmcgdXJsOworICAg IGJvb2xlYW4gZGVsZXRlZCA9IGZhbHNlOworfTsKKwogWyBKU0dlbmVyYXRlVG9KU09iamVjdCBd CiBkaWN0aW9uYXJ5IFJUQ0NlcnRpZmljYXRlU3RhdHMgOiBSVENTdGF0cyB7CiAgICAgRE9NU3Ry aW5nIGZpbmdlcnByaW50OwpAQCAtMTk0LDQgKzIxNSwzIEBAIGRpY3Rpb25hcnkgUlRDQ29kZWNT dGF0cyA6IFJUQ1N0YXRzIHsKIC8vIEZJWE1FIDE2OTY2MjogbWlzc2luZyBSVENNZWRpYVN0cmVh bVN0YXRzCiAvLyBGSVhNRSAxNjk2NjI6IG1pc3NpbmcgUlRDVHJhbnNwb3J0U3RhdHMKIC8vIEZJ WE1FIDE2OTY2MjogbWlzc2luZyBSVENJY2VDYW5kaWRhdGVTdGF0cwotLy8gRklYTUUgMTY5NjYy OiBtaXNzaW5nIFJUQ1N0YXRzSWNlQ2FuZGlkYXRlUGFpclN0YXRlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENTdGF0c0Nv bGxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENTdGF0c0NvbGxlY3Rvci5jcHAKaW5kZXggMjk4YjFlMzFjMDAwZDA1N2ExMjc2 YTFjNDkzYzdjYzgwYzcwZTE0Mi4uMjc4ZDQwZjcxYjExNTE3ODQzNTcxOTEwODJmN2I3YTExMTk0 NzY0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3 ZWJydGMvTGliV2ViUlRDU3RhdHNDb2xsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1N0YXRzQ29sbGVjdG9yLmNwcApA QCAtMjc4LDYgKzI3OCw1MSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZmlsbFJUQ0ljZUNhbmRpZGF0 ZVBhaXJTdGF0cyhSVENTdGF0c1JlcG9ydDo6SWNlQ2FuZGlkYXRlUGFpcgogICAgICAgICBzdGF0 cy5jb25zZW50UmVzcG9uc2VzU2VudCA9ICpydGNTdGF0cy5yZXNwb25zZXNfc2VudDsKIH0KIAor c3RhdGljIGlubGluZSBzdGQ6Om9wdGlvbmFsPFJUQ1N0YXRzUmVwb3J0OjpJY2VDYW5kaWRhdGVU eXBlPiBpY2VDYW5kaWRhdGVTdGF0ZShjb25zdCBzdGQ6OnN0cmluZyYgc3RhdGUpCit7CisgICAg aWYgKHN0YXRlID09ICJob3N0IikKKyAgICAgICAgcmV0dXJuIFJUQ1N0YXRzUmVwb3J0OjpJY2VD YW5kaWRhdGVUeXBlOjpIb3N0OworICAgIGlmIChzdGF0ZSA9PSAic3JmbHgiKQorICAgICAgICBy ZXR1cm4gUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVR5cGU6OlNyZmx4OworICAgIGlmIChz dGF0ZSA9PSAicHJmbHgiKQorICAgICAgICByZXR1cm4gUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRp ZGF0ZVR5cGU6OlByZmx4OworICAgIGlmIChzdGF0ZSA9PSAicmVsYXkiKQorICAgICAgICByZXR1 cm4gUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVR5cGU6OlJlbGF5OworCisgICAgcmV0dXJu IHsgfTsKK30KKworc3RhdGljIGlubGluZSB2b2lkIGZpbGxSVENJY2VDYW5kaWRhdGVTdGF0cyhS VENTdGF0c1JlcG9ydDo6SWNlQ2FuZGlkYXRlU3RhdHMmIHN0YXRzLCBjb25zdCB3ZWJydGM6OlJU Q0ljZUNhbmRpZGF0ZVN0YXRzJiBydGNTdGF0cykKK3sKKyAgICBzdGF0cy50eXBlID0gcnRjU3Rh dHMudHlwZSgpID09IHdlYnJ0Yzo6UlRDUmVtb3RlSWNlQ2FuZGlkYXRlU3RhdHM6OmtUeXBlID8g UlRDU3RhdHNSZXBvcnQ6OlR5cGU6OlJlbW90ZUNhbmRpZGF0ZSA6IFJUQ1N0YXRzUmVwb3J0OjpU eXBlOjpMb2NhbENhbmRpZGF0ZTsKKworICAgIGZpbGxSVENTdGF0cyhzdGF0cywgcnRjU3RhdHMp OworCisgICAgaWYgKHJ0Y1N0YXRzLnRyYW5zcG9ydF9pZC5pc19kZWZpbmVkKCkpCisgICAgICAg IHN0YXRzLnRyYW5zcG9ydElkID0gZnJvbVN0ZFN0cmluZygqcnRjU3RhdHMudHJhbnNwb3J0X2lk KTsKKyAgICBpZiAocnRjU3RhdHMuaXAuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5hZGRy ZXNzID0gZnJvbVN0ZFN0cmluZygqcnRjU3RhdHMuaXApOworICAgIGlmIChydGNTdGF0cy5wb3J0 LmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMucG9ydCA9ICpydGNTdGF0cy5wb3J0OworICAg IGlmIChydGNTdGF0cy5wcm90b2NvbC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLnByb3Rv Y29sID0gZnJvbVN0ZFN0cmluZygqcnRjU3RhdHMucHJvdG9jb2wpOworCisgICAgaWYgKHJ0Y1N0 YXRzLmNhbmRpZGF0ZV90eXBlLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMuY2FuZGlkYXRl VHlwZSA9IGljZUNhbmRpZGF0ZVN0YXRlKCpydGNTdGF0cy5jYW5kaWRhdGVfdHlwZSk7CisKKyAg ICBpZiAoc3RhdHMuY2FuZGlkYXRlVHlwZSA9PSBSVENTdGF0c1JlcG9ydDo6SWNlQ2FuZGlkYXRl VHlwZTo6UHJmbHgpCisgICAgICAgIHN0YXRzLmNhbmRpZGF0ZVR5cGUgPSB7IH07CisgICAgaWYg KHN0YXRzLmNhbmRpZGF0ZVR5cGUgPT0gUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVR5cGU6 OlByZmx4IHx8IHN0YXRzLmNhbmRpZGF0ZVR5cGUgPT0gUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRp ZGF0ZVR5cGU6Okhvc3QpCisgICAgICAgIHN0YXRzLmFkZHJlc3MgPSB7IH07CisKKyAgICBpZiAo cnRjU3RhdHMucHJpb3JpdHkuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5wcmlvcml0eSA9 ICpydGNTdGF0cy5wcmlvcml0eTsKKyAgICBpZiAocnRjU3RhdHMudXJsLmlzX2RlZmluZWQoKSkK KyAgICAgICAgc3RhdHMudXJsID0gZnJvbVN0ZFN0cmluZygqcnRjU3RhdHMudXJsKTsKKyAgICBp ZiAocnRjU3RhdHMuZGVsZXRlZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmRlbGV0ZWQg PSAqcnRjU3RhdHMuZGVsZXRlZDsKK30KKwogc3RhdGljIGlubGluZSB2b2lkIGZpbGxSVENDZXJ0 aWZpY2F0ZVN0YXRzKFJUQ1N0YXRzUmVwb3J0OjpDZXJ0aWZpY2F0ZVN0YXRzJiBzdGF0cywgY29u c3Qgd2VicnRjOjpSVENDZXJ0aWZpY2F0ZVN0YXRzJiBydGNTdGF0cykKIHsKICAgICBmaWxsUlRD U3RhdHMoc3RhdHMsIHJ0Y1N0YXRzKTsKQEAgLTM0MCw2ICszODUsMTAgQEAgdm9pZCBMaWJXZWJS VENTdGF0c0NvbGxlY3Rvcjo6T25TdGF0c0RlbGl2ZXJlZChjb25zdCBydGM6OnNjb3BlZF9yZWZw dHI8Y29uc3Qgd2UKICAgICAgICAgICAgICAgICBSVENTdGF0c1JlcG9ydDo6SWNlQ2FuZGlkYXRl UGFpclN0YXRzIHN0YXRzOwogICAgICAgICAgICAgICAgIGZpbGxSVENJY2VDYW5kaWRhdGVQYWly U3RhdHMoc3RhdHMsIHN0YXRpY19jYXN0PGNvbnN0IHdlYnJ0Yzo6UlRDSWNlQ2FuZGlkYXRlUGFp clN0YXRzJj4ocnRjU3RhdHMpKTsKICAgICAgICAgICAgICAgICByZXBvcnQtPmFkZFN0YXRzPElE TERpY3Rpb25hcnk8UlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVBhaXJTdGF0cz4+KFdURk1v dmUoc3RhdHMpKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAocnRjU3RhdHMudHlwZSgpID09IHdl YnJ0Yzo6UlRDUmVtb3RlSWNlQ2FuZGlkYXRlU3RhdHM6OmtUeXBlIHx8IHJ0Y1N0YXRzLnR5cGUo KSA9PSB3ZWJydGM6OlJUQ0xvY2FsSWNlQ2FuZGlkYXRlU3RhdHM6OmtUeXBlKSB7CisgICAgICAg ICAgICAgICAgUlRDU3RhdHNSZXBvcnQ6OkljZUNhbmRpZGF0ZVN0YXRzIHN0YXRzOworICAgICAg ICAgICAgICAgIGZpbGxSVENJY2VDYW5kaWRhdGVTdGF0cyhzdGF0cywgc3RhdGljX2Nhc3Q8Y29u c3Qgd2VicnRjOjpSVENJY2VDYW5kaWRhdGVTdGF0cyY+KHJ0Y1N0YXRzKSk7CisgICAgICAgICAg ICAgICAgcmVwb3J0LT5hZGRTdGF0czxJRExEaWN0aW9uYXJ5PFJUQ1N0YXRzUmVwb3J0OjpJY2VD YW5kaWRhdGVTdGF0cz4+KFdURk1vdmUoc3RhdHMpKTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAo cnRjU3RhdHMudHlwZSgpID09IHdlYnJ0Yzo6UlRDQ2VydGlmaWNhdGVTdGF0czo6a1R5cGUpIHsK ICAgICAgICAgICAgICAgICBSVENTdGF0c1JlcG9ydDo6Q2VydGlmaWNhdGVTdGF0cyBzdGF0czsK ICAgICAgICAgICAgICAgICBmaWxsUlRDQ2VydGlmaWNhdGVTdGF0cyhzdGF0cywgc3RhdGljX2Nh c3Q8Y29uc3Qgd2VicnRjOjpSVENDZXJ0aWZpY2F0ZVN0YXRzJj4ocnRjU3RhdHMpKTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCBlZmFjMjFhNGIwYjZhMmFkZmVlNTIzOGQxZTk5NDcyYmViNDBhYTMxLi5hMzQ4MTNjMzExYjcx MWI0ODM1ZWFjNGRhYWI3OGIyNDZiOTVhYTgzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgt MTAtMDYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBz dXBwb3J0IGZvciBJY2VDYW5kaWRhdGUgc3RhdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDMyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogd2VicnRjL2NhbmRpZGF0ZS1zdGF0cy1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIHdlYnJ0Yy9jYW5kaWRhdGUtc3RhdHMuaHRtbDogQWRkZWQu CisgICAgICAgICogd2VicnRjL3JvdXRpbmVzLmpzOgorICAgICAgICAqIHdlYnJ0Yy92aWRlby1z dGF0cy5odG1sOgorCiAyMDE4LTEwLTAzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv bT4KIAogICAgICAgICBBZGQgVlA4IHN1cHBvcnQgdG8gV2ViUlRDCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy93ZWJydGMvY2FuZGlkYXRlLXN0YXRzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L3dlYnJ0Yy9jYW5kaWRhdGUtc3RhdHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjIzZmU2ODRm M2I3NzRhOWY0ZTc2YWE0MzRmMDZhYThmYzljNGNkY2EKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy93ZWJydGMvY2FuZGlkYXRlLXN0YXRzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMg QEAKKworUEFTUyBJQ0UgY2FuZGlkYXRlIGRhdGEgY2hhbm5lbCBzdGF0cyAKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvd2VicnRjL2NhbmRpZGF0ZS1zdGF0cy5odG1sIGIvTGF5b3V0VGVzdHMv d2VicnRjL2NhbmRpZGF0ZS1zdGF0cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVhZGY3Mzg2MzE1YzUzNDNh ZTA0NWM4OTY2ZjdmZmFmNDA2NTljMTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy93 ZWJydGMvY2FuZGlkYXRlLXN0YXRzLmh0bWwKQEAgLTAsMCArMSw0MSBAQAorPCFkb2N0eXBlIGh0 bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgor ICAgICAgICA8dGl0bGU+VGVzdGluZyBiYXNpYyB2aWRlbyBleGNoYW5nZSBmcm9tIG9mZmVyZXIg dG8gcmVjZWl2ZXI8L3RpdGxlPgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3Rl c3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNl cy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5 PgorICAgICAgICA8c2NyaXB0IHNyYyA9InJvdXRpbmVzLmpzIj48L3NjcmlwdD4KKyAgICAgICAg PHNjcmlwdD4KK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4geworICAgIGxldCBmaXJzdENv bm5lY3Rpb24sIHNlY29uZENvbm5lY3Rpb247CisgICAgYXdhaXQgbmV3IFByb21pc2UoKHJlc29s dmUsIHJlamVjdCkgPT4geworICAgICAgICBjcmVhdGVDb25uZWN0aW9ucygoY29ubmVjdGlvbikg PT4geworICAgICAgICAgICAgZmlyc3RDb25uZWN0aW9uID0gY29ubmVjdGlvbjsKKyAgICAgICAg ICAgIGxvY2FsQ2hhbm5lbCA9IGNvbm5lY3Rpb24uY3JlYXRlRGF0YUNoYW5uZWwoJ3NlbmREYXRh Q2hhbm5lbCcpOworICAgICAgICB9LCAoY29ubmVjdGlvbikgPT4geworICAgICAgICAgICAgc2Vj b25kQ29ubmVjdGlvbiA9IGNvbm5lY3Rpb247CisgICAgICAgICAgICBjb25uZWN0aW9uLm9uZGF0 YWNoYW5uZWwgPSByZXNvbHZlOworICAgICAgICB9KTsKKyAgICAgICAgc2V0VGltZW91dCgoKSA9 PiB7IHJlamVjdCgiVGVzdCB0aW1lZCBvdXQiKTsgfSwgNTAwMCk7CisgICAgfSk7CisKKyAgICBs ZXQgc3RhdHMgPSBhd2FpdCBnZXRUeXBlZFN0YXRzKGZpcnN0Q29ubmVjdGlvbiwgImxvY2FsLWNh bmRpZGF0ZSIpOworICAgIGFzc2VydF90cnVlKCFzdGF0cy5hZGRyZXNzLCAiYWRkcmVzcyBpcyBu b3QgZXhwb3NlZCIpOworICAgIGFzc2VydF90cnVlKCFzdGF0cy5uZXR3b3JrVHlwZSwgIm5ldHdv cmtUeXBlIGlzIG5vdCBleHBvc2VkIik7CisKKyAgICBhc3NlcnRfYXJyYXlfZXF1YWxzKE9iamVj dC5rZXlzKHN0YXRzKSwgWyJpZCIsInRpbWVzdGFtcCIsInR5cGUiLCJjYW5kaWRhdGVUeXBlIiwi ZGVsZXRlZCIsInBvcnQiLCJwcmlvcml0eSIsInByb3RvY29sIiwidHJhbnNwb3J0SWQiXSwgImxv Y2FsIik7CisKKyAgICBzdGF0cyA9IGF3YWl0IGdldFR5cGVkU3RhdHMoZmlyc3RDb25uZWN0aW9u LCAicmVtb3RlLWNhbmRpZGF0ZSIpOworCisgICAgLy8gRm9yIG5vdywgd2UgZG8gbm90IHdhbnQg dG8gZXhwb3NlIGFkZHJlc3Mgb3IgbmV0d29ya1R5cGUuCisgICAgYXNzZXJ0X3RydWUoIXN0YXRz LmFkZHJlc3MsICJhZGRyZXNzIGlzIG5vdCBleHBvc2VkIik7CisgICAgYXNzZXJ0X3RydWUoIXN0 YXRzLm5ldHdvcmtUeXBlLCAibmV0d29ya1R5cGUgaXMgbm90IGV4cG9zZWQiKTsKKworICAgIGFz c2VydF9hcnJheV9lcXVhbHMoT2JqZWN0LmtleXMoc3RhdHMpLCBbImlkIiwidGltZXN0YW1wIiwi dHlwZSIsImNhbmRpZGF0ZVR5cGUiLCJkZWxldGVkIiwicG9ydCIsInByaW9yaXR5IiwicHJvdG9j b2wiLCJ0cmFuc3BvcnRJZCJdLCAicmVtb3RlIik7Cit9LCAiSUNFIGNhbmRpZGF0ZSBkYXRhIGNo YW5uZWwgc3RhdHMiKTsKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3JvdXRpbmVzLmpzIGIvTGF5b3V0VGVzdHMv d2VicnRjL3JvdXRpbmVzLmpzCmluZGV4IGM5ZGU1MDUxOTY0ZWQ4OGE3MGM1Y2E5ZmQxYzZhZjQ2 MzA3YWE2ZTguLmQzYjFhMGU3MjJkZjA2ZmY2YWE0OGFkZWNhNzA2Y2ZlN2ZhN2MyZDYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL3dlYnJ0Yy9yb3V0aW5lcy5qcworKysgYi9MYXlvdXRUZXN0cy93 ZWJydGMvcm91dGluZXMuanMKQEAgLTIxMSwzICsyMTEsMTQgQEAgZnVuY3Rpb24gc2V0Q29kZWMo c2RwLCBjb2RlYykKICAgICAgICAgcmV0dXJuIGxpbmUuaW5kZXhPZignYT1mbXRwJykgPT09IC0x ICYmIGxpbmUuaW5kZXhPZignYT1ydGNwLWZiJykgPT09IC0xICYmIChsaW5lLmluZGV4T2YoJ2E9 cnRwbWFwJykgPT09IC0xIHx8IGxpbmUuaW5kZXhPZihjb2RlYykgIT09IC0xKTsKICAgICB9KS5q b2luKCdcclxuJyk7CiB9CisKK2FzeW5jIGZ1bmN0aW9uIGdldFR5cGVkU3RhdHMoY29ubmVjdGlv biwgdHlwZSkKK3sKKyAgICBjb25zdCByZXBvcnQgPSBhd2FpdCBjb25uZWN0aW9uLmdldFN0YXRz KCk7CisgICAgdmFyIHN0YXRzOworICAgIHJlcG9ydC5mb3JFYWNoKChzdGF0SXRlbSkgPT4gewor ICAgICAgICBpZiAoc3RhdEl0ZW0udHlwZSA9PT0gdHlwZSkKKyAgICAgICAgICAgIHN0YXRzID0g c3RhdEl0ZW07CisgICAgfSk7CisgICAgcmV0dXJuIHN0YXRzOworfQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXN0YXRzLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlk ZW8tc3RhdHMuaHRtbAppbmRleCBkYzFjNGE1ZjI1Y2MyY2Q5NmZlMTUyNzczMDBhYzZhODRmOGVh ODJjLi4zNGFiY2JjNGRiYjI4ZTkzMjA1NTI1OTc5MzJmYTJhMGE0NjhiMjNiIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tc3RhdHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy93 ZWJydGMvdmlkZW8tc3RhdHMuaHRtbApAQCAtMTM3LDEwICsxMzcsMTAgQEAgcHJvbWlzZV90ZXN0 KGFzeW5jICh0ZXN0KSA9PiB7CiAgICAgYXdhaXQgY2hlY2tPdXRib3VuZEZyYW1lc051bWJlcklu Y3JlYXNlZChmaXJzdENvbm5lY3Rpb24sIHN0YXRzRmlyc3RDb25uZWN0aW9uLCAwKTsKIAogICAg IGxldCB0eXBlcyA9IGF3YWl0IGdldFN0YXRzVHlwZShmaXJzdENvbm5lY3Rpb24pOwotICAgIGFz c2VydF9hcnJheV9lcXVhbHModHlwZXMsIFsiY2FuZGlkYXRlLXBhaXIiLCAiY2VydGlmaWNhdGUi LCAiY29kZWMiLCAiaW5ib3VuZC1ydHAiLCAib3V0Ym91bmQtcnRwIiwgInRyYWNrIl0pOworICAg IGFzc2VydF9hcnJheV9lcXVhbHModHlwZXMsIFsiY2FuZGlkYXRlLXBhaXIiLCAiY2VydGlmaWNh dGUiLCAiY29kZWMiLCAiaW5ib3VuZC1ydHAiLCAibG9jYWwtY2FuZGlkYXRlIiwgIm91dGJvdW5k LXJ0cCIsICJyZW1vdGUtY2FuZGlkYXRlIiwgInRyYWNrIl0pOwogCiAgICAgdHlwZXMgPSBhd2Fp dCBnZXRTdGF0c1R5cGUoc2Vjb25kQ29ubmVjdGlvbik7Ci0gICAgYXNzZXJ0X2FycmF5X2VxdWFs cyh0eXBlcywgWyJjYW5kaWRhdGUtcGFpciIsICJjZXJ0aWZpY2F0ZSIsICJjb2RlYyIsICJpbmJv dW5kLXJ0cCIsICJvdXRib3VuZC1ydHAiLCAidHJhY2siXSk7CisgICAgYXNzZXJ0X2FycmF5X2Vx dWFscyh0eXBlcywgWyJjYW5kaWRhdGUtcGFpciIsICJjZXJ0aWZpY2F0ZSIsICJjb2RlYyIsICJp bmJvdW5kLXJ0cCIsICJsb2NhbC1jYW5kaWRhdGUiLCAib3V0Ym91bmQtcnRwIiwgInJlbW90ZS1j YW5kaWRhdGUiLCAidHJhY2siXSk7CiB9LCAiQmFzaWMgdmlkZW8gc3RhdHMiKTsKIAogcHJvbWlz ZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7Cg==