Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1tLekq-00GAjF-MX for pgsql-hackers@arkaria.postgresql.org; Thu, 12 Dec 2024 08:41:05 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1tLekl-0091zA-MR for pgsql-hackers@arkaria.postgresql.org; Thu, 12 Dec 2024 08:41:00 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1tLekl-0091z2-7B for pgsql-hackers@lists.postgresql.org; Thu, 12 Dec 2024 08:41:00 +0000 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1tLeki-002Qfp-Ux for pgsql-hackers@postgresql.org; Thu, 12 Dec 2024 08:40:59 +0000 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-723f37dd76cso279909b3a.0 for ; Thu, 12 Dec 2024 00:40:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733992855; x=1734597655; darn=postgresql.org; h=in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=7pxNcbQZegY5TdhHKzeRHrApngsMbWDaneGWcBPGtQI=; b=hsZiRzHfhsSI+89t2GrTj7t6KFW6nYhcFwVNFRnWzJiWzBAbG3F2O99vX9K9V4+MS0 h4IgKyAibqbepMBjWH70rsS7ZS4zct7zJNfeHwAMoHWocbZn57kB5PuaQpDkUMD8CYXw RGafZtdMAQDdOYm1QuYzmNb4b8oASfSXeozUPelGdQUHVsUeNc4mA+LgqEFezZHyOymy STFr6hTsGmH5asMdYeMBc/uUIZTA+AdvBODKtzJp9pIpDSNnPMQ7nqb0AhhJ4bGQP/pK BQAXN4fWLygKvuUX0zoG87NG+s17chyLIAhp5Rz93jGonG4KOcSnHaj4vBSN+D7LftGa +7Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733992855; x=1734597655; h=in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=7pxNcbQZegY5TdhHKzeRHrApngsMbWDaneGWcBPGtQI=; b=qnr3MuF4NvTqlJ2lK63klkwMwi//nNgB1kNV4yH2mfRtVgp7kr+EfD0nYcMyPs+t70 lfwtrhdB69GRmdEbvmk0dXE768rHgp9L3c98wUzJvXt/VNCtA7HzP+KgPoC7l6cyvadP YLKS5bnr+odH1Xp9E2u3hqAwP9JmLpoYv2LZHdTqpCH892oXyD0JQtcuFbX1taXX13SC W/VnzH3siJf3E7JEBqPW7Lrk5kDEfrgg4xZD4heowq73esh1tEPkjG/sptXtfXX6OkSL McKpc8i7rNmFha1mgEsdbgFDQDp3R44w5ilMV6e8bLgiqNfqGmVPf+7L8/syfc2p6nsM glfA== X-Gm-Message-State: AOJu0YyrQakpfWwAmrNKMMdGEgN7dHlsbSSckZLUxtbK9AaoWxrtvKA5 I13jTPvXYalKhH0oMenuoFrcJBf+Bjmcd94qJtUmMjc2ilFRYxDsldeJKlv1 X-Gm-Gg: ASbGncv1jnRXhu2mo2Uimk416B1BE2muBnagCTPauEgL5DzxDKCT65q03nOulmuVfCZ r4+V89kO4UilAHgaO18/aTuZlbBaCfIvKrSYH6Rf8PuO1JjZ18nUW+Zt/w6OIrEOchePSqiA0WB ihQmgHDbXy+9E8ZZEamXwdjq0eFsz88X090N8BYJbNeotdKeWJnmEJes/LBtVKardJLWinDqUSQ E5W65x0A4GhY+XW/NJRTGx472pWyvWiM6eTs4BJkMumDjjGiKUzSXK03HmDZNFrVrh0eKOYH3HF M1MiJWLPH4KEAhmrAHZZJCUX4xVQMw== X-Google-Smtp-Source: AGHT+IF8Kpk82e8nFa9FEvjjMZYMg7Wi/y3Q5YzLNp/m1A0QxZAMBflix0v/TI8oWKR/ID+943RmBQ== X-Received: by 2002:a05:6a00:92a6:b0:727:3cd0:1145 with SMTP id d2e1a72fcca58-728fa9a8139mr3780648b3a.2.1733992854950; Thu, 12 Dec 2024 00:40:54 -0800 (PST) Received: from [10.10.20.106] (node-gmq.pool-125-27.dynamic.totinternet.net. [125.27.84.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-725f13cd969sm6304281b3a.6.2024.12.12.00.40.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Dec 2024 00:40:53 -0800 (PST) Content-Type: multipart/mixed; boundary="------------ar1CVTxFxgXYLbrMI0y2PTHb" Message-ID: <0844622e-9967-409a-8038-470a36f1039c@gmail.com> Date: Thu, 12 Dec 2024 15:40:50 +0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Add Postgres module info To: Tom Lane Cc: PostgreSQL-development References: <506788.1733941263@sss.pgh.pa.us> <2c215c98-f713-4c5b-b21a-a4b8fa41890b@gmail.com> <556341.1733967371@sss.pgh.pa.us> Content-Language: en-AU From: Andrei Lepikhov In-Reply-To: <556341.1733967371@sss.pgh.pa.us> 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. --------------ar1CVTxFxgXYLbrMI0y2PTHb Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/12/24 08:36, Tom Lane wrote: > Andrei Lepikhov writes: >> It makes sense. But I want to clarify that I avoided changing >> PG_MODULE_MAGIC because the newly introduced structure has a totally >> different purpose and usage logic: the struct is designed to check >> compatibility, but module info isn't connected to the core version at >> all: a single version of the code may be built for multiple PG versions. >> At the same time, various versions of the same library may be usable >> with the same core. > > Surely. But I don't see a need for two separately-looked-up > physical structures. Seems to me it's sufficient to put the > ABI-checking fields into a sub-struct within the magic block. Okay, I've rewritten the patch to understand how it works. It seems to work pretty well. I added separate fields for minor and major versions. -- regards, Andrei Lepikhov --------------ar1CVTxFxgXYLbrMI0y2PTHb Content-Type: text/x-patch; charset=UTF-8; name="v1-0001-Introduce-PG_MODULE_MAGIC_EXT-macro.patch" Content-Disposition: attachment; filename="v1-0001-Introduce-PG_MODULE_MAGIC_EXT-macro.patch" Content-Transfer-Encoding: base64 RnJvbSAwYmM0MzFjZTBhYmFiYzlmZTU0OTI3NzMyMDU1MjVhNjgzOWYxMjY0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiAiQW5kcmVpIFYuIExlcGlraG92IiA8bGVwaWhvdkBn bWFpbC5jb20+CkRhdGU6IFR1ZSwgMTkgTm92IDIwMjQgMTg6NDU6MzYgKzA3MDAKU3ViamVj dDogW1BBVENIIHYxXSBJbnRyb2R1Y2UgUEdfTU9EVUxFX01BR0lDX0VYVCBtYWNyby4KClRo aXMgbWFjcm8gYWxsb3dzIGR5bmFtaWNhbGx5IGxvYWRlZCBzaGFyZWQgbGlicmFyaWVzICht b2R1bGVzKSBhIHN0YW5kYXJkIHdheQp0byBpbmNvcnBvcmF0ZSB2ZXJzaW9uIChtYWpvciBh bmQgbWlub3IpIGFuZCBuYW1lIGRhdGEuIFRoZSBpbnRyb2R1Y2VkCmNhdGFsb2d1ZSByb3V0 aW5lIG1vZHVsZV9pbmZvIGNhbiBiZSB1c2VkIHRvIGZpbmQgdGhpcyBtb2R1bGUgYnkgbmFt ZSBhbmQgY2hlY2sKdGhlIHZlcnNpb24uIEl0IG1ha2VzIHVzZXJzIGluZGVwZW5kZW50IGZy b20gZmlsZSBuYW1pbmcgY29udmVudGlvbnMuCgpXaXRoIGEgZ3Jvd2luZyBudW1iZXIgb2Yg UG9zdGdyZXMgY29yZSBob29rcyBhbmQgdGhlIGludHJvZHVjdGlvbiBvZiBuYW1lZCBEU00K c2VnbWVudHMsIHRoZSBudW1iZXIgb2YgbW9kdWxlcyB0aGF0IGRvbid0IG5lZWQgdG8gYmUg bG9hZGVkIG9uIHN0YXJ0dXAgbWF5Cmdyb3cgZmFzdC4gTW9yZW92ZXIsIGluIG1hbnkgY2Fz ZXMgcmVsYXRlZCB0byBxdWVyeSB0cmVlIHRyYW5zZm9ybWF0aW9uIG9yCmV4dHJhIHBhdGgg cmVjb21tZW5kYXRpb24sIHN1Y2ggbW9kdWxlcyBtaWdodCBub3QgbmVlZCBkYXRhYmFzZSBv YmplY3RzIGV4Y2VwdApHVUNzIC0gc2VlIGF1dG9fZXhwbGFpbiBhcyBhbiBleGFtcGxlLiBU aGF0IG1lYW5zIHRoZXkgZG9uJ3QgbmVlZCB0byBleGVjdXRlCnRoZSAnQ1JFQVRFIEVYVEVO U0lPTicgc3RhdGVtZW50IGF0IGFsbCBhbmQgZG9uJ3QgaGF2ZSBhIHJlY29yZCBpbgp0aGUg cGdfZXh0ZW5zaW9uIHRhYmxlLiBTdWNoIGEgdHJpY2sgcHJvdmlkZXMgbXVjaCBmbGV4aWJp bGl0eSwgaW5jbHVkaW5nCmFuIG9ubGluZSB1cGdyYWRlIGFuZCBtYXkgYmVjb21lIHdpZGVz cHJlYWQuCgpJbiBhZGRpdGlvbiwgaXQgaXMgYWxzbyBjb252ZW5pZW50IGluIHN1cHBvcnQg dG8gYmUgc3VyZSB0aGF0IHRoZSBpbnN0YWxsYXRpb24KKG9yIGF0IGxlYXN0IHRoZSBiYWNr ZW5kKSBpbmNsdWRlcyBhIHNwZWNpZmljIHZlcnNpb24gb2YgdGhlIG1vZHVsZS4gRXZlbiBp ZgphIG1vZHVsZSBoYXMgYW4gaW5zdGFsbGF0aW9uIHNjcmlwdCwgaXQgaXMgbm90IHJhcmUg dGhhdCBpdCBwcm92aWRlcwphbiBpbXBsZW1lbnRhdGlvbiBmb3IgYSByYW5nZSBvZiBVSSBy b3V0aW5lIHZlcnNpb25zLiBJdCBtYWtlcyBzZW5zZSB0byBlbnN1cmUKd2hpY2ggc3BlY2lm aWMgdmVyc2lvbiBvZiB0aGUgY29kZSBpcyB1c2VkLgoKRGlzY3Vzc2lvbnMgWzEsMl0gYWxy ZWFkeSBtZW50aW9uZWQgbW9kdWxlLWluZm8gc3R1ZmYsIGJ1dCBhdCB0aGF0IHRpbWUsCmV4 dGVuc2liaWxpdHkgdGVjaG5pcXVlcyBhbmQgZXh0ZW5zaW9uIHBvcHVsYXJpdHkgd2VyZSBs b3csIGFuZCBpdCB3YXNuJ3QKbmVjZXNzYXJ5IHRvIHByb3ZpZGUgdGhhdCBkYXRhLgoKWzFd IGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3JnL21lc3NhZ2UtaWQvZmxhdC8yMDA2MDUwNzIx MTcwNS5HQjM4MDglNDBzdmFuYS5vcmcKWzJdIGh0dHBzOi8vd3d3LnBvc3RncmVzcWwub3Jn L21lc3NhZ2UtaWQvZmxhdC8yMDA1MTEwNjE2MjY1OC4zNGMzMWQ1NyU0MHRodW5kZXIubG9n aWNhbGNoYW9zLm9yZwotLS0KIGNvbnRyaWIvYXV0b19leHBsYWluL2F1dG9fZXhwbGFpbi5j ICAgICAgICAgICB8ICAyICstCiBjb250cmliL2F1dG9fZXhwbGFpbi90LzAwMV9hdXRvX2V4 cGxhaW4ucGwgICAgfCAgOSArKysKIGNvbnRyaWIvcGdfcHJld2FybS90LzAwMV9iYXNpYy5w bCAgICAgICAgICAgICB8ICA4ICsrLQogLi4uL3BnX3N0YXRfc3RhdGVtZW50cy9wZ19zdGF0 X3N0YXRlbWVudHMuYyAgIHwgIDIgKy0KIHNyYy9iYWNrZW5kL3V0aWxzL2ZtZ3IvZGZtZ3Iu YyAgICAgICAgICAgICAgICB8IDcyICsrKysrKysrKysrKysrKysrKy0KIHNyYy9pbmNsdWRl L2NhdGFsb2cvcGdfcHJvYy5kYXQgICAgICAgICAgICAgICB8ICA2ICsrCiBzcmMvaW5jbHVk ZS9mbWdyLmggICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyNCArKysrKystCiA3IGZp bGVzIGNoYW5nZWQsIDExNiBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2NvbnRyaWIvYXV0b19leHBsYWluL2F1dG9fZXhwbGFpbi5jIGIvY29udHJpYi9h dXRvX2V4cGxhaW4vYXV0b19leHBsYWluLmMKaW5kZXggZjJlYWE4ZTQ5NC4uZjQ4MmFiMTI1 ZCAxMDA2NDQKLS0tIGEvY29udHJpYi9hdXRvX2V4cGxhaW4vYXV0b19leHBsYWluLmMKKysr IGIvY29udHJpYi9hdXRvX2V4cGxhaW4vYXV0b19leHBsYWluLmMKQEAgLTIwLDcgKzIwLDcg QEAKICNpbmNsdWRlICJleGVjdXRvci9pbnN0cnVtZW50LmgiCiAjaW5jbHVkZSAidXRpbHMv Z3VjLmgiCiAKLVBHX01PRFVMRV9NQUdJQzsKK1BHX01PRFVMRV9NQUdJQ19FWFQoImF1dG9f ZXhwbGFpbiIsIDEsIDApOwogCiAvKiBHVUMgdmFyaWFibGVzICovCiBzdGF0aWMgaW50CWF1 dG9fZXhwbGFpbl9sb2dfbWluX2R1cmF0aW9uID0gLTE7IC8qIG1zZWMgb3IgLTEgKi8KZGlm ZiAtLWdpdCBhL2NvbnRyaWIvYXV0b19leHBsYWluL3QvMDAxX2F1dG9fZXhwbGFpbi5wbCBi L2NvbnRyaWIvYXV0b19leHBsYWluL3QvMDAxX2F1dG9fZXhwbGFpbi5wbAppbmRleCAwZTVi MzRhZmE5Li41ZGI3ZGY1NDc4IDEwMDY0NAotLS0gYS9jb250cmliL2F1dG9fZXhwbGFpbi90 LzAwMV9hdXRvX2V4cGxhaW4ucGwKKysrIGIvY29udHJpYi9hdXRvX2V4cGxhaW4vdC8wMDFf YXV0b19leHBsYWluLnBsCkBAIC01Myw2ICs1MywxNSBAQCBsaWtlKAogCXFyL1NlcSBTY2Fu IG9uIHBnX2NsYXNzLywKIAkic2VxdWVudGlhbCBzY2FuIGxvZ2dlZCwgdGV4dCBtb2RlIik7 CiAKKyRsb2dfY29udGVudHMgPSAkbm9kZS0+c2FmZV9wc3FsKAorCSJwb3N0Z3JlcyIsIHF7 U0VMRUNUIHN1YnN0cmluZyhsaWJuYW1lLCAnYXV0b19leHBsYWluJyksbW9kdWxlX25hbWUs bWFqb3JfdmVyLG1pbm9yX3ZlcgorCQkJCSAgRlJPTSBtb2R1bGVfaW5mbygpIFdIRVJFIG1h am9yX3ZlciBJUyBOT1QgTlVMTDt9KTsKKworbGlrZSgKKwkkbG9nX2NvbnRlbnRzLAorCXFy L2F1dG9fZXhwbGFpbnxhdXRvX2V4cGxhaW58MXwwLywKKwkiQ2hlY2sgbW9kdWxlIHZlcnNp b24iKTsKKwogIyBQcmVwYXJlZCBxdWVyeS4KICRsb2dfY29udGVudHMgPSBxdWVyeV9sb2co JG5vZGUsCiAJcXtQUkVQQVJFIGdldF9wcm9jKG5hbWUpIEFTIFNFTEVDVCAqIEZST00gcGdf cHJvYyBXSEVSRSBwcm9uYW1lID0gJDE7IEVYRUNVVEUgZ2V0X3Byb2MoJ2ludDRwbCcpO30K ZGlmZiAtLWdpdCBhL2NvbnRyaWIvcGdfcHJld2FybS90LzAwMV9iYXNpYy5wbCBiL2NvbnRy aWIvcGdfcHJld2FybS90LzAwMV9iYXNpYy5wbAppbmRleCA4MjVkMzQ0OGVlLi5mMDE5N2Uz M2FmIDEwMDY0NAotLS0gYS9jb250cmliL3BnX3ByZXdhcm0vdC8wMDFfYmFzaWMucGwKKysr IGIvY29udHJpYi9wZ19wcmV3YXJtL3QvMDAxX2Jhc2ljLnBsCkBAIC0yNSw4ICsyNSwxNCBA QCAkbm9kZS0+c2FmZV9wc3FsKCJwb3N0Z3JlcyIsCiAJICAuICJDUkVBVEUgVEFCTEUgdGVz dChjMSBpbnQpO1xuIgogCSAgLiAiSU5TRVJUIElOVE8gdGVzdCBTRUxFQ1QgZ2VuZXJhdGVf c2VyaWVzKDEsIDEwMCk7Iik7CiAKLSMgdGVzdCByZWFkIG1vZGUKKyMgdGVzdCBlbXB0eSBt b2R1bGUgaW5mbwogbXkgJHJlc3VsdCA9CisgICRub2RlLT5zYWZlX3BzcWwoInBvc3RncmVz IiwgIlNFTEVDVCBzdWJzdHJpbmcobGlibmFtZSwgJ3BnX3ByZXdhcm0nKSwKKyAgCQkJCQkJ bW9kdWxlX25hbWUsbWFqb3JfdmVyLG1pbm9yX3ZlciBGUk9NIG1vZHVsZV9pbmZvKCk7Iik7 CitsaWtlKCRyZXN1bHQsIHFyL3BnX3ByZXdhcm18fHwvLCAnUmV0dXJuIG51bGwgaWYgbW9k dWxlIGRvZXMgbm90IHByb3ZpZGUgYW4gaW5mbycpOworCisjIHRlc3QgcmVhZCBtb2RlCisk cmVzdWx0ID0KICAgJG5vZGUtPnNhZmVfcHNxbCgicG9zdGdyZXMiLCAiU0VMRUNUIHBnX3By ZXdhcm0oJ3Rlc3QnLCAncmVhZCcpOyIpOwogbGlrZSgkcmVzdWx0LCBxci9eWzEtOV1bMC05 XSokLywgJ3JlYWQgbW9kZSBzdWNjZWVkZWQnKTsKIApkaWZmIC0tZ2l0IGEvY29udHJpYi9w Z19zdGF0X3N0YXRlbWVudHMvcGdfc3RhdF9zdGF0ZW1lbnRzLmMgYi9jb250cmliL3BnX3N0 YXRfc3RhdGVtZW50cy9wZ19zdGF0X3N0YXRlbWVudHMuYwppbmRleCA2MDJjYWU1NGZmLi4y NDM3NGU5MjA5IDEwMDY0NAotLS0gYS9jb250cmliL3BnX3N0YXRfc3RhdGVtZW50cy9wZ19z dGF0X3N0YXRlbWVudHMuYworKysgYi9jb250cmliL3BnX3N0YXRfc3RhdGVtZW50cy9wZ19z dGF0X3N0YXRlbWVudHMuYwpAQCAtNzEsNyArNzEsNyBAQAogI2luY2x1ZGUgInV0aWxzL21l bXV0aWxzLmgiCiAjaW5jbHVkZSAidXRpbHMvdGltZXN0YW1wLmgiCiAKLVBHX01PRFVMRV9N QUdJQzsKK1BHX01PRFVMRV9NQUdJQ19FWFQoInBnX3N0YXRfc3RhdGVtZW50cyIsIDEsIDEy KTsKIAogLyogTG9jYXRpb24gb2YgcGVybWFuZW50IHN0YXRzIGZpbGUgKHZhbGlkIHdoZW4g ZGF0YWJhc2UgaXMgc2h1dCBkb3duKSAqLwogI2RlZmluZSBQR1NTX0RVTVBfRklMRQlQR1NU QVRfU1RBVF9QRVJNQU5FTlRfRElSRUNUT1JZICIvcGdfc3RhdF9zdGF0ZW1lbnRzLnN0YXQi CmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC91dGlscy9mbWdyL2RmbWdyLmMgYi9zcmMvYmFj a2VuZC91dGlscy9mbWdyL2RmbWdyLmMKaW5kZXggOGU4MWVjYzc0OS4uZTExZjlkMjBhNiAx MDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvdXRpbHMvZm1nci9kZm1nci5jCisrKyBiL3NyYy9i YWNrZW5kL3V0aWxzL2ZtZ3IvZGZtZ3IuYwpAQCAtMjEsMTAgKzIxLDEyIEBACiAjZW5kaWYJ CQkJCQkJLyogIVdJTjMyICovCiAKICNpbmNsdWRlICJmbWdyLmgiCisjaW5jbHVkZSAiZnVu Y2FwaS5oIgogI2luY2x1ZGUgImxpYi9zdHJpbmdpbmZvLmgiCiAjaW5jbHVkZSAibWlzY2Fk bWluLmgiCiAjaW5jbHVkZSAic3RvcmFnZS9mZC5oIgogI2luY2x1ZGUgInN0b3JhZ2Uvc2ht ZW0uaCIKKyNpbmNsdWRlICJ1dGlscy9idWlsdGlucy5oIgogI2luY2x1ZGUgInV0aWxzL2hz ZWFyY2guaCIKIAogCkBAIC01MSw2ICs1Myw5IEBAIHR5cGVkZWYgc3RydWN0IGRmX2ZpbGVz CiAJaW5vX3QJCWlub2RlOwkJCS8qIElub2RlIG51bWJlciBvZiBmaWxlICovCiAjZW5kaWYK IAl2b2lkCSAgICpoYW5kbGU7CQkJLyogYSBoYW5kbGUgZm9yIHBnX2RsKiBmdW5jdGlvbnMg Ki8KKwljaGFyCQluYW1lW05BTUVEQVRBTEVOXTsKKwlpbnQzMgkJbWFqb3JfdmVyOworCWlu dDMyCQltaW5vcl92ZXI7CiAJY2hhcgkJZmlsZW5hbWVbRkxFWElCTEVfQVJSQVlfTUVNQkVS XTsJLyogRnVsbCBwYXRobmFtZSBvZiBmaWxlICovCiB9IER5bmFtaWNGaWxlTGlzdDsKIApA QCAtNzUsNyArODAsNyBAQCBzdGF0aWMgY2hhciAqc3Vic3RpdHV0ZV9saWJwYXRoX21hY3Jv KGNvbnN0IGNoYXIgKm5hbWUpOwogc3RhdGljIGNoYXIgKmZpbmRfaW5fZHluYW1pY19saWJw YXRoKGNvbnN0IGNoYXIgKmJhc2VuYW1lKTsKIAogLyogTWFnaWMgc3RydWN0dXJlIHRoYXQg bW9kdWxlIG5lZWRzIHRvIG1hdGNoIHRvIGJlIGFjY2VwdGVkICovCi1zdGF0aWMgY29uc3Qg UGdfbWFnaWNfc3RydWN0IG1hZ2ljX2RhdGEgPSBQR19NT0RVTEVfTUFHSUNfREFUQTsKK3N0 YXRpYyBjb25zdCBQZ19tYWdpY19zdHJ1Y3QgbWFnaWNfZGF0YSA9IFBHX01PRFVMRV9NQUdJ Q19EQVRBKHswfSk7CiAKIAogLyoKQEAgLTI0Niw3ICsyNTEsOCBAQCBpbnRlcm5hbF9sb2Fk X2xpYnJhcnkoY29uc3QgY2hhciAqbGlibmFtZSkKIAkJCWNvbnN0IFBnX21hZ2ljX3N0cnVj dCAqbWFnaWNfZGF0YV9wdHIgPSAoKm1hZ2ljX2Z1bmMpICgpOwogCiAJCQlpZiAobWFnaWNf ZGF0YV9wdHItPmxlbiAhPSBtYWdpY19kYXRhLmxlbiB8fAotCQkJCW1lbWNtcChtYWdpY19k YXRhX3B0ciwgJm1hZ2ljX2RhdGEsIG1hZ2ljX2RhdGEubGVuKSAhPSAwKQorCQkJCW1lbWNt cChtYWdpY19kYXRhX3B0ciwgJm1hZ2ljX2RhdGEsCisJCQkJCSAgIG9mZnNldG9mKFBnX21h Z2ljX3N0cnVjdCwgbW9kdWxlX2V4dHJhKSkgIT0gMCkKIAkJCXsKIAkJCQkvKiBjb3B5IGRh dGEgYmxvY2sgYmVmb3JlIHVubGlua2luZyBsaWJyYXJ5ICovCiAJCQkJUGdfbWFnaWNfc3Ry dWN0IG1vZHVsZV9tYWdpY19kYXRhID0gKm1hZ2ljX2RhdGFfcHRyOwpAQCAtMjU4LDYgKzI2 NCwyMCBAQCBpbnRlcm5hbF9sb2FkX2xpYnJhcnkoY29uc3QgY2hhciAqbGlibmFtZSkKIAkJ CQkvKiBpc3N1ZSBzdWl0YWJsZSBjb21wbGFpbnQgKi8KIAkJCQlpbmNvbXBhdGlibGVfbW9k dWxlX2Vycm9yKGxpYm5hbWUsICZtb2R1bGVfbWFnaWNfZGF0YSk7CiAJCQl9CisKKwkJCWlm IChtYWdpY19kYXRhX3B0ci0+bW9kdWxlX2V4dHJhLm5hbWVbMF0gIT0gJ1wwJykKKwkJCXsK KwkJCQlzdHJjcHkoZmlsZV9zY2FubmVyLT5uYW1lLCBtYWdpY19kYXRhX3B0ci0+bW9kdWxl X2V4dHJhLm5hbWUpOworCQkJCWZpbGVfc2Nhbm5lci0+bWFqb3JfdmVyID0gbWFnaWNfZGF0 YV9wdHItPm1vZHVsZV9leHRyYS5tYWpvcl92ZXI7CisJCQkJZmlsZV9zY2FubmVyLT5taW5v cl92ZXIgPSBtYWdpY19kYXRhX3B0ci0+bW9kdWxlX2V4dHJhLm1pbm9yX3ZlcjsKKwkJCX0K KwkJCWVsc2UKKwkJCXsKKwkJCQkvKgorCQkJCSAqIE5vIG5lZWQgYWRkaXRpb25hbCBlZmZv cnRzLiBaZXJvLWZpbGxlZCBkYXRhIHNlcnZlcyBhcyBpcyBpbgorCQkJCSAqIHRoZSAnbm90 IGluaXRpYWxpemVkJyBzdGF0ZQorCQkJCSAqLworCQkJfQogCQl9CiAJCWVsc2UKIAkJewpA QCAtNjc1LDMgKzY5NSw1MSBAQCBSZXN0b3JlTGlicmFyeVN0YXRlKGNoYXIgKnN0YXJ0X2Fk ZHJlc3MpCiAJCXN0YXJ0X2FkZHJlc3MgKz0gc3RybGVuKHN0YXJ0X2FkZHJlc3MpICsgMTsK IAl9CiB9CisKK0RhdHVtCittb2R1bGVfaW5mbyhQR19GVU5DVElPTl9BUkdTKQoreworCUZ1 bmNDYWxsQ29udGV4dAkgICAqZnVuY2N0eDsKKwlNZW1vcnlDb250ZXh0CQlvbGRjb250ZXh0 OworCUR5bmFtaWNGaWxlTGlzdAkgICAqZmlsZV9zY2FubmVyID0gTlVMTDsKKwlUdXBsZURl c2MJCQl0dXBkZXNjOworCURhdHVtCQkJCXJlc3VsdDsKKwlEYXR1bQkJCQl2YWx1ZXNbNF07 CisJYm9vbAkJCQlpc251bGxbNF0gPSB7MCwwLDAsMH07CisKKwlpZiAoU1JGX0lTX0ZJUlNU Q0FMTCgpKQorCXsKKwkJZnVuY2N0eCA9IFNSRl9GSVJTVENBTExfSU5JVCgpOworCQlvbGRj b250ZXh0ID0gTWVtb3J5Q29udGV4dFN3aXRjaFRvKGZ1bmNjdHgtPm11bHRpX2NhbGxfbWVt b3J5X2N0eCk7CisKKwkJaWYgKGdldF9jYWxsX3Jlc3VsdF90eXBlKGZjaW5mbywgTlVMTCwg JnR1cGRlc2MpICE9IFRZUEVGVU5DX0NPTVBPU0lURSkKKwkJCWVsb2coRVJST1IsICJyZXR1 cm4gdHlwZSBtdXN0IGJlIGEgcm93IHR5cGUiKTsKKworCQlmaWxlX3NjYW5uZXIgPSBmaWxl X2xpc3Q7CisKKwkJTWVtb3J5Q29udGV4dFN3aXRjaFRvKG9sZGNvbnRleHQpOworCX0KKwor CWZ1bmNjdHggPSBTUkZfUEVSQ0FMTF9TRVRVUCgpOworCisJaWYgKGZpbGVfc2Nhbm5lciAh PSBOVUxMKQorCXsKKwkJaWYgKGZpbGVfc2Nhbm5lci0+bmFtZVswXSA9PSAnXDAnKQorCQl7 CisJCQlpc251bGxbMF0gPSBpc251bGxbMV0gPSBpc251bGxbMl0gPSB0cnVlOworCQl9CisJ CWVsc2UKKwkJeworCQkJdmFsdWVzWzBdID0gQ1N0cmluZ0dldFRleHREYXR1bShmaWxlX3Nj YW5uZXItPm5hbWUpOworCQkJdmFsdWVzWzFdID0gSW50MzJHZXREYXR1bShmaWxlX3NjYW5u ZXItPm1ham9yX3Zlcik7CisJCQl2YWx1ZXNbMl0gPSBJbnQzMkdldERhdHVtKGZpbGVfc2Nh bm5lci0+bWlub3JfdmVyKTsKKwkJfQorCisJCXZhbHVlc1szXSA9IENTdHJpbmdHZXRUZXh0 RGF0dW0oZmlsZV9zY2FubmVyLT5maWxlbmFtZSk7CisJCXJlc3VsdCA9IEhlYXBUdXBsZUdl dERhdHVtKGhlYXBfZm9ybV90dXBsZSh0dXBkZXNjLCB2YWx1ZXMsIGlzbnVsbCkpOworCQlm aWxlX3NjYW5uZXIgPSBmaWxlX3NjYW5uZXItPm5leHQ7CisJCVNSRl9SRVRVUk5fTkVYVChm dW5jY3R4LCByZXN1bHQpOworCX0KKwllbHNlCisJCVNSRl9SRVRVUk5fRE9ORShmdW5jY3R4 KTsKK30KZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2NhdGFsb2cvcGdfcHJvYy5kYXQgYi9z cmMvaW5jbHVkZS9jYXRhbG9nL3BnX3Byb2MuZGF0CmluZGV4IDBmMjJjMjE3MjMuLjg2Mzhi NTg0MmMgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2NhdGFsb2cvcGdfcHJvYy5kYXQKKysr IGIvc3JjL2luY2x1ZGUvY2F0YWxvZy9wZ19wcm9jLmRhdApAQCAtMzExLDYgKzMxMSwxMiBA QAogICBwcm9uYW1lID0+ICdzY2FsYXJndGpvaW5zZWwnLCBwcm92b2xhdGlsZSA9PiAncycs IHByb3JldHR5cGUgPT4gJ2Zsb2F0OCcsCiAgIHByb2FyZ3R5cGVzID0+ICdpbnRlcm5hbCBv aWQgaW50ZXJuYWwgaW50MiBpbnRlcm5hbCcsCiAgIHByb3NyYyA9PiAnc2NhbGFyZ3Rqb2lu c2VsJyB9LAoreyBvaWQgPT4gJzExMScsIGRlc2NyID0+ICdNb2R1bGUgSW5mbycsCisgIHBy b25hbWUgPT4gJ21vZHVsZV9pbmZvJywgcHJvdm9sYXRpbGUgPT4gJ3MnLCBwcm9yZXR0eXBl ID0+ICdyZWNvcmQnLAorICBwcm9yZXRzZXQgPT4gJ3QnLCBwcm9hcmd0eXBlcyA9PiAnJywg cHJvYWxsYXJndHlwZXMgPT4gJ3t0ZXh0LGludDQsaW50NCx0ZXh0fScsCisgIHByb2FyZ21v ZGVzID0+ICd7byxvLG8sb30nLCBwcm9yb3dzID0+IDEwLAorICBwcm9hcmduYW1lcyA9PiAn e21vZHVsZV9uYW1lLG1ham9yX3ZlcixtaW5vcl92ZXIsbGlibmFtZX0nLAorICBwcm9zcmMg PT4gJ21vZHVsZV9pbmZvJyB9LAogCiB7IG9pZCA9PiAnMzM2JywKICAgZGVzY3IgPT4gJ3Jl c3RyaWN0aW9uIHNlbGVjdGl2aXR5IG9mIDw9IGFuZCByZWxhdGVkIG9wZXJhdG9ycyBvbiBz Y2FsYXIgZGF0YXR5cGVzJywKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2ZtZ3IuaCBiL3Ny Yy9pbmNsdWRlL2ZtZ3IuaAppbmRleCAxZTM3OTVkZTRhLi5kZTFjZTM0MDFmIDEwMDY0NAot LS0gYS9zcmMvaW5jbHVkZS9mbWdyLmgKKysrIGIvc3JjL2luY2x1ZGUvZm1nci5oCkBAIC00 NTksNiArNDU5LDEzIEBAIGV4dGVybiBQR0RMTEVYUE9SVCB2b2lkIF9QR19pbml0KHZvaWQp OwogICotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgKi8KIAordHlwZWRlZiBzdHJ1Y3QgcGdfbW9k dWxlX2luZm8KK3sKKwljaGFyCW5hbWVbTkFNRURBVEFMRU5dOworCWludDMyCW1ham9yX3Zl cjsKKwlpbnQzMgltaW5vcl92ZXI7Cit9IHBnX21vZHVsZV9pbmZvOworCiAvKiBEZWZpbml0 aW9uIG9mIHRoZSBtYWdpYyBibG9jayBzdHJ1Y3R1cmUgKi8KIHR5cGVkZWYgc3RydWN0CiB7 CkBAIC00NjksMTAgKzQ3NiwxMiBAQCB0eXBlZGVmIHN0cnVjdAogCWludAkJCW5hbWVkYXRh bGVuOwkvKiBOQU1FREFUQUxFTiAqLwogCWludAkJCWZsb2F0OGJ5dmFsOwkvKiBGTE9BVDhQ QVNTQllWQUwgKi8KIAljaGFyCQlhYmlfZXh0cmFbMzJdOwkvKiBzZWUgcGdfY29uZmlnX21h bnVhbC5oICovCisJcGdfbW9kdWxlX2luZm8gbW9kdWxlX2V4dHJhOwogfSBQZ19tYWdpY19z dHJ1Y3Q7CiAKIC8qIFRoZSBhY3R1YWwgZGF0YSBibG9jayBjb250ZW50cyAqLwotI2RlZmlu ZSBQR19NT0RVTEVfTUFHSUNfREFUQSBcCisvKiBGaWxsIHRoZSBtb2R1bGUgaW5mbyBwYXJ0 IHdpdGggemVyb3MgYnkgZGVmYXVsdC4gWmVyby1sZW5ndGggbW9kdWxlIG5hbWUgaW5kaWNh dGVzIHRoYXQgaXQgaXMgbm90IGluaXRpYWxpc2VkICovCisjZGVmaW5lIFBHX01PRFVMRV9N QUdJQ19EQVRBKC4uLikgXAogeyBcCiAJc2l6ZW9mKFBnX21hZ2ljX3N0cnVjdCksIFwKIAlQ R19WRVJTSU9OX05VTSAvIDEwMCwgXApAQCAtNDgxLDYgKzQ5MCw3IEBAIHR5cGVkZWYgc3Ry dWN0CiAJTkFNRURBVEFMRU4sIFwKIAlGTE9BVDhQQVNTQllWQUwsIFwKIAlGTUdSX0FCSV9F WFRSQSwgXAorCXtfX1ZBX0FSR1NfX30sIFwKIH0KIAogU3RhdGljQXNzZXJ0RGVjbChzaXpl b2YoRk1HUl9BQklfRVhUUkEpIDw9IHNpemVvZigoKFBnX21hZ2ljX3N0cnVjdCAqKSAwKS0+ YWJpX2V4dHJhKSwKQEAgLTUwMCwxMSArNTEwLDIxIEBAIGV4dGVybiBQR0RMTEVYUE9SVCBj b25zdCBQZ19tYWdpY19zdHJ1Y3QgKlBHX01BR0lDX0ZVTkNUSU9OX05BTUUodm9pZCk7IFwK IGNvbnN0IFBnX21hZ2ljX3N0cnVjdCAqIFwKIFBHX01BR0lDX0ZVTkNUSU9OX05BTUUodm9p ZCkgXAogeyBcCi0Jc3RhdGljIGNvbnN0IFBnX21hZ2ljX3N0cnVjdCBQZ19tYWdpY19kYXRh ID0gUEdfTU9EVUxFX01BR0lDX0RBVEE7IFwKKwlzdGF0aWMgY29uc3QgUGdfbWFnaWNfc3Ry dWN0IFBnX21hZ2ljX2RhdGEgPSBQR19NT0RVTEVfTUFHSUNfREFUQSh7MH0pOyBcCiAJcmV0 dXJuICZQZ19tYWdpY19kYXRhOyBcCiB9IFwKIGV4dGVybiBpbnQgbm9fc3VjaF92YXJpYWJs ZQogCisjZGVmaW5lIFBHX01PRFVMRV9NQUdJQ19FWFQoLi4uKSBcCitleHRlcm4gUEdETExF WFBPUlQgY29uc3QgUGdfbWFnaWNfc3RydWN0ICpQR19NQUdJQ19GVU5DVElPTl9OQU1FKHZv aWQpOyBcCitjb25zdCBQZ19tYWdpY19zdHJ1Y3QgKiBcCitQR19NQUdJQ19GVU5DVElPTl9O QU1FKHZvaWQpIFwKK3sgXAorCXN0YXRpYyBjb25zdCBQZ19tYWdpY19zdHJ1Y3QgUGdfbWFn aWNfZGF0YSA9IFwKKwkJUEdfTU9EVUxFX01BR0lDX0RBVEEoX19WQV9BUkdTX18pOyBcCisJ cmV0dXJuICZQZ19tYWdpY19kYXRhOyBcCit9IFwKK2V4dGVybiBpbnQgbm9fc3VjaF92YXJp YWJsZQogCiAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAqCQlTdXBwb3J0IHJvdXRpbmVzIGFu ZCBtYWNyb3MgZm9yIGNhbGxlcnMgb2YgZm1nci1jb21wYXRpYmxlIGZ1bmN0aW9ucwotLSAK Mi4zOS41Cgo= --------------ar1CVTxFxgXYLbrMI0y2PTHb--