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 1p3DB4-0008V9-FC for pgsql-hackers@arkaria.postgresql.org; Thu, 08 Dec 2022 09:26:50 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1p3DB2-0002t4-DJ for pgsql-hackers@arkaria.postgresql.org; Thu, 08 Dec 2022 09:26:48 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p3DB1-0002se-VV for pgsql-hackers@lists.postgresql.org; Thu, 08 Dec 2022 09:26:48 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p3DAv-0007lV-La for pgsql-hackers@postgresql.org; Thu, 08 Dec 2022 09:26:45 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id DF38F580397; Thu, 8 Dec 2022 04:26:37 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 08 Dec 2022 04:26:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1670491597; x=1670498797; bh=9a77SqCKsyNWqTkK2YwHyZHz8ow9 LIjqpTs7dFtfn3s=; b=Bj2cUIawf5S8x7uFFpDzJYamHJXT4u8Ec2myPxg7Hqrl EMSq/6i5ogALW8wVUVwl92eCRNxNW0tJJGKbi1DTRSm/Uz0ku9gjCj8LHabcU4bz d4oX8Agp2h91xiDY+Z9yRHH1BiulUTVg7afJ5hSuI8hiaJ1Z25vtY7moADTM4I/a qVtZi+somOwChxx2znPIPMXCUwH9Jrii7DxF/AGK3UpDuBl6QXsdUjZIjkIcy/Gr K1mOzFKJTbzn+7Njq1FK6WL5HGhlygG0LTUIwjzWqi37iq5ttrWuARuS/X86opj0 CgVqPi7ww8M/iCaFTtsqKSJbBXS4x7vir01nC6YoHg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvddtgddtgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpegtkfffgggfuffvvehfhfgjsehmtderredtfeejnecuhfhrohhmpefrvghtvghr ucfgihhsvghnthhrrghuthcuoehpvghtvghrrdgvihhsvghnthhrrghuthesvghnthgvrh hprhhishgvuggsrdgtohhmqeenucggtffrrghtthgvrhhnpeeutdekheeuhedtvdfgffeh leetfefhieefudeitdffiedtledujefhjedufeffffenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpvghtvghrrdgvihhsvghnthhrrghuthes vghnthgvrhhprhhishgvuggsrdgtohhm X-ME-Proxy: Feedback-ID: i131946ab:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 8 Dec 2022 04:26:36 -0500 (EST) Content-Type: multipart/mixed; boundary="------------KB2pW50iK7quoroRAVec1NLe" Message-ID: <61bc3065-32d0-9d83-0b0f-a1cf329ba72c@enterprisedb.com> Date: Thu, 8 Dec 2022 10:26:35 +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.1 Subject: Re: refactor ExecGrant_*() functions Content-Language: en-US To: Andres Freund Cc: pgsql-hackers References: <22c7e802-4e7d-8d87-8b71-cba95e6f4bcf@enterprisedb.com> <20221202172829.bicec4r4jzujan4i@awork3.anarazel.de> From: Peter Eisentraut In-Reply-To: <20221202172829.bicec4r4jzujan4i@awork3.anarazel.de> 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. --------------KB2pW50iK7quoroRAVec1NLe Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 02.12.22 18:28, Andres Freund wrote: > Hi, > > On 2022-12-02 08:30:55 +0100, Peter Eisentraut wrote: >> From 200879e5edfc1ce93b7af3cbfafc1f618626cbe9 Mon Sep 17 00:00:00 2001 >> From: Peter Eisentraut >> Date: Fri, 2 Dec 2022 08:16:53 +0100 >> Subject: [PATCH] Refactor ExecGrant_*() functions >> >> Instead of half a dozen of mostly-duplicate ExecGrant_Foo() functions, >> write one common function ExecGrant_generic() that can handle most of >> them. > > I'd name it ExecGrant_common() or such instead - ExecGrant_generic() sounds > like it will handle arbitrary things, which it doesn't. And, as you mention, > we could implement e.g. ExecGrant_Language() as using ExecGrant_common() + > additional checks. Done > Perhaps it'd be useful to add a callback to ExecGrant_generic() that can > perform additional checks, so that e.g. ExecGrant_Language() can easily be > implemented using ExecGrant_generic()? Done. This allows getting rid of ExecGrant_Language and ExecGrant_Type in addition to the previous patch. --------------KB2pW50iK7quoroRAVec1NLe Content-Type: text/plain; charset=UTF-8; name="v2-0001-Refactor-ExecGrant_-functions.patch" Content-Disposition: attachment; filename="v2-0001-Refactor-ExecGrant_-functions.patch" Content-Transfer-Encoding: base64 RnJvbSA3YzRjM2JkNWQxY2I3NzY1MDZiMTU3YzAxYzdmZDk3NWQ3MDBlOGQ5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogVGh1LCA4IERlYyAyMDIyIDEwOjIzOjA3ICswMTAwClN1YmplY3Q6 IFtQQVRDSCB2Ml0gUmVmYWN0b3IgRXhlY0dyYW50XyooKSBmdW5jdGlvbnMKCkluc3RlYWQg b2YgaGFsZiBhIGRvemVuIG9mIG1vc3RseS1kdXBsaWNhdGUgRXhlY0dyYW50X0ZvbygpIGZ1 bmN0aW9ucywKd3JpdGUgb25lIGNvbW1vbiBmdW5jdGlvbiBFeGVjR3JhbnRfZ2VuZXJpYygp IHRoYXQgY2FuIGhhbmRsZSBtb3N0IG9mCnRoZW0uICBXZSBhbHJlYWR5IGhhdmUgYWxsIHRo ZSBpbmZvcm1hdGlvbiB3ZSBuZWVkLCBzdWNoIGFzIHdoaWNoCnN5c3RlbSBjYXRhbG9nIGNv cnJlc3BvbmRzIHRvIHdoaWNoIGNhdGFsb2cgdGFibGUgYW5kIHdoaWNoIGNvbHVtbiBpcwp0 aGUgQUNMIGNvbHVtbi4KCkRpc2N1c3Npb246IGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3Jn L21lc3NhZ2UtaWQvZmxhdC8yMmM3ZTgwMi00ZTdkLThkODctOGI3MS1jYmE5NWU2ZjRiY2Yl NDBlbnRlcnByaXNlZGIuY29tCi0tLQogc3JjL2JhY2tlbmQvY2F0YWxvZy9hY2xjaGsuYyB8 IDk0OCArKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDczIGluc2VydGlvbnMoKyksIDg3NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9z cmMvYmFja2VuZC9jYXRhbG9nL2FjbGNoay5jIGIvc3JjL2JhY2tlbmQvY2F0YWxvZy9hY2xj aGsuYwppbmRleCA4ZDg0YTdiMDU2Li40Mzk2OGQ1NjljIDEwMDY0NAotLS0gYS9zcmMvYmFj a2VuZC9jYXRhbG9nL2FjbGNoay5jCisrKyBiL3NyYy9iYWNrZW5kL2NhdGFsb2cvYWNsY2hr LmMKQEAgLTEwNiwxNSArMTA2LDExIEBAIGJvb2wJCWJpbmFyeV91cGdyYWRlX3JlY29yZF9p bml0X3ByaXZzID0gZmFsc2U7CiAKIHN0YXRpYyB2b2lkIEV4ZWNHcmFudFN0bXRfb2lkcyhJ bnRlcm5hbEdyYW50ICppc3RtdCk7CiBzdGF0aWMgdm9pZCBFeGVjR3JhbnRfUmVsYXRpb24o SW50ZXJuYWxHcmFudCAqaXN0bXQpOwotc3RhdGljIHZvaWQgRXhlY0dyYW50X0RhdGFiYXNl KEludGVybmFsR3JhbnQgKmlzdG10KTsKLXN0YXRpYyB2b2lkIEV4ZWNHcmFudF9GZHcoSW50 ZXJuYWxHcmFudCAqaXN0bXQpOwotc3RhdGljIHZvaWQgRXhlY0dyYW50X0ZvcmVpZ25TZXJ2 ZXIoSW50ZXJuYWxHcmFudCAqaXN0bXQpOwotc3RhdGljIHZvaWQgRXhlY0dyYW50X0Z1bmN0 aW9uKEludGVybmFsR3JhbnQgKmlzdG10KTsKLXN0YXRpYyB2b2lkIEV4ZWNHcmFudF9MYW5n dWFnZShJbnRlcm5hbEdyYW50ICppc3RtdCk7CitzdGF0aWMgdm9pZCBFeGVjR3JhbnRfY29t bW9uKEludGVybmFsR3JhbnQgKmlzdG10LCBPaWQgY2xhc3NpZCwgQWNsTW9kZSBkZWZhdWx0 X3ByaXZzLAorCQkJCQkJCSB2b2lkICgqb2JqZWN0X2NoZWNrKSAoSW50ZXJuYWxHcmFudCAq aXN0bXQsIEhlYXBUdXBsZSB0dXBsZSkpOworc3RhdGljIHZvaWQgRXhlY0dyYW50X0xhbmd1 YWdlX2NoZWNrKEludGVybmFsR3JhbnQgKmlzdG10LCBIZWFwVHVwbGUgdHVwbGUpOwogc3Rh dGljIHZvaWQgRXhlY0dyYW50X0xhcmdlb2JqZWN0KEludGVybmFsR3JhbnQgKmlzdG10KTsK LXN0YXRpYyB2b2lkIEV4ZWNHcmFudF9OYW1lc3BhY2UoSW50ZXJuYWxHcmFudCAqaXN0bXQp Owotc3RhdGljIHZvaWQgRXhlY0dyYW50X1RhYmxlc3BhY2UoSW50ZXJuYWxHcmFudCAqaXN0 bXQpOwotc3RhdGljIHZvaWQgRXhlY0dyYW50X1R5cGUoSW50ZXJuYWxHcmFudCAqaXN0bXQp Oworc3RhdGljIHZvaWQgRXhlY0dyYW50X1R5cGVfY2hlY2soSW50ZXJuYWxHcmFudCAqaXN0 bXQsIEhlYXBUdXBsZSB0dXBsZSk7CiBzdGF0aWMgdm9pZCBFeGVjR3JhbnRfUGFyYW1ldGVy KEludGVybmFsR3JhbnQgKmlzdG10KTsKIAogc3RhdGljIHZvaWQgU2V0RGVmYXVsdEFDTHNJ blNjaGVtYXMoSW50ZXJuYWxEZWZhdWx0QUNMICppYWNscywgTGlzdCAqbnNwbmFtZXMpOwpA QCAtNjAyLDM0ICs1OTgsMzQgQEAgRXhlY0dyYW50U3RtdF9vaWRzKEludGVybmFsR3JhbnQg KmlzdG10KQogCQkJRXhlY0dyYW50X1JlbGF0aW9uKGlzdG10KTsKIAkJCWJyZWFrOwogCQlj YXNlIE9CSkVDVF9EQVRBQkFTRToKLQkJCUV4ZWNHcmFudF9EYXRhYmFzZShpc3RtdCk7CisJ CQlFeGVjR3JhbnRfY29tbW9uKGlzdG10LCBEYXRhYmFzZVJlbGF0aW9uSWQsIEFDTF9BTExf UklHSFRTX0RBVEFCQVNFLCBOVUxMKTsKIAkJCWJyZWFrOwogCQljYXNlIE9CSkVDVF9ET01B SU46CiAJCWNhc2UgT0JKRUNUX1RZUEU6Ci0JCQlFeGVjR3JhbnRfVHlwZShpc3RtdCk7CisJ CQlFeGVjR3JhbnRfY29tbW9uKGlzdG10LCBUeXBlUmVsYXRpb25JZCwgQUNMX0FMTF9SSUdI VFNfVFlQRSwgRXhlY0dyYW50X1R5cGVfY2hlY2spOwogCQkJYnJlYWs7CiAJCWNhc2UgT0JK RUNUX0ZEVzoKLQkJCUV4ZWNHcmFudF9GZHcoaXN0bXQpOworCQkJRXhlY0dyYW50X2NvbW1v bihpc3RtdCwgRm9yZWlnbkRhdGFXcmFwcGVyUmVsYXRpb25JZCwgQUNMX0FMTF9SSUdIVFNf RkRXLCBOVUxMKTsKIAkJCWJyZWFrOwogCQljYXNlIE9CSkVDVF9GT1JFSUdOX1NFUlZFUjoK LQkJCUV4ZWNHcmFudF9Gb3JlaWduU2VydmVyKGlzdG10KTsKKwkJCUV4ZWNHcmFudF9jb21t b24oaXN0bXQsIEZvcmVpZ25TZXJ2ZXJSZWxhdGlvbklkLCBBQ0xfQUxMX1JJR0hUU19GT1JF SUdOX1NFUlZFUiwgTlVMTCk7CiAJCQlicmVhazsKIAkJY2FzZSBPQkpFQ1RfRlVOQ1RJT046 CiAJCWNhc2UgT0JKRUNUX1BST0NFRFVSRToKIAkJY2FzZSBPQkpFQ1RfUk9VVElORToKLQkJ CUV4ZWNHcmFudF9GdW5jdGlvbihpc3RtdCk7CisJCQlFeGVjR3JhbnRfY29tbW9uKGlzdG10 LCBQcm9jZWR1cmVSZWxhdGlvbklkLCBBQ0xfQUxMX1JJR0hUU19GVU5DVElPTiwgTlVMTCk7 CiAJCQlicmVhazsKIAkJY2FzZSBPQkpFQ1RfTEFOR1VBR0U6Ci0JCQlFeGVjR3JhbnRfTGFu Z3VhZ2UoaXN0bXQpOworCQkJRXhlY0dyYW50X2NvbW1vbihpc3RtdCwgTGFuZ3VhZ2VSZWxh dGlvbklkLCBBQ0xfQUxMX1JJR0hUU19MQU5HVUFHRSwgRXhlY0dyYW50X0xhbmd1YWdlX2No ZWNrKTsKIAkJCWJyZWFrOwogCQljYXNlIE9CSkVDVF9MQVJHRU9CSkVDVDoKIAkJCUV4ZWNH cmFudF9MYXJnZW9iamVjdChpc3RtdCk7CiAJCQlicmVhazsKIAkJY2FzZSBPQkpFQ1RfU0NI RU1BOgotCQkJRXhlY0dyYW50X05hbWVzcGFjZShpc3RtdCk7CisJCQlFeGVjR3JhbnRfY29t bW9uKGlzdG10LCBOYW1lc3BhY2VSZWxhdGlvbklkLCBBQ0xfQUxMX1JJR0hUU19TQ0hFTUEs IE5VTEwpOwogCQkJYnJlYWs7CiAJCWNhc2UgT0JKRUNUX1RBQkxFU1BBQ0U6Ci0JCQlFeGVj R3JhbnRfVGFibGVzcGFjZShpc3RtdCk7CisJCQlFeGVjR3JhbnRfY29tbW9uKGlzdG10LCBU YWJsZVNwYWNlUmVsYXRpb25JZCwgQUNMX0FMTF9SSUdIVFNfVEFCTEVTUEFDRSwgTlVMTCk7 CiAJCQlicmVhazsKIAkJY2FzZSBPQkpFQ1RfUEFSQU1FVEVSX0FDTDoKIAkJCUV4ZWNHcmFu dF9QYXJhbWV0ZXIoaXN0bXQpOwpAQCAtMjEzMiwxMzcgKzIxMjgsMjUgQEAgRXhlY0dyYW50 X1JlbGF0aW9uKEludGVybmFsR3JhbnQgKmlzdG10KQogfQogCiBzdGF0aWMgdm9pZAotRXhl Y0dyYW50X0RhdGFiYXNlKEludGVybmFsR3JhbnQgKmlzdG10KQorRXhlY0dyYW50X2NvbW1v bihJbnRlcm5hbEdyYW50ICppc3RtdCwgT2lkIGNsYXNzaWQsIEFjbE1vZGUgZGVmYXVsdF9w cml2cywKKwkJCQkgdm9pZCAoKm9iamVjdF9jaGVjaykgKEludGVybmFsR3JhbnQgKmlzdG10 LCBIZWFwVHVwbGUgdHVwbGUpKQogeworCWludAkJCWNhY2hlaWQ7CiAJUmVsYXRpb24JcmVs YXRpb247CiAJTGlzdENlbGwgICAqY2VsbDsKIAogCWlmIChpc3RtdC0+YWxsX3ByaXZzICYm IGlzdG10LT5wcml2aWxlZ2VzID09IEFDTF9OT19SSUdIVFMpCi0JCWlzdG10LT5wcml2aWxl Z2VzID0gQUNMX0FMTF9SSUdIVFNfREFUQUJBU0U7Ci0KLQlyZWxhdGlvbiA9IHRhYmxlX29w ZW4oRGF0YWJhc2VSZWxhdGlvbklkLCBSb3dFeGNsdXNpdmVMb2NrKTsKLQotCWZvcmVhY2go Y2VsbCwgaXN0bXQtPm9iamVjdHMpCi0JewotCQlPaWQJCQlkYXRJZCA9IGxmaXJzdF9vaWQo Y2VsbCk7Ci0JCUZvcm1fcGdfZGF0YWJhc2UgcGdfZGF0YWJhc2VfdHVwbGU7Ci0JCURhdHVt CQlhY2xEYXR1bTsKLQkJYm9vbAkJaXNOdWxsOwotCQlBY2xNb2RlCQlhdmFpbF9nb3B0aW9u czsKLQkJQWNsTW9kZQkJdGhpc19wcml2aWxlZ2VzOwotCQlBY2wJCSAgICpvbGRfYWNsOwot CQlBY2wJCSAgICpuZXdfYWNsOwotCQlPaWQJCQlncmFudG9ySWQ7Ci0JCU9pZAkJCW93bmVy SWQ7Ci0JCUhlYXBUdXBsZQluZXd0dXBsZTsKLQkJRGF0dW0JCXZhbHVlc1tOYXR0c19wZ19k YXRhYmFzZV0gPSB7MH07Ci0JCWJvb2wJCW51bGxzW05hdHRzX3BnX2RhdGFiYXNlXSA9IHsw fTsKLQkJYm9vbAkJcmVwbGFjZXNbTmF0dHNfcGdfZGF0YWJhc2VdID0gezB9OwotCQlpbnQJ CQlub2xkbWVtYmVyczsKLQkJaW50CQkJbm5ld21lbWJlcnM7Ci0JCU9pZAkJICAgKm9sZG1l bWJlcnM7Ci0JCU9pZAkJICAgKm5ld21lbWJlcnM7Ci0JCUhlYXBUdXBsZQl0dXBsZTsKLQot CQl0dXBsZSA9IFNlYXJjaFN5c0NhY2hlMShEQVRBQkFTRU9JRCwgT2JqZWN0SWRHZXREYXR1 bShkYXRJZCkpOwotCQlpZiAoIUhlYXBUdXBsZUlzVmFsaWQodHVwbGUpKQotCQkJZWxvZyhF UlJPUiwgImNhY2hlIGxvb2t1cCBmYWlsZWQgZm9yIGRhdGFiYXNlICV1IiwgZGF0SWQpOwot Ci0JCXBnX2RhdGFiYXNlX3R1cGxlID0gKEZvcm1fcGdfZGF0YWJhc2UpIEdFVFNUUlVDVCh0 dXBsZSk7Ci0KLQkJLyoKLQkJICogR2V0IG93bmVyIElEIGFuZCB3b3JraW5nIGNvcHkgb2Yg ZXhpc3RpbmcgQUNMLiBJZiB0aGVyZSdzIG5vIEFDTCwKLQkJICogc3Vic3RpdHV0ZSB0aGUg cHJvcGVyIGRlZmF1bHQuCi0JCSAqLwotCQlvd25lcklkID0gcGdfZGF0YWJhc2VfdHVwbGUt PmRhdGRiYTsKLQkJYWNsRGF0dW0gPSBoZWFwX2dldGF0dHIodHVwbGUsIEFudW1fcGdfZGF0 YWJhc2VfZGF0YWNsLAotCQkJCQkJCQlSZWxhdGlvbkdldERlc2NyKHJlbGF0aW9uKSwgJmlz TnVsbCk7Ci0JCWlmIChpc051bGwpCi0JCXsKLQkJCW9sZF9hY2wgPSBhY2xkZWZhdWx0KE9C SkVDVF9EQVRBQkFTRSwgb3duZXJJZCk7Ci0JCQkvKiBUaGVyZSBhcmUgbm8gb2xkIG1lbWJl ciByb2xlcyBhY2NvcmRpbmcgdG8gdGhlIGNhdGFsb2dzICovCi0JCQlub2xkbWVtYmVycyA9 IDA7Ci0JCQlvbGRtZW1iZXJzID0gTlVMTDsKLQkJfQotCQllbHNlCi0JCXsKLQkJCW9sZF9h Y2wgPSBEYXR1bUdldEFjbFBDb3B5KGFjbERhdHVtKTsKLQkJCS8qIEdldCB0aGUgcm9sZXMg bWVudGlvbmVkIGluIHRoZSBleGlzdGluZyBBQ0wgKi8KLQkJCW5vbGRtZW1iZXJzID0gYWNs bWVtYmVycyhvbGRfYWNsLCAmb2xkbWVtYmVycyk7Ci0JCX0KLQotCQkvKiBEZXRlcm1pbmUg SUQgdG8gZG8gdGhlIGdyYW50IGFzLCBhbmQgYXZhaWxhYmxlIGdyYW50IG9wdGlvbnMgKi8K LQkJc2VsZWN0X2Jlc3RfZ3JhbnRvcihHZXRVc2VySWQoKSwgaXN0bXQtPnByaXZpbGVnZXMs Ci0JCQkJCQkJb2xkX2FjbCwgb3duZXJJZCwKLQkJCQkJCQkmZ3JhbnRvcklkLCAmYXZhaWxf Z29wdGlvbnMpOwotCi0JCS8qCi0JCSAqIFJlc3RyaWN0IHRoZSBwcml2aWxlZ2VzIHRvIHdo YXQgd2UgY2FuIGFjdHVhbGx5IGdyYW50LCBhbmQgZW1pdCB0aGUKLQkJICogc3RhbmRhcmRz LW1hbmRhdGVkIHdhcm5pbmcgYW5kIGVycm9yIG1lc3NhZ2VzLgotCQkgKi8KLQkJdGhpc19w cml2aWxlZ2VzID0KLQkJCXJlc3RyaWN0X2FuZF9jaGVja19ncmFudChpc3RtdC0+aXNfZ3Jh bnQsIGF2YWlsX2dvcHRpb25zLAotCQkJCQkJCQkJIGlzdG10LT5hbGxfcHJpdnMsIGlzdG10 LT5wcml2aWxlZ2VzLAotCQkJCQkJCQkJIGRhdElkLCBncmFudG9ySWQsIE9CSkVDVF9EQVRB QkFTRSwKLQkJCQkJCQkJCSBOYW1lU3RyKHBnX2RhdGFiYXNlX3R1cGxlLT5kYXRuYW1lKSwK LQkJCQkJCQkJCSAwLCBOVUxMKTsKLQotCQkvKgotCQkgKiBHZW5lcmF0ZSBuZXcgQUNMLgot CQkgKi8KLQkJbmV3X2FjbCA9IG1lcmdlX2FjbF93aXRoX2dyYW50KG9sZF9hY2wsIGlzdG10 LT5pc19ncmFudCwKLQkJCQkJCQkJCSAgIGlzdG10LT5ncmFudF9vcHRpb24sIGlzdG10LT5i ZWhhdmlvciwKLQkJCQkJCQkJCSAgIGlzdG10LT5ncmFudGVlcywgdGhpc19wcml2aWxlZ2Vz LAotCQkJCQkJCQkJICAgZ3JhbnRvcklkLCBvd25lcklkKTsKLQotCQkvKgotCQkgKiBXZSBu ZWVkIHRoZSBtZW1iZXJzIG9mIGJvdGggb2xkIGFuZCBuZXcgQUNMcyBzbyB3ZSBjYW4gY29y cmVjdCB0aGUKLQkJICogc2hhcmVkIGRlcGVuZGVuY3kgaW5mb3JtYXRpb24uCi0JCSAqLwot CQlubmV3bWVtYmVycyA9IGFjbG1lbWJlcnMobmV3X2FjbCwgJm5ld21lbWJlcnMpOwotCi0J CS8qIGZpbmlzaGVkIGJ1aWxkaW5nIG5ldyBBQ0wgdmFsdWUsIG5vdyBpbnNlcnQgaXQgKi8K LQkJcmVwbGFjZXNbQW51bV9wZ19kYXRhYmFzZV9kYXRhY2wgLSAxXSA9IHRydWU7Ci0JCXZh bHVlc1tBbnVtX3BnX2RhdGFiYXNlX2RhdGFjbCAtIDFdID0gUG9pbnRlckdldERhdHVtKG5l d19hY2wpOwotCi0JCW5ld3R1cGxlID0gaGVhcF9tb2RpZnlfdHVwbGUodHVwbGUsIFJlbGF0 aW9uR2V0RGVzY3IocmVsYXRpb24pLCB2YWx1ZXMsCi0JCQkJCQkJCQkgbnVsbHMsIHJlcGxh Y2VzKTsKLQotCQlDYXRhbG9nVHVwbGVVcGRhdGUocmVsYXRpb24sICZuZXd0dXBsZS0+dF9z ZWxmLCBuZXd0dXBsZSk7Ci0KLQkJLyogVXBkYXRlIHRoZSBzaGFyZWQgZGVwZW5kZW5jeSBB Q0wgaW5mbyAqLwotCQl1cGRhdGVBY2xEZXBlbmRlbmNpZXMoRGF0YWJhc2VSZWxhdGlvbklk LCBwZ19kYXRhYmFzZV90dXBsZS0+b2lkLCAwLAotCQkJCQkJCSAgb3duZXJJZCwKLQkJCQkJ CQkgIG5vbGRtZW1iZXJzLCBvbGRtZW1iZXJzLAotCQkJCQkJCSAgbm5ld21lbWJlcnMsIG5l d21lbWJlcnMpOwotCi0JCVJlbGVhc2VTeXNDYWNoZSh0dXBsZSk7Ci0KLQkJcGZyZWUobmV3 X2FjbCk7Ci0KLQkJLyogcHJldmVudCBlcnJvciB3aGVuIHByb2Nlc3NpbmcgZHVwbGljYXRl IG9iamVjdHMgKi8KLQkJQ29tbWFuZENvdW50ZXJJbmNyZW1lbnQoKTsKLQl9Ci0KLQl0YWJs ZV9jbG9zZShyZWxhdGlvbiwgUm93RXhjbHVzaXZlTG9jayk7Ci19CisJCWlzdG10LT5wcml2 aWxlZ2VzID0gZGVmYXVsdF9wcml2czsKIAotc3RhdGljIHZvaWQKLUV4ZWNHcmFudF9GZHco SW50ZXJuYWxHcmFudCAqaXN0bXQpCi17Ci0JUmVsYXRpb24JcmVsYXRpb247Ci0JTGlzdENl bGwgICAqY2VsbDsKLQotCWlmIChpc3RtdC0+YWxsX3ByaXZzICYmIGlzdG10LT5wcml2aWxl Z2VzID09IEFDTF9OT19SSUdIVFMpCi0JCWlzdG10LT5wcml2aWxlZ2VzID0gQUNMX0FMTF9S SUdIVFNfRkRXOworCWNhY2hlaWQgPSBnZXRfb2JqZWN0X2NhdGNhY2hlX29pZChjbGFzc2lk KTsKIAotCXJlbGF0aW9uID0gdGFibGVfb3BlbihGb3JlaWduRGF0YVdyYXBwZXJSZWxhdGlv bklkLCBSb3dFeGNsdXNpdmVMb2NrKTsKKwlyZWxhdGlvbiA9IHRhYmxlX29wZW4oY2xhc3Np ZCwgUm93RXhjbHVzaXZlTG9jayk7CiAKIAlmb3JlYWNoKGNlbGwsIGlzdG10LT5vYmplY3Rz KQogCXsKLQkJT2lkCQkJZmR3aWQgPSBsZmlyc3Rfb2lkKGNlbGwpOwotCQlGb3JtX3BnX2Zv cmVpZ25fZGF0YV93cmFwcGVyIHBnX2Zkd190dXBsZTsKKwkJT2lkCQkJb2JqZWN0aWQgPSBs Zmlyc3Rfb2lkKGNlbGwpOwogCQlEYXR1bQkJYWNsRGF0dW07CisJCURhdHVtCQluYW1lRGF0 dW07CiAJCWJvb2wJCWlzTnVsbDsKIAkJQWNsTW9kZQkJYXZhaWxfZ29wdGlvbnM7CiAJCUFj bE1vZGUJCXRoaXNfcHJpdmlsZWdlczsKQEAgLTIyNzIsMTU0ICsyMTU2LDQwIEBAIEV4ZWNH cmFudF9GZHcoSW50ZXJuYWxHcmFudCAqaXN0bXQpCiAJCU9pZAkJCW93bmVySWQ7CiAJCUhl YXBUdXBsZQl0dXBsZTsKIAkJSGVhcFR1cGxlCW5ld3R1cGxlOwotCQlEYXR1bQkJdmFsdWVz W05hdHRzX3BnX2ZvcmVpZ25fZGF0YV93cmFwcGVyXSA9IHswfTsKLQkJYm9vbAkJbnVsbHNb TmF0dHNfcGdfZm9yZWlnbl9kYXRhX3dyYXBwZXJdID0gezB9OwotCQlib29sCQlyZXBsYWNl c1tOYXR0c19wZ19mb3JlaWduX2RhdGFfd3JhcHBlcl0gPSB7MH07CisJCURhdHVtCSAgICp2 YWx1ZXMgPSBwYWxsb2MwX2FycmF5KERhdHVtLCBSZWxhdGlvbkdldERlc2NyKHJlbGF0aW9u KS0+bmF0dHMpOworCQlib29sCSAgICpudWxscyA9IHBhbGxvYzBfYXJyYXkoYm9vbCwgUmVs YXRpb25HZXREZXNjcihyZWxhdGlvbiktPm5hdHRzKTsKKwkJYm9vbAkgICAqcmVwbGFjZXMg PSBwYWxsb2MwX2FycmF5KGJvb2wsIFJlbGF0aW9uR2V0RGVzY3IocmVsYXRpb24pLT5uYXR0 cyk7CiAJCWludAkJCW5vbGRtZW1iZXJzOwogCQlpbnQJCQlubmV3bWVtYmVyczsKIAkJT2lk CQkgICAqb2xkbWVtYmVyczsKIAkJT2lkCQkgICAqbmV3bWVtYmVyczsKIAotCQl0dXBsZSA9 IFNlYXJjaFN5c0NhY2hlMShGT1JFSUdOREFUQVdSQVBQRVJPSUQsCi0JCQkJCQkJCU9iamVj dElkR2V0RGF0dW0oZmR3aWQpKTsKKwkJdHVwbGUgPSBTZWFyY2hTeXNDYWNoZTEoY2FjaGVp ZCwgT2JqZWN0SWRHZXREYXR1bShvYmplY3RpZCkpOwogCQlpZiAoIUhlYXBUdXBsZUlzVmFs aWQodHVwbGUpKQotCQkJZWxvZyhFUlJPUiwgImNhY2hlIGxvb2t1cCBmYWlsZWQgZm9yIGZv cmVpZ24tZGF0YSB3cmFwcGVyICV1IiwgZmR3aWQpOwotCi0JCXBnX2Zkd190dXBsZSA9IChG b3JtX3BnX2ZvcmVpZ25fZGF0YV93cmFwcGVyKSBHRVRTVFJVQ1QodHVwbGUpOwotCi0JCS8q Ci0JCSAqIEdldCBvd25lciBJRCBhbmQgd29ya2luZyBjb3B5IG9mIGV4aXN0aW5nIEFDTC4g SWYgdGhlcmUncyBubyBBQ0wsCi0JCSAqIHN1YnN0aXR1dGUgdGhlIHByb3BlciBkZWZhdWx0 LgotCQkgKi8KLQkJb3duZXJJZCA9IHBnX2Zkd190dXBsZS0+ZmR3b3duZXI7Ci0JCWFjbERh dHVtID0gU3lzQ2FjaGVHZXRBdHRyKEZPUkVJR05EQVRBV1JBUFBFUk9JRCwgdHVwbGUsCi0J CQkJCQkJCSAgIEFudW1fcGdfZm9yZWlnbl9kYXRhX3dyYXBwZXJfZmR3YWNsLAotCQkJCQkJ CQkgICAmaXNOdWxsKTsKLQkJaWYgKGlzTnVsbCkKLQkJewotCQkJb2xkX2FjbCA9IGFjbGRl ZmF1bHQoT0JKRUNUX0ZEVywgb3duZXJJZCk7Ci0JCQkvKiBUaGVyZSBhcmUgbm8gb2xkIG1l bWJlciByb2xlcyBhY2NvcmRpbmcgdG8gdGhlIGNhdGFsb2dzICovCi0JCQlub2xkbWVtYmVy cyA9IDA7Ci0JCQlvbGRtZW1iZXJzID0gTlVMTDsKLQkJfQotCQllbHNlCi0JCXsKLQkJCW9s ZF9hY2wgPSBEYXR1bUdldEFjbFBDb3B5KGFjbERhdHVtKTsKLQkJCS8qIEdldCB0aGUgcm9s ZXMgbWVudGlvbmVkIGluIHRoZSBleGlzdGluZyBBQ0wgKi8KLQkJCW5vbGRtZW1iZXJzID0g YWNsbWVtYmVycyhvbGRfYWNsLCAmb2xkbWVtYmVycyk7Ci0JCX0KLQotCQkvKiBEZXRlcm1p bmUgSUQgdG8gZG8gdGhlIGdyYW50IGFzLCBhbmQgYXZhaWxhYmxlIGdyYW50IG9wdGlvbnMg Ki8KLQkJc2VsZWN0X2Jlc3RfZ3JhbnRvcihHZXRVc2VySWQoKSwgaXN0bXQtPnByaXZpbGVn ZXMsCi0JCQkJCQkJb2xkX2FjbCwgb3duZXJJZCwKLQkJCQkJCQkmZ3JhbnRvcklkLCAmYXZh aWxfZ29wdGlvbnMpOworCQkJZWxvZyhFUlJPUiwgImNhY2hlIGxvb2t1cCBmYWlsZWQgZm9y ICVzICV1IiwgZ2V0X29iamVjdF9jbGFzc19kZXNjcihjbGFzc2lkKSwgb2JqZWN0aWQpOwog CiAJCS8qCi0JCSAqIFJlc3RyaWN0IHRoZSBwcml2aWxlZ2VzIHRvIHdoYXQgd2UgY2FuIGFj dHVhbGx5IGdyYW50LCBhbmQgZW1pdCB0aGUKLQkJICogc3RhbmRhcmRzLW1hbmRhdGVkIHdh cm5pbmcgYW5kIGVycm9yIG1lc3NhZ2VzLgorCQkgKiBBZGRpdGlvbmFsIG9iamVjdC10eXBl LXNwZWNpZmljIGNoZWNrcwogCQkgKi8KLQkJdGhpc19wcml2aWxlZ2VzID0KLQkJCXJlc3Ry aWN0X2FuZF9jaGVja19ncmFudChpc3RtdC0+aXNfZ3JhbnQsIGF2YWlsX2dvcHRpb25zLAot CQkJCQkJCQkJIGlzdG10LT5hbGxfcHJpdnMsIGlzdG10LT5wcml2aWxlZ2VzLAotCQkJCQkJ CQkJIGZkd2lkLCBncmFudG9ySWQsIE9CSkVDVF9GRFcsCi0JCQkJCQkJCQkgTmFtZVN0cihw Z19mZHdfdHVwbGUtPmZkd25hbWUpLAotCQkJCQkJCQkJIDAsIE5VTEwpOwotCi0JCS8qCi0J CSAqIEdlbmVyYXRlIG5ldyBBQ0wuCi0JCSAqLwotCQluZXdfYWNsID0gbWVyZ2VfYWNsX3dp dGhfZ3JhbnQob2xkX2FjbCwgaXN0bXQtPmlzX2dyYW50LAotCQkJCQkJCQkJICAgaXN0bXQt PmdyYW50X29wdGlvbiwgaXN0bXQtPmJlaGF2aW9yLAotCQkJCQkJCQkJICAgaXN0bXQtPmdy YW50ZWVzLCB0aGlzX3ByaXZpbGVnZXMsCi0JCQkJCQkJCQkgICBncmFudG9ySWQsIG93bmVy SWQpOwotCi0JCS8qCi0JCSAqIFdlIG5lZWQgdGhlIG1lbWJlcnMgb2YgYm90aCBvbGQgYW5k IG5ldyBBQ0xzIHNvIHdlIGNhbiBjb3JyZWN0IHRoZQotCQkgKiBzaGFyZWQgZGVwZW5kZW5j eSBpbmZvcm1hdGlvbi4KLQkJICovCi0JCW5uZXdtZW1iZXJzID0gYWNsbWVtYmVycyhuZXdf YWNsLCAmbmV3bWVtYmVycyk7Ci0KLQkJLyogZmluaXNoZWQgYnVpbGRpbmcgbmV3IEFDTCB2 YWx1ZSwgbm93IGluc2VydCBpdCAqLwotCQlyZXBsYWNlc1tBbnVtX3BnX2ZvcmVpZ25fZGF0 YV93cmFwcGVyX2Zkd2FjbCAtIDFdID0gdHJ1ZTsKLQkJdmFsdWVzW0FudW1fcGdfZm9yZWln bl9kYXRhX3dyYXBwZXJfZmR3YWNsIC0gMV0gPSBQb2ludGVyR2V0RGF0dW0obmV3X2FjbCk7 Ci0KLQkJbmV3dHVwbGUgPSBoZWFwX21vZGlmeV90dXBsZSh0dXBsZSwgUmVsYXRpb25HZXRE ZXNjcihyZWxhdGlvbiksIHZhbHVlcywKLQkJCQkJCQkJCSBudWxscywgcmVwbGFjZXMpOwot Ci0JCUNhdGFsb2dUdXBsZVVwZGF0ZShyZWxhdGlvbiwgJm5ld3R1cGxlLT50X3NlbGYsIG5l d3R1cGxlKTsKLQotCQkvKiBVcGRhdGUgaW5pdGlhbCBwcml2aWxlZ2VzIGZvciBleHRlbnNp b25zICovCi0JCXJlY29yZEV4dGVuc2lvbkluaXRQcml2KGZkd2lkLCBGb3JlaWduRGF0YVdy YXBwZXJSZWxhdGlvbklkLCAwLAotCQkJCQkJCQluZXdfYWNsKTsKLQotCQkvKiBVcGRhdGUg dGhlIHNoYXJlZCBkZXBlbmRlbmN5IEFDTCBpbmZvICovCi0JCXVwZGF0ZUFjbERlcGVuZGVu Y2llcyhGb3JlaWduRGF0YVdyYXBwZXJSZWxhdGlvbklkLAotCQkJCQkJCSAgcGdfZmR3X3R1 cGxlLT5vaWQsIDAsCi0JCQkJCQkJICBvd25lcklkLAotCQkJCQkJCSAgbm9sZG1lbWJlcnMs IG9sZG1lbWJlcnMsCi0JCQkJCQkJICBubmV3bWVtYmVycywgbmV3bWVtYmVycyk7Ci0KLQkJ UmVsZWFzZVN5c0NhY2hlKHR1cGxlKTsKLQotCQlwZnJlZShuZXdfYWNsKTsKLQotCQkvKiBw cmV2ZW50IGVycm9yIHdoZW4gcHJvY2Vzc2luZyBkdXBsaWNhdGUgb2JqZWN0cyAqLwotCQlD b21tYW5kQ291bnRlckluY3JlbWVudCgpOwotCX0KLQotCXRhYmxlX2Nsb3NlKHJlbGF0aW9u LCBSb3dFeGNsdXNpdmVMb2NrKTsKLX0KLQotc3RhdGljIHZvaWQKLUV4ZWNHcmFudF9Gb3Jl aWduU2VydmVyKEludGVybmFsR3JhbnQgKmlzdG10KQotewotCVJlbGF0aW9uCXJlbGF0aW9u OwotCUxpc3RDZWxsICAgKmNlbGw7Ci0KLQlpZiAoaXN0bXQtPmFsbF9wcml2cyAmJiBpc3Rt dC0+cHJpdmlsZWdlcyA9PSBBQ0xfTk9fUklHSFRTKQotCQlpc3RtdC0+cHJpdmlsZWdlcyA9 IEFDTF9BTExfUklHSFRTX0ZPUkVJR05fU0VSVkVSOwotCi0JcmVsYXRpb24gPSB0YWJsZV9v cGVuKEZvcmVpZ25TZXJ2ZXJSZWxhdGlvbklkLCBSb3dFeGNsdXNpdmVMb2NrKTsKLQotCWZv cmVhY2goY2VsbCwgaXN0bXQtPm9iamVjdHMpCi0JewotCQlPaWQJCQlzcnZpZCA9IGxmaXJz dF9vaWQoY2VsbCk7Ci0JCUZvcm1fcGdfZm9yZWlnbl9zZXJ2ZXIgcGdfc2VydmVyX3R1cGxl OwotCQlEYXR1bQkJYWNsRGF0dW07Ci0JCWJvb2wJCWlzTnVsbDsKLQkJQWNsTW9kZQkJYXZh aWxfZ29wdGlvbnM7Ci0JCUFjbE1vZGUJCXRoaXNfcHJpdmlsZWdlczsKLQkJQWNsCQkgICAq b2xkX2FjbDsKLQkJQWNsCQkgICAqbmV3X2FjbDsKLQkJT2lkCQkJZ3JhbnRvcklkOwotCQlP aWQJCQlvd25lcklkOwotCQlIZWFwVHVwbGUJdHVwbGU7Ci0JCUhlYXBUdXBsZQluZXd0dXBs ZTsKLQkJRGF0dW0JCXZhbHVlc1tOYXR0c19wZ19mb3JlaWduX3NlcnZlcl0gPSB7MH07Ci0J CWJvb2wJCW51bGxzW05hdHRzX3BnX2ZvcmVpZ25fc2VydmVyXSA9IHswfTsKLQkJYm9vbAkJ cmVwbGFjZXNbTmF0dHNfcGdfZm9yZWlnbl9zZXJ2ZXJdID0gezB9OwotCQlpbnQJCQlub2xk bWVtYmVyczsKLQkJaW50CQkJbm5ld21lbWJlcnM7Ci0JCU9pZAkJICAgKm9sZG1lbWJlcnM7 Ci0JCU9pZAkJICAgKm5ld21lbWJlcnM7Ci0KLQkJdHVwbGUgPSBTZWFyY2hTeXNDYWNoZTEo Rk9SRUlHTlNFUlZFUk9JRCwgT2JqZWN0SWRHZXREYXR1bShzcnZpZCkpOwotCQlpZiAoIUhl YXBUdXBsZUlzVmFsaWQodHVwbGUpKQotCQkJZWxvZyhFUlJPUiwgImNhY2hlIGxvb2t1cCBm YWlsZWQgZm9yIGZvcmVpZ24gc2VydmVyICV1Iiwgc3J2aWQpOwotCi0JCXBnX3NlcnZlcl90 dXBsZSA9IChGb3JtX3BnX2ZvcmVpZ25fc2VydmVyKSBHRVRTVFJVQ1QodHVwbGUpOworCQlp ZiAob2JqZWN0X2NoZWNrKQorCQkJb2JqZWN0X2NoZWNrKGlzdG10LCB0dXBsZSk7CiAKIAkJ LyoKIAkJICogR2V0IG93bmVyIElEIGFuZCB3b3JraW5nIGNvcHkgb2YgZXhpc3RpbmcgQUNM LiBJZiB0aGVyZSdzIG5vIEFDTCwKIAkJICogc3Vic3RpdHV0ZSB0aGUgcHJvcGVyIGRlZmF1 bHQuCiAJCSAqLwotCQlvd25lcklkID0gcGdfc2VydmVyX3R1cGxlLT5zcnZvd25lcjsKLQkJ YWNsRGF0dW0gPSBTeXNDYWNoZUdldEF0dHIoRk9SRUlHTlNFUlZFUk9JRCwgdHVwbGUsCi0J CQkJCQkJCSAgIEFudW1fcGdfZm9yZWlnbl9zZXJ2ZXJfc3J2YWNsLAorCQlvd25lcklkID0g RGF0dW1HZXRPYmplY3RJZChTeXNDYWNoZUdldEF0dHIoY2FjaGVpZCwKKwkJCQkJCQkJCQkJ CSAgIHR1cGxlLAorCQkJCQkJCQkJCQkJICAgZ2V0X29iamVjdF9hdHRudW1fb3duZXIoY2xh c3NpZCksCisJCQkJCQkJCQkJCQkgICAmaXNOdWxsKSk7CisJCUFzc2VydCghaXNOdWxsKTsK KwkJYWNsRGF0dW0gPSBTeXNDYWNoZUdldEF0dHIoY2FjaGVpZCwKKwkJCQkJCQkJICAgdHVw bGUsCisJCQkJCQkJCSAgIGdldF9vYmplY3RfYXR0bnVtX2FjbChjbGFzc2lkKSwKIAkJCQkJ CQkJICAgJmlzTnVsbCk7CiAJCWlmIChpc051bGwpCiAJCXsKLQkJCW9sZF9hY2wgPSBhY2xk ZWZhdWx0KE9CSkVDVF9GT1JFSUdOX1NFUlZFUiwgb3duZXJJZCk7CisJCQlvbGRfYWNsID0g YWNsZGVmYXVsdChnZXRfb2JqZWN0X3R5cGUoY2xhc3NpZCwgb2JqZWN0aWQpLCBvd25lcklk KTsKIAkJCS8qIFRoZXJlIGFyZSBubyBvbGQgbWVtYmVyIHJvbGVzIGFjY29yZGluZyB0byB0 aGUgY2F0YWxvZ3MgKi8KIAkJCW5vbGRtZW1iZXJzID0gMDsKIAkJCW9sZG1lbWJlcnMgPSBO VUxMOwpAQCAtMjQzNiwxMjUgKzIyMDYsMTAgQEAgRXhlY0dyYW50X0ZvcmVpZ25TZXJ2ZXIo SW50ZXJuYWxHcmFudCAqaXN0bXQpCiAJCQkJCQkJb2xkX2FjbCwgb3duZXJJZCwKIAkJCQkJ CQkmZ3JhbnRvcklkLCAmYXZhaWxfZ29wdGlvbnMpOwogCi0JCS8qCi0JCSAqIFJlc3RyaWN0 IHRoZSBwcml2aWxlZ2VzIHRvIHdoYXQgd2UgY2FuIGFjdHVhbGx5IGdyYW50LCBhbmQgZW1p dCB0aGUKLQkJICogc3RhbmRhcmRzLW1hbmRhdGVkIHdhcm5pbmcgYW5kIGVycm9yIG1lc3Nh Z2VzLgotCQkgKi8KLQkJdGhpc19wcml2aWxlZ2VzID0KLQkJCXJlc3RyaWN0X2FuZF9jaGVj a19ncmFudChpc3RtdC0+aXNfZ3JhbnQsIGF2YWlsX2dvcHRpb25zLAotCQkJCQkJCQkJIGlz dG10LT5hbGxfcHJpdnMsIGlzdG10LT5wcml2aWxlZ2VzLAotCQkJCQkJCQkJIHNydmlkLCBn cmFudG9ySWQsIE9CSkVDVF9GT1JFSUdOX1NFUlZFUiwKLQkJCQkJCQkJCSBOYW1lU3RyKHBn X3NlcnZlcl90dXBsZS0+c3J2bmFtZSksCi0JCQkJCQkJCQkgMCwgTlVMTCk7Ci0KLQkJLyoK LQkJICogR2VuZXJhdGUgbmV3IEFDTC4KLQkJICovCi0JCW5ld19hY2wgPSBtZXJnZV9hY2xf d2l0aF9ncmFudChvbGRfYWNsLCBpc3RtdC0+aXNfZ3JhbnQsCi0JCQkJCQkJCQkgICBpc3Rt dC0+Z3JhbnRfb3B0aW9uLCBpc3RtdC0+YmVoYXZpb3IsCi0JCQkJCQkJCQkgICBpc3RtdC0+ Z3JhbnRlZXMsIHRoaXNfcHJpdmlsZWdlcywKLQkJCQkJCQkJCSAgIGdyYW50b3JJZCwgb3du ZXJJZCk7Ci0KLQkJLyoKLQkJICogV2UgbmVlZCB0aGUgbWVtYmVycyBvZiBib3RoIG9sZCBh bmQgbmV3IEFDTHMgc28gd2UgY2FuIGNvcnJlY3QgdGhlCi0JCSAqIHNoYXJlZCBkZXBlbmRl bmN5IGluZm9ybWF0aW9uLgotCQkgKi8KLQkJbm5ld21lbWJlcnMgPSBhY2xtZW1iZXJzKG5l d19hY2wsICZuZXdtZW1iZXJzKTsKLQotCQkvKiBmaW5pc2hlZCBidWlsZGluZyBuZXcgQUNM IHZhbHVlLCBub3cgaW5zZXJ0IGl0ICovCi0JCXJlcGxhY2VzW0FudW1fcGdfZm9yZWlnbl9z ZXJ2ZXJfc3J2YWNsIC0gMV0gPSB0cnVlOwotCQl2YWx1ZXNbQW51bV9wZ19mb3JlaWduX3Nl cnZlcl9zcnZhY2wgLSAxXSA9IFBvaW50ZXJHZXREYXR1bShuZXdfYWNsKTsKLQotCQluZXd0 dXBsZSA9IGhlYXBfbW9kaWZ5X3R1cGxlKHR1cGxlLCBSZWxhdGlvbkdldERlc2NyKHJlbGF0 aW9uKSwgdmFsdWVzLAotCQkJCQkJCQkJIG51bGxzLCByZXBsYWNlcyk7Ci0KLQkJQ2F0YWxv Z1R1cGxlVXBkYXRlKHJlbGF0aW9uLCAmbmV3dHVwbGUtPnRfc2VsZiwgbmV3dHVwbGUpOwot Ci0JCS8qIFVwZGF0ZSBpbml0aWFsIHByaXZpbGVnZXMgZm9yIGV4dGVuc2lvbnMgKi8KLQkJ cmVjb3JkRXh0ZW5zaW9uSW5pdFByaXYoc3J2aWQsIEZvcmVpZ25TZXJ2ZXJSZWxhdGlvbklk LCAwLCBuZXdfYWNsKTsKLQotCQkvKiBVcGRhdGUgdGhlIHNoYXJlZCBkZXBlbmRlbmN5IEFD TCBpbmZvICovCi0JCXVwZGF0ZUFjbERlcGVuZGVuY2llcyhGb3JlaWduU2VydmVyUmVsYXRp b25JZCwKLQkJCQkJCQkgIHBnX3NlcnZlcl90dXBsZS0+b2lkLCAwLAotCQkJCQkJCSAgb3du ZXJJZCwKLQkJCQkJCQkgIG5vbGRtZW1iZXJzLCBvbGRtZW1iZXJzLAotCQkJCQkJCSAgbm5l d21lbWJlcnMsIG5ld21lbWJlcnMpOwotCi0JCVJlbGVhc2VTeXNDYWNoZSh0dXBsZSk7Ci0K LQkJcGZyZWUobmV3X2FjbCk7Ci0KLQkJLyogcHJldmVudCBlcnJvciB3aGVuIHByb2Nlc3Np bmcgZHVwbGljYXRlIG9iamVjdHMgKi8KLQkJQ29tbWFuZENvdW50ZXJJbmNyZW1lbnQoKTsK LQl9Ci0KLQl0YWJsZV9jbG9zZShyZWxhdGlvbiwgUm93RXhjbHVzaXZlTG9jayk7Ci19Ci0K LXN0YXRpYyB2b2lkCi1FeGVjR3JhbnRfRnVuY3Rpb24oSW50ZXJuYWxHcmFudCAqaXN0bXQp Ci17Ci0JUmVsYXRpb24JcmVsYXRpb247Ci0JTGlzdENlbGwgICAqY2VsbDsKLQotCWlmIChp c3RtdC0+YWxsX3ByaXZzICYmIGlzdG10LT5wcml2aWxlZ2VzID09IEFDTF9OT19SSUdIVFMp Ci0JCWlzdG10LT5wcml2aWxlZ2VzID0gQUNMX0FMTF9SSUdIVFNfRlVOQ1RJT047Ci0KLQly ZWxhdGlvbiA9IHRhYmxlX29wZW4oUHJvY2VkdXJlUmVsYXRpb25JZCwgUm93RXhjbHVzaXZl TG9jayk7Ci0KLQlmb3JlYWNoKGNlbGwsIGlzdG10LT5vYmplY3RzKQotCXsKLQkJT2lkCQkJ ZnVuY0lkID0gbGZpcnN0X29pZChjZWxsKTsKLQkJRm9ybV9wZ19wcm9jIHBnX3Byb2NfdHVw bGU7Ci0JCURhdHVtCQlhY2xEYXR1bTsKLQkJYm9vbAkJaXNOdWxsOwotCQlBY2xNb2RlCQlh dmFpbF9nb3B0aW9uczsKLQkJQWNsTW9kZQkJdGhpc19wcml2aWxlZ2VzOwotCQlBY2wJCSAg ICpvbGRfYWNsOwotCQlBY2wJCSAgICpuZXdfYWNsOwotCQlPaWQJCQlncmFudG9ySWQ7Ci0J CU9pZAkJCW93bmVySWQ7Ci0JCUhlYXBUdXBsZQl0dXBsZTsKLQkJSGVhcFR1cGxlCW5ld3R1 cGxlOwotCQlEYXR1bQkJdmFsdWVzW05hdHRzX3BnX3Byb2NdID0gezB9OwotCQlib29sCQlu dWxsc1tOYXR0c19wZ19wcm9jXSA9IHswfTsKLQkJYm9vbAkJcmVwbGFjZXNbTmF0dHNfcGdf cHJvY10gPSB7MH07Ci0JCWludAkJCW5vbGRtZW1iZXJzOwotCQlpbnQJCQlubmV3bWVtYmVy czsKLQkJT2lkCQkgICAqb2xkbWVtYmVyczsKLQkJT2lkCQkgICAqbmV3bWVtYmVyczsKLQot CQl0dXBsZSA9IFNlYXJjaFN5c0NhY2hlMShQUk9DT0lELCBPYmplY3RJZEdldERhdHVtKGZ1 bmNJZCkpOwotCQlpZiAoIUhlYXBUdXBsZUlzVmFsaWQodHVwbGUpKQotCQkJZWxvZyhFUlJP UiwgImNhY2hlIGxvb2t1cCBmYWlsZWQgZm9yIGZ1bmN0aW9uICV1IiwgZnVuY0lkKTsKLQot CQlwZ19wcm9jX3R1cGxlID0gKEZvcm1fcGdfcHJvYykgR0VUU1RSVUNUKHR1cGxlKTsKLQot CQkvKgotCQkgKiBHZXQgb3duZXIgSUQgYW5kIHdvcmtpbmcgY29weSBvZiBleGlzdGluZyBB Q0wuIElmIHRoZXJlJ3Mgbm8gQUNMLAotCQkgKiBzdWJzdGl0dXRlIHRoZSBwcm9wZXIgZGVm YXVsdC4KLQkJICovCi0JCW93bmVySWQgPSBwZ19wcm9jX3R1cGxlLT5wcm9vd25lcjsKLQkJ YWNsRGF0dW0gPSBTeXNDYWNoZUdldEF0dHIoUFJPQ09JRCwgdHVwbGUsIEFudW1fcGdfcHJv Y19wcm9hY2wsCi0JCQkJCQkJCSAgICZpc051bGwpOwotCQlpZiAoaXNOdWxsKQotCQl7Ci0J CQlvbGRfYWNsID0gYWNsZGVmYXVsdChPQkpFQ1RfRlVOQ1RJT04sIG93bmVySWQpOwotCQkJ LyogVGhlcmUgYXJlIG5vIG9sZCBtZW1iZXIgcm9sZXMgYWNjb3JkaW5nIHRvIHRoZSBjYXRh bG9ncyAqLwotCQkJbm9sZG1lbWJlcnMgPSAwOwotCQkJb2xkbWVtYmVycyA9IE5VTEw7Ci0J CX0KLQkJZWxzZQotCQl7Ci0JCQlvbGRfYWNsID0gRGF0dW1HZXRBY2xQQ29weShhY2xEYXR1 bSk7Ci0JCQkvKiBHZXQgdGhlIHJvbGVzIG1lbnRpb25lZCBpbiB0aGUgZXhpc3RpbmcgQUNM ICovCi0JCQlub2xkbWVtYmVycyA9IGFjbG1lbWJlcnMob2xkX2FjbCwgJm9sZG1lbWJlcnMp OwotCQl9Ci0KLQkJLyogRGV0ZXJtaW5lIElEIHRvIGRvIHRoZSBncmFudCBhcywgYW5kIGF2 YWlsYWJsZSBncmFudCBvcHRpb25zICovCi0JCXNlbGVjdF9iZXN0X2dyYW50b3IoR2V0VXNl cklkKCksIGlzdG10LT5wcml2aWxlZ2VzLAotCQkJCQkJCW9sZF9hY2wsIG93bmVySWQsCi0J CQkJCQkJJmdyYW50b3JJZCwgJmF2YWlsX2dvcHRpb25zKTsKKwkJbmFtZURhdHVtID0gU3lz Q2FjaGVHZXRBdHRyKGNhY2hlaWQsIHR1cGxlLAorCQkJCQkJCQkJZ2V0X29iamVjdF9hdHRu dW1fbmFtZShjbGFzc2lkKSwKKwkJCQkJCQkJCSZpc051bGwpOworCQlBc3NlcnQoIWlzTnVs bCk7CiAKIAkJLyoKIAkJICogUmVzdHJpY3QgdGhlIHByaXZpbGVnZXMgdG8gd2hhdCB3ZSBj YW4gYWN0dWFsbHkgZ3JhbnQsIGFuZCBlbWl0IHRoZQpAQCAtMjU2Myw4ICsyMjE4LDggQEAg RXhlY0dyYW50X0Z1bmN0aW9uKEludGVybmFsR3JhbnQgKmlzdG10KQogCQl0aGlzX3ByaXZp bGVnZXMgPQogCQkJcmVzdHJpY3RfYW5kX2NoZWNrX2dyYW50KGlzdG10LT5pc19ncmFudCwg YXZhaWxfZ29wdGlvbnMsCiAJCQkJCQkJCQkgaXN0bXQtPmFsbF9wcml2cywgaXN0bXQtPnBy aXZpbGVnZXMsCi0JCQkJCQkJCQkgZnVuY0lkLCBncmFudG9ySWQsIE9CSkVDVF9GVU5DVElP TiwKLQkJCQkJCQkJCSBOYW1lU3RyKHBnX3Byb2NfdHVwbGUtPnByb25hbWUpLAorCQkJCQkJ CQkJIG9iamVjdGlkLCBncmFudG9ySWQsIGdldF9vYmplY3RfdHlwZShjbGFzc2lkLCBvYmpl Y3RpZCksCisJCQkJCQkJCQkgTmFtZVN0cigqRGF0dW1HZXROYW1lKG5hbWVEYXR1bSkpLAog CQkJCQkJCQkJIDAsIE5VTEwpOwogCiAJCS8qCkBAIC0yNTgyLDggKzIyMzcsOCBAQCBFeGVj R3JhbnRfRnVuY3Rpb24oSW50ZXJuYWxHcmFudCAqaXN0bXQpCiAJCW5uZXdtZW1iZXJzID0g YWNsbWVtYmVycyhuZXdfYWNsLCAmbmV3bWVtYmVycyk7CiAKIAkJLyogZmluaXNoZWQgYnVp bGRpbmcgbmV3IEFDTCB2YWx1ZSwgbm93IGluc2VydCBpdCAqLwotCQlyZXBsYWNlc1tBbnVt X3BnX3Byb2NfcHJvYWNsIC0gMV0gPSB0cnVlOwotCQl2YWx1ZXNbQW51bV9wZ19wcm9jX3By b2FjbCAtIDFdID0gUG9pbnRlckdldERhdHVtKG5ld19hY2wpOworCQlyZXBsYWNlc1tnZXRf b2JqZWN0X2F0dG51bV9hY2woY2xhc3NpZCkgLSAxXSA9IHRydWU7CisJCXZhbHVlc1tnZXRf b2JqZWN0X2F0dG51bV9hY2woY2xhc3NpZCkgLSAxXSA9IFBvaW50ZXJHZXREYXR1bShuZXdf YWNsKTsKIAogCQluZXd0dXBsZSA9IGhlYXBfbW9kaWZ5X3R1cGxlKHR1cGxlLCBSZWxhdGlv bkdldERlc2NyKHJlbGF0aW9uKSwgdmFsdWVzLAogCQkJCQkJCQkJIG51bGxzLCByZXBsYWNl cyk7CkBAIC0yNTkxLDEwICsyMjQ2LDExIEBAIEV4ZWNHcmFudF9GdW5jdGlvbihJbnRlcm5h bEdyYW50ICppc3RtdCkKIAkJQ2F0YWxvZ1R1cGxlVXBkYXRlKHJlbGF0aW9uLCAmbmV3dHVw bGUtPnRfc2VsZiwgbmV3dHVwbGUpOwogCiAJCS8qIFVwZGF0ZSBpbml0aWFsIHByaXZpbGVn ZXMgZm9yIGV4dGVuc2lvbnMgKi8KLQkJcmVjb3JkRXh0ZW5zaW9uSW5pdFByaXYoZnVuY0lk LCBQcm9jZWR1cmVSZWxhdGlvbklkLCAwLCBuZXdfYWNsKTsKKwkJcmVjb3JkRXh0ZW5zaW9u SW5pdFByaXYob2JqZWN0aWQsIGNsYXNzaWQsIDAsIG5ld19hY2wpOwogCiAJCS8qIFVwZGF0 ZSB0aGUgc2hhcmVkIGRlcGVuZGVuY3kgQUNMIGluZm8gKi8KLQkJdXBkYXRlQWNsRGVwZW5k ZW5jaWVzKFByb2NlZHVyZVJlbGF0aW9uSWQsIGZ1bmNJZCwgMCwKKwkJdXBkYXRlQWNsRGVw ZW5kZW5jaWVzKGNsYXNzaWQsCisJCQkJCQkJICBvYmplY3RpZCwgMCwKIAkJCQkJCQkgIG93 bmVySWQsCiAJCQkJCQkJICBub2xkbWVtYmVycywgb2xkbWVtYmVycywKIAkJCQkJCQkgIG5u ZXdtZW1iZXJzLCBuZXdtZW1iZXJzKTsKQEAgLTI2MTEsMTMwICsyMjY3LDE5IEBAIEV4ZWNH cmFudF9GdW5jdGlvbihJbnRlcm5hbEdyYW50ICppc3RtdCkKIH0KIAogc3RhdGljIHZvaWQK LUV4ZWNHcmFudF9MYW5ndWFnZShJbnRlcm5hbEdyYW50ICppc3RtdCkKK0V4ZWNHcmFudF9M YW5ndWFnZV9jaGVjayhJbnRlcm5hbEdyYW50ICppc3RtdCwgSGVhcFR1cGxlIHR1cGxlKQog ewotCVJlbGF0aW9uCXJlbGF0aW9uOwotCUxpc3RDZWxsICAgKmNlbGw7Ci0KLQlpZiAoaXN0 bXQtPmFsbF9wcml2cyAmJiBpc3RtdC0+cHJpdmlsZWdlcyA9PSBBQ0xfTk9fUklHSFRTKQot CQlpc3RtdC0+cHJpdmlsZWdlcyA9IEFDTF9BTExfUklHSFRTX0xBTkdVQUdFOwotCi0JcmVs YXRpb24gPSB0YWJsZV9vcGVuKExhbmd1YWdlUmVsYXRpb25JZCwgUm93RXhjbHVzaXZlTG9j ayk7Ci0KLQlmb3JlYWNoKGNlbGwsIGlzdG10LT5vYmplY3RzKQotCXsKLQkJT2lkCQkJbGFu Z0lkID0gbGZpcnN0X29pZChjZWxsKTsKLQkJRm9ybV9wZ19sYW5ndWFnZSBwZ19sYW5ndWFn ZV90dXBsZTsKLQkJRGF0dW0JCWFjbERhdHVtOwotCQlib29sCQlpc051bGw7Ci0JCUFjbE1v ZGUJCWF2YWlsX2dvcHRpb25zOwotCQlBY2xNb2RlCQl0aGlzX3ByaXZpbGVnZXM7Ci0JCUFj bAkJICAgKm9sZF9hY2w7Ci0JCUFjbAkJICAgKm5ld19hY2w7Ci0JCU9pZAkJCWdyYW50b3JJ ZDsKLQkJT2lkCQkJb3duZXJJZDsKLQkJSGVhcFR1cGxlCXR1cGxlOwotCQlIZWFwVHVwbGUJ bmV3dHVwbGU7Ci0JCURhdHVtCQl2YWx1ZXNbTmF0dHNfcGdfbGFuZ3VhZ2VdID0gezB9Owot CQlib29sCQludWxsc1tOYXR0c19wZ19sYW5ndWFnZV0gPSB7MH07Ci0JCWJvb2wJCXJlcGxh Y2VzW05hdHRzX3BnX2xhbmd1YWdlXSA9IHswfTsKLQkJaW50CQkJbm9sZG1lbWJlcnM7Ci0J CWludAkJCW5uZXdtZW1iZXJzOwotCQlPaWQJCSAgICpvbGRtZW1iZXJzOwotCQlPaWQJCSAg ICpuZXdtZW1iZXJzOwotCi0JCXR1cGxlID0gU2VhcmNoU3lzQ2FjaGUxKExBTkdPSUQsIE9i amVjdElkR2V0RGF0dW0obGFuZ0lkKSk7Ci0JCWlmICghSGVhcFR1cGxlSXNWYWxpZCh0dXBs ZSkpCi0JCQllbG9nKEVSUk9SLCAiY2FjaGUgbG9va3VwIGZhaWxlZCBmb3IgbGFuZ3VhZ2Ug JXUiLCBsYW5nSWQpOwotCi0JCXBnX2xhbmd1YWdlX3R1cGxlID0gKEZvcm1fcGdfbGFuZ3Vh Z2UpIEdFVFNUUlVDVCh0dXBsZSk7Ci0KLQkJaWYgKCFwZ19sYW5ndWFnZV90dXBsZS0+bGFu cGx0cnVzdGVkKQotCQkJZXJlcG9ydChFUlJPUiwKLQkJCQkJKGVycmNvZGUoRVJSQ09ERV9X Uk9OR19PQkpFQ1RfVFlQRSksCi0JCQkJCSBlcnJtc2coImxhbmd1YWdlIFwiJXNcIiBpcyBu b3QgdHJ1c3RlZCIsCi0JCQkJCQkJTmFtZVN0cihwZ19sYW5ndWFnZV90dXBsZS0+bGFubmFt ZSkpLAotCQkJCQkgZXJyZGV0YWlsKCJHUkFOVCBhbmQgUkVWT0tFIGFyZSBub3QgYWxsb3dl ZCBvbiB1bnRydXN0ZWQgbGFuZ3VhZ2VzLCAiCi0JCQkJCQkJICAgImJlY2F1c2Ugb25seSBz dXBlcnVzZXJzIGNhbiB1c2UgdW50cnVzdGVkIGxhbmd1YWdlcy4iKSkpOwotCi0JCS8qCi0J CSAqIEdldCBvd25lciBJRCBhbmQgd29ya2luZyBjb3B5IG9mIGV4aXN0aW5nIEFDTC4gSWYg dGhlcmUncyBubyBBQ0wsCi0JCSAqIHN1YnN0aXR1dGUgdGhlIHByb3BlciBkZWZhdWx0Lgot CQkgKi8KLQkJb3duZXJJZCA9IHBnX2xhbmd1YWdlX3R1cGxlLT5sYW5vd25lcjsKLQkJYWNs RGF0dW0gPSBTeXNDYWNoZUdldEF0dHIoTEFOR05BTUUsIHR1cGxlLCBBbnVtX3BnX2xhbmd1 YWdlX2xhbmFjbCwKLQkJCQkJCQkJICAgJmlzTnVsbCk7Ci0JCWlmIChpc051bGwpCi0JCXsK LQkJCW9sZF9hY2wgPSBhY2xkZWZhdWx0KE9CSkVDVF9MQU5HVUFHRSwgb3duZXJJZCk7Ci0J CQkvKiBUaGVyZSBhcmUgbm8gb2xkIG1lbWJlciByb2xlcyBhY2NvcmRpbmcgdG8gdGhlIGNh dGFsb2dzICovCi0JCQlub2xkbWVtYmVycyA9IDA7Ci0JCQlvbGRtZW1iZXJzID0gTlVMTDsK LQkJfQotCQllbHNlCi0JCXsKLQkJCW9sZF9hY2wgPSBEYXR1bUdldEFjbFBDb3B5KGFjbERh dHVtKTsKLQkJCS8qIEdldCB0aGUgcm9sZXMgbWVudGlvbmVkIGluIHRoZSBleGlzdGluZyBB Q0wgKi8KLQkJCW5vbGRtZW1iZXJzID0gYWNsbWVtYmVycyhvbGRfYWNsLCAmb2xkbWVtYmVy cyk7Ci0JCX0KLQotCQkvKiBEZXRlcm1pbmUgSUQgdG8gZG8gdGhlIGdyYW50IGFzLCBhbmQg YXZhaWxhYmxlIGdyYW50IG9wdGlvbnMgKi8KLQkJc2VsZWN0X2Jlc3RfZ3JhbnRvcihHZXRV c2VySWQoKSwgaXN0bXQtPnByaXZpbGVnZXMsCi0JCQkJCQkJb2xkX2FjbCwgb3duZXJJZCwK LQkJCQkJCQkmZ3JhbnRvcklkLCAmYXZhaWxfZ29wdGlvbnMpOwotCi0JCS8qCi0JCSAqIFJl c3RyaWN0IHRoZSBwcml2aWxlZ2VzIHRvIHdoYXQgd2UgY2FuIGFjdHVhbGx5IGdyYW50LCBh bmQgZW1pdCB0aGUKLQkJICogc3RhbmRhcmRzLW1hbmRhdGVkIHdhcm5pbmcgYW5kIGVycm9y IG1lc3NhZ2VzLgotCQkgKi8KLQkJdGhpc19wcml2aWxlZ2VzID0KLQkJCXJlc3RyaWN0X2Fu ZF9jaGVja19ncmFudChpc3RtdC0+aXNfZ3JhbnQsIGF2YWlsX2dvcHRpb25zLAotCQkJCQkJ CQkJIGlzdG10LT5hbGxfcHJpdnMsIGlzdG10LT5wcml2aWxlZ2VzLAotCQkJCQkJCQkJIGxh bmdJZCwgZ3JhbnRvcklkLCBPQkpFQ1RfTEFOR1VBR0UsCi0JCQkJCQkJCQkgTmFtZVN0cihw Z19sYW5ndWFnZV90dXBsZS0+bGFubmFtZSksCi0JCQkJCQkJCQkgMCwgTlVMTCk7Ci0KLQkJ LyoKLQkJICogR2VuZXJhdGUgbmV3IEFDTC4KLQkJICovCi0JCW5ld19hY2wgPSBtZXJnZV9h Y2xfd2l0aF9ncmFudChvbGRfYWNsLCBpc3RtdC0+aXNfZ3JhbnQsCi0JCQkJCQkJCQkgICBp c3RtdC0+Z3JhbnRfb3B0aW9uLCBpc3RtdC0+YmVoYXZpb3IsCi0JCQkJCQkJCQkgICBpc3Rt dC0+Z3JhbnRlZXMsIHRoaXNfcHJpdmlsZWdlcywKLQkJCQkJCQkJCSAgIGdyYW50b3JJZCwg b3duZXJJZCk7Ci0KLQkJLyoKLQkJICogV2UgbmVlZCB0aGUgbWVtYmVycyBvZiBib3RoIG9s ZCBhbmQgbmV3IEFDTHMgc28gd2UgY2FuIGNvcnJlY3QgdGhlCi0JCSAqIHNoYXJlZCBkZXBl bmRlbmN5IGluZm9ybWF0aW9uLgotCQkgKi8KLQkJbm5ld21lbWJlcnMgPSBhY2xtZW1iZXJz KG5ld19hY2wsICZuZXdtZW1iZXJzKTsKLQotCQkvKiBmaW5pc2hlZCBidWlsZGluZyBuZXcg QUNMIHZhbHVlLCBub3cgaW5zZXJ0IGl0ICovCi0JCXJlcGxhY2VzW0FudW1fcGdfbGFuZ3Vh Z2VfbGFuYWNsIC0gMV0gPSB0cnVlOwotCQl2YWx1ZXNbQW51bV9wZ19sYW5ndWFnZV9sYW5h Y2wgLSAxXSA9IFBvaW50ZXJHZXREYXR1bShuZXdfYWNsKTsKLQotCQluZXd0dXBsZSA9IGhl YXBfbW9kaWZ5X3R1cGxlKHR1cGxlLCBSZWxhdGlvbkdldERlc2NyKHJlbGF0aW9uKSwgdmFs dWVzLAotCQkJCQkJCQkJIG51bGxzLCByZXBsYWNlcyk7Ci0KLQkJQ2F0YWxvZ1R1cGxlVXBk YXRlKHJlbGF0aW9uLCAmbmV3dHVwbGUtPnRfc2VsZiwgbmV3dHVwbGUpOworCUZvcm1fcGdf bGFuZ3VhZ2UgcGdfbGFuZ3VhZ2VfdHVwbGU7CiAKLQkJLyogVXBkYXRlIGluaXRpYWwgcHJp dmlsZWdlcyBmb3IgZXh0ZW5zaW9ucyAqLwotCQlyZWNvcmRFeHRlbnNpb25Jbml0UHJpdihs YW5nSWQsIExhbmd1YWdlUmVsYXRpb25JZCwgMCwgbmV3X2FjbCk7Ci0KLQkJLyogVXBkYXRl IHRoZSBzaGFyZWQgZGVwZW5kZW5jeSBBQ0wgaW5mbyAqLwotCQl1cGRhdGVBY2xEZXBlbmRl bmNpZXMoTGFuZ3VhZ2VSZWxhdGlvbklkLCBwZ19sYW5ndWFnZV90dXBsZS0+b2lkLCAwLAot CQkJCQkJCSAgb3duZXJJZCwKLQkJCQkJCQkgIG5vbGRtZW1iZXJzLCBvbGRtZW1iZXJzLAot CQkJCQkJCSAgbm5ld21lbWJlcnMsIG5ld21lbWJlcnMpOwotCi0JCVJlbGVhc2VTeXNDYWNo ZSh0dXBsZSk7CisJcGdfbGFuZ3VhZ2VfdHVwbGUgPSAoRm9ybV9wZ19sYW5ndWFnZSkgR0VU U1RSVUNUKHR1cGxlKTsKIAotCQlwZnJlZShuZXdfYWNsKTsKLQotCQkvKiBwcmV2ZW50IGVy cm9yIHdoZW4gcHJvY2Vzc2luZyBkdXBsaWNhdGUgb2JqZWN0cyAqLwotCQlDb21tYW5kQ291 bnRlckluY3JlbWVudCgpOwotCX0KLQotCXRhYmxlX2Nsb3NlKHJlbGF0aW9uLCBSb3dFeGNs dXNpdmVMb2NrKTsKKwlpZiAoIXBnX2xhbmd1YWdlX3R1cGxlLT5sYW5wbHRydXN0ZWQpCisJ CWVyZXBvcnQoRVJST1IsCisJCQkJKGVycmNvZGUoRVJSQ09ERV9XUk9OR19PQkpFQ1RfVFlQ RSksCisJCQkJIGVycm1zZygibGFuZ3VhZ2UgXCIlc1wiIGlzIG5vdCB0cnVzdGVkIiwKKwkJ CQkJCU5hbWVTdHIocGdfbGFuZ3VhZ2VfdHVwbGUtPmxhbm5hbWUpKSwKKwkJCQkgZXJyZGV0 YWlsKCJHUkFOVCBhbmQgUkVWT0tFIGFyZSBub3QgYWxsb3dlZCBvbiB1bnRydXN0ZWQgbGFu Z3VhZ2VzLCAiCisJCQkJCQkgICAiYmVjYXVzZSBvbmx5IHN1cGVydXNlcnMgY2FuIHVzZSB1 bnRydXN0ZWQgbGFuZ3VhZ2VzLiIpKSk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC0yODc0LDM3 MiArMjQxOSwyNSBAQCBFeGVjR3JhbnRfTGFyZ2VvYmplY3QoSW50ZXJuYWxHcmFudCAqaXN0 bXQpCiB9CiAKIHN0YXRpYyB2b2lkCi1FeGVjR3JhbnRfTmFtZXNwYWNlKEludGVybmFsR3Jh bnQgKmlzdG10KQotewotCVJlbGF0aW9uCXJlbGF0aW9uOwotCUxpc3RDZWxsICAgKmNlbGw7 Ci0KLQlpZiAoaXN0bXQtPmFsbF9wcml2cyAmJiBpc3RtdC0+cHJpdmlsZWdlcyA9PSBBQ0xf Tk9fUklHSFRTKQotCQlpc3RtdC0+cHJpdmlsZWdlcyA9IEFDTF9BTExfUklHSFRTX1NDSEVN QTsKLQotCXJlbGF0aW9uID0gdGFibGVfb3BlbihOYW1lc3BhY2VSZWxhdGlvbklkLCBSb3dF eGNsdXNpdmVMb2NrKTsKLQotCWZvcmVhY2goY2VsbCwgaXN0bXQtPm9iamVjdHMpCi0Jewot CQlPaWQJCQluc3BpZCA9IGxmaXJzdF9vaWQoY2VsbCk7Ci0JCUZvcm1fcGdfbmFtZXNwYWNl IHBnX25hbWVzcGFjZV90dXBsZTsKLQkJRGF0dW0JCWFjbERhdHVtOwotCQlib29sCQlpc051 bGw7Ci0JCUFjbE1vZGUJCWF2YWlsX2dvcHRpb25zOwotCQlBY2xNb2RlCQl0aGlzX3ByaXZp bGVnZXM7Ci0JCUFjbAkJICAgKm9sZF9hY2w7Ci0JCUFjbAkJICAgKm5ld19hY2w7Ci0JCU9p ZAkJCWdyYW50b3JJZDsKLQkJT2lkCQkJb3duZXJJZDsKLQkJSGVhcFR1cGxlCXR1cGxlOwot CQlIZWFwVHVwbGUJbmV3dHVwbGU7Ci0JCURhdHVtCQl2YWx1ZXNbTmF0dHNfcGdfbmFtZXNw YWNlXSA9IHswfTsKLQkJYm9vbAkJbnVsbHNbTmF0dHNfcGdfbmFtZXNwYWNlXSA9IHswfTsK LQkJYm9vbAkJcmVwbGFjZXNbTmF0dHNfcGdfbmFtZXNwYWNlXSA9IHswfTsKLQkJaW50CQkJ bm9sZG1lbWJlcnM7Ci0JCWludAkJCW5uZXdtZW1iZXJzOwotCQlPaWQJCSAgICpvbGRtZW1i ZXJzOwotCQlPaWQJCSAgICpuZXdtZW1iZXJzOwotCi0JCXR1cGxlID0gU2VhcmNoU3lzQ2Fj aGUxKE5BTUVTUEFDRU9JRCwgT2JqZWN0SWRHZXREYXR1bShuc3BpZCkpOwotCQlpZiAoIUhl YXBUdXBsZUlzVmFsaWQodHVwbGUpKQotCQkJZWxvZyhFUlJPUiwgImNhY2hlIGxvb2t1cCBm YWlsZWQgZm9yIG5hbWVzcGFjZSAldSIsIG5zcGlkKTsKLQotCQlwZ19uYW1lc3BhY2VfdHVw bGUgPSAoRm9ybV9wZ19uYW1lc3BhY2UpIEdFVFNUUlVDVCh0dXBsZSk7Ci0KLQkJLyoKLQkJ ICogR2V0IG93bmVyIElEIGFuZCB3b3JraW5nIGNvcHkgb2YgZXhpc3RpbmcgQUNMLiBJZiB0 aGVyZSdzIG5vIEFDTCwKLQkJICogc3Vic3RpdHV0ZSB0aGUgcHJvcGVyIGRlZmF1bHQuCi0J CSAqLwotCQlvd25lcklkID0gcGdfbmFtZXNwYWNlX3R1cGxlLT5uc3Bvd25lcjsKLQkJYWNs RGF0dW0gPSBTeXNDYWNoZUdldEF0dHIoTkFNRVNQQUNFTkFNRSwgdHVwbGUsCi0JCQkJCQkJ CSAgIEFudW1fcGdfbmFtZXNwYWNlX25zcGFjbCwKLQkJCQkJCQkJICAgJmlzTnVsbCk7Ci0J CWlmIChpc051bGwpCi0JCXsKLQkJCW9sZF9hY2wgPSBhY2xkZWZhdWx0KE9CSkVDVF9TQ0hF TUEsIG93bmVySWQpOwotCQkJLyogVGhlcmUgYXJlIG5vIG9sZCBtZW1iZXIgcm9sZXMgYWNj b3JkaW5nIHRvIHRoZSBjYXRhbG9ncyAqLwotCQkJbm9sZG1lbWJlcnMgPSAwOwotCQkJb2xk bWVtYmVycyA9IE5VTEw7Ci0JCX0KLQkJZWxzZQotCQl7Ci0JCQlvbGRfYWNsID0gRGF0dW1H ZXRBY2xQQ29weShhY2xEYXR1bSk7Ci0JCQkvKiBHZXQgdGhlIHJvbGVzIG1lbnRpb25lZCBp biB0aGUgZXhpc3RpbmcgQUNMICovCi0JCQlub2xkbWVtYmVycyA9IGFjbG1lbWJlcnMob2xk X2FjbCwgJm9sZG1lbWJlcnMpOwotCQl9Ci0KLQkJLyogRGV0ZXJtaW5lIElEIHRvIGRvIHRo ZSBncmFudCBhcywgYW5kIGF2YWlsYWJsZSBncmFudCBvcHRpb25zICovCi0JCXNlbGVjdF9i ZXN0X2dyYW50b3IoR2V0VXNlcklkKCksIGlzdG10LT5wcml2aWxlZ2VzLAotCQkJCQkJCW9s ZF9hY2wsIG93bmVySWQsCi0JCQkJCQkJJmdyYW50b3JJZCwgJmF2YWlsX2dvcHRpb25zKTsK LQotCQkvKgotCQkgKiBSZXN0cmljdCB0aGUgcHJpdmlsZWdlcyB0byB3aGF0IHdlIGNhbiBh Y3R1YWxseSBncmFudCwgYW5kIGVtaXQgdGhlCi0JCSAqIHN0YW5kYXJkcy1tYW5kYXRlZCB3 YXJuaW5nIGFuZCBlcnJvciBtZXNzYWdlcy4KLQkJICovCi0JCXRoaXNfcHJpdmlsZWdlcyA9 Ci0JCQlyZXN0cmljdF9hbmRfY2hlY2tfZ3JhbnQoaXN0bXQtPmlzX2dyYW50LCBhdmFpbF9n b3B0aW9ucywKLQkJCQkJCQkJCSBpc3RtdC0+YWxsX3ByaXZzLCBpc3RtdC0+cHJpdmlsZWdl cywKLQkJCQkJCQkJCSBuc3BpZCwgZ3JhbnRvcklkLCBPQkpFQ1RfU0NIRU1BLAotCQkJCQkJ CQkJIE5hbWVTdHIocGdfbmFtZXNwYWNlX3R1cGxlLT5uc3BuYW1lKSwKLQkJCQkJCQkJCSAw LCBOVUxMKTsKLQotCQkvKgotCQkgKiBHZW5lcmF0ZSBuZXcgQUNMLgotCQkgKi8KLQkJbmV3 X2FjbCA9IG1lcmdlX2FjbF93aXRoX2dyYW50KG9sZF9hY2wsIGlzdG10LT5pc19ncmFudCwK LQkJCQkJCQkJCSAgIGlzdG10LT5ncmFudF9vcHRpb24sIGlzdG10LT5iZWhhdmlvciwKLQkJ CQkJCQkJCSAgIGlzdG10LT5ncmFudGVlcywgdGhpc19wcml2aWxlZ2VzLAotCQkJCQkJCQkJ ICAgZ3JhbnRvcklkLCBvd25lcklkKTsKLQotCQkvKgotCQkgKiBXZSBuZWVkIHRoZSBtZW1i ZXJzIG9mIGJvdGggb2xkIGFuZCBuZXcgQUNMcyBzbyB3ZSBjYW4gY29ycmVjdCB0aGUKLQkJ ICogc2hhcmVkIGRlcGVuZGVuY3kgaW5mb3JtYXRpb24uCi0JCSAqLwotCQlubmV3bWVtYmVy cyA9IGFjbG1lbWJlcnMobmV3X2FjbCwgJm5ld21lbWJlcnMpOwotCi0JCS8qIGZpbmlzaGVk IGJ1aWxkaW5nIG5ldyBBQ0wgdmFsdWUsIG5vdyBpbnNlcnQgaXQgKi8KLQkJcmVwbGFjZXNb QW51bV9wZ19uYW1lc3BhY2VfbnNwYWNsIC0gMV0gPSB0cnVlOwotCQl2YWx1ZXNbQW51bV9w Z19uYW1lc3BhY2VfbnNwYWNsIC0gMV0gPSBQb2ludGVyR2V0RGF0dW0obmV3X2FjbCk7Ci0K LQkJbmV3dHVwbGUgPSBoZWFwX21vZGlmeV90dXBsZSh0dXBsZSwgUmVsYXRpb25HZXREZXNj cihyZWxhdGlvbiksIHZhbHVlcywKLQkJCQkJCQkJCSBudWxscywgcmVwbGFjZXMpOwotCi0J CUNhdGFsb2dUdXBsZVVwZGF0ZShyZWxhdGlvbiwgJm5ld3R1cGxlLT50X3NlbGYsIG5ld3R1 cGxlKTsKLQotCQkvKiBVcGRhdGUgaW5pdGlhbCBwcml2aWxlZ2VzIGZvciBleHRlbnNpb25z ICovCi0JCXJlY29yZEV4dGVuc2lvbkluaXRQcml2KG5zcGlkLCBOYW1lc3BhY2VSZWxhdGlv bklkLCAwLCBuZXdfYWNsKTsKLQotCQkvKiBVcGRhdGUgdGhlIHNoYXJlZCBkZXBlbmRlbmN5 IEFDTCBpbmZvICovCi0JCXVwZGF0ZUFjbERlcGVuZGVuY2llcyhOYW1lc3BhY2VSZWxhdGlv bklkLCBwZ19uYW1lc3BhY2VfdHVwbGUtPm9pZCwgMCwKLQkJCQkJCQkgIG93bmVySWQsCi0J CQkJCQkJICBub2xkbWVtYmVycywgb2xkbWVtYmVycywKLQkJCQkJCQkgIG5uZXdtZW1iZXJz LCBuZXdtZW1iZXJzKTsKLQotCQlSZWxlYXNlU3lzQ2FjaGUodHVwbGUpOwotCi0JCXBmcmVl KG5ld19hY2wpOwotCi0JCS8qIHByZXZlbnQgZXJyb3Igd2hlbiBwcm9jZXNzaW5nIGR1cGxp Y2F0ZSBvYmplY3RzICovCi0JCUNvbW1hbmRDb3VudGVySW5jcmVtZW50KCk7Ci0JfQotCi0J dGFibGVfY2xvc2UocmVsYXRpb24sIFJvd0V4Y2x1c2l2ZUxvY2spOwotfQotCi1zdGF0aWMg dm9pZAotRXhlY0dyYW50X1RhYmxlc3BhY2UoSW50ZXJuYWxHcmFudCAqaXN0bXQpCitFeGVj R3JhbnRfVHlwZV9jaGVjayhJbnRlcm5hbEdyYW50ICppc3RtdCwgSGVhcFR1cGxlIHR1cGxl KQogewotCVJlbGF0aW9uCXJlbGF0aW9uOwotCUxpc3RDZWxsICAgKmNlbGw7CisJRm9ybV9w Z190eXBlIHBnX3R5cGVfdHVwbGU7CiAKLQlpZiAoaXN0bXQtPmFsbF9wcml2cyAmJiBpc3Rt dC0+cHJpdmlsZWdlcyA9PSBBQ0xfTk9fUklHSFRTKQotCQlpc3RtdC0+cHJpdmlsZWdlcyA9 IEFDTF9BTExfUklHSFRTX1RBQkxFU1BBQ0U7Ci0KLQlyZWxhdGlvbiA9IHRhYmxlX29wZW4o VGFibGVTcGFjZVJlbGF0aW9uSWQsIFJvd0V4Y2x1c2l2ZUxvY2spOwotCi0JZm9yZWFjaChj ZWxsLCBpc3RtdC0+b2JqZWN0cykKLQl7Ci0JCU9pZAkJCXRibElkID0gbGZpcnN0X29pZChj ZWxsKTsKLQkJRm9ybV9wZ190YWJsZXNwYWNlIHBnX3RhYmxlc3BhY2VfdHVwbGU7Ci0JCURh dHVtCQlhY2xEYXR1bTsKLQkJYm9vbAkJaXNOdWxsOwotCQlBY2xNb2RlCQlhdmFpbF9nb3B0 aW9uczsKLQkJQWNsTW9kZQkJdGhpc19wcml2aWxlZ2VzOwotCQlBY2wJCSAgICpvbGRfYWNs OwotCQlBY2wJCSAgICpuZXdfYWNsOwotCQlPaWQJCQlncmFudG9ySWQ7Ci0JCU9pZAkJCW93 bmVySWQ7Ci0JCUhlYXBUdXBsZQluZXd0dXBsZTsKLQkJRGF0dW0JCXZhbHVlc1tOYXR0c19w Z190YWJsZXNwYWNlXSA9IHswfTsKLQkJYm9vbAkJbnVsbHNbTmF0dHNfcGdfdGFibGVzcGFj ZV0gPSB7MH07Ci0JCWJvb2wJCXJlcGxhY2VzW05hdHRzX3BnX3RhYmxlc3BhY2VdID0gezB9 OwotCQlpbnQJCQlub2xkbWVtYmVyczsKLQkJaW50CQkJbm5ld21lbWJlcnM7Ci0JCU9pZAkJ ICAgKm9sZG1lbWJlcnM7Ci0JCU9pZAkJICAgKm5ld21lbWJlcnM7Ci0JCUhlYXBUdXBsZQl0 dXBsZTsKLQotCQkvKiBTZWFyY2ggc3lzY2FjaGUgZm9yIHBnX3RhYmxlc3BhY2UgKi8KLQkJ dHVwbGUgPSBTZWFyY2hTeXNDYWNoZTEoVEFCTEVTUEFDRU9JRCwgT2JqZWN0SWRHZXREYXR1 bSh0YmxJZCkpOwotCQlpZiAoIUhlYXBUdXBsZUlzVmFsaWQodHVwbGUpKQotCQkJZWxvZyhF UlJPUiwgImNhY2hlIGxvb2t1cCBmYWlsZWQgZm9yIHRhYmxlc3BhY2UgJXUiLCB0YmxJZCk7 CisJcGdfdHlwZV90dXBsZSA9IChGb3JtX3BnX3R5cGUpIEdFVFNUUlVDVCh0dXBsZSk7CiAK LQkJcGdfdGFibGVzcGFjZV90dXBsZSA9IChGb3JtX3BnX3RhYmxlc3BhY2UpIEdFVFNUUlVD VCh0dXBsZSk7Ci0KLQkJLyoKLQkJICogR2V0IG93bmVyIElEIGFuZCB3b3JraW5nIGNvcHkg b2YgZXhpc3RpbmcgQUNMLiBJZiB0aGVyZSdzIG5vIEFDTCwKLQkJICogc3Vic3RpdHV0ZSB0 aGUgcHJvcGVyIGRlZmF1bHQuCi0JCSAqLwotCQlvd25lcklkID0gcGdfdGFibGVzcGFjZV90 dXBsZS0+c3Bjb3duZXI7Ci0JCWFjbERhdHVtID0gaGVhcF9nZXRhdHRyKHR1cGxlLCBBbnVt X3BnX3RhYmxlc3BhY2Vfc3BjYWNsLAotCQkJCQkJCQlSZWxhdGlvbkdldERlc2NyKHJlbGF0 aW9uKSwgJmlzTnVsbCk7Ci0JCWlmIChpc051bGwpCi0JCXsKLQkJCW9sZF9hY2wgPSBhY2xk ZWZhdWx0KE9CSkVDVF9UQUJMRVNQQUNFLCBvd25lcklkKTsKLQkJCS8qIFRoZXJlIGFyZSBu byBvbGQgbWVtYmVyIHJvbGVzIGFjY29yZGluZyB0byB0aGUgY2F0YWxvZ3MgKi8KLQkJCW5v bGRtZW1iZXJzID0gMDsKLQkJCW9sZG1lbWJlcnMgPSBOVUxMOwotCQl9Ci0JCWVsc2UKLQkJ ewotCQkJb2xkX2FjbCA9IERhdHVtR2V0QWNsUENvcHkoYWNsRGF0dW0pOwotCQkJLyogR2V0 IHRoZSByb2xlcyBtZW50aW9uZWQgaW4gdGhlIGV4aXN0aW5nIEFDTCAqLwotCQkJbm9sZG1l bWJlcnMgPSBhY2xtZW1iZXJzKG9sZF9hY2wsICZvbGRtZW1iZXJzKTsKLQkJfQotCi0JCS8q IERldGVybWluZSBJRCB0byBkbyB0aGUgZ3JhbnQgYXMsIGFuZCBhdmFpbGFibGUgZ3JhbnQg b3B0aW9ucyAqLwotCQlzZWxlY3RfYmVzdF9ncmFudG9yKEdldFVzZXJJZCgpLCBpc3RtdC0+ cHJpdmlsZWdlcywKLQkJCQkJCQlvbGRfYWNsLCBvd25lcklkLAotCQkJCQkJCSZncmFudG9y SWQsICZhdmFpbF9nb3B0aW9ucyk7Ci0KLQkJLyoKLQkJICogUmVzdHJpY3QgdGhlIHByaXZp bGVnZXMgdG8gd2hhdCB3ZSBjYW4gYWN0dWFsbHkgZ3JhbnQsIGFuZCBlbWl0IHRoZQotCQkg KiBzdGFuZGFyZHMtbWFuZGF0ZWQgd2FybmluZyBhbmQgZXJyb3IgbWVzc2FnZXMuCi0JCSAq LwotCQl0aGlzX3ByaXZpbGVnZXMgPQotCQkJcmVzdHJpY3RfYW5kX2NoZWNrX2dyYW50KGlz dG10LT5pc19ncmFudCwgYXZhaWxfZ29wdGlvbnMsCi0JCQkJCQkJCQkgaXN0bXQtPmFsbF9w cml2cywgaXN0bXQtPnByaXZpbGVnZXMsCi0JCQkJCQkJCQkgdGJsSWQsIGdyYW50b3JJZCwg T0JKRUNUX1RBQkxFU1BBQ0UsCi0JCQkJCQkJCQkgTmFtZVN0cihwZ190YWJsZXNwYWNlX3R1 cGxlLT5zcGNuYW1lKSwKLQkJCQkJCQkJCSAwLCBOVUxMKTsKLQotCQkvKgotCQkgKiBHZW5l cmF0ZSBuZXcgQUNMLgotCQkgKi8KLQkJbmV3X2FjbCA9IG1lcmdlX2FjbF93aXRoX2dyYW50 KG9sZF9hY2wsIGlzdG10LT5pc19ncmFudCwKLQkJCQkJCQkJCSAgIGlzdG10LT5ncmFudF9v cHRpb24sIGlzdG10LT5iZWhhdmlvciwKLQkJCQkJCQkJCSAgIGlzdG10LT5ncmFudGVlcywg dGhpc19wcml2aWxlZ2VzLAotCQkJCQkJCQkJICAgZ3JhbnRvcklkLCBvd25lcklkKTsKLQot CQkvKgotCQkgKiBXZSBuZWVkIHRoZSBtZW1iZXJzIG9mIGJvdGggb2xkIGFuZCBuZXcgQUNM cyBzbyB3ZSBjYW4gY29ycmVjdCB0aGUKLQkJICogc2hhcmVkIGRlcGVuZGVuY3kgaW5mb3Jt YXRpb24uCi0JCSAqLwotCQlubmV3bWVtYmVycyA9IGFjbG1lbWJlcnMobmV3X2FjbCwgJm5l d21lbWJlcnMpOwotCi0JCS8qIGZpbmlzaGVkIGJ1aWxkaW5nIG5ldyBBQ0wgdmFsdWUsIG5v dyBpbnNlcnQgaXQgKi8KLQkJcmVwbGFjZXNbQW51bV9wZ190YWJsZXNwYWNlX3NwY2FjbCAt IDFdID0gdHJ1ZTsKLQkJdmFsdWVzW0FudW1fcGdfdGFibGVzcGFjZV9zcGNhY2wgLSAxXSA9 IFBvaW50ZXJHZXREYXR1bShuZXdfYWNsKTsKLQotCQluZXd0dXBsZSA9IGhlYXBfbW9kaWZ5 X3R1cGxlKHR1cGxlLCBSZWxhdGlvbkdldERlc2NyKHJlbGF0aW9uKSwgdmFsdWVzLAotCQkJ CQkJCQkJIG51bGxzLCByZXBsYWNlcyk7Ci0KLQkJQ2F0YWxvZ1R1cGxlVXBkYXRlKHJlbGF0 aW9uLCAmbmV3dHVwbGUtPnRfc2VsZiwgbmV3dHVwbGUpOwotCi0JCS8qIFVwZGF0ZSB0aGUg c2hhcmVkIGRlcGVuZGVuY3kgQUNMIGluZm8gKi8KLQkJdXBkYXRlQWNsRGVwZW5kZW5jaWVz KFRhYmxlU3BhY2VSZWxhdGlvbklkLCB0YmxJZCwgMCwKLQkJCQkJCQkgIG93bmVySWQsCi0J CQkJCQkJICBub2xkbWVtYmVycywgb2xkbWVtYmVycywKLQkJCQkJCQkgIG5uZXdtZW1iZXJz LCBuZXdtZW1iZXJzKTsKLQotCQlSZWxlYXNlU3lzQ2FjaGUodHVwbGUpOwotCQlwZnJlZShu ZXdfYWNsKTsKLQotCQkvKiBwcmV2ZW50IGVycm9yIHdoZW4gcHJvY2Vzc2luZyBkdXBsaWNh dGUgb2JqZWN0cyAqLwotCQlDb21tYW5kQ291bnRlckluY3JlbWVudCgpOwotCX0KLQotCXRh YmxlX2Nsb3NlKHJlbGF0aW9uLCBSb3dFeGNsdXNpdmVMb2NrKTsKLX0KLQotc3RhdGljIHZv aWQKLUV4ZWNHcmFudF9UeXBlKEludGVybmFsR3JhbnQgKmlzdG10KQotewotCVJlbGF0aW9u CXJlbGF0aW9uOwotCUxpc3RDZWxsICAgKmNlbGw7Ci0KLQlpZiAoaXN0bXQtPmFsbF9wcml2 cyAmJiBpc3RtdC0+cHJpdmlsZWdlcyA9PSBBQ0xfTk9fUklHSFRTKQotCQlpc3RtdC0+cHJp dmlsZWdlcyA9IEFDTF9BTExfUklHSFRTX1RZUEU7Ci0KLQlyZWxhdGlvbiA9IHRhYmxlX29w ZW4oVHlwZVJlbGF0aW9uSWQsIFJvd0V4Y2x1c2l2ZUxvY2spOwotCi0JZm9yZWFjaChjZWxs LCBpc3RtdC0+b2JqZWN0cykKLQl7Ci0JCU9pZAkJCXR5cElkID0gbGZpcnN0X29pZChjZWxs KTsKLQkJRm9ybV9wZ190eXBlIHBnX3R5cGVfdHVwbGU7Ci0JCURhdHVtCQlhY2xEYXR1bTsK LQkJYm9vbAkJaXNOdWxsOwotCQlBY2xNb2RlCQlhdmFpbF9nb3B0aW9uczsKLQkJQWNsTW9k ZQkJdGhpc19wcml2aWxlZ2VzOwotCQlBY2wJCSAgICpvbGRfYWNsOwotCQlBY2wJCSAgICpu ZXdfYWNsOwotCQlPaWQJCQlncmFudG9ySWQ7Ci0JCU9pZAkJCW93bmVySWQ7Ci0JCUhlYXBU dXBsZQluZXd0dXBsZTsKLQkJRGF0dW0JCXZhbHVlc1tOYXR0c19wZ190eXBlXSA9IHswfTsK LQkJYm9vbAkJbnVsbHNbTmF0dHNfcGdfdHlwZV0gPSB7MH07Ci0JCWJvb2wJCXJlcGxhY2Vz W05hdHRzX3BnX3R5cGVdID0gezB9OwotCQlpbnQJCQlub2xkbWVtYmVyczsKLQkJaW50CQkJ bm5ld21lbWJlcnM7Ci0JCU9pZAkJICAgKm9sZG1lbWJlcnM7Ci0JCU9pZAkJICAgKm5ld21l bWJlcnM7Ci0JCUhlYXBUdXBsZQl0dXBsZTsKLQotCQkvKiBTZWFyY2ggc3lzY2FjaGUgZm9y IHBnX3R5cGUgKi8KLQkJdHVwbGUgPSBTZWFyY2hTeXNDYWNoZTEoVFlQRU9JRCwgT2JqZWN0 SWRHZXREYXR1bSh0eXBJZCkpOwotCQlpZiAoIUhlYXBUdXBsZUlzVmFsaWQodHVwbGUpKQot CQkJZWxvZyhFUlJPUiwgImNhY2hlIGxvb2t1cCBmYWlsZWQgZm9yIHR5cGUgJXUiLCB0eXBJ ZCk7Ci0KLQkJcGdfdHlwZV90dXBsZSA9IChGb3JtX3BnX3R5cGUpIEdFVFNUUlVDVCh0dXBs ZSk7Ci0KLQkJaWYgKElzVHJ1ZUFycmF5VHlwZShwZ190eXBlX3R1cGxlKSkKLQkJCWVyZXBv cnQoRVJST1IsCi0JCQkJCShlcnJjb2RlKEVSUkNPREVfSU5WQUxJRF9HUkFOVF9PUEVSQVRJ T04pLAotCQkJCQkgZXJybXNnKCJjYW5ub3Qgc2V0IHByaXZpbGVnZXMgb2YgYXJyYXkgdHlw ZXMiKSwKLQkJCQkJIGVycmhpbnQoIlNldCB0aGUgcHJpdmlsZWdlcyBvZiB0aGUgZWxlbWVu dCB0eXBlIGluc3RlYWQuIikpKTsKLQotCQkvKiBVc2VkIEdSQU5UIERPTUFJTiBvbiBhIG5v bi1kb21haW4/ICovCi0JCWlmIChpc3RtdC0+b2JqdHlwZSA9PSBPQkpFQ1RfRE9NQUlOICYm Ci0JCQlwZ190eXBlX3R1cGxlLT50eXB0eXBlICE9IFRZUFRZUEVfRE9NQUlOKQotCQkJZXJl cG9ydChFUlJPUiwKLQkJCQkJKGVycmNvZGUoRVJSQ09ERV9XUk9OR19PQkpFQ1RfVFlQRSks Ci0JCQkJCSBlcnJtc2coIlwiJXNcIiBpcyBub3QgYSBkb21haW4iLAotCQkJCQkJCU5hbWVT dHIocGdfdHlwZV90dXBsZS0+dHlwbmFtZSkpKSk7Ci0KLQkJLyoKLQkJICogR2V0IG93bmVy IElEIGFuZCB3b3JraW5nIGNvcHkgb2YgZXhpc3RpbmcgQUNMLiBJZiB0aGVyZSdzIG5vIEFD TCwKLQkJICogc3Vic3RpdHV0ZSB0aGUgcHJvcGVyIGRlZmF1bHQuCi0JCSAqLwotCQlvd25l cklkID0gcGdfdHlwZV90dXBsZS0+dHlwb3duZXI7Ci0JCWFjbERhdHVtID0gaGVhcF9nZXRh dHRyKHR1cGxlLCBBbnVtX3BnX3R5cGVfdHlwYWNsLAotCQkJCQkJCQlSZWxhdGlvbkdldERl c2NyKHJlbGF0aW9uKSwgJmlzTnVsbCk7Ci0JCWlmIChpc051bGwpCi0JCXsKLQkJCW9sZF9h Y2wgPSBhY2xkZWZhdWx0KGlzdG10LT5vYmp0eXBlLCBvd25lcklkKTsKLQkJCS8qIFRoZXJl IGFyZSBubyBvbGQgbWVtYmVyIHJvbGVzIGFjY29yZGluZyB0byB0aGUgY2F0YWxvZ3MgKi8K LQkJCW5vbGRtZW1iZXJzID0gMDsKLQkJCW9sZG1lbWJlcnMgPSBOVUxMOwotCQl9Ci0JCWVs c2UKLQkJewotCQkJb2xkX2FjbCA9IERhdHVtR2V0QWNsUENvcHkoYWNsRGF0dW0pOwotCQkJ LyogR2V0IHRoZSByb2xlcyBtZW50aW9uZWQgaW4gdGhlIGV4aXN0aW5nIEFDTCAqLwotCQkJ bm9sZG1lbWJlcnMgPSBhY2xtZW1iZXJzKG9sZF9hY2wsICZvbGRtZW1iZXJzKTsKLQkJfQot Ci0JCS8qIERldGVybWluZSBJRCB0byBkbyB0aGUgZ3JhbnQgYXMsIGFuZCBhdmFpbGFibGUg Z3JhbnQgb3B0aW9ucyAqLwotCQlzZWxlY3RfYmVzdF9ncmFudG9yKEdldFVzZXJJZCgpLCBp c3RtdC0+cHJpdmlsZWdlcywKLQkJCQkJCQlvbGRfYWNsLCBvd25lcklkLAotCQkJCQkJCSZn cmFudG9ySWQsICZhdmFpbF9nb3B0aW9ucyk7Ci0KLQkJLyoKLQkJICogUmVzdHJpY3QgdGhl IHByaXZpbGVnZXMgdG8gd2hhdCB3ZSBjYW4gYWN0dWFsbHkgZ3JhbnQsIGFuZCBlbWl0IHRo ZQotCQkgKiBzdGFuZGFyZHMtbWFuZGF0ZWQgd2FybmluZyBhbmQgZXJyb3IgbWVzc2FnZXMu Ci0JCSAqLwotCQl0aGlzX3ByaXZpbGVnZXMgPQotCQkJcmVzdHJpY3RfYW5kX2NoZWNrX2dy YW50KGlzdG10LT5pc19ncmFudCwgYXZhaWxfZ29wdGlvbnMsCi0JCQkJCQkJCQkgaXN0bXQt PmFsbF9wcml2cywgaXN0bXQtPnByaXZpbGVnZXMsCi0JCQkJCQkJCQkgdHlwSWQsIGdyYW50 b3JJZCwgT0JKRUNUX1RZUEUsCi0JCQkJCQkJCQkgTmFtZVN0cihwZ190eXBlX3R1cGxlLT50 eXBuYW1lKSwKLQkJCQkJCQkJCSAwLCBOVUxMKTsKLQotCQkvKgotCQkgKiBHZW5lcmF0ZSBu ZXcgQUNMLgotCQkgKi8KLQkJbmV3X2FjbCA9IG1lcmdlX2FjbF93aXRoX2dyYW50KG9sZF9h Y2wsIGlzdG10LT5pc19ncmFudCwKLQkJCQkJCQkJCSAgIGlzdG10LT5ncmFudF9vcHRpb24s IGlzdG10LT5iZWhhdmlvciwKLQkJCQkJCQkJCSAgIGlzdG10LT5ncmFudGVlcywgdGhpc19w cml2aWxlZ2VzLAotCQkJCQkJCQkJICAgZ3JhbnRvcklkLCBvd25lcklkKTsKLQotCQkvKgot CQkgKiBXZSBuZWVkIHRoZSBtZW1iZXJzIG9mIGJvdGggb2xkIGFuZCBuZXcgQUNMcyBzbyB3 ZSBjYW4gY29ycmVjdCB0aGUKLQkJICogc2hhcmVkIGRlcGVuZGVuY3kgaW5mb3JtYXRpb24u Ci0JCSAqLwotCQlubmV3bWVtYmVycyA9IGFjbG1lbWJlcnMobmV3X2FjbCwgJm5ld21lbWJl cnMpOwotCi0JCS8qIGZpbmlzaGVkIGJ1aWxkaW5nIG5ldyBBQ0wgdmFsdWUsIG5vdyBpbnNl cnQgaXQgKi8KLQkJcmVwbGFjZXNbQW51bV9wZ190eXBlX3R5cGFjbCAtIDFdID0gdHJ1ZTsK LQkJdmFsdWVzW0FudW1fcGdfdHlwZV90eXBhY2wgLSAxXSA9IFBvaW50ZXJHZXREYXR1bShu ZXdfYWNsKTsKLQotCQluZXd0dXBsZSA9IGhlYXBfbW9kaWZ5X3R1cGxlKHR1cGxlLCBSZWxh dGlvbkdldERlc2NyKHJlbGF0aW9uKSwgdmFsdWVzLAotCQkJCQkJCQkJIG51bGxzLCByZXBs YWNlcyk7Ci0KLQkJQ2F0YWxvZ1R1cGxlVXBkYXRlKHJlbGF0aW9uLCAmbmV3dHVwbGUtPnRf c2VsZiwgbmV3dHVwbGUpOwotCi0JCS8qIFVwZGF0ZSBpbml0aWFsIHByaXZpbGVnZXMgZm9y IGV4dGVuc2lvbnMgKi8KLQkJcmVjb3JkRXh0ZW5zaW9uSW5pdFByaXYodHlwSWQsIFR5cGVS ZWxhdGlvbklkLCAwLCBuZXdfYWNsKTsKLQotCQkvKiBVcGRhdGUgdGhlIHNoYXJlZCBkZXBl bmRlbmN5IEFDTCBpbmZvICovCi0JCXVwZGF0ZUFjbERlcGVuZGVuY2llcyhUeXBlUmVsYXRp b25JZCwgdHlwSWQsIDAsCi0JCQkJCQkJICBvd25lcklkLAotCQkJCQkJCSAgbm9sZG1lbWJl cnMsIG9sZG1lbWJlcnMsCi0JCQkJCQkJICBubmV3bWVtYmVycywgbmV3bWVtYmVycyk7Ci0K LQkJUmVsZWFzZVN5c0NhY2hlKHR1cGxlKTsKLQkJcGZyZWUobmV3X2FjbCk7Ci0KLQkJLyog cHJldmVudCBlcnJvciB3aGVuIHByb2Nlc3NpbmcgZHVwbGljYXRlIG9iamVjdHMgKi8KLQkJ Q29tbWFuZENvdW50ZXJJbmNyZW1lbnQoKTsKLQl9CisJaWYgKElzVHJ1ZUFycmF5VHlwZShw Z190eXBlX3R1cGxlKSkKKwkJZXJlcG9ydChFUlJPUiwKKwkJCQkoZXJyY29kZShFUlJDT0RF X0lOVkFMSURfR1JBTlRfT1BFUkFUSU9OKSwKKwkJCQkgZXJybXNnKCJjYW5ub3Qgc2V0IHBy aXZpbGVnZXMgb2YgYXJyYXkgdHlwZXMiKSwKKwkJCQkgZXJyaGludCgiU2V0IHRoZSBwcml2 aWxlZ2VzIG9mIHRoZSBlbGVtZW50IHR5cGUgaW5zdGVhZC4iKSkpOwogCi0JdGFibGVfY2xv c2UocmVsYXRpb24sIFJvd0V4Y2x1c2l2ZUxvY2spOworCS8qIFVzZWQgR1JBTlQgRE9NQUlO IG9uIGEgbm9uLWRvbWFpbj8gKi8KKwlpZiAoaXN0bXQtPm9ianR5cGUgPT0gT0JKRUNUX0RP TUFJTiAmJgorCQlwZ190eXBlX3R1cGxlLT50eXB0eXBlICE9IFRZUFRZUEVfRE9NQUlOKQor CQllcmVwb3J0KEVSUk9SLAorCQkJCShlcnJjb2RlKEVSUkNPREVfV1JPTkdfT0JKRUNUX1RZ UEUpLAorCQkJCSBlcnJtc2coIlwiJXNcIiBpcyBub3QgYSBkb21haW4iLAorCQkJCQkJTmFt ZVN0cihwZ190eXBlX3R1cGxlLT50eXBuYW1lKSkpKTsKIH0KIAogc3RhdGljIHZvaWQKLS0g CjIuMzguMQoK --------------KB2pW50iK7quoroRAVec1NLe--