Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p10Vk-00057r-QO for pgsql-hackers@arkaria.postgresql.org; Fri, 02 Dec 2022 07:31:05 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1p10Vj-0008CA-Mr for pgsql-hackers@arkaria.postgresql.org; Fri, 02 Dec 2022 07:31:03 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p10Vj-0008Bx-3s for pgsql-hackers@lists.postgresql.org; Fri, 02 Dec 2022 07:31:03 +0000 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p10Vf-0004b1-3K for pgsql-hackers@postgresql.org; Fri, 02 Dec 2022 07:31:02 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 924CC2B065B3 for ; Fri, 2 Dec 2022 02:30:57 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Fri, 02 Dec 2022 02:30:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:message-id:mime-version :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1669966257; x= 1669973457; bh=DfTAme7Pm2N/I3cvX1HuOiqbouwBd3pU0de3Rqv+ezw=; b=k GrMV/7886kaq+8LthgnMNgY1whQEJNWMwoIdZO3ff2BbUlxQxxDEr3zx0SWQpuik kzleCjOBxGSGAOvLNb54osDrEETCAsF2ma/06y3Fn4GsdDU4RHxrnJ6c9MymXkf8 SR9xwXRrIN1edThrvgmIrW0/eiVknwF+kfqZHKwfZ098eurJOPLMcM8z7iG55yMW RgYyLL/R4CkGSDNoO+zgzsGCV9wCmyF4MV7eexbo6wuBhb6C48j78n3xAQDvNaXp f3Ifky/3oNIo5aOFupdm27aL0FSvathQeZHgK1QCHqMf9KOIgSietiGBCcSs/KGs IoiNQaR1ctgBGHUdnZUnw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrtdeigdduudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpegtkfffgggfhffuvfesmhdtreertd efjeenucfhrhhomheprfgvthgvrhcugfhishgvnhhtrhgruhhtuceophgvthgvrhdrvghi shgvnhhtrhgruhhtsegvnhhtvghrphhrihhsvggusgdrtghomheqnecuggftrfgrthhtvg hrnhepieejveeiudeuheduhedutdffieejjeetieejhefhveeufedtffejieelhfelkeff necuffhomhgrihhnpehpohhsthhgrhgvshhqlhdrohhrghenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpvghtvghrrdgvihhsvghnthhrrghu thesvghnthgvrhhprhhishgvuggsrdgtohhm X-ME-Proxy: Feedback-ID: i131946ab:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 2 Dec 2022 02:30:56 -0500 (EST) Content-Type: multipart/mixed; boundary="------------33BpK3WKNyIqMx4eY6BuoLd9" Message-ID: <22c7e802-4e7d-8d87-8b71-cba95e6f4bcf@enterprisedb.com> Date: Fri, 2 Dec 2022 08:30:55 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Content-Language: en-US From: Peter Eisentraut Subject: refactor ExecGrant_*() functions To: pgsql-hackers List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------33BpK3WKNyIqMx4eY6BuoLd9 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Continuing the ideas in [0], this patch refactors the ExecGrant_Foo() functions and replaces many of them by a common function that is driven by the ObjectProperty table. It would be nice to do more here, for example ExecGrant_Language(), which has additional non-generalizable checks, but I think this is already a good start. For example, the work being discussed on privileges on publications [1] would be able to take good advantage of this. [0]: https://www.postgresql.org/message-id/95c30f96-4060-2f48-98b5-a4392d3b6066@enterprisedb.com [1]: https://www.postgresql.org/message-id/flat/20330.1652105397@antos --------------33BpK3WKNyIqMx4eY6BuoLd9 Content-Type: text/plain; charset=UTF-8; name="0001-Refactor-ExecGrant_-functions.patch" Content-Disposition: attachment; filename="0001-Refactor-ExecGrant_-functions.patch" Content-Transfer-Encoding: base64 RnJvbSAyMDA4NzllNWVkZmMxY2U5M2I3YWYzY2JmYWZjMWY2MTg2MjZjYmU5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogRnJpLCAyIERlYyAyMDIyIDA4OjE2OjUzICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gUmVmYWN0b3IgRXhlY0dyYW50XyooKSBmdW5jdGlvbnMKCkluc3RlYWQgb2Yg aGFsZiBhIGRvemVuIG9mIG1vc3RseS1kdXBsaWNhdGUgRXhlY0dyYW50X0ZvbygpIGZ1bmN0 aW9ucywKd3JpdGUgb25lIGNvbW1vbiBmdW5jdGlvbiBFeGVjR3JhbnRfZ2VuZXJpYygpIHRo YXQgY2FuIGhhbmRsZSBtb3N0IG9mCnRoZW0uICBXZSBhbHJlYWR5IGhhdmUgYWxsIHRoZSBp bmZvcm1hdGlvbiB3ZSBuZWVkLCBzdWNoIGFzIHdoaWNoCnN5c3RlbSBjYXRhbG9nIGNvcnJl c3BvbmRzIHRvIHdoaWNoIGNhdGFsb2cgdGFibGUgYW5kIHdoaWNoIGNvbHVtbiBpcwp0aGUg QUNMIGNvbHVtbi4KLS0tCiBzcmMvYmFja2VuZC9jYXRhbG9nL2FjbGNoay5jIHwgNjYyICsr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzQg aW5zZXJ0aW9ucygrKSwgNjI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9iYWNr ZW5kL2NhdGFsb2cvYWNsY2hrLmMgYi9zcmMvYmFja2VuZC9jYXRhbG9nL2FjbGNoay5jCmlu ZGV4IDhkODRhN2IwNTYuLjYxMmVmMWE2NjYgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2Nh dGFsb2cvYWNsY2hrLmMKKysrIGIvc3JjL2JhY2tlbmQvY2F0YWxvZy9hY2xjaGsuYwpAQCAt MTA2LDE0ICsxMDYsOSBAQCBib29sCQliaW5hcnlfdXBncmFkZV9yZWNvcmRfaW5pdF9wcml2 cyA9IGZhbHNlOwogCiBzdGF0aWMgdm9pZCBFeGVjR3JhbnRTdG10X29pZHMoSW50ZXJuYWxH cmFudCAqaXN0bXQpOwogc3RhdGljIHZvaWQgRXhlY0dyYW50X1JlbGF0aW9uKEludGVybmFs R3JhbnQgKmlzdG10KTsKLXN0YXRpYyB2b2lkIEV4ZWNHcmFudF9EYXRhYmFzZShJbnRlcm5h bEdyYW50ICppc3RtdCk7Ci1zdGF0aWMgdm9pZCBFeGVjR3JhbnRfRmR3KEludGVybmFsR3Jh bnQgKmlzdG10KTsKLXN0YXRpYyB2b2lkIEV4ZWNHcmFudF9Gb3JlaWduU2VydmVyKEludGVy bmFsR3JhbnQgKmlzdG10KTsKLXN0YXRpYyB2b2lkIEV4ZWNHcmFudF9GdW5jdGlvbihJbnRl cm5hbEdyYW50ICppc3RtdCk7CitzdGF0aWMgdm9pZCBFeGVjR3JhbnRfZ2VuZXJpYyhJbnRl cm5hbEdyYW50ICppc3RtdCwgT2lkIGNsYXNzaWQsIEFjbE1vZGUgZGVmYXVsdF9wcml2cyk7 CiBzdGF0aWMgdm9pZCBFeGVjR3JhbnRfTGFuZ3VhZ2UoSW50ZXJuYWxHcmFudCAqaXN0bXQp Owogc3RhdGljIHZvaWQgRXhlY0dyYW50X0xhcmdlb2JqZWN0KEludGVybmFsR3JhbnQgKmlz dG10KTsKLXN0YXRpYyB2b2lkIEV4ZWNHcmFudF9OYW1lc3BhY2UoSW50ZXJuYWxHcmFudCAq aXN0bXQpOwotc3RhdGljIHZvaWQgRXhlY0dyYW50X1RhYmxlc3BhY2UoSW50ZXJuYWxHcmFu dCAqaXN0bXQpOwogc3RhdGljIHZvaWQgRXhlY0dyYW50X1R5cGUoSW50ZXJuYWxHcmFudCAq aXN0bXQpOwogc3RhdGljIHZvaWQgRXhlY0dyYW50X1BhcmFtZXRlcihJbnRlcm5hbEdyYW50 ICppc3RtdCk7CiAKQEAgLTYwMiwyMiArNTk3LDIyIEBAIEV4ZWNHcmFudFN0bXRfb2lkcyhJ bnRlcm5hbEdyYW50ICppc3RtdCkKIAkJCUV4ZWNHcmFudF9SZWxhdGlvbihpc3RtdCk7CiAJ CQlicmVhazsKIAkJY2FzZSBPQkpFQ1RfREFUQUJBU0U6Ci0JCQlFeGVjR3JhbnRfRGF0YWJh c2UoaXN0bXQpOworCQkJRXhlY0dyYW50X2dlbmVyaWMoaXN0bXQsIERhdGFiYXNlUmVsYXRp b25JZCwgQUNMX0FMTF9SSUdIVFNfREFUQUJBU0UpOwogCQkJYnJlYWs7CiAJCWNhc2UgT0JK RUNUX0RPTUFJTjoKIAkJY2FzZSBPQkpFQ1RfVFlQRToKIAkJCUV4ZWNHcmFudF9UeXBlKGlz dG10KTsKIAkJCWJyZWFrOwogCQljYXNlIE9CSkVDVF9GRFc6Ci0JCQlFeGVjR3JhbnRfRmR3 KGlzdG10KTsKKwkJCUV4ZWNHcmFudF9nZW5lcmljKGlzdG10LCBGb3JlaWduRGF0YVdyYXBw ZXJSZWxhdGlvbklkLCBBQ0xfQUxMX1JJR0hUU19GRFcpOwogCQkJYnJlYWs7CiAJCWNhc2Ug T0JKRUNUX0ZPUkVJR05fU0VSVkVSOgotCQkJRXhlY0dyYW50X0ZvcmVpZ25TZXJ2ZXIoaXN0 bXQpOworCQkJRXhlY0dyYW50X2dlbmVyaWMoaXN0bXQsIEZvcmVpZ25TZXJ2ZXJSZWxhdGlv bklkLCBBQ0xfQUxMX1JJR0hUU19GT1JFSUdOX1NFUlZFUik7CiAJCQlicmVhazsKIAkJY2Fz ZSBPQkpFQ1RfRlVOQ1RJT046CiAJCWNhc2UgT0JKRUNUX1BST0NFRFVSRToKIAkJY2FzZSBP QkpFQ1RfUk9VVElORToKLQkJCUV4ZWNHcmFudF9GdW5jdGlvbihpc3RtdCk7CisJCQlFeGVj R3JhbnRfZ2VuZXJpYyhpc3RtdCwgUHJvY2VkdXJlUmVsYXRpb25JZCwgQUNMX0FMTF9SSUdI VFNfRlVOQ1RJT04pOwogCQkJYnJlYWs7CiAJCWNhc2UgT0JKRUNUX0xBTkdVQUdFOgogCQkJ RXhlY0dyYW50X0xhbmd1YWdlKGlzdG10KTsKQEAgLTYyNiwxMCArNjIxLDEwIEBAIEV4ZWNH cmFudFN0bXRfb2lkcyhJbnRlcm5hbEdyYW50ICppc3RtdCkKIAkJCUV4ZWNHcmFudF9MYXJn ZW9iamVjdChpc3RtdCk7CiAJCQlicmVhazsKIAkJY2FzZSBPQkpFQ1RfU0NIRU1BOgotCQkJ RXhlY0dyYW50X05hbWVzcGFjZShpc3RtdCk7CisJCQlFeGVjR3JhbnRfZ2VuZXJpYyhpc3Rt dCwgTmFtZXNwYWNlUmVsYXRpb25JZCwgQUNMX0FMTF9SSUdIVFNfU0NIRU1BKTsKIAkJCWJy ZWFrOwogCQljYXNlIE9CSkVDVF9UQUJMRVNQQUNFOgotCQkJRXhlY0dyYW50X1RhYmxlc3Bh Y2UoaXN0bXQpOworCQkJRXhlY0dyYW50X2dlbmVyaWMoaXN0bXQsIFRhYmxlU3BhY2VSZWxh dGlvbklkLCBBQ0xfQUxMX1JJR0hUU19UQUJMRVNQQUNFKTsKIAkJCWJyZWFrOwogCQljYXNl IE9CSkVDVF9QQVJBTUVURVJfQUNMOgogCQkJRXhlY0dyYW50X1BhcmFtZXRlcihpc3RtdCk7 CkBAIC0yMTMyLDM4MCArMjEyNywyMiBAQCBFeGVjR3JhbnRfUmVsYXRpb24oSW50ZXJuYWxH cmFudCAqaXN0bXQpCiB9CiAKIHN0YXRpYyB2b2lkCi1FeGVjR3JhbnRfRGF0YWJhc2UoSW50 ZXJuYWxHcmFudCAqaXN0bXQpCi17Ci0JUmVsYXRpb24JcmVsYXRpb247Ci0JTGlzdENlbGwg ICAqY2VsbDsKLQotCWlmIChpc3RtdC0+YWxsX3ByaXZzICYmIGlzdG10LT5wcml2aWxlZ2Vz ID09IEFDTF9OT19SSUdIVFMpCi0JCWlzdG10LT5wcml2aWxlZ2VzID0gQUNMX0FMTF9SSUdI VFNfREFUQUJBU0U7Ci0KLQlyZWxhdGlvbiA9IHRhYmxlX29wZW4oRGF0YWJhc2VSZWxhdGlv bklkLCBSb3dFeGNsdXNpdmVMb2NrKTsKLQotCWZvcmVhY2goY2VsbCwgaXN0bXQtPm9iamVj dHMpCi0JewotCQlPaWQJCQlkYXRJZCA9IGxmaXJzdF9vaWQoY2VsbCk7Ci0JCUZvcm1fcGdf ZGF0YWJhc2UgcGdfZGF0YWJhc2VfdHVwbGU7Ci0JCURhdHVtCQlhY2xEYXR1bTsKLQkJYm9v bAkJaXNOdWxsOwotCQlBY2xNb2RlCQlhdmFpbF9nb3B0aW9uczsKLQkJQWNsTW9kZQkJdGhp c19wcml2aWxlZ2VzOwotCQlBY2wJCSAgICpvbGRfYWNsOwotCQlBY2wJCSAgICpuZXdfYWNs OwotCQlPaWQJCQlncmFudG9ySWQ7Ci0JCU9pZAkJCW93bmVySWQ7Ci0JCUhlYXBUdXBsZQlu ZXd0dXBsZTsKLQkJRGF0dW0JCXZhbHVlc1tOYXR0c19wZ19kYXRhYmFzZV0gPSB7MH07Ci0J CWJvb2wJCW51bGxzW05hdHRzX3BnX2RhdGFiYXNlXSA9IHswfTsKLQkJYm9vbAkJcmVwbGFj ZXNbTmF0dHNfcGdfZGF0YWJhc2VdID0gezB9OwotCQlpbnQJCQlub2xkbWVtYmVyczsKLQkJ aW50CQkJbm5ld21lbWJlcnM7Ci0JCU9pZAkJICAgKm9sZG1lbWJlcnM7Ci0JCU9pZAkJICAg Km5ld21lbWJlcnM7Ci0JCUhlYXBUdXBsZQl0dXBsZTsKLQotCQl0dXBsZSA9IFNlYXJjaFN5 c0NhY2hlMShEQVRBQkFTRU9JRCwgT2JqZWN0SWRHZXREYXR1bShkYXRJZCkpOwotCQlpZiAo IUhlYXBUdXBsZUlzVmFsaWQodHVwbGUpKQotCQkJZWxvZyhFUlJPUiwgImNhY2hlIGxvb2t1 cCBmYWlsZWQgZm9yIGRhdGFiYXNlICV1IiwgZGF0SWQpOwotCi0JCXBnX2RhdGFiYXNlX3R1 cGxlID0gKEZvcm1fcGdfZGF0YWJhc2UpIEdFVFNUUlVDVCh0dXBsZSk7Ci0KLQkJLyoKLQkJ ICogR2V0IG93bmVyIElEIGFuZCB3b3JraW5nIGNvcHkgb2YgZXhpc3RpbmcgQUNMLiBJZiB0 aGVyZSdzIG5vIEFDTCwKLQkJICogc3Vic3RpdHV0ZSB0aGUgcHJvcGVyIGRlZmF1bHQuCi0J CSAqLwotCQlvd25lcklkID0gcGdfZGF0YWJhc2VfdHVwbGUtPmRhdGRiYTsKLQkJYWNsRGF0 dW0gPSBoZWFwX2dldGF0dHIodHVwbGUsIEFudW1fcGdfZGF0YWJhc2VfZGF0YWNsLAotCQkJ CQkJCQlSZWxhdGlvbkdldERlc2NyKHJlbGF0aW9uKSwgJmlzTnVsbCk7Ci0JCWlmIChpc051 bGwpCi0JCXsKLQkJCW9sZF9hY2wgPSBhY2xkZWZhdWx0KE9CSkVDVF9EQVRBQkFTRSwgb3du ZXJJZCk7Ci0JCQkvKiBUaGVyZSBhcmUgbm8gb2xkIG1lbWJlciByb2xlcyBhY2NvcmRpbmcg dG8gdGhlIGNhdGFsb2dzICovCi0JCQlub2xkbWVtYmVycyA9IDA7Ci0JCQlvbGRtZW1iZXJz ID0gTlVMTDsKLQkJfQotCQllbHNlCi0JCXsKLQkJCW9sZF9hY2wgPSBEYXR1bUdldEFjbFBD b3B5KGFjbERhdHVtKTsKLQkJCS8qIEdldCB0aGUgcm9sZXMgbWVudGlvbmVkIGluIHRoZSBl eGlzdGluZyBBQ0wgKi8KLQkJCW5vbGRtZW1iZXJzID0gYWNsbWVtYmVycyhvbGRfYWNsLCAm b2xkbWVtYmVycyk7Ci0JCX0KLQotCQkvKiBEZXRlcm1pbmUgSUQgdG8gZG8gdGhlIGdyYW50 IGFzLCBhbmQgYXZhaWxhYmxlIGdyYW50IG9wdGlvbnMgKi8KLQkJc2VsZWN0X2Jlc3RfZ3Jh bnRvcihHZXRVc2VySWQoKSwgaXN0bXQtPnByaXZpbGVnZXMsCi0JCQkJCQkJb2xkX2FjbCwg b3duZXJJZCwKLQkJCQkJCQkmZ3JhbnRvcklkLCAmYXZhaWxfZ29wdGlvbnMpOwotCi0JCS8q Ci0JCSAqIFJlc3RyaWN0IHRoZSBwcml2aWxlZ2VzIHRvIHdoYXQgd2UgY2FuIGFjdHVhbGx5 IGdyYW50LCBhbmQgZW1pdCB0aGUKLQkJICogc3RhbmRhcmRzLW1hbmRhdGVkIHdhcm5pbmcg YW5kIGVycm9yIG1lc3NhZ2VzLgotCQkgKi8KLQkJdGhpc19wcml2aWxlZ2VzID0KLQkJCXJl c3RyaWN0X2FuZF9jaGVja19ncmFudChpc3RtdC0+aXNfZ3JhbnQsIGF2YWlsX2dvcHRpb25z LAotCQkJCQkJCQkJIGlzdG10LT5hbGxfcHJpdnMsIGlzdG10LT5wcml2aWxlZ2VzLAotCQkJ CQkJCQkJIGRhdElkLCBncmFudG9ySWQsIE9CSkVDVF9EQVRBQkFTRSwKLQkJCQkJCQkJCSBO YW1lU3RyKHBnX2RhdGFiYXNlX3R1cGxlLT5kYXRuYW1lKSwKLQkJCQkJCQkJCSAwLCBOVUxM KTsKLQotCQkvKgotCQkgKiBHZW5lcmF0ZSBuZXcgQUNMLgotCQkgKi8KLQkJbmV3X2FjbCA9 IG1lcmdlX2FjbF93aXRoX2dyYW50KG9sZF9hY2wsIGlzdG10LT5pc19ncmFudCwKLQkJCQkJ CQkJCSAgIGlzdG10LT5ncmFudF9vcHRpb24sIGlzdG10LT5iZWhhdmlvciwKLQkJCQkJCQkJ CSAgIGlzdG10LT5ncmFudGVlcywgdGhpc19wcml2aWxlZ2VzLAotCQkJCQkJCQkJICAgZ3Jh bnRvcklkLCBvd25lcklkKTsKLQotCQkvKgotCQkgKiBXZSBuZWVkIHRoZSBtZW1iZXJzIG9m IGJvdGggb2xkIGFuZCBuZXcgQUNMcyBzbyB3ZSBjYW4gY29ycmVjdCB0aGUKLQkJICogc2hh cmVkIGRlcGVuZGVuY3kgaW5mb3JtYXRpb24uCi0JCSAqLwotCQlubmV3bWVtYmVycyA9IGFj bG1lbWJlcnMobmV3X2FjbCwgJm5ld21lbWJlcnMpOwotCi0JCS8qIGZpbmlzaGVkIGJ1aWxk aW5nIG5ldyBBQ0wgdmFsdWUsIG5vdyBpbnNlcnQgaXQgKi8KLQkJcmVwbGFjZXNbQW51bV9w Z19kYXRhYmFzZV9kYXRhY2wgLSAxXSA9IHRydWU7Ci0JCXZhbHVlc1tBbnVtX3BnX2RhdGFi YXNlX2RhdGFjbCAtIDFdID0gUG9pbnRlckdldERhdHVtKG5ld19hY2wpOwotCi0JCW5ld3R1 cGxlID0gaGVhcF9tb2RpZnlfdHVwbGUodHVwbGUsIFJlbGF0aW9uR2V0RGVzY3IocmVsYXRp b24pLCB2YWx1ZXMsCi0JCQkJCQkJCQkgbnVsbHMsIHJlcGxhY2VzKTsKLQotCQlDYXRhbG9n VHVwbGVVcGRhdGUocmVsYXRpb24sICZuZXd0dXBsZS0+dF9zZWxmLCBuZXd0dXBsZSk7Ci0K LQkJLyogVXBkYXRlIHRoZSBzaGFyZWQgZGVwZW5kZW5jeSBBQ0wgaW5mbyAqLwotCQl1cGRh dGVBY2xEZXBlbmRlbmNpZXMoRGF0YWJhc2VSZWxhdGlvbklkLCBwZ19kYXRhYmFzZV90dXBs ZS0+b2lkLCAwLAotCQkJCQkJCSAgb3duZXJJZCwKLQkJCQkJCQkgIG5vbGRtZW1iZXJzLCBv bGRtZW1iZXJzLAotCQkJCQkJCSAgbm5ld21lbWJlcnMsIG5ld21lbWJlcnMpOwotCi0JCVJl bGVhc2VTeXNDYWNoZSh0dXBsZSk7Ci0KLQkJcGZyZWUobmV3X2FjbCk7Ci0KLQkJLyogcHJl dmVudCBlcnJvciB3aGVuIHByb2Nlc3NpbmcgZHVwbGljYXRlIG9iamVjdHMgKi8KLQkJQ29t bWFuZENvdW50ZXJJbmNyZW1lbnQoKTsKLQl9Ci0KLQl0YWJsZV9jbG9zZShyZWxhdGlvbiwg Um93RXhjbHVzaXZlTG9jayk7Ci19Ci0KLXN0YXRpYyB2b2lkCi1FeGVjR3JhbnRfRmR3KElu dGVybmFsR3JhbnQgKmlzdG10KQotewotCVJlbGF0aW9uCXJlbGF0aW9uOwotCUxpc3RDZWxs ICAgKmNlbGw7Ci0KLQlpZiAoaXN0bXQtPmFsbF9wcml2cyAmJiBpc3RtdC0+cHJpdmlsZWdl cyA9PSBBQ0xfTk9fUklHSFRTKQotCQlpc3RtdC0+cHJpdmlsZWdlcyA9IEFDTF9BTExfUklH SFRTX0ZEVzsKLQotCXJlbGF0aW9uID0gdGFibGVfb3BlbihGb3JlaWduRGF0YVdyYXBwZXJS ZWxhdGlvbklkLCBSb3dFeGNsdXNpdmVMb2NrKTsKLQotCWZvcmVhY2goY2VsbCwgaXN0bXQt Pm9iamVjdHMpCi0JewotCQlPaWQJCQlmZHdpZCA9IGxmaXJzdF9vaWQoY2VsbCk7Ci0JCUZv cm1fcGdfZm9yZWlnbl9kYXRhX3dyYXBwZXIgcGdfZmR3X3R1cGxlOwotCQlEYXR1bQkJYWNs RGF0dW07Ci0JCWJvb2wJCWlzTnVsbDsKLQkJQWNsTW9kZQkJYXZhaWxfZ29wdGlvbnM7Ci0J CUFjbE1vZGUJCXRoaXNfcHJpdmlsZWdlczsKLQkJQWNsCQkgICAqb2xkX2FjbDsKLQkJQWNs CQkgICAqbmV3X2FjbDsKLQkJT2lkCQkJZ3JhbnRvcklkOwotCQlPaWQJCQlvd25lcklkOwot CQlIZWFwVHVwbGUJdHVwbGU7Ci0JCUhlYXBUdXBsZQluZXd0dXBsZTsKLQkJRGF0dW0JCXZh bHVlc1tOYXR0c19wZ19mb3JlaWduX2RhdGFfd3JhcHBlcl0gPSB7MH07Ci0JCWJvb2wJCW51 bGxzW05hdHRzX3BnX2ZvcmVpZ25fZGF0YV93cmFwcGVyXSA9IHswfTsKLQkJYm9vbAkJcmVw bGFjZXNbTmF0dHNfcGdfZm9yZWlnbl9kYXRhX3dyYXBwZXJdID0gezB9OwotCQlpbnQJCQlu b2xkbWVtYmVyczsKLQkJaW50CQkJbm5ld21lbWJlcnM7Ci0JCU9pZAkJICAgKm9sZG1lbWJl cnM7Ci0JCU9pZAkJICAgKm5ld21lbWJlcnM7Ci0KLQkJdHVwbGUgPSBTZWFyY2hTeXNDYWNo ZTEoRk9SRUlHTkRBVEFXUkFQUEVST0lELAotCQkJCQkJCQlPYmplY3RJZEdldERhdHVtKGZk d2lkKSk7Ci0JCWlmICghSGVhcFR1cGxlSXNWYWxpZCh0dXBsZSkpCi0JCQllbG9nKEVSUk9S LCAiY2FjaGUgbG9va3VwIGZhaWxlZCBmb3IgZm9yZWlnbi1kYXRhIHdyYXBwZXIgJXUiLCBm ZHdpZCk7Ci0KLQkJcGdfZmR3X3R1cGxlID0gKEZvcm1fcGdfZm9yZWlnbl9kYXRhX3dyYXBw ZXIpIEdFVFNUUlVDVCh0dXBsZSk7Ci0KLQkJLyoKLQkJICogR2V0IG93bmVyIElEIGFuZCB3 b3JraW5nIGNvcHkgb2YgZXhpc3RpbmcgQUNMLiBJZiB0aGVyZSdzIG5vIEFDTCwKLQkJICog c3Vic3RpdHV0ZSB0aGUgcHJvcGVyIGRlZmF1bHQuCi0JCSAqLwotCQlvd25lcklkID0gcGdf ZmR3X3R1cGxlLT5mZHdvd25lcjsKLQkJYWNsRGF0dW0gPSBTeXNDYWNoZUdldEF0dHIoRk9S RUlHTkRBVEFXUkFQUEVST0lELCB0dXBsZSwKLQkJCQkJCQkJICAgQW51bV9wZ19mb3JlaWdu X2RhdGFfd3JhcHBlcl9mZHdhY2wsCi0JCQkJCQkJCSAgICZpc051bGwpOwotCQlpZiAoaXNO dWxsKQotCQl7Ci0JCQlvbGRfYWNsID0gYWNsZGVmYXVsdChPQkpFQ1RfRkRXLCBvd25lcklk KTsKLQkJCS8qIFRoZXJlIGFyZSBubyBvbGQgbWVtYmVyIHJvbGVzIGFjY29yZGluZyB0byB0 aGUgY2F0YWxvZ3MgKi8KLQkJCW5vbGRtZW1iZXJzID0gMDsKLQkJCW9sZG1lbWJlcnMgPSBO VUxMOwotCQl9Ci0JCWVsc2UKLQkJewotCQkJb2xkX2FjbCA9IERhdHVtR2V0QWNsUENvcHko YWNsRGF0dW0pOwotCQkJLyogR2V0IHRoZSByb2xlcyBtZW50aW9uZWQgaW4gdGhlIGV4aXN0 aW5nIEFDTCAqLwotCQkJbm9sZG1lbWJlcnMgPSBhY2xtZW1iZXJzKG9sZF9hY2wsICZvbGRt ZW1iZXJzKTsKLQkJfQotCi0JCS8qIERldGVybWluZSBJRCB0byBkbyB0aGUgZ3JhbnQgYXMs IGFuZCBhdmFpbGFibGUgZ3JhbnQgb3B0aW9ucyAqLwotCQlzZWxlY3RfYmVzdF9ncmFudG9y KEdldFVzZXJJZCgpLCBpc3RtdC0+cHJpdmlsZWdlcywKLQkJCQkJCQlvbGRfYWNsLCBvd25l cklkLAotCQkJCQkJCSZncmFudG9ySWQsICZhdmFpbF9nb3B0aW9ucyk7Ci0KLQkJLyoKLQkJ ICogUmVzdHJpY3QgdGhlIHByaXZpbGVnZXMgdG8gd2hhdCB3ZSBjYW4gYWN0dWFsbHkgZ3Jh bnQsIGFuZCBlbWl0IHRoZQotCQkgKiBzdGFuZGFyZHMtbWFuZGF0ZWQgd2FybmluZyBhbmQg ZXJyb3IgbWVzc2FnZXMuCi0JCSAqLwotCQl0aGlzX3ByaXZpbGVnZXMgPQotCQkJcmVzdHJp Y3RfYW5kX2NoZWNrX2dyYW50KGlzdG10LT5pc19ncmFudCwgYXZhaWxfZ29wdGlvbnMsCi0J CQkJCQkJCQkgaXN0bXQtPmFsbF9wcml2cywgaXN0bXQtPnByaXZpbGVnZXMsCi0JCQkJCQkJ CQkgZmR3aWQsIGdyYW50b3JJZCwgT0JKRUNUX0ZEVywKLQkJCQkJCQkJCSBOYW1lU3RyKHBn X2Zkd190dXBsZS0+ZmR3bmFtZSksCi0JCQkJCQkJCQkgMCwgTlVMTCk7Ci0KLQkJLyoKLQkJ ICogR2VuZXJhdGUgbmV3IEFDTC4KLQkJICovCi0JCW5ld19hY2wgPSBtZXJnZV9hY2xfd2l0 aF9ncmFudChvbGRfYWNsLCBpc3RtdC0+aXNfZ3JhbnQsCi0JCQkJCQkJCQkgICBpc3RtdC0+ Z3JhbnRfb3B0aW9uLCBpc3RtdC0+YmVoYXZpb3IsCi0JCQkJCQkJCQkgICBpc3RtdC0+Z3Jh bnRlZXMsIHRoaXNfcHJpdmlsZWdlcywKLQkJCQkJCQkJCSAgIGdyYW50b3JJZCwgb3duZXJJ ZCk7Ci0KLQkJLyoKLQkJICogV2UgbmVlZCB0aGUgbWVtYmVycyBvZiBib3RoIG9sZCBhbmQg bmV3IEFDTHMgc28gd2UgY2FuIGNvcnJlY3QgdGhlCi0JCSAqIHNoYXJlZCBkZXBlbmRlbmN5 IGluZm9ybWF0aW9uLgotCQkgKi8KLQkJbm5ld21lbWJlcnMgPSBhY2xtZW1iZXJzKG5ld19h Y2wsICZuZXdtZW1iZXJzKTsKLQotCQkvKiBmaW5pc2hlZCBidWlsZGluZyBuZXcgQUNMIHZh bHVlLCBub3cgaW5zZXJ0IGl0ICovCi0JCXJlcGxhY2VzW0FudW1fcGdfZm9yZWlnbl9kYXRh X3dyYXBwZXJfZmR3YWNsIC0gMV0gPSB0cnVlOwotCQl2YWx1ZXNbQW51bV9wZ19mb3JlaWdu X2RhdGFfd3JhcHBlcl9mZHdhY2wgLSAxXSA9IFBvaW50ZXJHZXREYXR1bShuZXdfYWNsKTsK LQotCQluZXd0dXBsZSA9IGhlYXBfbW9kaWZ5X3R1cGxlKHR1cGxlLCBSZWxhdGlvbkdldERl c2NyKHJlbGF0aW9uKSwgdmFsdWVzLAotCQkJCQkJCQkJIG51bGxzLCByZXBsYWNlcyk7Ci0K LQkJQ2F0YWxvZ1R1cGxlVXBkYXRlKHJlbGF0aW9uLCAmbmV3dHVwbGUtPnRfc2VsZiwgbmV3 dHVwbGUpOwotCi0JCS8qIFVwZGF0ZSBpbml0aWFsIHByaXZpbGVnZXMgZm9yIGV4dGVuc2lv bnMgKi8KLQkJcmVjb3JkRXh0ZW5zaW9uSW5pdFByaXYoZmR3aWQsIEZvcmVpZ25EYXRhV3Jh cHBlclJlbGF0aW9uSWQsIDAsCi0JCQkJCQkJCW5ld19hY2wpOwotCi0JCS8qIFVwZGF0ZSB0 aGUgc2hhcmVkIGRlcGVuZGVuY3kgQUNMIGluZm8gKi8KLQkJdXBkYXRlQWNsRGVwZW5kZW5j aWVzKEZvcmVpZ25EYXRhV3JhcHBlclJlbGF0aW9uSWQsCi0JCQkJCQkJICBwZ19mZHdfdHVw bGUtPm9pZCwgMCwKLQkJCQkJCQkgIG93bmVySWQsCi0JCQkJCQkJICBub2xkbWVtYmVycywg b2xkbWVtYmVycywKLQkJCQkJCQkgIG5uZXdtZW1iZXJzLCBuZXdtZW1iZXJzKTsKLQotCQlS ZWxlYXNlU3lzQ2FjaGUodHVwbGUpOwotCi0JCXBmcmVlKG5ld19hY2wpOwotCi0JCS8qIHBy ZXZlbnQgZXJyb3Igd2hlbiBwcm9jZXNzaW5nIGR1cGxpY2F0ZSBvYmplY3RzICovCi0JCUNv bW1hbmRDb3VudGVySW5jcmVtZW50KCk7Ci0JfQotCi0JdGFibGVfY2xvc2UocmVsYXRpb24s IFJvd0V4Y2x1c2l2ZUxvY2spOwotfQotCi1zdGF0aWMgdm9pZAotRXhlY0dyYW50X0ZvcmVp Z25TZXJ2ZXIoSW50ZXJuYWxHcmFudCAqaXN0bXQpCitFeGVjR3JhbnRfZ2VuZXJpYyhJbnRl cm5hbEdyYW50ICppc3RtdCwgT2lkIGNsYXNzaWQsIEFjbE1vZGUgZGVmYXVsdF9wcml2cykK IHsKKwlpbnQJCQljYWNoZWlkOwogCVJlbGF0aW9uCXJlbGF0aW9uOwogCUxpc3RDZWxsICAg KmNlbGw7CiAKIAlpZiAoaXN0bXQtPmFsbF9wcml2cyAmJiBpc3RtdC0+cHJpdmlsZWdlcyA9 PSBBQ0xfTk9fUklHSFRTKQotCQlpc3RtdC0+cHJpdmlsZWdlcyA9IEFDTF9BTExfUklHSFRT X0ZPUkVJR05fU0VSVkVSOwotCi0JcmVsYXRpb24gPSB0YWJsZV9vcGVuKEZvcmVpZ25TZXJ2 ZXJSZWxhdGlvbklkLCBSb3dFeGNsdXNpdmVMb2NrKTsKLQotCWZvcmVhY2goY2VsbCwgaXN0 bXQtPm9iamVjdHMpCi0JewotCQlPaWQJCQlzcnZpZCA9IGxmaXJzdF9vaWQoY2VsbCk7Ci0J CUZvcm1fcGdfZm9yZWlnbl9zZXJ2ZXIgcGdfc2VydmVyX3R1cGxlOwotCQlEYXR1bQkJYWNs RGF0dW07Ci0JCWJvb2wJCWlzTnVsbDsKLQkJQWNsTW9kZQkJYXZhaWxfZ29wdGlvbnM7Ci0J CUFjbE1vZGUJCXRoaXNfcHJpdmlsZWdlczsKLQkJQWNsCQkgICAqb2xkX2FjbDsKLQkJQWNs CQkgICAqbmV3X2FjbDsKLQkJT2lkCQkJZ3JhbnRvcklkOwotCQlPaWQJCQlvd25lcklkOwot CQlIZWFwVHVwbGUJdHVwbGU7Ci0JCUhlYXBUdXBsZQluZXd0dXBsZTsKLQkJRGF0dW0JCXZh bHVlc1tOYXR0c19wZ19mb3JlaWduX3NlcnZlcl0gPSB7MH07Ci0JCWJvb2wJCW51bGxzW05h dHRzX3BnX2ZvcmVpZ25fc2VydmVyXSA9IHswfTsKLQkJYm9vbAkJcmVwbGFjZXNbTmF0dHNf cGdfZm9yZWlnbl9zZXJ2ZXJdID0gezB9OwotCQlpbnQJCQlub2xkbWVtYmVyczsKLQkJaW50 CQkJbm5ld21lbWJlcnM7Ci0JCU9pZAkJICAgKm9sZG1lbWJlcnM7Ci0JCU9pZAkJICAgKm5l d21lbWJlcnM7Ci0KLQkJdHVwbGUgPSBTZWFyY2hTeXNDYWNoZTEoRk9SRUlHTlNFUlZFUk9J RCwgT2JqZWN0SWRHZXREYXR1bShzcnZpZCkpOwotCQlpZiAoIUhlYXBUdXBsZUlzVmFsaWQo dHVwbGUpKQotCQkJZWxvZyhFUlJPUiwgImNhY2hlIGxvb2t1cCBmYWlsZWQgZm9yIGZvcmVp Z24gc2VydmVyICV1Iiwgc3J2aWQpOwotCi0JCXBnX3NlcnZlcl90dXBsZSA9IChGb3JtX3Bn X2ZvcmVpZ25fc2VydmVyKSBHRVRTVFJVQ1QodHVwbGUpOwotCi0JCS8qCi0JCSAqIEdldCBv d25lciBJRCBhbmQgd29ya2luZyBjb3B5IG9mIGV4aXN0aW5nIEFDTC4gSWYgdGhlcmUncyBu byBBQ0wsCi0JCSAqIHN1YnN0aXR1dGUgdGhlIHByb3BlciBkZWZhdWx0LgotCQkgKi8KLQkJ b3duZXJJZCA9IHBnX3NlcnZlcl90dXBsZS0+c3J2b3duZXI7Ci0JCWFjbERhdHVtID0gU3lz Q2FjaGVHZXRBdHRyKEZPUkVJR05TRVJWRVJPSUQsIHR1cGxlLAotCQkJCQkJCQkgICBBbnVt X3BnX2ZvcmVpZ25fc2VydmVyX3NydmFjbCwKLQkJCQkJCQkJICAgJmlzTnVsbCk7Ci0JCWlm IChpc051bGwpCi0JCXsKLQkJCW9sZF9hY2wgPSBhY2xkZWZhdWx0KE9CSkVDVF9GT1JFSUdO X1NFUlZFUiwgb3duZXJJZCk7Ci0JCQkvKiBUaGVyZSBhcmUgbm8gb2xkIG1lbWJlciByb2xl cyBhY2NvcmRpbmcgdG8gdGhlIGNhdGFsb2dzICovCi0JCQlub2xkbWVtYmVycyA9IDA7Ci0J CQlvbGRtZW1iZXJzID0gTlVMTDsKLQkJfQotCQllbHNlCi0JCXsKLQkJCW9sZF9hY2wgPSBE YXR1bUdldEFjbFBDb3B5KGFjbERhdHVtKTsKLQkJCS8qIEdldCB0aGUgcm9sZXMgbWVudGlv bmVkIGluIHRoZSBleGlzdGluZyBBQ0wgKi8KLQkJCW5vbGRtZW1iZXJzID0gYWNsbWVtYmVy cyhvbGRfYWNsLCAmb2xkbWVtYmVycyk7Ci0JCX0KLQotCQkvKiBEZXRlcm1pbmUgSUQgdG8g ZG8gdGhlIGdyYW50IGFzLCBhbmQgYXZhaWxhYmxlIGdyYW50IG9wdGlvbnMgKi8KLQkJc2Vs ZWN0X2Jlc3RfZ3JhbnRvcihHZXRVc2VySWQoKSwgaXN0bXQtPnByaXZpbGVnZXMsCi0JCQkJ CQkJb2xkX2FjbCwgb3duZXJJZCwKLQkJCQkJCQkmZ3JhbnRvcklkLCAmYXZhaWxfZ29wdGlv bnMpOwotCi0JCS8qCi0JCSAqIFJlc3RyaWN0IHRoZSBwcml2aWxlZ2VzIHRvIHdoYXQgd2Ug Y2FuIGFjdHVhbGx5IGdyYW50LCBhbmQgZW1pdCB0aGUKLQkJICogc3RhbmRhcmRzLW1hbmRh dGVkIHdhcm5pbmcgYW5kIGVycm9yIG1lc3NhZ2VzLgotCQkgKi8KLQkJdGhpc19wcml2aWxl Z2VzID0KLQkJCXJlc3RyaWN0X2FuZF9jaGVja19ncmFudChpc3RtdC0+aXNfZ3JhbnQsIGF2 YWlsX2dvcHRpb25zLAotCQkJCQkJCQkJIGlzdG10LT5hbGxfcHJpdnMsIGlzdG10LT5wcml2 aWxlZ2VzLAotCQkJCQkJCQkJIHNydmlkLCBncmFudG9ySWQsIE9CSkVDVF9GT1JFSUdOX1NF UlZFUiwKLQkJCQkJCQkJCSBOYW1lU3RyKHBnX3NlcnZlcl90dXBsZS0+c3J2bmFtZSksCi0J CQkJCQkJCQkgMCwgTlVMTCk7Ci0KLQkJLyoKLQkJICogR2VuZXJhdGUgbmV3IEFDTC4KLQkJ ICovCi0JCW5ld19hY2wgPSBtZXJnZV9hY2xfd2l0aF9ncmFudChvbGRfYWNsLCBpc3RtdC0+ aXNfZ3JhbnQsCi0JCQkJCQkJCQkgICBpc3RtdC0+Z3JhbnRfb3B0aW9uLCBpc3RtdC0+YmVo YXZpb3IsCi0JCQkJCQkJCQkgICBpc3RtdC0+Z3JhbnRlZXMsIHRoaXNfcHJpdmlsZWdlcywK LQkJCQkJCQkJCSAgIGdyYW50b3JJZCwgb3duZXJJZCk7Ci0KLQkJLyoKLQkJICogV2UgbmVl ZCB0aGUgbWVtYmVycyBvZiBib3RoIG9sZCBhbmQgbmV3IEFDTHMgc28gd2UgY2FuIGNvcnJl Y3QgdGhlCi0JCSAqIHNoYXJlZCBkZXBlbmRlbmN5IGluZm9ybWF0aW9uLgotCQkgKi8KLQkJ bm5ld21lbWJlcnMgPSBhY2xtZW1iZXJzKG5ld19hY2wsICZuZXdtZW1iZXJzKTsKLQotCQkv KiBmaW5pc2hlZCBidWlsZGluZyBuZXcgQUNMIHZhbHVlLCBub3cgaW5zZXJ0IGl0ICovCi0J CXJlcGxhY2VzW0FudW1fcGdfZm9yZWlnbl9zZXJ2ZXJfc3J2YWNsIC0gMV0gPSB0cnVlOwot CQl2YWx1ZXNbQW51bV9wZ19mb3JlaWduX3NlcnZlcl9zcnZhY2wgLSAxXSA9IFBvaW50ZXJH ZXREYXR1bShuZXdfYWNsKTsKLQotCQluZXd0dXBsZSA9IGhlYXBfbW9kaWZ5X3R1cGxlKHR1 cGxlLCBSZWxhdGlvbkdldERlc2NyKHJlbGF0aW9uKSwgdmFsdWVzLAotCQkJCQkJCQkJIG51 bGxzLCByZXBsYWNlcyk7Ci0KLQkJQ2F0YWxvZ1R1cGxlVXBkYXRlKHJlbGF0aW9uLCAmbmV3 dHVwbGUtPnRfc2VsZiwgbmV3dHVwbGUpOwotCi0JCS8qIFVwZGF0ZSBpbml0aWFsIHByaXZp bGVnZXMgZm9yIGV4dGVuc2lvbnMgKi8KLQkJcmVjb3JkRXh0ZW5zaW9uSW5pdFByaXYoc3J2 aWQsIEZvcmVpZ25TZXJ2ZXJSZWxhdGlvbklkLCAwLCBuZXdfYWNsKTsKLQotCQkvKiBVcGRh dGUgdGhlIHNoYXJlZCBkZXBlbmRlbmN5IEFDTCBpbmZvICovCi0JCXVwZGF0ZUFjbERlcGVu ZGVuY2llcyhGb3JlaWduU2VydmVyUmVsYXRpb25JZCwKLQkJCQkJCQkgIHBnX3NlcnZlcl90 dXBsZS0+b2lkLCAwLAotCQkJCQkJCSAgb3duZXJJZCwKLQkJCQkJCQkgIG5vbGRtZW1iZXJz LCBvbGRtZW1iZXJzLAotCQkJCQkJCSAgbm5ld21lbWJlcnMsIG5ld21lbWJlcnMpOwotCi0J CVJlbGVhc2VTeXNDYWNoZSh0dXBsZSk7CisJCWlzdG10LT5wcml2aWxlZ2VzID0gZGVmYXVs dF9wcml2czsKIAotCQlwZnJlZShuZXdfYWNsKTsKLQotCQkvKiBwcmV2ZW50IGVycm9yIHdo ZW4gcHJvY2Vzc2luZyBkdXBsaWNhdGUgb2JqZWN0cyAqLwotCQlDb21tYW5kQ291bnRlcklu Y3JlbWVudCgpOwotCX0KLQotCXRhYmxlX2Nsb3NlKHJlbGF0aW9uLCBSb3dFeGNsdXNpdmVM b2NrKTsKLX0KLQotc3RhdGljIHZvaWQKLUV4ZWNHcmFudF9GdW5jdGlvbihJbnRlcm5hbEdy YW50ICppc3RtdCkKLXsKLQlSZWxhdGlvbglyZWxhdGlvbjsKLQlMaXN0Q2VsbCAgICpjZWxs OwotCi0JaWYgKGlzdG10LT5hbGxfcHJpdnMgJiYgaXN0bXQtPnByaXZpbGVnZXMgPT0gQUNM X05PX1JJR0hUUykKLQkJaXN0bXQtPnByaXZpbGVnZXMgPSBBQ0xfQUxMX1JJR0hUU19GVU5D VElPTjsKKwljYWNoZWlkID0gZ2V0X29iamVjdF9jYXRjYWNoZV9vaWQoY2xhc3NpZCk7CiAK LQlyZWxhdGlvbiA9IHRhYmxlX29wZW4oUHJvY2VkdXJlUmVsYXRpb25JZCwgUm93RXhjbHVz aXZlTG9jayk7CisJcmVsYXRpb24gPSB0YWJsZV9vcGVuKGNsYXNzaWQsIFJvd0V4Y2x1c2l2 ZUxvY2spOwogCiAJZm9yZWFjaChjZWxsLCBpc3RtdC0+b2JqZWN0cykKIAl7Ci0JCU9pZAkJ CWZ1bmNJZCA9IGxmaXJzdF9vaWQoY2VsbCk7Ci0JCUZvcm1fcGdfcHJvYyBwZ19wcm9jX3R1 cGxlOworCQlPaWQJCQlvYmplY3RpZCA9IGxmaXJzdF9vaWQoY2VsbCk7CiAJCURhdHVtCQlh Y2xEYXR1bTsKIAkJYm9vbAkJaXNOdWxsOwogCQlBY2xNb2RlCQlhdmFpbF9nb3B0aW9uczsK QEAgLTI1MTYsMzAgKzIxNTMsMzQgQEAgRXhlY0dyYW50X0Z1bmN0aW9uKEludGVybmFsR3Jh bnQgKmlzdG10KQogCQlPaWQJCQlvd25lcklkOwogCQlIZWFwVHVwbGUJdHVwbGU7CiAJCUhl YXBUdXBsZQluZXd0dXBsZTsKLQkJRGF0dW0JCXZhbHVlc1tOYXR0c19wZ19wcm9jXSA9IHsw fTsKLQkJYm9vbAkJbnVsbHNbTmF0dHNfcGdfcHJvY10gPSB7MH07Ci0JCWJvb2wJCXJlcGxh Y2VzW05hdHRzX3BnX3Byb2NdID0gezB9OworCQlEYXR1bQkgICAqdmFsdWVzID0gcGFsbG9j MF9hcnJheShEYXR1bSwgUmVsYXRpb25HZXREZXNjcihyZWxhdGlvbiktPm5hdHRzKTsKKwkJ Ym9vbAkgICAqbnVsbHMgPSBwYWxsb2MwX2FycmF5KGJvb2wsIFJlbGF0aW9uR2V0RGVzY3Io cmVsYXRpb24pLT5uYXR0cyk7CisJCWJvb2wJICAgKnJlcGxhY2VzID0gcGFsbG9jMF9hcnJh eShib29sLCBSZWxhdGlvbkdldERlc2NyKHJlbGF0aW9uKS0+bmF0dHMpOwogCQlpbnQJCQlu b2xkbWVtYmVyczsKIAkJaW50CQkJbm5ld21lbWJlcnM7CiAJCU9pZAkJICAgKm9sZG1lbWJl cnM7CiAJCU9pZAkJICAgKm5ld21lbWJlcnM7CiAKLQkJdHVwbGUgPSBTZWFyY2hTeXNDYWNo ZTEoUFJPQ09JRCwgT2JqZWN0SWRHZXREYXR1bShmdW5jSWQpKTsKKwkJdHVwbGUgPSBTZWFy Y2hTeXNDYWNoZTEoY2FjaGVpZCwgT2JqZWN0SWRHZXREYXR1bShvYmplY3RpZCkpOwogCQlp ZiAoIUhlYXBUdXBsZUlzVmFsaWQodHVwbGUpKQotCQkJZWxvZyhFUlJPUiwgImNhY2hlIGxv b2t1cCBmYWlsZWQgZm9yIGZ1bmN0aW9uICV1IiwgZnVuY0lkKTsKLQotCQlwZ19wcm9jX3R1 cGxlID0gKEZvcm1fcGdfcHJvYykgR0VUU1RSVUNUKHR1cGxlKTsKKwkJCWVsb2coRVJST1Is ICJjYWNoZSBsb29rdXAgZmFpbGVkIGZvciAlcyAldSIsIGdldF9vYmplY3RfY2xhc3NfZGVz Y3IoY2xhc3NpZCksIG9iamVjdGlkKTsKIAogCQkvKgogCQkgKiBHZXQgb3duZXIgSUQgYW5k IHdvcmtpbmcgY29weSBvZiBleGlzdGluZyBBQ0wuIElmIHRoZXJlJ3Mgbm8gQUNMLAogCQkg KiBzdWJzdGl0dXRlIHRoZSBwcm9wZXIgZGVmYXVsdC4KIAkJICovCi0JCW93bmVySWQgPSBw Z19wcm9jX3R1cGxlLT5wcm9vd25lcjsKLQkJYWNsRGF0dW0gPSBTeXNDYWNoZUdldEF0dHIo UFJPQ09JRCwgdHVwbGUsIEFudW1fcGdfcHJvY19wcm9hY2wsCisJCW93bmVySWQgPSBEYXR1 bUdldE9iamVjdElkKFN5c0NhY2hlR2V0QXR0cihjYWNoZWlkLAorCQkJCQkJCQkJCQkJICAg dHVwbGUsCisJCQkJCQkJCQkJCQkgICBnZXRfb2JqZWN0X2F0dG51bV9vd25lcihjbGFzc2lk KSwKKwkJCQkJCQkJCQkJCSAgICZpc051bGwpKTsKKwkJQXNzZXJ0KCFpc051bGwpOworCQlh Y2xEYXR1bSA9IFN5c0NhY2hlR2V0QXR0cihjYWNoZWlkLAorCQkJCQkJCQkgICB0dXBsZSwK KwkJCQkJCQkJICAgZ2V0X29iamVjdF9hdHRudW1fYWNsKGNsYXNzaWQpLAogCQkJCQkJCQkg ICAmaXNOdWxsKTsKIAkJaWYgKGlzTnVsbCkKIAkJewotCQkJb2xkX2FjbCA9IGFjbGRlZmF1 bHQoT0JKRUNUX0ZVTkNUSU9OLCBvd25lcklkKTsKKwkJCW9sZF9hY2wgPSBhY2xkZWZhdWx0 KGdldF9vYmplY3RfdHlwZShjbGFzc2lkLCBvYmplY3RpZCksIG93bmVySWQpOwogCQkJLyog VGhlcmUgYXJlIG5vIG9sZCBtZW1iZXIgcm9sZXMgYWNjb3JkaW5nIHRvIHRoZSBjYXRhbG9n cyAqLwogCQkJbm9sZG1lbWJlcnMgPSAwOwogCQkJb2xkbWVtYmVycyA9IE5VTEw7CkBAIC0y NTYzLDggKzIyMDQsOCBAQCBFeGVjR3JhbnRfRnVuY3Rpb24oSW50ZXJuYWxHcmFudCAqaXN0 bXQpCiAJCXRoaXNfcHJpdmlsZWdlcyA9CiAJCQlyZXN0cmljdF9hbmRfY2hlY2tfZ3JhbnQo aXN0bXQtPmlzX2dyYW50LCBhdmFpbF9nb3B0aW9ucywKIAkJCQkJCQkJCSBpc3RtdC0+YWxs X3ByaXZzLCBpc3RtdC0+cHJpdmlsZWdlcywKLQkJCQkJCQkJCSBmdW5jSWQsIGdyYW50b3JJ ZCwgT0JKRUNUX0ZVTkNUSU9OLAotCQkJCQkJCQkJIE5hbWVTdHIocGdfcHJvY190dXBsZS0+ cHJvbmFtZSksCisJCQkJCQkJCQkgb2JqZWN0aWQsIGdyYW50b3JJZCwgZ2V0X29iamVjdF90 eXBlKGNsYXNzaWQsIG9iamVjdGlkKSwKKwkJCQkJCQkJCSBOYW1lU3RyKCpEYXR1bUdldE5h bWUoU3lzQ2FjaGVHZXRBdHRyKGNhY2hlaWQsIHR1cGxlLCBnZXRfb2JqZWN0X2F0dG51bV9u YW1lKGNsYXNzaWQpLCAmaXNOdWxsKSkpLAogCQkJCQkJCQkJIDAsIE5VTEwpOwogCiAJCS8q CkBAIC0yNTgyLDggKzIyMjMsOCBAQCBFeGVjR3JhbnRfRnVuY3Rpb24oSW50ZXJuYWxHcmFu dCAqaXN0bXQpCiAJCW5uZXdtZW1iZXJzID0gYWNsbWVtYmVycyhuZXdfYWNsLCAmbmV3bWVt YmVycyk7CiAKIAkJLyogZmluaXNoZWQgYnVpbGRpbmcgbmV3IEFDTCB2YWx1ZSwgbm93IGlu c2VydCBpdCAqLwotCQlyZXBsYWNlc1tBbnVtX3BnX3Byb2NfcHJvYWNsIC0gMV0gPSB0cnVl OwotCQl2YWx1ZXNbQW51bV9wZ19wcm9jX3Byb2FjbCAtIDFdID0gUG9pbnRlckdldERhdHVt KG5ld19hY2wpOworCQlyZXBsYWNlc1tnZXRfb2JqZWN0X2F0dG51bV9hY2woY2xhc3NpZCkg LSAxXSA9IHRydWU7CisJCXZhbHVlc1tnZXRfb2JqZWN0X2F0dG51bV9hY2woY2xhc3NpZCkg LSAxXSA9IFBvaW50ZXJHZXREYXR1bShuZXdfYWNsKTsKIAogCQluZXd0dXBsZSA9IGhlYXBf bW9kaWZ5X3R1cGxlKHR1cGxlLCBSZWxhdGlvbkdldERlc2NyKHJlbGF0aW9uKSwgdmFsdWVz LAogCQkJCQkJCQkJIG51bGxzLCByZXBsYWNlcyk7CkBAIC0yNTkxLDEwICsyMjMyLDExIEBA IEV4ZWNHcmFudF9GdW5jdGlvbihJbnRlcm5hbEdyYW50ICppc3RtdCkKIAkJQ2F0YWxvZ1R1 cGxlVXBkYXRlKHJlbGF0aW9uLCAmbmV3dHVwbGUtPnRfc2VsZiwgbmV3dHVwbGUpOwogCiAJ CS8qIFVwZGF0ZSBpbml0aWFsIHByaXZpbGVnZXMgZm9yIGV4dGVuc2lvbnMgKi8KLQkJcmVj b3JkRXh0ZW5zaW9uSW5pdFByaXYoZnVuY0lkLCBQcm9jZWR1cmVSZWxhdGlvbklkLCAwLCBu ZXdfYWNsKTsKKwkJcmVjb3JkRXh0ZW5zaW9uSW5pdFByaXYob2JqZWN0aWQsIGNsYXNzaWQs IDAsIG5ld19hY2wpOwogCiAJCS8qIFVwZGF0ZSB0aGUgc2hhcmVkIGRlcGVuZGVuY3kgQUNM IGluZm8gKi8KLQkJdXBkYXRlQWNsRGVwZW5kZW5jaWVzKFByb2NlZHVyZVJlbGF0aW9uSWQs IGZ1bmNJZCwgMCwKKwkJdXBkYXRlQWNsRGVwZW5kZW5jaWVzKGNsYXNzaWQsCisJCQkJCQkJ ICBvYmplY3RpZCwgMCwKIAkJCQkJCQkgIG93bmVySWQsCiAJCQkJCQkJICBub2xkbWVtYmVy cywgb2xkbWVtYmVycywKIAkJCQkJCQkgIG5uZXdtZW1iZXJzLCBuZXdtZW1iZXJzKTsKQEAg LTI4NzMsMjQyICsyNTE1LDYgQEAgRXhlY0dyYW50X0xhcmdlb2JqZWN0KEludGVybmFsR3Jh bnQgKmlzdG10KQogCXRhYmxlX2Nsb3NlKHJlbGF0aW9uLCBSb3dFeGNsdXNpdmVMb2NrKTsK IH0KIAotc3RhdGljIHZvaWQKLUV4ZWNHcmFudF9OYW1lc3BhY2UoSW50ZXJuYWxHcmFudCAq aXN0bXQpCi17Ci0JUmVsYXRpb24JcmVsYXRpb247Ci0JTGlzdENlbGwgICAqY2VsbDsKLQot CWlmIChpc3RtdC0+YWxsX3ByaXZzICYmIGlzdG10LT5wcml2aWxlZ2VzID09IEFDTF9OT19S SUdIVFMpCi0JCWlzdG10LT5wcml2aWxlZ2VzID0gQUNMX0FMTF9SSUdIVFNfU0NIRU1BOwot Ci0JcmVsYXRpb24gPSB0YWJsZV9vcGVuKE5hbWVzcGFjZVJlbGF0aW9uSWQsIFJvd0V4Y2x1 c2l2ZUxvY2spOwotCi0JZm9yZWFjaChjZWxsLCBpc3RtdC0+b2JqZWN0cykKLQl7Ci0JCU9p ZAkJCW5zcGlkID0gbGZpcnN0X29pZChjZWxsKTsKLQkJRm9ybV9wZ19uYW1lc3BhY2UgcGdf bmFtZXNwYWNlX3R1cGxlOwotCQlEYXR1bQkJYWNsRGF0dW07Ci0JCWJvb2wJCWlzTnVsbDsK LQkJQWNsTW9kZQkJYXZhaWxfZ29wdGlvbnM7Ci0JCUFjbE1vZGUJCXRoaXNfcHJpdmlsZWdl czsKLQkJQWNsCQkgICAqb2xkX2FjbDsKLQkJQWNsCQkgICAqbmV3X2FjbDsKLQkJT2lkCQkJ Z3JhbnRvcklkOwotCQlPaWQJCQlvd25lcklkOwotCQlIZWFwVHVwbGUJdHVwbGU7Ci0JCUhl YXBUdXBsZQluZXd0dXBsZTsKLQkJRGF0dW0JCXZhbHVlc1tOYXR0c19wZ19uYW1lc3BhY2Vd ID0gezB9OwotCQlib29sCQludWxsc1tOYXR0c19wZ19uYW1lc3BhY2VdID0gezB9OwotCQli b29sCQlyZXBsYWNlc1tOYXR0c19wZ19uYW1lc3BhY2VdID0gezB9OwotCQlpbnQJCQlub2xk bWVtYmVyczsKLQkJaW50CQkJbm5ld21lbWJlcnM7Ci0JCU9pZAkJICAgKm9sZG1lbWJlcnM7 Ci0JCU9pZAkJICAgKm5ld21lbWJlcnM7Ci0KLQkJdHVwbGUgPSBTZWFyY2hTeXNDYWNoZTEo TkFNRVNQQUNFT0lELCBPYmplY3RJZEdldERhdHVtKG5zcGlkKSk7Ci0JCWlmICghSGVhcFR1 cGxlSXNWYWxpZCh0dXBsZSkpCi0JCQllbG9nKEVSUk9SLCAiY2FjaGUgbG9va3VwIGZhaWxl ZCBmb3IgbmFtZXNwYWNlICV1IiwgbnNwaWQpOwotCi0JCXBnX25hbWVzcGFjZV90dXBsZSA9 IChGb3JtX3BnX25hbWVzcGFjZSkgR0VUU1RSVUNUKHR1cGxlKTsKLQotCQkvKgotCQkgKiBH ZXQgb3duZXIgSUQgYW5kIHdvcmtpbmcgY29weSBvZiBleGlzdGluZyBBQ0wuIElmIHRoZXJl J3Mgbm8gQUNMLAotCQkgKiBzdWJzdGl0dXRlIHRoZSBwcm9wZXIgZGVmYXVsdC4KLQkJICov Ci0JCW93bmVySWQgPSBwZ19uYW1lc3BhY2VfdHVwbGUtPm5zcG93bmVyOwotCQlhY2xEYXR1 bSA9IFN5c0NhY2hlR2V0QXR0cihOQU1FU1BBQ0VOQU1FLCB0dXBsZSwKLQkJCQkJCQkJICAg QW51bV9wZ19uYW1lc3BhY2VfbnNwYWNsLAotCQkJCQkJCQkgICAmaXNOdWxsKTsKLQkJaWYg KGlzTnVsbCkKLQkJewotCQkJb2xkX2FjbCA9IGFjbGRlZmF1bHQoT0JKRUNUX1NDSEVNQSwg b3duZXJJZCk7Ci0JCQkvKiBUaGVyZSBhcmUgbm8gb2xkIG1lbWJlciByb2xlcyBhY2NvcmRp bmcgdG8gdGhlIGNhdGFsb2dzICovCi0JCQlub2xkbWVtYmVycyA9IDA7Ci0JCQlvbGRtZW1i ZXJzID0gTlVMTDsKLQkJfQotCQllbHNlCi0JCXsKLQkJCW9sZF9hY2wgPSBEYXR1bUdldEFj bFBDb3B5KGFjbERhdHVtKTsKLQkJCS8qIEdldCB0aGUgcm9sZXMgbWVudGlvbmVkIGluIHRo ZSBleGlzdGluZyBBQ0wgKi8KLQkJCW5vbGRtZW1iZXJzID0gYWNsbWVtYmVycyhvbGRfYWNs LCAmb2xkbWVtYmVycyk7Ci0JCX0KLQotCQkvKiBEZXRlcm1pbmUgSUQgdG8gZG8gdGhlIGdy YW50IGFzLCBhbmQgYXZhaWxhYmxlIGdyYW50IG9wdGlvbnMgKi8KLQkJc2VsZWN0X2Jlc3Rf Z3JhbnRvcihHZXRVc2VySWQoKSwgaXN0bXQtPnByaXZpbGVnZXMsCi0JCQkJCQkJb2xkX2Fj bCwgb3duZXJJZCwKLQkJCQkJCQkmZ3JhbnRvcklkLCAmYXZhaWxfZ29wdGlvbnMpOwotCi0J CS8qCi0JCSAqIFJlc3RyaWN0IHRoZSBwcml2aWxlZ2VzIHRvIHdoYXQgd2UgY2FuIGFjdHVh bGx5IGdyYW50LCBhbmQgZW1pdCB0aGUKLQkJICogc3RhbmRhcmRzLW1hbmRhdGVkIHdhcm5p bmcgYW5kIGVycm9yIG1lc3NhZ2VzLgotCQkgKi8KLQkJdGhpc19wcml2aWxlZ2VzID0KLQkJ CXJlc3RyaWN0X2FuZF9jaGVja19ncmFudChpc3RtdC0+aXNfZ3JhbnQsIGF2YWlsX2dvcHRp b25zLAotCQkJCQkJCQkJIGlzdG10LT5hbGxfcHJpdnMsIGlzdG10LT5wcml2aWxlZ2VzLAot CQkJCQkJCQkJIG5zcGlkLCBncmFudG9ySWQsIE9CSkVDVF9TQ0hFTUEsCi0JCQkJCQkJCQkg TmFtZVN0cihwZ19uYW1lc3BhY2VfdHVwbGUtPm5zcG5hbWUpLAotCQkJCQkJCQkJIDAsIE5V TEwpOwotCi0JCS8qCi0JCSAqIEdlbmVyYXRlIG5ldyBBQ0wuCi0JCSAqLwotCQluZXdfYWNs ID0gbWVyZ2VfYWNsX3dpdGhfZ3JhbnQob2xkX2FjbCwgaXN0bXQtPmlzX2dyYW50LAotCQkJ CQkJCQkJICAgaXN0bXQtPmdyYW50X29wdGlvbiwgaXN0bXQtPmJlaGF2aW9yLAotCQkJCQkJ CQkJICAgaXN0bXQtPmdyYW50ZWVzLCB0aGlzX3ByaXZpbGVnZXMsCi0JCQkJCQkJCQkgICBn cmFudG9ySWQsIG93bmVySWQpOwotCi0JCS8qCi0JCSAqIFdlIG5lZWQgdGhlIG1lbWJlcnMg b2YgYm90aCBvbGQgYW5kIG5ldyBBQ0xzIHNvIHdlIGNhbiBjb3JyZWN0IHRoZQotCQkgKiBz aGFyZWQgZGVwZW5kZW5jeSBpbmZvcm1hdGlvbi4KLQkJICovCi0JCW5uZXdtZW1iZXJzID0g YWNsbWVtYmVycyhuZXdfYWNsLCAmbmV3bWVtYmVycyk7Ci0KLQkJLyogZmluaXNoZWQgYnVp bGRpbmcgbmV3IEFDTCB2YWx1ZSwgbm93IGluc2VydCBpdCAqLwotCQlyZXBsYWNlc1tBbnVt X3BnX25hbWVzcGFjZV9uc3BhY2wgLSAxXSA9IHRydWU7Ci0JCXZhbHVlc1tBbnVtX3BnX25h bWVzcGFjZV9uc3BhY2wgLSAxXSA9IFBvaW50ZXJHZXREYXR1bShuZXdfYWNsKTsKLQotCQlu ZXd0dXBsZSA9IGhlYXBfbW9kaWZ5X3R1cGxlKHR1cGxlLCBSZWxhdGlvbkdldERlc2NyKHJl bGF0aW9uKSwgdmFsdWVzLAotCQkJCQkJCQkJIG51bGxzLCByZXBsYWNlcyk7Ci0KLQkJQ2F0 YWxvZ1R1cGxlVXBkYXRlKHJlbGF0aW9uLCAmbmV3dHVwbGUtPnRfc2VsZiwgbmV3dHVwbGUp OwotCi0JCS8qIFVwZGF0ZSBpbml0aWFsIHByaXZpbGVnZXMgZm9yIGV4dGVuc2lvbnMgKi8K LQkJcmVjb3JkRXh0ZW5zaW9uSW5pdFByaXYobnNwaWQsIE5hbWVzcGFjZVJlbGF0aW9uSWQs IDAsIG5ld19hY2wpOwotCi0JCS8qIFVwZGF0ZSB0aGUgc2hhcmVkIGRlcGVuZGVuY3kgQUNM IGluZm8gKi8KLQkJdXBkYXRlQWNsRGVwZW5kZW5jaWVzKE5hbWVzcGFjZVJlbGF0aW9uSWQs IHBnX25hbWVzcGFjZV90dXBsZS0+b2lkLCAwLAotCQkJCQkJCSAgb3duZXJJZCwKLQkJCQkJ CQkgIG5vbGRtZW1iZXJzLCBvbGRtZW1iZXJzLAotCQkJCQkJCSAgbm5ld21lbWJlcnMsIG5l d21lbWJlcnMpOwotCi0JCVJlbGVhc2VTeXNDYWNoZSh0dXBsZSk7Ci0KLQkJcGZyZWUobmV3 X2FjbCk7Ci0KLQkJLyogcHJldmVudCBlcnJvciB3aGVuIHByb2Nlc3NpbmcgZHVwbGljYXRl IG9iamVjdHMgKi8KLQkJQ29tbWFuZENvdW50ZXJJbmNyZW1lbnQoKTsKLQl9Ci0KLQl0YWJs ZV9jbG9zZShyZWxhdGlvbiwgUm93RXhjbHVzaXZlTG9jayk7Ci19Ci0KLXN0YXRpYyB2b2lk Ci1FeGVjR3JhbnRfVGFibGVzcGFjZShJbnRlcm5hbEdyYW50ICppc3RtdCkKLXsKLQlSZWxh dGlvbglyZWxhdGlvbjsKLQlMaXN0Q2VsbCAgICpjZWxsOwotCi0JaWYgKGlzdG10LT5hbGxf cHJpdnMgJiYgaXN0bXQtPnByaXZpbGVnZXMgPT0gQUNMX05PX1JJR0hUUykKLQkJaXN0bXQt PnByaXZpbGVnZXMgPSBBQ0xfQUxMX1JJR0hUU19UQUJMRVNQQUNFOwotCi0JcmVsYXRpb24g PSB0YWJsZV9vcGVuKFRhYmxlU3BhY2VSZWxhdGlvbklkLCBSb3dFeGNsdXNpdmVMb2NrKTsK LQotCWZvcmVhY2goY2VsbCwgaXN0bXQtPm9iamVjdHMpCi0JewotCQlPaWQJCQl0YmxJZCA9 IGxmaXJzdF9vaWQoY2VsbCk7Ci0JCUZvcm1fcGdfdGFibGVzcGFjZSBwZ190YWJsZXNwYWNl X3R1cGxlOwotCQlEYXR1bQkJYWNsRGF0dW07Ci0JCWJvb2wJCWlzTnVsbDsKLQkJQWNsTW9k ZQkJYXZhaWxfZ29wdGlvbnM7Ci0JCUFjbE1vZGUJCXRoaXNfcHJpdmlsZWdlczsKLQkJQWNs CQkgICAqb2xkX2FjbDsKLQkJQWNsCQkgICAqbmV3X2FjbDsKLQkJT2lkCQkJZ3JhbnRvcklk OwotCQlPaWQJCQlvd25lcklkOwotCQlIZWFwVHVwbGUJbmV3dHVwbGU7Ci0JCURhdHVtCQl2 YWx1ZXNbTmF0dHNfcGdfdGFibGVzcGFjZV0gPSB7MH07Ci0JCWJvb2wJCW51bGxzW05hdHRz X3BnX3RhYmxlc3BhY2VdID0gezB9OwotCQlib29sCQlyZXBsYWNlc1tOYXR0c19wZ190YWJs ZXNwYWNlXSA9IHswfTsKLQkJaW50CQkJbm9sZG1lbWJlcnM7Ci0JCWludAkJCW5uZXdtZW1i ZXJzOwotCQlPaWQJCSAgICpvbGRtZW1iZXJzOwotCQlPaWQJCSAgICpuZXdtZW1iZXJzOwot CQlIZWFwVHVwbGUJdHVwbGU7Ci0KLQkJLyogU2VhcmNoIHN5c2NhY2hlIGZvciBwZ190YWJs ZXNwYWNlICovCi0JCXR1cGxlID0gU2VhcmNoU3lzQ2FjaGUxKFRBQkxFU1BBQ0VPSUQsIE9i amVjdElkR2V0RGF0dW0odGJsSWQpKTsKLQkJaWYgKCFIZWFwVHVwbGVJc1ZhbGlkKHR1cGxl KSkKLQkJCWVsb2coRVJST1IsICJjYWNoZSBsb29rdXAgZmFpbGVkIGZvciB0YWJsZXNwYWNl ICV1IiwgdGJsSWQpOwotCi0JCXBnX3RhYmxlc3BhY2VfdHVwbGUgPSAoRm9ybV9wZ190YWJs ZXNwYWNlKSBHRVRTVFJVQ1QodHVwbGUpOwotCi0JCS8qCi0JCSAqIEdldCBvd25lciBJRCBh bmQgd29ya2luZyBjb3B5IG9mIGV4aXN0aW5nIEFDTC4gSWYgdGhlcmUncyBubyBBQ0wsCi0J CSAqIHN1YnN0aXR1dGUgdGhlIHByb3BlciBkZWZhdWx0LgotCQkgKi8KLQkJb3duZXJJZCA9 IHBnX3RhYmxlc3BhY2VfdHVwbGUtPnNwY293bmVyOwotCQlhY2xEYXR1bSA9IGhlYXBfZ2V0 YXR0cih0dXBsZSwgQW51bV9wZ190YWJsZXNwYWNlX3NwY2FjbCwKLQkJCQkJCQkJUmVsYXRp b25HZXREZXNjcihyZWxhdGlvbiksICZpc051bGwpOwotCQlpZiAoaXNOdWxsKQotCQl7Ci0J CQlvbGRfYWNsID0gYWNsZGVmYXVsdChPQkpFQ1RfVEFCTEVTUEFDRSwgb3duZXJJZCk7Ci0J CQkvKiBUaGVyZSBhcmUgbm8gb2xkIG1lbWJlciByb2xlcyBhY2NvcmRpbmcgdG8gdGhlIGNh dGFsb2dzICovCi0JCQlub2xkbWVtYmVycyA9IDA7Ci0JCQlvbGRtZW1iZXJzID0gTlVMTDsK LQkJfQotCQllbHNlCi0JCXsKLQkJCW9sZF9hY2wgPSBEYXR1bUdldEFjbFBDb3B5KGFjbERh dHVtKTsKLQkJCS8qIEdldCB0aGUgcm9sZXMgbWVudGlvbmVkIGluIHRoZSBleGlzdGluZyBB Q0wgKi8KLQkJCW5vbGRtZW1iZXJzID0gYWNsbWVtYmVycyhvbGRfYWNsLCAmb2xkbWVtYmVy cyk7Ci0JCX0KLQotCQkvKiBEZXRlcm1pbmUgSUQgdG8gZG8gdGhlIGdyYW50IGFzLCBhbmQg YXZhaWxhYmxlIGdyYW50IG9wdGlvbnMgKi8KLQkJc2VsZWN0X2Jlc3RfZ3JhbnRvcihHZXRV c2VySWQoKSwgaXN0bXQtPnByaXZpbGVnZXMsCi0JCQkJCQkJb2xkX2FjbCwgb3duZXJJZCwK LQkJCQkJCQkmZ3JhbnRvcklkLCAmYXZhaWxfZ29wdGlvbnMpOwotCi0JCS8qCi0JCSAqIFJl c3RyaWN0IHRoZSBwcml2aWxlZ2VzIHRvIHdoYXQgd2UgY2FuIGFjdHVhbGx5IGdyYW50LCBh bmQgZW1pdCB0aGUKLQkJICogc3RhbmRhcmRzLW1hbmRhdGVkIHdhcm5pbmcgYW5kIGVycm9y IG1lc3NhZ2VzLgotCQkgKi8KLQkJdGhpc19wcml2aWxlZ2VzID0KLQkJCXJlc3RyaWN0X2Fu ZF9jaGVja19ncmFudChpc3RtdC0+aXNfZ3JhbnQsIGF2YWlsX2dvcHRpb25zLAotCQkJCQkJ CQkJIGlzdG10LT5hbGxfcHJpdnMsIGlzdG10LT5wcml2aWxlZ2VzLAotCQkJCQkJCQkJIHRi bElkLCBncmFudG9ySWQsIE9CSkVDVF9UQUJMRVNQQUNFLAotCQkJCQkJCQkJIE5hbWVTdHIo cGdfdGFibGVzcGFjZV90dXBsZS0+c3BjbmFtZSksCi0JCQkJCQkJCQkgMCwgTlVMTCk7Ci0K LQkJLyoKLQkJICogR2VuZXJhdGUgbmV3IEFDTC4KLQkJICovCi0JCW5ld19hY2wgPSBtZXJn ZV9hY2xfd2l0aF9ncmFudChvbGRfYWNsLCBpc3RtdC0+aXNfZ3JhbnQsCi0JCQkJCQkJCQkg ICBpc3RtdC0+Z3JhbnRfb3B0aW9uLCBpc3RtdC0+YmVoYXZpb3IsCi0JCQkJCQkJCQkgICBp c3RtdC0+Z3JhbnRlZXMsIHRoaXNfcHJpdmlsZWdlcywKLQkJCQkJCQkJCSAgIGdyYW50b3JJ ZCwgb3duZXJJZCk7Ci0KLQkJLyoKLQkJICogV2UgbmVlZCB0aGUgbWVtYmVycyBvZiBib3Ro IG9sZCBhbmQgbmV3IEFDTHMgc28gd2UgY2FuIGNvcnJlY3QgdGhlCi0JCSAqIHNoYXJlZCBk ZXBlbmRlbmN5IGluZm9ybWF0aW9uLgotCQkgKi8KLQkJbm5ld21lbWJlcnMgPSBhY2xtZW1i ZXJzKG5ld19hY2wsICZuZXdtZW1iZXJzKTsKLQotCQkvKiBmaW5pc2hlZCBidWlsZGluZyBu ZXcgQUNMIHZhbHVlLCBub3cgaW5zZXJ0IGl0ICovCi0JCXJlcGxhY2VzW0FudW1fcGdfdGFi bGVzcGFjZV9zcGNhY2wgLSAxXSA9IHRydWU7Ci0JCXZhbHVlc1tBbnVtX3BnX3RhYmxlc3Bh Y2Vfc3BjYWNsIC0gMV0gPSBQb2ludGVyR2V0RGF0dW0obmV3X2FjbCk7Ci0KLQkJbmV3dHVw bGUgPSBoZWFwX21vZGlmeV90dXBsZSh0dXBsZSwgUmVsYXRpb25HZXREZXNjcihyZWxhdGlv biksIHZhbHVlcywKLQkJCQkJCQkJCSBudWxscywgcmVwbGFjZXMpOwotCi0JCUNhdGFsb2dU dXBsZVVwZGF0ZShyZWxhdGlvbiwgJm5ld3R1cGxlLT50X3NlbGYsIG5ld3R1cGxlKTsKLQot CQkvKiBVcGRhdGUgdGhlIHNoYXJlZCBkZXBlbmRlbmN5IEFDTCBpbmZvICovCi0JCXVwZGF0 ZUFjbERlcGVuZGVuY2llcyhUYWJsZVNwYWNlUmVsYXRpb25JZCwgdGJsSWQsIDAsCi0JCQkJ CQkJICBvd25lcklkLAotCQkJCQkJCSAgbm9sZG1lbWJlcnMsIG9sZG1lbWJlcnMsCi0JCQkJ CQkJICBubmV3bWVtYmVycywgbmV3bWVtYmVycyk7Ci0KLQkJUmVsZWFzZVN5c0NhY2hlKHR1 cGxlKTsKLQkJcGZyZWUobmV3X2FjbCk7Ci0KLQkJLyogcHJldmVudCBlcnJvciB3aGVuIHBy b2Nlc3NpbmcgZHVwbGljYXRlIG9iamVjdHMgKi8KLQkJQ29tbWFuZENvdW50ZXJJbmNyZW1l bnQoKTsKLQl9Ci0KLQl0YWJsZV9jbG9zZShyZWxhdGlvbiwgUm93RXhjbHVzaXZlTG9jayk7 Ci19Ci0KIHN0YXRpYyB2b2lkCiBFeGVjR3JhbnRfVHlwZShJbnRlcm5hbEdyYW50ICppc3Rt dCkKIHsKLS0gCjIuMzguMQoK --------------33BpK3WKNyIqMx4eY6BuoLd9--