25890 2009-05-20 08:06:41 -0700 Implement Network logging channel on Mac 2009-05-21 11:52:54 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Enhancement --- 1 ap ap ddkilzer oldest_to_newest 122163 0 ap 2009-05-20 08:06:41 -0700 Network logging is implemented in ResourceHandleCFNet, but not in ResourceHandleMac. 122165 1 30509 ap 2009-05-20 08:12:26 -0700 Created attachment 30509 proposed patch 122380 2 30509 ddkilzer 2009-05-21 10:35:57 -0700 Comment on attachment 30509 proposed patch >-- (void)connection:(NSURLConnection *)unusedConnection didFailWithError:(NSError *)error >+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error > { >- UNUSED_PARAM(unusedConnection); >+ UNUSED_PARAM(connection); >+ >+ LOG(Network, "Handle %p delegate connection:%p didFailWithError:%@", m_handle, connection, error); Is NSError* converted to an NSString* implicitly here? r=me 122386 3 darin 2009-05-21 10:48:36 -0700 (In reply to comment #2) > Is NSError* converted to an NSString* implicitly here? %@ logs the description of the object. So it doesn't just work with strings. The answer is effectively yes. 122389 4 ap 2009-05-21 11:52:54 -0700 Committed <http://trac.webkit.org/changeset/43974>. 30509 2009-05-20 08:12:26 -0700 2009-05-21 10:35:57 -0700 proposed patch NetworkLogging.txt text/plain 10726 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MzkxMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMDktMDUtMjAgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTg5MAorICAgICAgICBJ bXBsZW1lbnQgTmV0d29yayBsb2dnaW5nIGNoYW5uZWwgb24gTWFjCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlSGFuZGxlOjp+UmVzb3VyY2VIYW5kbGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VIYW5kbGU6OnN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpj YW5jZWwpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OnNldERlZmVyc0xvYWRp bmcpOgorICAgICAgICAoLVtXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc0RlbGVnYXRlIGNvbm5lY3Rp b246d2lsbFNlbmRSZXF1ZXN0OnJlZGlyZWN0UmVzcG9uc2U6XSk6CisgICAgICAgICgtW1dlYkNv cmVSZXNvdXJjZUhhbmRsZUFzRGVsZWdhdGUgY29ubmVjdGlvblNob3VsZFVzZUNyZWRlbnRpYWxT dG9yYWdlOl0pOgorICAgICAgICAoLVtXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc0RlbGVnYXRlIGNv bm5lY3Rpb246ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOl0pOgorICAgICAgICAo LVtXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc0RlbGVnYXRlIGNvbm5lY3Rpb246ZGlkQ2FuY2VsQXV0 aGVudGljYXRpb25DaGFsbGVuZ2U6XSk6CisgICAgICAgICgtW1dlYkNvcmVSZXNvdXJjZUhhbmRs ZUFzRGVsZWdhdGUgY29ubmVjdGlvbjpkaWRSZWNlaXZlUmVzcG9uc2U6XSk6CisgICAgICAgICgt W1dlYkNvcmVSZXNvdXJjZUhhbmRsZUFzRGVsZWdhdGUgY29ubmVjdGlvbjpkaWRSZWNlaXZlRGF0 YTpsZW5ndGhSZWNlaXZlZDpdKToKKyAgICAgICAgKC1bV2ViQ29yZVJlc291cmNlSGFuZGxlQXNE ZWxlZ2F0ZSBjb25uZWN0aW9uOndpbGxTdG9wQnVmZmVyaW5nRGF0YTpdKToKKyAgICAgICAgKC1b V2ViQ29yZVJlc291cmNlSGFuZGxlQXNEZWxlZ2F0ZSBjb25uZWN0aW9uOmRpZFNlbmRCb2R5RGF0 YTp0b3RhbEJ5dGVzV3JpdHRlbjp0b3RhbEJ5dGVzRXhwZWN0ZWRUb1dyaXRlOl0pOgorICAgICAg ICAoLVtXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc0RlbGVnYXRlIGNvbm5lY3Rpb25EaWRGaW5pc2hM b2FkaW5nOl0pOgorICAgICAgICAoLVtXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc0RlbGVnYXRlIGNv bm5lY3Rpb246ZGlkRmFpbFdpdGhFcnJvcjpdKToKKyAgICAgICAgKC1bV2ViQ29yZVJlc291cmNl SGFuZGxlQXNEZWxlZ2F0ZSBjb25uZWN0aW9uOndpbGxDYWNoZVJlc3BvbnNlOl0pOgorICAgICAg ICBBZGRlZCBsb2dnaW5nIGZvciBhc3luYyByZXF1ZXN0cyAoYXMgdGhlc2UgYXJlIG1vc3QgaW50 ZXJlc3RpbmcpLgorCiAyMDA5LTA1LTIwICBLZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVvbGxp dmllcnMuY29tPgogCiAgICAgICAgIENVUkwgYmFja2VuZCBidWlsZCBmaXguIE1ha2Ugc3VyZSBV UkwgaXMgYWx3YXlzIHNldC4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVz b3VyY2VIYW5kbGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQkocmV2aXNpb24gNDM4OTApCisrKyBXZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0zMyw2ICszMyw3IEBACiAjaW1wb3J0ICJGb3JtRGF0YVN0cmVhbU1hYy5oIgogI2ltcG9ydCAi RnJhbWUuaCIKICNpbXBvcnQgIkZyYW1lTG9hZGVyLmgiCisjaW1wb3J0ICJMb2dnaW5nLmgiCiAj aW1wb3J0ICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW1wb3J0ICJQYWdlLmgiCiAjaW1wb3J0ICJS ZXNvdXJjZUVycm9yLmgiCkBAIC0xMjIsNiArMTIzLDggQEAgUmVzb3VyY2VIYW5kbGVJbnRlcm5h bDo6flJlc291cmNlSGFuZGxlSQogUmVzb3VyY2VIYW5kbGU6On5SZXNvdXJjZUhhbmRsZSgpCiB7 CiAgICAgcmVsZWFzZURlbGVnYXRlKCk7CisKKyAgICBMT0coTmV0d29yaywgIkhhbmRsZSAlcCBk ZXN0cm95ZWQiLCB0aGlzKTsKIH0KIAogc3RhdGljIGNvbnN0IGRvdWJsZSBNYXhGb3VuZGF0aW9u VmVyc2lvbldpdGhvdXRkaWRTZW5kQm9keURhdGFEZWxlZ2F0ZSA9IDY3Ny4yMTsKQEAgLTIxNCw2 ICsyMTcsOCBAQCBib29sIFJlc291cmNlSGFuZGxlOjpzdGFydChGcmFtZSogZnJhbWUpCiAjaWZu ZGVmIE5ERUJVRwogICAgIGlzSW5pdGlhbGl6aW5nQ29ubmVjdGlvbiA9IE5POwogI2VuZGlmCisK KyAgICBMT0coTmV0d29yaywgIkhhbmRsZSAlcCBzdGFydGluZyBjb25uZWN0aW9uICVwIGZvciAl QCIsIHRoaXMsIGNvbm5lY3Rpb24sIGQtPm1fcmVxdWVzdC5uc1VSTFJlcXVlc3QoKSk7CiAgICAg CiAgICAgZC0+bV9jb25uZWN0aW9uID0gY29ubmVjdGlvbjsKIApAQCAtMjMzLDYgKzIzOCw4IEBA IGJvb2wgUmVzb3VyY2VIYW5kbGU6OnN0YXJ0KEZyYW1lKiBmcmFtZSkKIAogdm9pZCBSZXNvdXJj ZUhhbmRsZTo6Y2FuY2VsKCkKIHsKKyAgICBMT0coTmV0d29yaywgIkhhbmRsZSAlcCBjYW5jZWwg Y29ubmVjdGlvbiAlcCIsIHRoaXMsIGQtPm1fY29ubmVjdGlvbi5nZXQoKSk7CisKICAgICBpZiAo IVJlc291cmNlSGFuZGxlOjpkaWRTZW5kQm9keURhdGFEZWxlZ2F0ZUV4aXN0cygpKQogICAgICAg ICBkaXNhc3NvY2lhdGVTdHJlYW1XaXRoUmVzb3VyY2VIYW5kbGUoW2QtPm1fcmVxdWVzdC5uc1VS TFJlcXVlc3QoKSBIVFRQQm9keVN0cmVhbV0pOwogICAgIFtkLT5tX2Nvbm5lY3Rpb24uZ2V0KCkg Y2FuY2VsXTsKQEAgLTI0MCw2ICsyNDcsOCBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpjYW5jZWwo KQogCiB2b2lkIFJlc291cmNlSGFuZGxlOjpzZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVmZXJzKQog eworICAgIExPRyhOZXR3b3JrLCAiSGFuZGxlICVwIHNldERlZmVyc0xvYWRpbmcoJXMpIiwgdGhp cywgZGVmZXJzID8gInRydWUiIDogImZhbHNlIik7CisKICAgICBkLT5tX2RlZmVyc0xvYWRpbmcg PSBkZWZlcnM7CiAgICAgaWYgKGQtPm1fY29ubmVjdGlvbikKICAgICAgICAgd2tTZXROU1VSTENv bm5lY3Rpb25EZWZlcnNDYWxsYmFja3MoZC0+bV9jb25uZWN0aW9uLmdldCgpLCBkZWZlcnMpOwpA QCAtNTMzLDkgKzU0Miw5IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnJlY2VpdmVkQ2FuY2VsbGF0 aW8KICAgICBtX2hhbmRsZSA9IDA7CiB9CiAKLS0gKE5TVVJMUmVxdWVzdCAqKWNvbm5lY3Rpb246 KE5TVVJMQ29ubmVjdGlvbiAqKXVudXNlZENvbm5lY3Rpb24gd2lsbFNlbmRSZXF1ZXN0OihOU1VS TFJlcXVlc3QgKiluZXdSZXF1ZXN0IHJlZGlyZWN0UmVzcG9uc2U6KE5TVVJMUmVzcG9uc2UgKily ZWRpcmVjdFJlc3BvbnNlCistIChOU1VSTFJlcXVlc3QgKiljb25uZWN0aW9uOihOU1VSTENvbm5l Y3Rpb24gKiljb25uZWN0aW9uIHdpbGxTZW5kUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopbmV3UmVx dWVzdCByZWRpcmVjdFJlc3BvbnNlOihOU1VSTFJlc3BvbnNlICopcmVkaXJlY3RSZXNwb25zZQog ewotICAgIFVOVVNFRF9QQVJBTSh1bnVzZWRDb25uZWN0aW9uKTsKKyAgICBVTlVTRURfUEFSQU0o Y29ubmVjdGlvbik7CiAKICAgICAvLyB0aGUgd2lsbFNlbmRSZXF1ZXN0IGNhbGwgbWF5IGNhbmNl bCB0aGlzIGxvYWQsIGluIHdoaWNoIGNhc2Ugc2VsZiBjb3VsZCBiZSBkZWFsbG9jYXRlZAogICAg IFJldGFpblB0cjxXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc0RlbGVnYXRlPiBwcm90ZWN0KHNlbGYp OwpAQCAtNTQ3LDYgKzU1Niw4IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnJlY2VpdmVkQ2FuY2Vs bGF0aW8KICAgICBpZiAoIXJlZGlyZWN0UmVzcG9uc2UpCiAgICAgICAgIHJldHVybiBuZXdSZXF1 ZXN0OwogICAgIAorICAgIExPRyhOZXR3b3JrLCAiSGFuZGxlICVwIGRlbGVnYXRlIGNvbm5lY3Rp b246JXAgd2lsbFNlbmRSZXF1ZXN0OiVAIHJlZGlyZWN0UmVzcG9uc2U6JXAiLCBtX2hhbmRsZSwg Y29ubmVjdGlvbiwgW25ld1JlcXVlc3QgZGVzY3JpcHRpb25dLCByZWRpcmVjdFJlc3BvbnNlKTsK KwogICAgIENhbGxiYWNrR3VhcmQgZ3VhcmQ7CiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3Qg PSBuZXdSZXF1ZXN0OwogICAgIG1faGFuZGxlLT53aWxsU2VuZFJlcXVlc3QocmVxdWVzdCwgcmVk aXJlY3RSZXNwb25zZSk7CkBAIC01NjUsOSArNTc2LDExIEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6 OnJlY2VpdmVkQ2FuY2VsbGF0aW8KICAgICByZXR1cm4gcmVxdWVzdC5uc1VSTFJlcXVlc3QoKTsK IH0KIAotLSAoQk9PTCljb25uZWN0aW9uU2hvdWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2U6KE5TVVJM Q29ubmVjdGlvbiAqKXVudXNlZENvbm5lY3Rpb24KKy0gKEJPT0wpY29ubmVjdGlvblNob3VsZFVz ZUNyZWRlbnRpYWxTdG9yYWdlOihOU1VSTENvbm5lY3Rpb24gKiljb25uZWN0aW9uCiB7Ci0gICAg VU5VU0VEX1BBUkFNKHVudXNlZENvbm5lY3Rpb24pOworICAgIFVOVVNFRF9QQVJBTShjb25uZWN0 aW9uKTsKKworICAgIExPRyhOZXR3b3JrLCAiSGFuZGxlICVwIGRlbGVnYXRlIGNvbm5lY3Rpb25T aG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZTolcCIsIG1faGFuZGxlLCBjb25uZWN0aW9uKTsKIAog ICAgIGlmICghbV9oYW5kbGUpCiAgICAgICAgIHJldHVybiBOTzsKQEAgLTU3NiwxOSArNTg5LDIz IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnJlY2VpdmVkQ2FuY2VsbGF0aW8KICAgICByZXR1cm4g bV9oYW5kbGUtPnNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlKCk7CiB9CiAKLS0gKHZvaWQpY29u bmVjdGlvbjooTlNVUkxDb25uZWN0aW9uICopdW51c2VkQ29ubmVjdGlvbiBkaWRSZWNlaXZlQXV0 aGVudGljYXRpb25DaGFsbGVuZ2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFs bGVuZ2UKKy0gKHZvaWQpY29ubmVjdGlvbjooTlNVUkxDb25uZWN0aW9uICopY29ubmVjdGlvbiBk aWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFs bGVuZ2UgKiljaGFsbGVuZ2UKIHsKLSAgICBVTlVTRURfUEFSQU0odW51c2VkQ29ubmVjdGlvbik7 Ci0gICAgCisgICAgVU5VU0VEX1BBUkFNKGNvbm5lY3Rpb24pOworCisgICAgTE9HKE5ldHdvcmss ICJIYW5kbGUgJXAgZGVsZWdhdGUgY29ubmVjdGlvbjolcCBkaWRSZWNlaXZlQXV0aGVudGljYXRp b25DaGFsbGVuZ2U6JXAiLCBtX2hhbmRsZSwgY29ubmVjdGlvbiwgY2hhbGxlbmdlKTsKKwogICAg IGlmICghbV9oYW5kbGUpCiAgICAgICAgIHJldHVybjsKICAgICBDYWxsYmFja0d1YXJkIGd1YXJk OwogICAgIG1faGFuZGxlLT5kaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoY29yZShj aGFsbGVuZ2UpKTsKIH0KIAotLSAodm9pZCljb25uZWN0aW9uOihOU1VSTENvbm5lY3Rpb24gKil1 bnVzZWRDb25uZWN0aW9uIGRpZENhbmNlbEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOihOU1VSTEF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICopY2hhbGxlbmdlCistICh2b2lkKWNvbm5lY3Rpb246KE5T VVJMQ29ubmVjdGlvbiAqKWNvbm5lY3Rpb24gZGlkQ2FuY2VsQXV0aGVudGljYXRpb25DaGFsbGVu Z2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFsbGVuZ2UKIHsKLSAgICBVTlVT RURfUEFSQU0odW51c2VkQ29ubmVjdGlvbik7CisgICAgVU5VU0VEX1BBUkFNKGNvbm5lY3Rpb24p OworCisgICAgTE9HKE5ldHdvcmssICJIYW5kbGUgJXAgZGVsZWdhdGUgY29ubmVjdGlvbjolcCBk aWRDYW5jZWxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTolcCIsIG1faGFuZGxlLCBjb25uZWN0aW9u LCBjaGFsbGVuZ2UpOwogCiAgICAgaWYgKCFtX2hhbmRsZSkKICAgICAgICAgcmV0dXJuOwpAQCAt NTk2LDkgKzYxMywxMSBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpyZWNlaXZlZENhbmNlbGxhdGlv CiAgICAgbV9oYW5kbGUtPmRpZENhbmNlbEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKGNvcmUoY2hh bGxlbmdlKSk7CiB9CiAKLS0gKHZvaWQpY29ubmVjdGlvbjooTlNVUkxDb25uZWN0aW9uICopdW51 c2VkQ29ubmVjdGlvbiBkaWRSZWNlaXZlUmVzcG9uc2U6KE5TVVJMUmVzcG9uc2UgKilyCistICh2 b2lkKWNvbm5lY3Rpb246KE5TVVJMQ29ubmVjdGlvbiAqKWNvbm5lY3Rpb24gZGlkUmVjZWl2ZVJl c3BvbnNlOihOU1VSTFJlc3BvbnNlICopcgogewotICAgIFVOVVNFRF9QQVJBTSh1bnVzZWRDb25u ZWN0aW9uKTsKKyAgICBVTlVTRURfUEFSQU0oY29ubmVjdGlvbik7CisKKyAgICBMT0coTmV0d29y aywgIkhhbmRsZSAlcCBkZWxlZ2F0ZSBjb25uZWN0aW9uOiVwIGRpZFJlY2VpdmVSZXNwb25zZTol cCAoSFRUUCBzdGF0dXMgJWQpIiwgbV9oYW5kbGUsIGNvbm5lY3Rpb24sIHIsIFtyIHJlc3BvbmRz VG9TZWxlY3RvcjpAc2VsZWN0b3Ioc3RhdHVzQ29kZSldID8gWyhpZClyIHN0YXR1c0NvZGVdIDog MCk7CiAKICAgICBpZiAoIW1faGFuZGxlIHx8ICFtX2hhbmRsZS0+Y2xpZW50KCkpCiAgICAgICAg IHJldHVybjsKQEAgLTYxNSw5ICs2MzQsMTEgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6cmVjZWl2 ZWRDYW5jZWxsYXRpbwogICAgIG1faGFuZGxlLT5jbGllbnQoKS0+ZGlkUmVjZWl2ZVJlc3BvbnNl KG1faGFuZGxlLCByKTsKIH0KIAotLSAodm9pZCljb25uZWN0aW9uOihOU1VSTENvbm5lY3Rpb24g Kil1bnVzZWRDb25uZWN0aW9uIGRpZFJlY2VpdmVEYXRhOihOU0RhdGEgKilkYXRhIGxlbmd0aFJl Y2VpdmVkOihsb25nIGxvbmcpbGVuZ3RoUmVjZWl2ZWQKKy0gKHZvaWQpY29ubmVjdGlvbjooTlNV UkxDb25uZWN0aW9uICopY29ubmVjdGlvbiBkaWRSZWNlaXZlRGF0YTooTlNEYXRhICopZGF0YSBs ZW5ndGhSZWNlaXZlZDoobG9uZyBsb25nKWxlbmd0aFJlY2VpdmVkCiB7Ci0gICAgVU5VU0VEX1BB UkFNKHVudXNlZENvbm5lY3Rpb24pOworICAgIFVOVVNFRF9QQVJBTShjb25uZWN0aW9uKTsKKwor ICAgIExPRyhOZXR3b3JrLCAiSGFuZGxlICVwIGRlbGVnYXRlIGNvbm5lY3Rpb246JXAgZGlkUmVj ZWl2ZURhdGE6JXAgbGVuZ3RoUmVjZWl2ZWQ6JWxsZCIsIG1faGFuZGxlLCBjb25uZWN0aW9uLCBk YXRhLCBsZW5ndGhSZWNlaXZlZCk7CiAKICAgICBpZiAoIW1faGFuZGxlIHx8ICFtX2hhbmRsZS0+ Y2xpZW50KCkpCiAgICAgICAgIHJldHVybjsKQEAgLTYyOCw5ICs2NDksMTEgQEAgdm9pZCBSZXNv dXJjZUhhbmRsZTo6cmVjZWl2ZWRDYW5jZWxsYXRpbwogICAgIG1faGFuZGxlLT5jbGllbnQoKS0+ ZGlkUmVjZWl2ZURhdGEobV9oYW5kbGUsIChjb25zdCBjaGFyKilbZGF0YSBieXRlc10sIFtkYXRh IGxlbmd0aF0sIHN0YXRpY19jYXN0PGludD4obGVuZ3RoUmVjZWl2ZWQpKTsKIH0KIAotLSAodm9p ZCljb25uZWN0aW9uOihOU1VSTENvbm5lY3Rpb24gKil1bnVzZWRDb25uZWN0aW9uIHdpbGxTdG9w QnVmZmVyaW5nRGF0YTooTlNEYXRhICopZGF0YQorLSAodm9pZCljb25uZWN0aW9uOihOU1VSTENv bm5lY3Rpb24gKiljb25uZWN0aW9uIHdpbGxTdG9wQnVmZmVyaW5nRGF0YTooTlNEYXRhICopZGF0 YQogewotICAgIFVOVVNFRF9QQVJBTSh1bnVzZWRDb25uZWN0aW9uKTsKKyAgICBVTlVTRURfUEFS QU0oY29ubmVjdGlvbik7CisKKyAgICBMT0coTmV0d29yaywgIkhhbmRsZSAlcCBkZWxlZ2F0ZSBj b25uZWN0aW9uOiVwIHdpbGxTdG9wQnVmZmVyaW5nRGF0YTolcCIsIG1faGFuZGxlLCBjb25uZWN0 aW9uLCBkYXRhKTsKIAogICAgIGlmICghbV9oYW5kbGUgfHwgIW1faGFuZGxlLT5jbGllbnQoKSkK ICAgICAgICAgcmV0dXJuOwpAQCAtNjQxLDEwICs2NjQsMTIgQEAgdm9pZCBSZXNvdXJjZUhhbmRs ZTo6cmVjZWl2ZWRDYW5jZWxsYXRpbwogICAgIG1faGFuZGxlLT5jbGllbnQoKS0+d2lsbFN0b3BC dWZmZXJpbmdEYXRhKG1faGFuZGxlLCAoY29uc3QgY2hhciopW2RhdGEgYnl0ZXNdLCBzdGF0aWNf Y2FzdDxpbnQ+KFtkYXRhIGxlbmd0aF0pKTsKIH0KIAotLSAodm9pZCljb25uZWN0aW9uOihOU1VS TENvbm5lY3Rpb24gKil1bnVzZWRDb25uZWN0aW9uIGRpZFNlbmRCb2R5RGF0YTooTlNJbnRlZ2Vy KXVudXNlZEJ5dGVzV3JpdHRlbiB0b3RhbEJ5dGVzV3JpdHRlbjooTlNJbnRlZ2VyKXRvdGFsQnl0 ZXNXcml0dGVuIHRvdGFsQnl0ZXNFeHBlY3RlZFRvV3JpdGU6KE5TSW50ZWdlcil0b3RhbEJ5dGVz RXhwZWN0ZWRUb1dyaXRlCistICh2b2lkKWNvbm5lY3Rpb246KE5TVVJMQ29ubmVjdGlvbiAqKWNv bm5lY3Rpb24gZGlkU2VuZEJvZHlEYXRhOihOU0ludGVnZXIpYnl0ZXNXcml0dGVuIHRvdGFsQnl0 ZXNXcml0dGVuOihOU0ludGVnZXIpdG90YWxCeXRlc1dyaXR0ZW4gdG90YWxCeXRlc0V4cGVjdGVk VG9Xcml0ZTooTlNJbnRlZ2VyKXRvdGFsQnl0ZXNFeHBlY3RlZFRvV3JpdGUKIHsKLSAgICBVTlVT RURfUEFSQU0odW51c2VkQ29ubmVjdGlvbik7Ci0gICAgVU5VU0VEX1BBUkFNKHVudXNlZEJ5dGVz V3JpdHRlbik7CisgICAgVU5VU0VEX1BBUkFNKGNvbm5lY3Rpb24pOworICAgIFVOVVNFRF9QQVJB TShieXRlc1dyaXR0ZW4pOworCisgICAgTE9HKE5ldHdvcmssICJIYW5kbGUgJXAgZGVsZWdhdGUg Y29ubmVjdGlvbjolcCBkaWRTZW5kQm9keURhdGE6JWQgdG90YWxCeXRlc1dyaXR0ZW46JWQgdG90 YWxCeXRlc0V4cGVjdGVkVG9Xcml0ZTolZCIsIG1faGFuZGxlLCBjb25uZWN0aW9uLCBieXRlc1dy aXR0ZW4sIHRvdGFsQnl0ZXNXcml0dGVuLCB0b3RhbEJ5dGVzRXhwZWN0ZWRUb1dyaXRlKTsKIAog ICAgIGlmICghbV9oYW5kbGUgfHwgIW1faGFuZGxlLT5jbGllbnQoKSkKICAgICAgICAgcmV0dXJu OwpAQCAtNjUyLDkgKzY3NywxMSBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpyZWNlaXZlZENhbmNl bGxhdGlvCiAgICAgbV9oYW5kbGUtPmNsaWVudCgpLT5kaWRTZW5kRGF0YShtX2hhbmRsZSwgdG90 YWxCeXRlc1dyaXR0ZW4sIHRvdGFsQnl0ZXNFeHBlY3RlZFRvV3JpdGUpOwogfQogCi0tICh2b2lk KWNvbm5lY3Rpb25EaWRGaW5pc2hMb2FkaW5nOihOU1VSTENvbm5lY3Rpb24gKil1bnVzZWRDb25u ZWN0aW9uCistICh2b2lkKWNvbm5lY3Rpb25EaWRGaW5pc2hMb2FkaW5nOihOU1VSTENvbm5lY3Rp b24gKiljb25uZWN0aW9uCiB7Ci0gICAgVU5VU0VEX1BBUkFNKHVudXNlZENvbm5lY3Rpb24pOwor ICAgIFVOVVNFRF9QQVJBTShjb25uZWN0aW9uKTsKKworICAgIExPRyhOZXR3b3JrLCAiSGFuZGxl ICVwIGRlbGVnYXRlIGNvbm5lY3Rpb25EaWRGaW5pc2hMb2FkaW5nOiVwIiwgbV9oYW5kbGUsIGNv bm5lY3Rpb24pOwogCiAgICAgaWYgKCFtX2hhbmRsZSB8fCAhbV9oYW5kbGUtPmNsaWVudCgpKQog ICAgICAgICByZXR1cm47CkBAIC02NjYsOSArNjkzLDExIEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6 OnJlY2VpdmVkQ2FuY2VsbGF0aW8KICAgICBtX2hhbmRsZS0+Y2xpZW50KCktPmRpZEZpbmlzaExv YWRpbmcobV9oYW5kbGUpOwogfQogCi0tICh2b2lkKWNvbm5lY3Rpb246KE5TVVJMQ29ubmVjdGlv biAqKXVudXNlZENvbm5lY3Rpb24gZGlkRmFpbFdpdGhFcnJvcjooTlNFcnJvciAqKWVycm9yCist ICh2b2lkKWNvbm5lY3Rpb246KE5TVVJMQ29ubmVjdGlvbiAqKWNvbm5lY3Rpb24gZGlkRmFpbFdp dGhFcnJvcjooTlNFcnJvciAqKWVycm9yCiB7Ci0gICAgVU5VU0VEX1BBUkFNKHVudXNlZENvbm5l Y3Rpb24pOworICAgIFVOVVNFRF9QQVJBTShjb25uZWN0aW9uKTsKKworICAgIExPRyhOZXR3b3Jr LCAiSGFuZGxlICVwIGRlbGVnYXRlIGNvbm5lY3Rpb246JXAgZGlkRmFpbFdpdGhFcnJvcjolQCIs IG1faGFuZGxlLCBjb25uZWN0aW9uLCBlcnJvcik7CiAKICAgICBpZiAoIW1faGFuZGxlIHx8ICFt X2hhbmRsZS0+Y2xpZW50KCkpCiAgICAgICAgIHJldHVybjsKQEAgLTY5Myw2ICs3MjIsOCBAQCB2 b2lkIFJlc291cmNlSGFuZGxlOjpyZWNlaXZlZENhbmNlbGxhdGlvCiAKIC0gKE5TQ2FjaGVkVVJM UmVzcG9uc2UgKiljb25uZWN0aW9uOihOU1VSTENvbm5lY3Rpb24gKiljb25uZWN0aW9uIHdpbGxD YWNoZVJlc3BvbnNlOihOU0NhY2hlZFVSTFJlc3BvbnNlICopY2FjaGVkUmVzcG9uc2UKIHsKKyAg ICBMT0coTmV0d29yaywgIkhhbmRsZSAlcCBkZWxlZ2F0ZSBjb25uZWN0aW9uOiVwIHdpbGxDYWNo ZVJlc3BvbnNlOiVwIiwgbV9oYW5kbGUsIGNvbm5lY3Rpb24sIGNhY2hlZFJlc3BvbnNlKTsKKwog I2lmZGVmIEJVSUxESU5HX09OX1RJR0VSCiAgICAgLy8gT24gVGlnZXIgQ0ZVUkxDb25uZWN0aW9u IGNhbiBzb21ldGltZXMgY2FsbCB0aGUgY29ubmVjdGlvbjp3aWxsQ2FjaGVSZXNwb25zZTogZGVs ZWdhdGUgbWV0aG9kIG9uCiAgICAgLy8gYSBzZWNvbmRhcnkgdGhyZWFkIGluc3RlYWQgb2YgdGhl IG1haW4gdGhyZWFkLiBJZiB0aGlzIGhhcHBlbnMgcGVyZm9ybSB0aGUgd29yayBvbiB0aGUgbWFp biB0aHJlYWQuCg==