215678 2020-08-19 18:44:44 -0700 Missing WebRTC Metrics in iOS 14 Beta 5 2020-11-30 11:29:44 -0800 1 1 1 Unclassified WebKit WebRTC Safari Technology Preview iPhone / iPad Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=212668 InRadar P2 Normal --- 1 cxxu youennf ap eric.carlson ews-watchlist glenn hta jer.noble juberti philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1681577 0 cxxu 2020-08-19 18:44:44 -0700 WebRTC getStats API is missing critical metric values in iOS 14 Beta 5 (Tested on iphone 11) For the "video" "track" type , it is missing the following critical metrics: "kind" "jitterBufferDelay" "jitterBufferEmittedCount" For the "audio" "track" type , it is missing the following critical metrics: "kind" "jitterBufferDelay" "jitterBufferEmittedCount" "concealedSamples" "totalSamplesReceived" 1682188 1 webkit-bug-importer 2020-08-22 15:53:12 -0700 <rdar://problem/67625414> 1682189 2 ap 2020-08-22 15:54:00 -0700 Could you please clarify if this works as expected on iOS 13.6.1? 1682350 3 cxxu 2020-08-24 09:31:28 -0700 These metrics don't exist in iOS 13.6, many new metrics have been added since iOS 14. We have cut a ticket for adding the missing metrics (comparing to Chromium and w3c webrtc-stats) and has been closed (https://bugs.webkit.org/show_bug.cgi?id=212668), some of the metrics have been added (verified in iOS 14 beta 5), but there are still some important metrics that are missing. 1710574 4 415017 youennf 2020-11-30 05:21:11 -0800 Created attachment 415017 Patch 1710690 5 ews-feeder 2020-11-30 11:29:43 -0800 Committed r270255: <https://trac.webkit.org/changeset/270255> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415017. 415017 2020-11-30 05:21:11 -0800 2020-11-30 11:29:44 -0800 Patch bug-215678-20201130142109.patch text/plain 12449 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQ4NDFkNTk0MGUxYjFi YTYwYjMyYmY4NjIxNWUyMWYxOTg1NmQwOS4uNGEwYTA4OTA3ZTFkNDFmY2FlNjVjMjUzMzA3OTlj MGYwN2JlMDFkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTExLTMwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNaXNzaW5nIFdlYlJUQyBN ZXRyaWNzIGluIGlPUyAxNCBCZXRhIDUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNTY3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjc2MjU0MTQ+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwb3Nl IG1vcmUgc3RhdHMgYW5kIGZpeCBhIGJ1ZyBpbiBzdGF0IGV4cG9zdXJlIGNvZGUgZm9yIGtpbmQu CisgICAgICAgIENvdmVyZWQgYnkgdXBkYXRlZCB0ZXN0LgorCisgICAgICAgICogTW9kdWxlcy9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDU3RhdHNDb2xsZWN0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6ZmlsbEluYm91bmRSdHBTdHJlYW1TdGF0cyk6CisgICAgICAgIChXZWJDb3Jl OjpmaWxsUmVtb3RlSW5ib3VuZFJ0cFN0cmVhbVN0YXRzKToKKyAgICAgICAgKFdlYkNvcmU6OmZp bGxPdXRib3VuZFJ0cFN0cmVhbVN0YXRzKToKKwogMjAyMC0xMS0zMCAgWW91ZW5uIEZhYmxldCAg PHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSUNFIGRvZXMgbm90IHJlc29sdmUgZm9yIGB0 dXJuc2AgcmVsYXkgY2FuZGlkYXRlcyByb290ZWQgaW4gTGV0c0VuY3J5cHQgQ0EKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJU Q1N0YXRzQ29sbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v bGlid2VicnRjL0xpYldlYlJUQ1N0YXRzQ29sbGVjdG9yLmNwcAppbmRleCBjNTRlMzZhNWYyMWM2 YzU0MjAxNjk3MjNlMmViMTdhNjViMzU4M2Q0Li40Yzg1M2U3MmM3ZTg2N2ZhOWU3NTBhZjZjMzQ1 YjE0MjQxMzNhNzhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENTdGF0c0NvbGxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDU3RhdHNDb2xsZWN0 b3IuY3BwCkBAIC0xMTksNyArMTE5LDE0IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBmaWxsSW5ib3Vu ZFJ0cFN0cmVhbVN0YXRzKFJUQ1N0YXRzUmVwb3J0OjpJbmJvdW5kUnRwU3RyZWFtU3RhCiAgICAg ICAgIHN0YXRzLmZyYW1lc0RlY29kZWQgPSAqcnRjU3RhdHMuZnJhbWVzX2RlY29kZWQ7CiAgICAg aWYgKHJ0Y1N0YXRzLmtleV9mcmFtZXNfZGVjb2RlZC5pc19kZWZpbmVkKCkpCiAgICAgICAgIHN0 YXRzLmtleUZyYW1lc0RlY29kZWQgPSAqcnRjU3RhdHMua2V5X2ZyYW1lc19kZWNvZGVkOwotICAg IC8vIGZyYW1lV2lkdGgsIGZyYW1lSGVpZ2h0LCBmcmFtZUJpdERlcHRoLCBmcmFtZXNQZXJTZWNv bmQKKyAgICBpZiAocnRjU3RhdHMuZnJhbWVfd2lkdGguaXNfZGVmaW5lZCgpKQorICAgICAgICBz dGF0cy5mcmFtZVdpZHRoID0gKnJ0Y1N0YXRzLmZyYW1lX3dpZHRoOworICAgIGlmIChydGNTdGF0 cy5mcmFtZV9oZWlnaHQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5mcmFtZUhlaWdodCA9 ICpydGNTdGF0cy5mcmFtZV9oZWlnaHQ7CisgICAgaWYgKHJ0Y1N0YXRzLmZyYW1lX2JpdF9kZXB0 aC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmZyYW1lQml0RGVwdGggPSAqcnRjU3RhdHMu ZnJhbWVfYml0X2RlcHRoOworICAgIGlmIChydGNTdGF0cy5mcmFtZXNfcGVyX3NlY29uZC5pc19k ZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmZyYW1lc1BlclNlY29uZCA9ICpydGNTdGF0cy5mcmFt ZXNfcGVyX3NlY29uZDsKICAgICBpZiAocnRjU3RhdHMucXBfc3VtLmlzX2RlZmluZWQoKSkKICAg ICAgICAgc3RhdHMucXBTdW0gPSAqcnRjU3RhdHMucXBfc3VtOwogICAgIGlmIChydGNTdGF0cy50 b3RhbF9kZWNvZGVfdGltZS5pc19kZWZpbmVkKCkpCkBAIC0xMjgsNyArMTM1LDEwIEBAIHN0YXRp YyBpbmxpbmUgdm9pZCBmaWxsSW5ib3VuZFJ0cFN0cmVhbVN0YXRzKFJUQ1N0YXRzUmVwb3J0OjpJ bmJvdW5kUnRwU3RyZWFtU3RhCiAgICAgICAgIHN0YXRzLnRvdGFsSW50ZXJGcmFtZURlbGF5ID0g KnJ0Y1N0YXRzLnRvdGFsX2ludGVyX2ZyYW1lX2RlbGF5OwogICAgIGlmIChydGNTdGF0cy50b3Rh bF9zcXVhcmVkX2ludGVyX2ZyYW1lX2RlbGF5LmlzX2RlZmluZWQoKSkKICAgICAgICAgc3RhdHMu dG90YWxTcXVhcmVkSW50ZXJGcmFtZURlbGF5ID0gKnJ0Y1N0YXRzLnRvdGFsX3NxdWFyZWRfaW50 ZXJfZnJhbWVfZGVsYXk7Ci0gICAgLy8gdm9pY2VBY3Rpdml0eUZsYWcsIGxhc3RQYWNrZXRSZWNl aXZlZFRpbWVzdGFtcCwgYXZlcmFnZVJ0Y3BJbnRlcnZhbAorICAgIC8vIHZvaWNlQWN0aXZpdHlG bGFnCisgICAgaWYgKHJ0Y1N0YXRzLmxhc3RfcGFja2V0X3JlY2VpdmVkX3RpbWVzdGFtcC5pc19k ZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmxhc3RQYWNrZXRSZWNlaXZlZFRpbWVzdGFtcCA9ICpy dGNTdGF0cy5sYXN0X3BhY2tldF9yZWNlaXZlZF90aW1lc3RhbXA7CisgICAgLy8gYXZlcmFnZVJ0 Y3BJbnRlcnZhbAogICAgIGlmIChydGNTdGF0cy5oZWFkZXJfYnl0ZXNfcmVjZWl2ZWQuaXNfZGVm aW5lZCgpKQogICAgICAgICBzdGF0cy5oZWFkZXJCeXRlc1JlY2VpdmVkID0gKnJ0Y1N0YXRzLmhl YWRlcl9ieXRlc19yZWNlaXZlZDsKICAgICBpZiAocnRjU3RhdHMuZmVjX3BhY2tldHNfcmVjZWl2 ZWQuaXNfZGVmaW5lZCgpKQpAQCAtMTQ2LDkgKzE1NiwzMyBAQCBzdGF0aWMgaW5saW5lIHZvaWQg ZmlsbEluYm91bmRSdHBTdHJlYW1TdGF0cyhSVENTdGF0c1JlcG9ydDo6SW5ib3VuZFJ0cFN0cmVh bVN0YQogICAgICAgICBzdGF0cy5uYWNrQ291bnQgPSAqcnRjU3RhdHMubmFja19jb3VudDsKICAg ICBpZiAocnRjU3RhdHMuc2xpX2NvdW50LmlzX2RlZmluZWQoKSkKICAgICAgICAgc3RhdHMuc2xp Q291bnQgPSAqcnRjU3RhdHMuc2xpX2NvdW50OwotICAgIC8vIGVzdGltYXRlZFBsYXlvdXRUaW1l c3RhbXAsIGppdHRlckJ1ZmZlckRlbGF5LCBqaXR0ZXJCdWZmZXJFbWl0dGVkQ291bnQsIHRvdGFs U2FtcGxlc1JlY2VpdmVkLCBzYW1wbGVzRGVjb2RlZFdpdGhTaWxrLCBzYW1wbGVzRGVjb2RlZFdp dGhDZWx0Ci0gICAgLy8gY29uY2VhbGVkU2FtcGxlcywgc2lsZW50Q29uY2VhbGVkU2FtcGxlcywg Y29uY2VhbG1lbnRFdmVudHMsIGluc2VydGVkU2FtcGxlc0ZvckRlY2VsZXJhdGlvbiwgcmVtb3Zl ZFNhbXBsZXNGb3JBY2NlbGVyYXRpb24KLSAgICAvLyBhdWRpb0xldmVsLCB0b3RhbEF1ZGlvRW5l cmd5LCB0b3RhbFNhbXBsZXNEdXJhdGlvbiwgZnJhbWVzUmVjZWl2ZWQKKyAgICBpZiAocnRjU3Rh dHMuZXN0aW1hdGVkX3BsYXlvdXRfdGltZXN0YW1wLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3Rh dHMuZXN0aW1hdGVkUGxheW91dFRpbWVzdGFtcCA9ICpydGNTdGF0cy5lc3RpbWF0ZWRfcGxheW91 dF90aW1lc3RhbXA7CisgICAgaWYgKHJ0Y1N0YXRzLmppdHRlcl9idWZmZXJfZGVsYXkuaXNfZGVm aW5lZCgpKQorICAgICAgICBzdGF0cy5qaXR0ZXJCdWZmZXJEZWxheSA9ICpydGNTdGF0cy5qaXR0 ZXJfYnVmZmVyX2RlbGF5OworICAgIGlmIChydGNTdGF0cy5qaXR0ZXJfYnVmZmVyX2VtaXR0ZWRf Y291bnQuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5qaXR0ZXJCdWZmZXJFbWl0dGVkQ291 bnQgPSAqcnRjU3RhdHMuaml0dGVyX2J1ZmZlcl9lbWl0dGVkX2NvdW50OworICAgIGlmIChydGNT dGF0cy50b3RhbF9zYW1wbGVzX3JlY2VpdmVkLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMu dG90YWxTYW1wbGVzUmVjZWl2ZWQgPSAqcnRjU3RhdHMudG90YWxfc2FtcGxlc19yZWNlaXZlZDsK KyAgICAvLyBzYW1wbGVzRGVjb2RlZFdpdGhTaWxrLCBzYW1wbGVzRGVjb2RlZFdpdGhDZWx0Cisg ICAgaWYgKHJ0Y1N0YXRzLmNvbmNlYWxlZF9zYW1wbGVzLmlzX2RlZmluZWQoKSkKKyAgICAgICAg c3RhdHMuY29uY2VhbGVkU2FtcGxlcyA9ICpydGNTdGF0cy5jb25jZWFsZWRfc2FtcGxlczsKKyAg ICBpZiAocnRjU3RhdHMuc2lsZW50X2NvbmNlYWxlZF9zYW1wbGVzLmlzX2RlZmluZWQoKSkKKyAg ICAgICAgc3RhdHMuc2lsZW50Q29uY2VhbGVkU2FtcGxlcyA9ICpydGNTdGF0cy5zaWxlbnRfY29u Y2VhbGVkX3NhbXBsZXM7CisgICAgaWYgKHJ0Y1N0YXRzLmNvbmNlYWxtZW50X2V2ZW50cy5pc19k ZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmNvbmNlYWxtZW50RXZlbnRzID0gKnJ0Y1N0YXRzLmNv bmNlYWxtZW50X2V2ZW50czsKKyAgICBpZiAocnRjU3RhdHMuaW5zZXJ0ZWRfc2FtcGxlc19mb3Jf ZGVjZWxlcmF0aW9uLmlzX2RlZmluZWQoKSkKKyAgICAgICAgc3RhdHMuaW5zZXJ0ZWRTYW1wbGVz Rm9yRGVjZWxlcmF0aW9uID0gKnJ0Y1N0YXRzLmluc2VydGVkX3NhbXBsZXNfZm9yX2RlY2VsZXJh dGlvbjsKKyAgICBpZiAocnRjU3RhdHMucmVtb3ZlZF9zYW1wbGVzX2Zvcl9hY2NlbGVyYXRpb24u aXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5yZW1vdmVkU2FtcGxlc0ZvckFjY2VsZXJhdGlv biA9ICpydGNTdGF0cy5yZW1vdmVkX3NhbXBsZXNfZm9yX2FjY2VsZXJhdGlvbjsKKyAgICBpZiAo cnRjU3RhdHMuYXVkaW9fbGV2ZWwuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5hdWRpb0xl dmVsID0gKnJ0Y1N0YXRzLmF1ZGlvX2xldmVsOworICAgIGlmIChydGNTdGF0cy50b3RhbF9hdWRp b19lbmVyZ3kuaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy50b3RhbEF1ZGlvRW5lcmd5ID0g KnJ0Y1N0YXRzLnRvdGFsX2F1ZGlvX2VuZXJneTsKKyAgICBpZiAocnRjU3RhdHMudG90YWxfc2Ft cGxlc19kdXJhdGlvbi5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLnRvdGFsU2FtcGxlc0R1 cmF0aW9uID0gKnJ0Y1N0YXRzLnRvdGFsX3NhbXBsZXNfZHVyYXRpb247CisgICAgaWYgKHJ0Y1N0 YXRzLmZyYW1lc19yZWNlaXZlZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmZyYW1lc1Jl Y2VpdmVkID0gKnJ0Y1N0YXRzLmZyYW1lc19yZWNlaXZlZDsKIAogICAgIGlmIChydGNTdGF0cy50 cmFja19pZC5pc19kZWZpbmVkKCkpCiAgICAgICAgIHN0YXRzLnRyYWNrSWQgPSBmcm9tU3RkU3Ry aW5nKCpydGNTdGF0cy50cmFja19pZCk7CkBAIC0xNjYsNyArMjAwLDcgQEAgc3RhdGljIGlubGlu ZSB2b2lkIGZpbGxSZW1vdGVJbmJvdW5kUnRwU3RyZWFtU3RhdHMoUlRDU3RhdHNSZXBvcnQ6OlJl bW90ZUluYm91bmQKICAgICBpZiAocnRjU3RhdHMuY29kZWNfaWQuaXNfZGVmaW5lZCgpKQogICAg ICAgICBzdGF0cy5jb2RlY0lkID0gZnJvbVN0ZFN0cmluZygqcnRjU3RhdHMuY29kZWNfaWQpOwog ICAgIGlmIChydGNTdGF0cy5raW5kLmlzX2RlZmluZWQoKSkKLSAgICAgICAgc3RhdHMua2luZCA9 IHN0YXRzLmtpbmQ7CisgICAgICAgIHN0YXRzLmtpbmQgPSBmcm9tU3RkU3RyaW5nKCpydGNTdGF0 cy5raW5kKTsKIAogICAgIGlmIChydGNTdGF0cy5sb2NhbF9pZC5pc19kZWZpbmVkKCkpCiAgICAg ICAgIHN0YXRzLmxvY2FsSWQgPSBmcm9tU3RkU3RyaW5nKCpydGNTdGF0cy5sb2NhbF9pZCk7CkBA IC0xOTYsNyArMjMwLDggQEAgc3RhdGljIGlubGluZSB2b2lkIGZpbGxPdXRib3VuZFJ0cFN0cmVh bVN0YXRzKFJUQ1N0YXRzUmVwb3J0OjpPdXRib3VuZFJ0cFN0cmVhbVMKICAgICAvLyBzZW5kZXJJ ZAogICAgIGlmIChydGNTdGF0cy5yZW1vdGVfaWQuaXNfZGVmaW5lZCgpKQogICAgICAgICBzdGF0 cy5yZW1vdGVJZCA9IGZyb21TdGRTdHJpbmcoKnJ0Y1N0YXRzLnJlbW90ZV9pZCk7Ci0gICAgLy8g cmlkLCBwYWNrZXRzRGlzY2FyZGVkT25TZW5kCisgICAgaWYgKHJ0Y1N0YXRzLnJpZC5pc19kZWZp bmVkKCkpCisgICAgICAgIHN0YXRzLnJpZCA9IGZyb21TdGRTdHJpbmcoKnJ0Y1N0YXRzLnJpZCk7 CiAgICAgaWYgKHJ0Y1N0YXRzLmhlYWRlcl9ieXRlc19zZW50LmlzX2RlZmluZWQoKSkKICAgICAg ICAgc3RhdHMuaGVhZGVyQnl0ZXNTZW50ID0gKnJ0Y1N0YXRzLmhlYWRlcl9ieXRlc19zZW50Owog ICAgIC8vIHBhY2tldHNEaXNjYXJkZWRPblNlbmQsIGJ5dGVzRGlzY2FyZGVkT25TZW5kLCBmZWNQ YWNrZXRzU2VudDsKQEAgLTIwNiw3ICsyNDEsMTkgQEAgc3RhdGljIGlubGluZSB2b2lkIGZpbGxP dXRib3VuZFJ0cFN0cmVhbVN0YXRzKFJUQ1N0YXRzUmVwb3J0OjpPdXRib3VuZFJ0cFN0cmVhbVMK ICAgICAgICAgc3RhdHMucmV0cmFuc21pdHRlZEJ5dGVzU2VudCA9ICpydGNTdGF0cy5yZXRyYW5z bWl0dGVkX2J5dGVzX3NlbnQ7CiAgICAgaWYgKHJ0Y1N0YXRzLnRhcmdldF9iaXRyYXRlLmlzX2Rl ZmluZWQoKSkKICAgICAgICAgc3RhdHMudGFyZ2V0Qml0cmF0ZSA9ICpydGNTdGF0cy50YXJnZXRf Yml0cmF0ZTsKLSAgICAvLyB0b3RhbEVuY29kZWRCeXRlc1RhcmdldCwgZnJhbWVXaWR0aCwgZnJh bWVIZWlnaHQsIGZyYW1lQml0RGVwdGgsIGZyYW1lc1BlclNlY29uZCwgZnJhbWVzU2VudCwgaHVn ZUZyYW1lc1NlbnQKKyAgICBpZiAocnRjU3RhdHMudG90YWxfZW5jb2RlZF9ieXRlc190YXJnZXQu aXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy50b3RhbEVuY29kZWRCeXRlc1RhcmdldCA9ICpy dGNTdGF0cy50b3RhbF9lbmNvZGVkX2J5dGVzX3RhcmdldDsKKyAgICBpZiAocnRjU3RhdHMuZnJh bWVfd2lkdGguaXNfZGVmaW5lZCgpKQorICAgICAgICBzdGF0cy5mcmFtZVdpZHRoID0gKnJ0Y1N0 YXRzLmZyYW1lX3dpZHRoOworICAgIGlmIChydGNTdGF0cy5mcmFtZV9oZWlnaHQuaXNfZGVmaW5l ZCgpKQorICAgICAgICBzdGF0cy5mcmFtZUhlaWdodCA9ICpydGNTdGF0cy5mcmFtZV9oZWlnaHQ7 CisgICAgLy8gZnJhbWVCaXREZXB0aAorICAgIGlmIChydGNTdGF0cy5mcmFtZXNfcGVyX3NlY29u ZC5pc19kZWZpbmVkKCkpCisgICAgICAgIHN0YXRzLmZyYW1lc1BlclNlY29uZCA9ICpydGNTdGF0 cy5mcmFtZXNfcGVyX3NlY29uZDsKKyAgICBpZiAocnRjU3RhdHMuZnJhbWVzX3NlbnQuaXNfZGVm aW5lZCgpKQorICAgICAgICBzdGF0cy5mcmFtZXNTZW50ID0gKnJ0Y1N0YXRzLmZyYW1lc19zZW50 OworICAgIGlmIChydGNTdGF0cy5odWdlX2ZyYW1lc19zZW50LmlzX2RlZmluZWQoKSkKKyAgICAg ICAgc3RhdHMuaHVnZUZyYW1lc1NlbnQgPSAqcnRjU3RhdHMuaHVnZV9mcmFtZXNfc2VudDsKICAg ICBpZiAocnRjU3RhdHMuZnJhbWVzX2VuY29kZWQuaXNfZGVmaW5lZCgpKQogICAgICAgICBzdGF0 cy5mcmFtZXNFbmNvZGVkID0gKnJ0Y1N0YXRzLmZyYW1lc19lbmNvZGVkOwogICAgIGlmIChydGNT dGF0cy5rZXlfZnJhbWVzX2VuY29kZWQuaXNfZGVmaW5lZCgpKQpAQCAtMjE0LDExICsyNjEsMTQg QEAgc3RhdGljIGlubGluZSB2b2lkIGZpbGxPdXRib3VuZFJ0cFN0cmVhbVN0YXRzKFJUQ1N0YXRz UmVwb3J0OjpPdXRib3VuZFJ0cFN0cmVhbVMKICAgICAvLyBmcmFtZXNEaXNjYXJkZWRPblNlbmQ7 CiAgICAgaWYgKHJ0Y1N0YXRzLnFwX3N1bS5pc19kZWZpbmVkKCkpCiAgICAgICAgIHN0YXRzLnFw U3VtID0gKnJ0Y1N0YXRzLnFwX3N1bTsKLSAgICAvLyB0b3RhbEVuY29kZWRCeXRlc1RhcmdldCwg ZnJhbWVXaWR0aCwgZnJhbWVIZWlnaHQsIGZyYW1lQml0RGVwdGgsIGZyYW1lc1BlclNlY29uZCwg ZnJhbWVzU2VudCwgaHVnZUZyYW1lc1NlbnQKLSAgICAvLyB0b3RhbFNhbXBsZXNTZW50LCBzYW1w bGVzRW5jb2RlZFdpdGhTaWxrLCBzYW1wbGVzRW5jb2RlZFdpdGhDZWx0LCB2b2ljZUFjdGl2aXR5 RmxhZywgdG90YWxFbmNvZGVUaW1lCisgICAgLy8gdG90YWxTYW1wbGVzU2VudCwgc2FtcGxlc0Vu Y29kZWRXaXRoU2lsaywgc2FtcGxlc0VuY29kZWRXaXRoQ2VsdCwgdm9pY2VBY3Rpdml0eUZsYWcK KyAgICBpZiAocnRjU3RhdHMudG90YWxfZW5jb2RlX3RpbWUuaXNfZGVmaW5lZCgpKQorICAgICAg ICBzdGF0cy50b3RhbEVuY29kZVRpbWUgPSAqcnRjU3RhdHMudG90YWxfZW5jb2RlX3RpbWU7CiAg ICAgaWYgKHJ0Y1N0YXRzLnRvdGFsX3BhY2tldF9zZW5kX2RlbGF5LmlzX2RlZmluZWQoKSkKICAg ICAgICAgc3RhdHMudG90YWxQYWNrZXRTZW5kRGVsYXkgPSAqcnRjU3RhdHMudG90YWxfcGFja2V0 X3NlbmRfZGVsYXk7Ci0gICAgLy8gYXZlcmFnZVJ0Y3BJbnRlcnZhbCwgcXVhbGl0eUxpbWl0YXRp b25SZXNvbHV0aW9uQ2hhbmdlcworICAgIC8vIGF2ZXJhZ2VSdGNwSW50ZXJ2YWwKKyAgICBpZiAo cnRjU3RhdHMucXVhbGl0eV9saW1pdGF0aW9uX3Jlc29sdXRpb25fY2hhbmdlcy5pc19kZWZpbmVk KCkpCisgICAgICAgIHN0YXRzLnF1YWxpdHlMaW1pdGF0aW9uUmVzb2x1dGlvbkNoYW5nZXMgPSAq cnRjU3RhdHMucXVhbGl0eV9saW1pdGF0aW9uX3Jlc29sdXRpb25fY2hhbmdlczsKICAgICBpZiAo cnRjU3RhdHMubmFja19jb3VudC5pc19kZWZpbmVkKCkpCiAgICAgICAgIHN0YXRzLm5hY2tDb3Vu dCA9ICpydGNTdGF0cy5uYWNrX2NvdW50OwogICAgIGlmIChydGNTdGF0cy5maXJfY291bnQuaXNf ZGVmaW5lZCgpKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IDcwMTQyNWFjMGIxMTQ1YTMwNWEyZTY1ZWU5MWMzNmEzYTIwMjg4 NjAuLjYwOGZhNzViNjg0MDM5ZWU5MjcyMDNmMzJjNmNjNDI3YzgwZGM0MzUgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAyMC0xMS0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+ CisKKyAgICAgICAgTWlzc2luZyBXZWJSVEMgTWV0cmljcyBpbiBpT1MgMTQgQmV0YSA1CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU2NzgKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzY3NjI1NDE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogd2VicnRjL3ZpZGVvLXN0YXRzLmh0bWw6CisKIDIwMjAt MTEtMjcgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBz dXBwb3J0IGZvciByZWFkYWJsZS93cml0YWJsZSB0byBSVENSdHBTRnJhbWVUcmFuc2Zvcm0KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1zdGF0cy5odG1sIGIvTGF5b3V0VGVz dHMvd2VicnRjL3ZpZGVvLXN0YXRzLmh0bWwKaW5kZXggOWNhN2FmN2E1Nzc3NjBjZmYxZmIxNzY0 NzNkMGQ2MjRhMTkxNTUxZS4uMjIwMjczOWVkMjc0MTg4NzMwZDAxZTI3N2Y5ZjlkYWIxMjNjYzkx ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXN0YXRzLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXN0YXRzLmh0bWwKQEAgLTcxLDYgKzcxLDIwIEBAIGZ1 bmN0aW9uIGdldEluYm91bmRSVFBTdGF0cyhjb25uZWN0aW9uKQogICAgIH0pOwogfQogCitmdW5j dGlvbiBnZXRSZW1vdGVJbmJvdW5kUlRQU3RhdHMoY29ubmVjdGlvbikKK3sKKyAgICByZXR1cm4g Y29ubmVjdGlvbi5nZXRTdGF0cygpLnRoZW4oKHJlcG9ydCkgPT4geworICAgICAgICBjaGVja1N0 YXRzUmVwb3J0SXRlcmF0b3IocmVwb3J0KTsKKyAgICAgICAgdmFyIHN0YXRzOworICAgICAgICBy ZXBvcnQuZm9yRWFjaCgoc3RhdEl0ZW0pID0+IHsKKyAgICAgICAgICAgIGlmIChzdGF0SXRlbS50 eXBlID09PSAicmVtb3RlLWluYm91bmQtcnRwIikgeworICAgICAgICAgICAgICAgIHN0YXRzID0g c3RhdEl0ZW07CisgICAgICAgICAgICB9CisgICAgICAgIH0pOworICAgICAgICByZXR1cm4gc3Rh dHM7CisgICAgfSk7Cit9CisKIGZ1bmN0aW9uIGdldE91dGJvdW5kUlRQU3RhdHMoY29ubmVjdGlv bikKIHsKICAgICByZXR1cm4gY29ubmVjdGlvbi5nZXRTdGF0cygpLnRoZW4oKHJlcG9ydCkgPT4g ewpAQCAtMTA4LDYgKzEyMiw3IEBAIGZ1bmN0aW9uIHRlc3RUaW1lc3RhbXBEaWZmZXJlbmNlKHRp bWVTdGFtcERpZmZlcmVuY2UsIG51bWJlck9mRnJhbWVzKQogZnVuY3Rpb24gY2hlY2tJbmJvdW5k RnJhbWVzTnVtYmVySW5jcmVhc2VkKHNlY29uZENvbm5lY3Rpb24sIHN0YXRzU2Vjb25kQ29ubmVj dGlvbiwgY291bnQpCiB7CiAgICAgcmV0dXJuIGdldEluYm91bmRSVFBTdGF0cyhzZWNvbmRDb25u ZWN0aW9uKS50aGVuKChzdGF0cykgPT4geworICAgICAgICBhc3NlcnRfdHJ1ZSghIXN0YXRzLmtp bmQpOwogICAgICAgICBpZiAoc3RhdHMuZnJhbWVzRGVjb2RlZCA+IHN0YXRzU2Vjb25kQ29ubmVj dGlvbi5mcmFtZXNEZWNvZGVkKSB7CiAgICAgICAgICAgICBpZiAodGVzdFRpbWVzdGFtcERpZmZl cmVuY2Uoc3RhdHMudGltZXN0YW1wIC0gc3RhdHNTZWNvbmRDb25uZWN0aW9uLnRpbWVzdGFtcCwg c3RhdHMuZnJhbWVzRGVjb2RlZCAtIHN0YXRzU2Vjb25kQ29ubmVjdGlvbi5mcmFtZXNEZWNvZGVk KSkKICAgICAgICAgICAgICAgICByZXR1cm4gUHJvbWlzZS5yZWplY3QoInRpbWVzdGFtcCBhbmQg ZnJhbWVzIGluY3JlbWVudCBkbyBub3QgbWF0Y2giKTsKQEAgLTE5NywxMSArMjEyLDE0IEBAIHBy b21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4gewogCiAgICAgYXNzZXJ0X2FycmF5X2VxdWFscyh0 eXBlcywgWyJjYW5kaWRhdGUtcGFpciIsICJjZXJ0aWZpY2F0ZSIsICJjb2RlYyIsICJpbmJvdW5k LXJ0cCIsICJsb2NhbC1jYW5kaWRhdGUiLCAibWVkaWEtc291cmNlIiwgIm91dGJvdW5kLXJ0cCIs ICJwZWVyLWNvbm5lY3Rpb24iLCAicmVtb3RlLWNhbmRpZGF0ZSIsICJyZW1vdGUtaW5ib3VuZC1y dHAiLCAidHJhY2siLCAidHJhbnNwb3J0Il0sICJzZWNvbmQgY29ubmVjdGlvbiIpOwogCi0gICAg IGNvbnN0IGF1ZGlvU291cmNlU3RhdHMgPSBhd2FpdCBnZXRBdWRpb1NvdXJjZVN0YXRzKGZpcnN0 Q29ubmVjdGlvbik7Ci0gICAgIGFzc2VydF90cnVlKCEhYXVkaW9Tb3VyY2VTdGF0cywgImF1ZGlv IHNvdXJjZSBwcmVzZW5jZSIpOworICAgIGNvbnN0IGF1ZGlvU291cmNlU3RhdHMgPSBhd2FpdCBn ZXRBdWRpb1NvdXJjZVN0YXRzKGZpcnN0Q29ubmVjdGlvbik7CisgICAgYXNzZXJ0X3RydWUoISFh dWRpb1NvdXJjZVN0YXRzLCAiYXVkaW8gc291cmNlIHByZXNlbmNlIik7CisKKyAgICBjb25zdCB2 aWRlb1NvdXJjZVN0YXRzID0gYXdhaXQgZ2V0VmlkZW9Tb3VyY2VTdGF0cyhmaXJzdENvbm5lY3Rp b24pOworICAgIGFzc2VydF90cnVlKCEhdmlkZW9Tb3VyY2VTdGF0cywgInZpZGVvIHNvdXJjZSBw cmVzZW5jZSIpOwogCi0gICAgIGNvbnN0IHZpZGVvU291cmNlU3RhdHMgPSBhd2FpdCBnZXRWaWRl b1NvdXJjZVN0YXRzKGZpcnN0Q29ubmVjdGlvbik7Ci0gICAgIGFzc2VydF90cnVlKCEhdmlkZW9T b3VyY2VTdGF0cywgInZpZGVvIHNvdXJjZSBwcmVzZW5jZSIpOworICAgIGNvbnN0IHJlbW90ZUlu Ym91bmRTdGF0cyA9IGF3YWl0IGdldFJlbW90ZUluYm91bmRSVFBTdGF0cyhmaXJzdENvbm5lY3Rp b24pOworICAgIGFzc2VydF90cnVlKHJlbW90ZUluYm91bmRTdGF0cy5raW5kID09PSAiYXVkaW8i fHwgcmVtb3RlSW5ib3VuZFN0YXRzLmtpbmQgPT09ICJ2aWRlbyIsICJraW5kIGlzIHByZXNlbnQi KTsKIH0sICJCYXNpYyB2aWRlbyBzdGF0cyIpOwogCiBwcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3Qp ID0+IHsKQEAgLTIzMCw2ICsyNDgsMTEgQEAgcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7 CiAgICAgfSk7CiAgICAgYXNzZXJ0X2ZhbHNlKCEhb3V0c3RhdHMpOwogICAgIGFzc2VydF90cnVl KCEhaW5zdGF0cyk7CisKKyAgICBhc3NlcnRfZ3JlYXRlcl90aGFuX2VxdWFsKGluc3RhdHMuaml0 dGVyQnVmZmVyRGVsYXksIDAsICJqaXR0ZXJCdWZmZXJEZWxheSIpOworICAgIGFzc2VydF9ncmVh dGVyX3RoYW5fZXF1YWwoaW5zdGF0cy5qaXR0ZXJCdWZmZXJFbWl0dGVkQ291bnQsIDAsICJqaXR0 ZXJCdWZmZXJFbWl0dGVkQ291bnQiKTsKKyAgICBhc3NlcnRfZ3JlYXRlcl90aGFuX2VxdWFsKGlu c3RhdHMuY29uY2VhbGVkU2FtcGxlcywgMCwgImNvbmNlYWxlZFNhbXBsZXMiKTsKKyAgICBhc3Nl cnRfZ3JlYXRlcl90aGFuX2VxdWFsKGluc3RhdHMudG90YWxTYW1wbGVzUmVjZWl2ZWQsIDAsICJ0 b3RhbFNhbXBsZXNSZWNlaXZlZCIpOwogfSwgIlJlY2VpdmVyIHN0YXRzIik7CiAKIHByb21pc2Vf dGVzdChhc3luYyAodGVzdCkgPT4gewo=