180325 2017-12-02 18:40:37 -0800 Move registration activation and clearing from SWServerJobQueue to SWServerRegistration 2017-12-02 21:33:20 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf beidson cdumez commit-queue webkit-bug-importer oldest_to_newest 1377419 0 youennf 2017-12-02 18:40:37 -0800 These algorithms fit naturally in SWServerRegistration and are used as part of clients.claim which has SWServerRegistration but no job queue. 1377421 1 328275 youennf 2017-12-02 18:54:01 -0800 Created attachment 328275 Patch 1377427 2 328275 cdumez 2017-12-02 19:59:12 -0800 Comment on attachment 328275 Patch r=me 1377438 3 328275 commit-queue 2017-12-02 21:32:37 -0800 Comment on attachment 328275 Patch Clearing flags on attachment: 328275 Committed r225457: <https://trac.webkit.org/changeset/225457> 1377439 4 commit-queue 2017-12-02 21:32:38 -0800 All reviewed patches have been landed. Closing bug. 1377440 5 webkit-bug-importer 2017-12-02 21:33:20 -0800 <rdar://problem/35817170> 328275 2017-12-02 18:54:01 -0800 2017-12-02 21:32:37 -0800 Patch bug-180325-20171202185400.patch text/plain 18356 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1NDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjIxNDgwMGRhZDlhYzM0 NDllOGM5ODc1NDJhMGYxNzdmODY2MGVmZS4uOTU2Y2QyZTJmY2IyM2U3Y2ExYjRlMDhmOGY4MDk2 ZGNlMzVmODZmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDE3LTEyLTAyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBNb3ZlIHJlZ2lzdHJhdGlv biBhY3RpdmF0aW9uIGFuZCBjbGVhcmluZyBmcm9tIFNXU2VydmVySm9iUXVldWUgdG8gU1dTZXJ2 ZXJSZWdpc3RyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE4MDMyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIGNoYW5nZSBvZiBiZWhhdmlvci4KKworICAgICAgICBUaGVzZSBhbGdvcml0aG1z IGZpdCBuYXR1cmFsbHkgaW4gU1dTZXJ2ZXJSZWdpc3RyYXRpb24gYW5kIHdpbGwgYmUgdXNlZCBh cyBwYXJ0IG9mIGNsaWVudHMuY2xhaW0uCisKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2Uvc2Vy dmVyL1NXU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVyOjpjbGVhckFsbCk6 CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZlcjo6ZGlkRmluaXNoQWN0aXZhdGlvbik6CisgICAg ICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlckpvYlF1ZXVlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNXU2VydmVySm9iUXVldWU6OnNjcmlwdEZldGNoRmluaXNoZWQpOgorICAg ICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJKb2JRdWV1ZTo6c2NyaXB0Q29udGV4dEZhaWxlZFRvU3Rh cnQpOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJKb2JRdWV1ZTo6ZGlkRmluaXNoSW5zdGFs bCk6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZlckpvYlF1ZXVlOjpydW5VbnJlZ2lzdGVySm9i KToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVySm9iUXVldWU6OnRyeUFjdGl2YXRlKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVySm9iUXVldWU6OmFjdGl2YXRlKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVySm9iUXVldWU6OmRpZEZpbmlzaEFjdGl2 YXRpb24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJKb2JRdWV1ZTo6dHJ5 Q2xlYXJSZWdpc3RyYXRpb24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Y2xlYXJSZWdp c3RyYXRpb25Xb3JrZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJKb2JR dWV1ZTo6Y2xlYXJSZWdpc3RyYXRpb24pOiBEZWxldGVkLgorICAgICAgICAqIHdvcmtlcnMvc2Vy dmljZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1ZS5oOgorICAgICAgICAqIHdvcmtlcnMvc2Vydmlj ZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1dT ZXJ2ZXJSZWdpc3RyYXRpb246OnRyeUNsZWFyKToKKyAgICAgICAgKFdlYkNvcmU6OmNsZWFyUmVn aXN0cmF0aW9uV29ya2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVyUmVnaXN0cmF0aW9u OjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZlclJlZ2lzdHJhdGlvbjo6dHJ5QWN0 aXZhdGUpOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXJSZWdpc3RyYXRpb246OmFjdGl2YXRl KToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVyUmVnaXN0cmF0aW9uOjpkaWRGaW5pc2hBY3Rp dmF0aW9uKToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0 cmF0aW9uLmg6CisKKzIwMTctMTItMDIgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgorCiAgICAgICAgIENhbGwgIlRlcm1pbmF0ZSBTZXJ2aWNlIFdvcmtlciIgb24gYWxsIHdvcmtl cnMgd2hlbiBhbGwgdGhlaXIgY2xpZW50cyBhcmUgZ29uZQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5NTUyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKaW5kZXggMWRkNTZlMzI1ZGUx NGJhMTM3YjA1YjYwNTYyYTViYjJlMGYzZmUwZi4uY2E1MTU0OTJmY2I1MzQyN2JmYWM2OGQxY2Vh OTQ2ZDg5MWQ3MjgxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9TV1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9TV1NlcnZlci5jcHAKQEAgLTE0OCw3ICsxNDgsNyBAQCB2b2lkIFNXU2VydmVyOjpj bGVhckFsbCgpCiB7CiAgICAgbV9qb2JRdWV1ZXMuY2xlYXIoKTsKICAgICB3aGlsZSAoIW1fcmVn aXN0cmF0aW9ucy5pc0VtcHR5KCkpCi0gICAgICAgIFNXU2VydmVySm9iUXVldWU6OmNsZWFyUmVn aXN0cmF0aW9uKCp0aGlzLCAqbV9yZWdpc3RyYXRpb25zLmJlZ2luKCktPnZhbHVlKTsKKyAgICAg ICAgbV9yZWdpc3RyYXRpb25zLmJlZ2luKCktPnZhbHVlLT5jbGVhcigpOwogICAgIEFTU0VSVCht X3JlZ2lzdHJhdGlvbnNCeUlELmlzRW1wdHkoKSk7CiAgICAgbV9vcmlnaW5TdG9yZS0+Y2xlYXJB bGwoKTsKIH0KQEAgLTMxMiw3ICszMTIsNyBAQCB2b2lkIFNXU2VydmVyOjpkaWRGaW5pc2hJbnN0 YWxsKGNvbnN0IHN0ZDo6b3B0aW9uYWw8U2VydmljZVdvcmtlckpvYkRhdGFJZGVudGlmaQogdm9p ZCBTV1NlcnZlcjo6ZGlkRmluaXNoQWN0aXZhdGlvbihTV1NlcnZlcldvcmtlciYgd29ya2VyKQog ewogICAgIGlmIChhdXRvKiByZWdpc3RyYXRpb24gPSBnZXRSZWdpc3RyYXRpb24od29ya2VyLnJl Z2lzdHJhdGlvbktleSgpKSkKLSAgICAgICAgU1dTZXJ2ZXJKb2JRdWV1ZTo6ZGlkRmluaXNoQWN0 aXZhdGlvbigqcmVnaXN0cmF0aW9uLCB3b3JrZXIuaWRlbnRpZmllcigpKTsKKyAgICAgICAgcmVn aXN0cmF0aW9uLT5kaWRGaW5pc2hBY3RpdmF0aW9uKHdvcmtlci5pZGVudGlmaWVyKCkpOwogfQog CiAvLyBodHRwczovL3czYy5naXRodWIuaW8vU2VydmljZVdvcmtlci8jY2xpZW50cy1nZXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJK b2JRdWV1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2Vy dmVySm9iUXVldWUuY3BwCmluZGV4IDY5YTllYmQyNTgxODc4NWFmY2FmYmQwNDExNTJmNWE0NDJk YjNjNDYuLjY1ZTg0NjljYjgwNjBkNGU4N2RjMTdiZWFmZmQxODllOGQxYzQyNDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJKb2JRdWV1 ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZl ckpvYlF1ZXVlLmNwcApAQCAtNzMsNyArNzMsNyBAQCB2b2lkIFNXU2VydmVySm9iUXVldWU6OnNj cmlwdEZldGNoRmluaXNoZWQoU1dTZXJ2ZXI6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIGNvbgog CiAgICAgICAgIC8vIElmIG5ld2VzdFdvcmtlciBpcyBudWxsLCBpbnZva2UgQ2xlYXIgUmVnaXN0 cmF0aW9uIGFsZ29yaXRobSBwYXNzaW5nIHJlZ2lzdHJhdGlvbiBhcyBpdHMgYXJndW1lbnQuCiAg ICAgICAgIGlmICghbmV3ZXN0V29ya2VyKQotICAgICAgICAgICAgY2xlYXJSZWdpc3RyYXRpb24o bV9zZXJ2ZXIsICpyZWdpc3RyYXRpb24pOworICAgICAgICAgICAgcmVnaXN0cmF0aW9uLT5jbGVh cigpOwogCiAgICAgICAgIC8vIEludm9rZSBGaW5pc2ggSm9iIHdpdGggam9iIGFuZCBhYm9ydCB0 aGVzZSBzdGVwcy4KICAgICAgICAgZmluaXNoQ3VycmVudEpvYigpOwpAQCAtMTA1LDcgKzEwNSw3 IEBAIHZvaWQgU1dTZXJ2ZXJKb2JRdWV1ZTo6c2NyaXB0Q29udGV4dEZhaWxlZFRvU3RhcnQoY29u c3QgU2VydmljZVdvcmtlckpvYkRhdGFJZGVuCiAKICAgICAvLyBJZiBuZXdlc3RXb3JrZXIgaXMg bnVsbCwgaW52b2tlIENsZWFyIFJlZ2lzdHJhdGlvbiBhbGdvcml0aG0gcGFzc2luZyByZWdpc3Ry YXRpb24gYXMgaXRzIGFyZ3VtZW50LgogICAgIGlmICghcmVnaXN0cmF0aW9uLT5nZXROZXdlc3RX b3JrZXIoKSkKLSAgICAgICAgY2xlYXJSZWdpc3RyYXRpb24obV9zZXJ2ZXIsICpyZWdpc3RyYXRp b24pOworICAgICAgICByZWdpc3RyYXRpb24tPmNsZWFyKCk7CiAKICAgICAvLyBJbnZva2UgRmlu aXNoIEpvYiB3aXRoIGpvYiBhbmQgYWJvcnQgdGhlc2Ugc3RlcHMuCiAgICAgZmluaXNoQ3VycmVu dEpvYigpOwpAQCAtMTc1LDcgKzE3NSw4IEBAIHZvaWQgU1dTZXJ2ZXJKb2JRdWV1ZTo6ZGlkRmlu aXNoSW5zdGFsbChjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YUlkZW50aWZpZXImIGpvCiAKICAg ICAgICAgLy8gSWYgbmV3ZXN0V29ya2VyIGlzIG51bGwsIGludm9rZSBDbGVhciBSZWdpc3RyYXRp b24gYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9uIGFzIGl0cyBhcmd1bWVudC4KICAgICAg ICAgaWYgKCFyZWdpc3RyYXRpb24tPmdldE5ld2VzdFdvcmtlcigpKQotICAgICAgICAgICAgY2xl YXJSZWdpc3RyYXRpb24obV9zZXJ2ZXIsICpyZWdpc3RyYXRpb24pOworICAgICAgICAgICAgcmVn aXN0cmF0aW9uLT5jbGVhcigpOworCiAgICAgICAgIC8vIEludm9rZSBGaW5pc2ggSm9iIHdpdGgg am9iIGFuZCBhYm9ydCB0aGVzZSBzdGVwcy4KICAgICAgICAgZmluaXNoQ3VycmVudEpvYigpOwog ICAgICAgICByZXR1cm47CkBAIC0xOTYsNzAgKzE5Nyw3IEBAIHZvaWQgU1dTZXJ2ZXJKb2JRdWV1 ZTo6ZGlkRmluaXNoSW5zdGFsbChjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YUlkZW50aWZpZXIm IGpvCiAgICAgZmluaXNoQ3VycmVudEpvYigpOwogCiAgICAgLy8gRklYTUU6IFdhaXQgZm9yIGFs bCB0aGUgdGFza3MgcXVldWVkIGJ5IFVwZGF0ZSBXb3JrZXIgU3RhdGUgaW52b2tlZCBpbiB0aGlz IGFsZ29yaXRobSBoYXZlIGV4ZWN1dGVkLgotICAgIHRyeUFjdGl2YXRlKG1fc2VydmVyLCAqcmVn aXN0cmF0aW9uKTsKLX0KLQotLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL1NlcnZpY2VXb3JrZXIv I3RyeS1hY3RpdmF0ZS1hbGdvcml0aG0KLXZvaWQgU1dTZXJ2ZXJKb2JRdWV1ZTo6dHJ5QWN0aXZh dGUoU1dTZXJ2ZXImIHNlcnZlciwgU1dTZXJ2ZXJSZWdpc3RyYXRpb24mIHJlZ2lzdHJhdGlvbikK LXsKLSAgICAvLyBJZiByZWdpc3RyYXRpb24ncyB3YWl0aW5nIHdvcmtlciBpcyBudWxsLCByZXR1 cm4uCi0gICAgaWYgKCFyZWdpc3RyYXRpb24ud2FpdGluZ1dvcmtlcigpKQotICAgICAgICByZXR1 cm47Ci0gICAgLy8gSWYgcmVnaXN0cmF0aW9uJ3MgYWN0aXZlIHdvcmtlciBpcyBub3QgbnVsbCBh bmQgcmVnaXN0cmF0aW9uJ3MgYWN0aXZlIHdvcmtlcidzIHN0YXRlIGlzIGFjdGl2YXRpbmcsIHJl dHVybi4KLSAgICBpZiAocmVnaXN0cmF0aW9uLmFjdGl2ZVdvcmtlcigpICYmIHJlZ2lzdHJhdGlv bi5hY3RpdmVXb3JrZXIoKS0+c3RhdGUoKSA9PSBTZXJ2aWNlV29ya2VyU3RhdGU6OkFjdGl2YXRp bmcpCi0gICAgICAgIHJldHVybjsKLQotICAgIC8vIEludm9rZSBBY3RpdmF0ZSB3aXRoIHJlZ2lz dHJhdGlvbiBpZiBlaXRoZXIgb2YgdGhlIGZvbGxvd2luZyBpcyB0cnVlOgotICAgIC8vIC0gcmVn aXN0cmF0aW9uJ3MgYWN0aXZlIHdvcmtlciBpcyBudWxsLgotICAgIC8vIC0gVGhlIHJlc3VsdCBv ZiBydW5uaW5nIFNlcnZpY2UgV29ya2VyIEhhcyBObyBQZW5kaW5nIEV2ZW50cyB3aXRoIHJlZ2lz dHJhdGlvbidzIGFjdGl2ZSB3b3JrZXIgaXMgdHJ1ZSwKLSAgICAvLyAgIGFuZCBubyBzZXJ2aWNl IHdvcmtlciBjbGllbnQgaXMgdXNpbmcgcmVnaXN0cmF0aW9uCi0gICAgLy8gRklYTUU6IENoZWNr IGZvciB0aGUgc2tpcCB3YWl0aW5nIGZsYWcuCi0gICAgaWYgKCFyZWdpc3RyYXRpb24uYWN0aXZl V29ya2VyKCkgfHwgIXJlZ2lzdHJhdGlvbi5hY3RpdmVXb3JrZXIoKS0+aGFzUGVuZGluZ0V2ZW50 cygpKQotICAgICAgICBhY3RpdmF0ZShzZXJ2ZXIsIHJlZ2lzdHJhdGlvbik7Ci19Ci0KLS8vIGh0 dHBzOi8vdzNjLmdpdGh1Yi5pby9TZXJ2aWNlV29ya2VyLyNhY3RpdmF0ZQotdm9pZCBTV1NlcnZl ckpvYlF1ZXVlOjphY3RpdmF0ZShTV1NlcnZlciYgc2VydmVyLCBTV1NlcnZlclJlZ2lzdHJhdGlv biYgcmVnaXN0cmF0aW9uKQotewotICAgIC8vIElmIHJlZ2lzdHJhdGlvbidzIHdhaXRpbmcgd29y a2VyIGlzIG51bGwsIGFib3J0IHRoZXNlIHN0ZXBzLgotICAgIGlmICghcmVnaXN0cmF0aW9uLndh aXRpbmdXb3JrZXIoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgLy8gSWYgcmVnaXN0cmF0aW9u J3MgYWN0aXZlIHdvcmtlciBpcyBub3QgbnVsbCwgdGhlbjoKLSAgICBpZiAoYXV0byogYWN0aXZl V29ya2VyID0gcmVnaXN0cmF0aW9uLmFjdGl2ZVdvcmtlcigpKSB7Ci0gICAgICAgIC8vIFRlcm1p bmF0ZSByZWdpc3RyYXRpb24ncyBhY3RpdmUgd29ya2VyLgotICAgICAgICBhY3RpdmVXb3JrZXIt PnRlcm1pbmF0ZSgpOwotICAgICAgICAvLyBSdW4gdGhlIFVwZGF0ZSBXb3JrZXIgU3RhdGUgYWxn b3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9uJ3MgYWN0aXZlIHdvcmtlciBhbmQgcmVkdW5kYW50 IGFzIHRoZSBhcmd1bWVudHMuCi0gICAgICAgIHJlZ2lzdHJhdGlvbi51cGRhdGVXb3JrZXJTdGF0 ZSgqYWN0aXZlV29ya2VyLCBTZXJ2aWNlV29ya2VyU3RhdGU6OlJlZHVuZGFudCk7Ci0gICAgfQot ICAgIC8vIFJ1biB0aGUgVXBkYXRlIFJlZ2lzdHJhdGlvbiBTdGF0ZSBhbGdvcml0aG0gcGFzc2lu ZyByZWdpc3RyYXRpb24sICJhY3RpdmUiIGFuZCByZWdpc3RyYXRpb24ncyB3YWl0aW5nIHdvcmtl ciBhcyB0aGUgYXJndW1lbnRzLgotICAgIHJlZ2lzdHJhdGlvbi51cGRhdGVSZWdpc3RyYXRpb25T dGF0ZShTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uU3RhdGU6OkFjdGl2ZSwgcmVnaXN0cmF0aW9u LndhaXRpbmdXb3JrZXIoKSk7Ci0gICAgLy8gUnVuIHRoZSBVcGRhdGUgUmVnaXN0cmF0aW9uIFN0 YXRlIGFsZ29yaXRobSBwYXNzaW5nIHJlZ2lzdHJhdGlvbiwgIndhaXRpbmciIGFuZCBudWxsIGFz IHRoZSBhcmd1bWVudHMuCi0gICAgcmVnaXN0cmF0aW9uLnVwZGF0ZVJlZ2lzdHJhdGlvblN0YXRl KFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0ZTo6V2FpdGluZywgbnVsbHB0cik7Ci0gICAg Ly8gUnVuIHRoZSBVcGRhdGUgV29ya2VyIFN0YXRlIGFsZ29yaXRobSBwYXNzaW5nIHJlZ2lzdHJh dGlvbidzIGFjdGl2ZSB3b3JrZXIgYW5kIGFjdGl2YXRpbmcgYXMgdGhlIGFyZ3VtZW50cy4KLSAg ICByZWdpc3RyYXRpb24udXBkYXRlV29ya2VyU3RhdGUoKnJlZ2lzdHJhdGlvbi5hY3RpdmVXb3Jr ZXIoKSwgU2VydmljZVdvcmtlclN0YXRlOjpBY3RpdmF0aW5nKTsKLSAgICAvLyBGSVhNRTogRm9y IGVhY2ggc2VydmljZSB3b3JrZXIgY2xpZW50IGNsaWVudCB3aG9zZSBjcmVhdGlvbiBVUkwgbWF0 Y2hlcyByZWdpc3RyYXRpb24ncyBzY29wZSB1cmwuLi4KLQotICAgIC8vIEZvciBlYWNoIHNlcnZp Y2Ugd29ya2VyIGNsaWVudCBjbGllbnQgd2hvIGlzIHVzaW5nIHJlZ2lzdHJhdGlvbjoKLSAgICAv LyAtIFNldCBjbGllbnQncyBhY3RpdmUgd29ya2VyIHRvIHJlZ2lzdHJhdGlvbidzIGFjdGl2ZSB3 b3JrZXIuCi0gICAgLy8gLSBJbnZva2UgTm90aWZ5IENvbnRyb2xsZXIgQ2hhbmdlIGFsZ29yaXRo bSB3aXRoIGNsaWVudCBhcyB0aGUgYXJndW1lbnQuCi0gICAgcmVnaXN0cmF0aW9uLm5vdGlmeUNs aWVudHNPZkNvbnRyb2xsZXJDaGFuZ2UoKTsKLQotICAgIC8vIEZJWE1FOiBJbnZva2UgUnVuIFNl cnZpY2UgV29ya2VyIGFsZ29yaXRobSB3aXRoIGFjdGl2ZVdvcmtlciBhcyB0aGUgYXJndW1lbnQu Ci0KLSAgICAvLyBRdWV1ZSBhIHRhc2sgdG8gZmlyZSB0aGUgYWN0aXZhdGUgZXZlbnQuCi0gICAg QVNTRVJUKHJlZ2lzdHJhdGlvbi5hY3RpdmVXb3JrZXIoKSk7Ci0gICAgc2VydmVyLmZpcmVBY3Rp dmF0ZUV2ZW50KCpyZWdpc3RyYXRpb24uYWN0aXZlV29ya2VyKCkpOwotfQotCi0vLyBodHRwczov L3czYy5naXRodWIuaW8vU2VydmljZVdvcmtlci8jYWN0aXZhdGUgKHBvc3QgYWN0aXZhdGUgZXZl bnQgc3RlcHMpLgotdm9pZCBTV1NlcnZlckpvYlF1ZXVlOjpkaWRGaW5pc2hBY3RpdmF0aW9uKFNX U2VydmVyUmVnaXN0cmF0aW9uJiByZWdpc3RyYXRpb24sIFNlcnZpY2VXb3JrZXJJZGVudGlmaWVy IHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyKQotewotICAgIGlmICghcmVnaXN0cmF0aW9uLmFjdGl2 ZVdvcmtlcigpIHx8IHJlZ2lzdHJhdGlvbi5hY3RpdmVXb3JrZXIoKS0+aWRlbnRpZmllcigpICE9 IHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyKQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBSdW4g dGhlIFVwZGF0ZSBXb3JrZXIgU3RhdGUgYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9uJ3Mg YWN0aXZlIHdvcmtlciBhbmQgYWN0aXZhdGVkIGFzIHRoZSBhcmd1bWVudHMuCi0gICAgcmVnaXN0 cmF0aW9uLnVwZGF0ZVdvcmtlclN0YXRlKCpyZWdpc3RyYXRpb24uYWN0aXZlV29ya2VyKCksIFNl cnZpY2VXb3JrZXJTdGF0ZTo6QWN0aXZhdGVkKTsKKyAgICByZWdpc3RyYXRpb24tPnRyeUFjdGl2 YXRlKCk7CiB9CiAKIC8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9TZXJ2aWNlV29ya2VyLyNydW4t am9iCkBAIC0zNDYsNDggKzI4NCwxMCBAQCB2b2lkIFNXU2VydmVySm9iUXVldWU6OnJ1blVucmVn aXN0ZXJKb2IoY29uc3QgU2VydmljZVdvcmtlckpvYkRhdGEmIGpvYikKICAgICBtX3NlcnZlci5y ZXNvbHZlVW5yZWdpc3RyYXRpb25Kb2Ioam9iLCBtX3JlZ2lzdHJhdGlvbktleSwgdHJ1ZSk7CiAK ICAgICAvLyBJbnZva2UgVHJ5IENsZWFyIFJlZ2lzdHJhdGlvbiB3aXRoIHJlZ2lzdHJhdGlvbi4K LSAgICB0cnlDbGVhclJlZ2lzdHJhdGlvbigqcmVnaXN0cmF0aW9uKTsKKyAgICByZWdpc3RyYXRp b24tPnRyeUNsZWFyKCk7CiAgICAgZmluaXNoQ3VycmVudEpvYigpOwogfQogCi0vLyBodHRwczov L3czYy5naXRodWIuaW8vU2VydmljZVdvcmtlci8jdHJ5LWNsZWFyLXJlZ2lzdHJhdGlvbi1hbGdv cml0aG0KLXZvaWQgU1dTZXJ2ZXJKb2JRdWV1ZTo6dHJ5Q2xlYXJSZWdpc3RyYXRpb24oU1dTZXJ2 ZXJSZWdpc3RyYXRpb24mIHJlZ2lzdHJhdGlvbikKLXsKLSAgICBpZiAocmVnaXN0cmF0aW9uLmhh c0NsaWVudHNVc2luZ1JlZ2lzdHJhdGlvbigpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAo cmVnaXN0cmF0aW9uLmluc3RhbGxpbmdXb3JrZXIoKSAmJiByZWdpc3RyYXRpb24uaW5zdGFsbGlu Z1dvcmtlcigpLT5oYXNQZW5kaW5nRXZlbnRzKCkpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAo cmVnaXN0cmF0aW9uLndhaXRpbmdXb3JrZXIoKSAmJiByZWdpc3RyYXRpb24ud2FpdGluZ1dvcmtl cigpLT5oYXNQZW5kaW5nRXZlbnRzKCkpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAocmVnaXN0 cmF0aW9uLmFjdGl2ZVdvcmtlcigpICYmIHJlZ2lzdHJhdGlvbi5hY3RpdmVXb3JrZXIoKS0+aGFz UGVuZGluZ0V2ZW50cygpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBjbGVhclJlZ2lzdHJhdGlv bihtX3NlcnZlciwgcmVnaXN0cmF0aW9uKTsKLX0KLQotLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlv L1NlcnZpY2VXb3JrZXIvI2NsZWFyLXJlZ2lzdHJhdGlvbgotc3RhdGljIHZvaWQgY2xlYXJSZWdp c3RyYXRpb25Xb3JrZXIoU1dTZXJ2ZXJSZWdpc3RyYXRpb24mIHJlZ2lzdHJhdGlvbiwgU1dTZXJ2 ZXJXb3JrZXIqIHdvcmtlciwgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0YXRlIHN0YXRlKQot ewotICAgIGlmICghd29ya2VyKQotICAgICAgICByZXR1cm47Ci0KLSAgICB3b3JrZXItPnRlcm1p bmF0ZSgpOwotICAgIHJlZ2lzdHJhdGlvbi51cGRhdGVXb3JrZXJTdGF0ZSgqd29ya2VyLCBTZXJ2 aWNlV29ya2VyU3RhdGU6OlJlZHVuZGFudCk7Ci0gICAgcmVnaXN0cmF0aW9uLnVwZGF0ZVJlZ2lz dHJhdGlvblN0YXRlKHN0YXRlLCBudWxscHRyKTsKLX0KLQotLy8gaHR0cHM6Ly93M2MuZ2l0aHVi LmlvL1NlcnZpY2VXb3JrZXIvI2NsZWFyLXJlZ2lzdHJhdGlvbgotdm9pZCBTV1NlcnZlckpvYlF1 ZXVlOjpjbGVhclJlZ2lzdHJhdGlvbihTV1NlcnZlciYgc2VydmVyLCBTV1NlcnZlclJlZ2lzdHJh dGlvbiYgcmVnaXN0cmF0aW9uKQotewotICAgIGNsZWFyUmVnaXN0cmF0aW9uV29ya2VyKHJlZ2lz dHJhdGlvbiwgcmVnaXN0cmF0aW9uLmluc3RhbGxpbmdXb3JrZXIoKSwgU2VydmljZVdvcmtlclJl Z2lzdHJhdGlvblN0YXRlOjpJbnN0YWxsaW5nKTsKLSAgICBjbGVhclJlZ2lzdHJhdGlvbldvcmtl cihyZWdpc3RyYXRpb24sIHJlZ2lzdHJhdGlvbi53YWl0aW5nV29ya2VyKCksIFNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25TdGF0ZTo6V2FpdGluZyk7Ci0gICAgY2xlYXJSZWdpc3RyYXRpb25Xb3Jr ZXIocmVnaXN0cmF0aW9uLCByZWdpc3RyYXRpb24uYWN0aXZlV29ya2VyKCksIFNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25TdGF0ZTo6QWN0aXZlKTsKLQotICAgIC8vIFJlbW92ZSBzY29wZSB0byBy ZWdpc3RyYXRpb24gbWFwW3Njb3BlU3RyaW5nXS4KLSAgICBzZXJ2ZXIucmVtb3ZlUmVnaXN0cmF0 aW9uKHJlZ2lzdHJhdGlvbi5rZXkoKSk7Ci19Ci0KIC8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9T ZXJ2aWNlV29ya2VyLyN1cGRhdGUtYWxnb3JpdGhtCiB2b2lkIFNXU2VydmVySm9iUXVldWU6OnJ1 blVwZGF0ZUpvYihjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YSYgam9iKQogewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlckpvYlF1ZXVl LmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVySm9iUXVl dWUuaAppbmRleCAyM2JhMDdhYWM1MzY2NDY5MDY1MTg1OGQwNzA0YTE1ZDFmODk3ZGQ3Li44MTA5 MTVkYzhhOGJkMDdmOGQ0YjcwNjgwMGQwNmY4YWU0NTM5ZTg2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVySm9iUXVldWUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVySm9iUXVldWUuaApA QCAtNTIsMTEgKzUyLDggQEAgcHVibGljOgogICAgIHZvaWQgc2NyaXB0Q29udGV4dEZhaWxlZFRv U3RhcnQoY29uc3QgU2VydmljZVdvcmtlckpvYkRhdGFJZGVudGlmaWVyJiwgU2VydmljZVdvcmtl cklkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSk7CiAgICAgdm9pZCBzY3JpcHRDb250 ZXh0U3RhcnRlZChjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YUlkZW50aWZpZXImLCBTZXJ2aWNl V29ya2VySWRlbnRpZmllcik7CiAgICAgdm9pZCBkaWRGaW5pc2hJbnN0YWxsKGNvbnN0IFNlcnZp Y2VXb3JrZXJKb2JEYXRhSWRlbnRpZmllciYsIFNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLCBib29s IHdhc1N1Y2Nlc3NmdWwpOwotICAgIHN0YXRpYyB2b2lkIGRpZEZpbmlzaEFjdGl2YXRpb24oU1dT ZXJ2ZXJSZWdpc3RyYXRpb24mLCBTZXJ2aWNlV29ya2VySWRlbnRpZmllcik7CiAgICAgdm9pZCBk aWRSZXNvbHZlUmVnaXN0cmF0aW9uUHJvbWlzZSgpOwogCi0gICAgc3RhdGljIHZvaWQgY2xlYXJS ZWdpc3RyYXRpb24oU1dTZXJ2ZXImLCBTV1NlcnZlclJlZ2lzdHJhdGlvbiYpOwotCiBwcml2YXRl OgogICAgIHZvaWQgam9iVGltZXJGaXJlZCgpOwogICAgIHZvaWQgcnVuTmV4dEpvYlN5bmNocm9u b3VzbHkoKTsKQEAgLTY3LDEwICs2NCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBydW5VbnJlZ2lz dGVySm9iKGNvbnN0IFNlcnZpY2VXb3JrZXJKb2JEYXRhJik7CiAgICAgdm9pZCBydW5VcGRhdGVK b2IoY29uc3QgU2VydmljZVdvcmtlckpvYkRhdGEmKTsKIAotICAgIHZvaWQgdHJ5Q2xlYXJSZWdp c3RyYXRpb24oU1dTZXJ2ZXJSZWdpc3RyYXRpb24mKTsKICAgICB2b2lkIGluc3RhbGwoU1dTZXJ2 ZXJSZWdpc3RyYXRpb24mLCBTZXJ2aWNlV29ya2VySWRlbnRpZmllcik7Ci0gICAgc3RhdGljIHZv aWQgdHJ5QWN0aXZhdGUoU1dTZXJ2ZXImLCBTV1NlcnZlclJlZ2lzdHJhdGlvbiYpOwotICAgIHN0 YXRpYyB2b2lkIGFjdGl2YXRlKFNXU2VydmVyJiwgU1dTZXJ2ZXJSZWdpc3RyYXRpb24mKTsKIAog ICAgIGJvb2wgaXNDdXJyZW50bHlQcm9jZXNzaW5nSm9iKGNvbnN0IFNlcnZpY2VXb3JrZXJKb2JE YXRhSWRlbnRpZmllciYpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3Jr ZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0cmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3BwCmluZGV4 IDJlY2NmNTg4NzExNWIzZDNmY2IwMDBkOThmZjY3M2NmZTM3ZWQ5MTcuLjgyNzQ5ZTQ4ZjhkN2Fj NTFjMDZjZjcyZGY3OGExYTg4NmIzM2EwNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uY3Bw CkBAIC0xODAsNiArMTgwLDEwOCBAQCB2b2lkIFNXU2VydmVyUmVnaXN0cmF0aW9uOjp1bnJlZ2lz dGVyU2VydmVyQ29ubmVjdGlvbihTV1NlcnZlckNvbm5lY3Rpb25JZGVudGlmaQogICAgIG1fY2xp ZW50c1VzaW5nUmVnaXN0cmF0aW9uLnJlbW92ZShzZXJ2ZXJDb25uZWN0aW9uSWRlbnRpZmllcik7 CiB9CiAKKy8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9TZXJ2aWNlV29ya2VyLyN0cnktY2xlYXIt cmVnaXN0cmF0aW9uLWFsZ29yaXRobQorYm9vbCBTV1NlcnZlclJlZ2lzdHJhdGlvbjo6dHJ5Q2xl YXIoKQoreworICAgIGlmIChoYXNDbGllbnRzVXNpbmdSZWdpc3RyYXRpb24oKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgaWYgKGluc3RhbGxpbmdXb3JrZXIoKSAmJiBpbnN0YWxsaW5n V29ya2VyKCktPmhhc1BlbmRpbmdFdmVudHMoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAg IGlmICh3YWl0aW5nV29ya2VyKCkgJiYgd2FpdGluZ1dvcmtlcigpLT5oYXNQZW5kaW5nRXZlbnRz KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoYWN0aXZlV29ya2VyKCkgJiYgYWN0 aXZlV29ya2VyKCktPmhhc1BlbmRpbmdFdmVudHMoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgY2xlYXIoKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworLy8gaHR0cHM6Ly93M2MuZ2l0 aHViLmlvL1NlcnZpY2VXb3JrZXIvI2NsZWFyLXJlZ2lzdHJhdGlvbgorc3RhdGljIHZvaWQgY2xl YXJSZWdpc3RyYXRpb25Xb3JrZXIoU1dTZXJ2ZXJSZWdpc3RyYXRpb24mIHJlZ2lzdHJhdGlvbiwg U1dTZXJ2ZXJXb3JrZXIqIHdvcmtlciwgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0YXRlIHN0 YXRlKQoreworICAgIGlmICghd29ya2VyKQorICAgICAgICByZXR1cm47CisKKyAgICB3b3JrZXIt PnRlcm1pbmF0ZSgpOworICAgIHJlZ2lzdHJhdGlvbi51cGRhdGVXb3JrZXJTdGF0ZSgqd29ya2Vy LCBTZXJ2aWNlV29ya2VyU3RhdGU6OlJlZHVuZGFudCk7CisgICAgcmVnaXN0cmF0aW9uLnVwZGF0 ZVJlZ2lzdHJhdGlvblN0YXRlKHN0YXRlLCBudWxscHRyKTsKK30KKworLy8gaHR0cHM6Ly93M2Mu Z2l0aHViLmlvL1NlcnZpY2VXb3JrZXIvI2NsZWFyLXJlZ2lzdHJhdGlvbgordm9pZCBTV1NlcnZl clJlZ2lzdHJhdGlvbjo6Y2xlYXIoKQoreworICAgIGNsZWFyUmVnaXN0cmF0aW9uV29ya2VyKCp0 aGlzLCBpbnN0YWxsaW5nV29ya2VyKCksIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25TdGF0ZTo6 SW5zdGFsbGluZyk7CisgICAgY2xlYXJSZWdpc3RyYXRpb25Xb3JrZXIoKnRoaXMsIHdhaXRpbmdX b3JrZXIoKSwgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblN0YXRlOjpXYWl0aW5nKTsKKyAgICBj bGVhclJlZ2lzdHJhdGlvbldvcmtlcigqdGhpcywgYWN0aXZlV29ya2VyKCksIFNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25TdGF0ZTo6QWN0aXZlKTsKKworICAgIC8vIFJlbW92ZSBzY29wZSB0byBy ZWdpc3RyYXRpb24gbWFwW3Njb3BlU3RyaW5nXS4KKyAgICBtX3NlcnZlci5yZW1vdmVSZWdpc3Ry YXRpb24oa2V5KCkpOworfQorCisvLyBodHRwczovL3czYy5naXRodWIuaW8vU2VydmljZVdvcmtl ci8jdHJ5LWFjdGl2YXRlLWFsZ29yaXRobQordm9pZCBTV1NlcnZlclJlZ2lzdHJhdGlvbjo6dHJ5 QWN0aXZhdGUoKQoreworICAgIC8vIElmIHJlZ2lzdHJhdGlvbidzIHdhaXRpbmcgd29ya2VyIGlz IG51bGwsIHJldHVybi4KKyAgICBpZiAoIXdhaXRpbmdXb3JrZXIoKSkKKyAgICAgICAgcmV0dXJu OworICAgIC8vIElmIHJlZ2lzdHJhdGlvbidzIGFjdGl2ZSB3b3JrZXIgaXMgbm90IG51bGwgYW5k IHJlZ2lzdHJhdGlvbidzIGFjdGl2ZSB3b3JrZXIncyBzdGF0ZSBpcyBhY3RpdmF0aW5nLCByZXR1 cm4uCisgICAgaWYgKGFjdGl2ZVdvcmtlcigpICYmIGFjdGl2ZVdvcmtlcigpLT5zdGF0ZSgpID09 IFNlcnZpY2VXb3JrZXJTdGF0ZTo6QWN0aXZhdGluZykKKyAgICAgICAgcmV0dXJuOworCisgICAg Ly8gSW52b2tlIEFjdGl2YXRlIHdpdGggcmVnaXN0cmF0aW9uIGlmIGVpdGhlciBvZiB0aGUgZm9s bG93aW5nIGlzIHRydWU6CisgICAgLy8gLSByZWdpc3RyYXRpb24ncyBhY3RpdmUgd29ya2VyIGlz IG51bGwuCisgICAgLy8gLSBUaGUgcmVzdWx0IG9mIHJ1bm5pbmcgU2VydmljZSBXb3JrZXIgSGFz IE5vIFBlbmRpbmcgRXZlbnRzIHdpdGggcmVnaXN0cmF0aW9uJ3MgYWN0aXZlIHdvcmtlciBpcyB0 cnVlLAorICAgIC8vICAgYW5kIG5vIHNlcnZpY2Ugd29ya2VyIGNsaWVudCBpcyB1c2luZyByZWdp c3RyYXRpb24KKyAgICAvLyBGSVhNRTogQ2hlY2sgZm9yIHRoZSBza2lwIHdhaXRpbmcgZmxhZy4K KyAgICBpZiAoIWFjdGl2ZVdvcmtlcigpIHx8ICFhY3RpdmVXb3JrZXIoKS0+aGFzUGVuZGluZ0V2 ZW50cygpKQorICAgICAgICBhY3RpdmF0ZSgpOworfQorCisvLyBodHRwczovL3czYy5naXRodWIu aW8vU2VydmljZVdvcmtlci8jYWN0aXZhdGUKK3ZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OmFj dGl2YXRlKCkKK3sKKyAgICAvLyBJZiByZWdpc3RyYXRpb24ncyB3YWl0aW5nIHdvcmtlciBpcyBu dWxsLCBhYm9ydCB0aGVzZSBzdGVwcy4KKyAgICBpZiAoIXdhaXRpbmdXb3JrZXIoKSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgLy8gSWYgcmVnaXN0cmF0aW9uJ3MgYWN0aXZlIHdvcmtlciBpcyBu b3QgbnVsbCwgdGhlbjoKKyAgICBpZiAoYXV0byogd29ya2VyID0gYWN0aXZlV29ya2VyKCkpIHsK KyAgICAgICAgLy8gVGVybWluYXRlIHJlZ2lzdHJhdGlvbidzIGFjdGl2ZSB3b3JrZXIuCisgICAg ICAgIHdvcmtlci0+dGVybWluYXRlKCk7CisgICAgICAgIC8vIFJ1biB0aGUgVXBkYXRlIFdvcmtl ciBTdGF0ZSBhbGdvcml0aG0gcGFzc2luZyByZWdpc3RyYXRpb24ncyBhY3RpdmUgd29ya2VyIGFu ZCByZWR1bmRhbnQgYXMgdGhlIGFyZ3VtZW50cy4KKyAgICAgICAgdXBkYXRlV29ya2VyU3RhdGUo KndvcmtlciwgU2VydmljZVdvcmtlclN0YXRlOjpSZWR1bmRhbnQpOworICAgIH0KKyAgICAvLyBS dW4gdGhlIFVwZGF0ZSBSZWdpc3RyYXRpb24gU3RhdGUgYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0 cmF0aW9uLCAiYWN0aXZlIiBhbmQgcmVnaXN0cmF0aW9uJ3Mgd2FpdGluZyB3b3JrZXIgYXMgdGhl IGFyZ3VtZW50cy4KKyAgICB1cGRhdGVSZWdpc3RyYXRpb25TdGF0ZShTZXJ2aWNlV29ya2VyUmVn aXN0cmF0aW9uU3RhdGU6OkFjdGl2ZSwgd2FpdGluZ1dvcmtlcigpKTsKKyAgICAvLyBSdW4gdGhl IFVwZGF0ZSBSZWdpc3RyYXRpb24gU3RhdGUgYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9u LCAid2FpdGluZyIgYW5kIG51bGwgYXMgdGhlIGFyZ3VtZW50cy4KKyAgICB1cGRhdGVSZWdpc3Ry YXRpb25TdGF0ZShTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uU3RhdGU6OldhaXRpbmcsIG51bGxw dHIpOworICAgIC8vIFJ1biB0aGUgVXBkYXRlIFdvcmtlciBTdGF0ZSBhbGdvcml0aG0gcGFzc2lu ZyByZWdpc3RyYXRpb24ncyBhY3RpdmUgd29ya2VyIGFuZCBhY3RpdmF0aW5nIGFzIHRoZSBhcmd1 bWVudHMuCisgICAgdXBkYXRlV29ya2VyU3RhdGUoKmFjdGl2ZVdvcmtlcigpLCBTZXJ2aWNlV29y a2VyU3RhdGU6OkFjdGl2YXRpbmcpOworICAgIC8vIEZJWE1FOiBGb3IgZWFjaCBzZXJ2aWNlIHdv cmtlciBjbGllbnQgY2xpZW50IHdob3NlIGNyZWF0aW9uIFVSTCBtYXRjaGVzIHJlZ2lzdHJhdGlv bidzIHNjb3BlIHVybC4uLgorCisgICAgLy8gRm9yIGVhY2ggc2VydmljZSB3b3JrZXIgY2xpZW50 IGNsaWVudCB3aG8gaXMgdXNpbmcgcmVnaXN0cmF0aW9uOgorICAgIC8vIC0gU2V0IGNsaWVudCdz IGFjdGl2ZSB3b3JrZXIgdG8gcmVnaXN0cmF0aW9uJ3MgYWN0aXZlIHdvcmtlci4KKyAgICAvLyAt IEludm9rZSBOb3RpZnkgQ29udHJvbGxlciBDaGFuZ2UgYWxnb3JpdGhtIHdpdGggY2xpZW50IGFz IHRoZSBhcmd1bWVudC4KKyAgICBub3RpZnlDbGllbnRzT2ZDb250cm9sbGVyQ2hhbmdlKCk7CisK KyAgICAvLyBGSVhNRTogSW52b2tlIFJ1biBTZXJ2aWNlIFdvcmtlciBhbGdvcml0aG0gd2l0aCBh Y3RpdmVXb3JrZXIgYXMgdGhlIGFyZ3VtZW50LgorCisgICAgLy8gUXVldWUgYSB0YXNrIHRvIGZp cmUgdGhlIGFjdGl2YXRlIGV2ZW50LgorICAgIEFTU0VSVChhY3RpdmVXb3JrZXIoKSk7CisgICAg bV9zZXJ2ZXIuZmlyZUFjdGl2YXRlRXZlbnQoKmFjdGl2ZVdvcmtlcigpKTsKK30KKworLy8gaHR0 cHM6Ly93M2MuZ2l0aHViLmlvL1NlcnZpY2VXb3JrZXIvI2FjdGl2YXRlIChwb3N0IGFjdGl2YXRl IGV2ZW50IHN0ZXBzKS4KK3ZvaWQgU1dTZXJ2ZXJSZWdpc3RyYXRpb246OmRpZEZpbmlzaEFjdGl2 YXRpb24oU2VydmljZVdvcmtlcklkZW50aWZpZXIgc2VydmljZVdvcmtlcklkZW50aWZpZXIpCit7 CisgICAgaWYgKCFhY3RpdmVXb3JrZXIoKSB8fCBhY3RpdmVXb3JrZXIoKS0+aWRlbnRpZmllcigp ICE9IHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBS dW4gdGhlIFVwZGF0ZSBXb3JrZXIgU3RhdGUgYWxnb3JpdGhtIHBhc3NpbmcgcmVnaXN0cmF0aW9u J3MgYWN0aXZlIHdvcmtlciBhbmQgYWN0aXZhdGVkIGFzIHRoZSBhcmd1bWVudHMuCisgICAgdXBk YXRlV29ya2VyU3RhdGUoKmFjdGl2ZVdvcmtlcigpLCBTZXJ2aWNlV29ya2VyU3RhdGU6OkFjdGl2 YXRlZCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShT RVJWSUNFX1dPUktFUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vydmlj ZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMv c2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3RyYXRpb24uaAppbmRleCA4YTEwYWYzZDY1MDQy N2JkOTlmMTdmN2YzZTUwZTEyNDBjNjAzZWFmLi4yMGIyN2QyOWMwMjY2MWJhMDhmMzk5ZDI4MmMy NDcwNGQ2ZDE0MzYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uv c2VydmVyL1NXU2VydmVyUmVnaXN0cmF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlclJlZ2lzdHJhdGlvbi5oCkBAIC04MSw5ICs4MSwxNiBA QCBwdWJsaWM6CiAKICAgICB2b2lkIG5vdGlmeUNsaWVudHNPZkNvbnRyb2xsZXJDaGFuZ2UoKTsK IAorICAgIHZvaWQgY2xlYXIoKTsKKyAgICBib29sIHRyeUNsZWFyKCk7CisgICAgdm9pZCB0cnlB Y3RpdmF0ZSgpOworICAgIHZvaWQgZGlkRmluaXNoQWN0aXZhdGlvbihTZXJ2aWNlV29ya2VySWRl bnRpZmllcik7CisKIHByaXZhdGU6CiAgICAgdm9pZCBmb3JFYWNoQ29ubmVjdGlvbihjb25zdCBX VEY6OkZ1bmN0aW9uPHZvaWQoU1dTZXJ2ZXI6OkNvbm5lY3Rpb24mKT4mKTsKIAorICAgIHZvaWQg YWN0aXZhdGUoKTsKKwogICAgIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyIG1f aWRlbnRpZmllcjsKICAgICBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5IG1fcmVnaXN0cmF0 aW9uS2V5OwogICAgIFNlcnZpY2VXb3JrZXJVcGRhdGVWaWFDYWNoZSBtX3VwZGF0ZVZpYUNhY2hl Owo=