From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: Re: [PATCH v13.1 26/26] cmdline switches and config vars to control colo-proxy Date: Wed, 30 Mar 2016 15:42:06 +0100 Message-ID: <22267.58814.358526.222436@mariner.uk.xensource.com> References: <1458888273-7469-1-git-send-email-xiecl.fnst@cn.fujitsu.com> <1458888273-7469-27-git-send-email-xiecl.fnst@cn.fujitsu.com> <56F8A965.6080905@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <56F8A965.6080905@cn.fujitsu.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Changlong Xie Cc: Lars Kurth , Li Zhijian , Wei Liu , Ian Campbell , Wen Congyang , Andrew Cooper , Jiang Yunhong , Dong Eddie , xen devel , Anthony Perard , Gui Jianfeng , Shriram Rajagopalan , Yang Hongyang List-Id: xen-devel@lists.xenproject.org Q2hhbmdsb25nIFhpZSB3cml0ZXMgKCJbUEFUQ0ggdjEzLjEgMjYvMjZdIGNtZGxpbmUgc3dpdGNo ZXMgYW5kIGNvbmZpZyB2YXJzIHRvIGNvbnRyb2wgY29sby1wcm94eSIpOgo+ICBGcm9tIDFiZmQx NDYyMjQ1NTYzNWM2Y2FlNjEzMDM5NjI1MDk5NmU0OWZhY2MgTW9uIFNlcCAxNyAwMDowMDowMCAy MDAxCj4gRnJvbTogV2VuIENvbmd5YW5nIDx3ZW5jeUBjbi5mdWppdHN1LmNvbT4KPiBEYXRlOiBX ZWQsIDE1IEp1bCAyMDE1IDE3OjE4OjU2ICswODAwCj4gU3ViamVjdDogW1BBVENIIHYxMy4xIDI2 LzI2XSBjbWRsaW5lIHN3aXRjaGVzIGFuZCBjb25maWcgdmFycyB0byBjb250cm9sIAo+IGNvbG8t cHJveHkKCkkgZm91bmQgYSBwcm9wZXIgY29weSBvZiB0aGlzIGluOgogIGh0dHBzOi8vZ2l0aHVi LmNvbS9QYXRpbmcveGVuLmdpdCMyN2U2NGZlOGE0OTUKClRoYXQgY29tbWl0IGlzCgpBY2tlZC1i eTogSWFuIEphY2tzb24gPGlhbi5qYWNrc29uQGV1LmNpdHJpeC5jb20+CgpJYW4uCgpGcm9tIDI3 ZTY0ZmU4YTQ5NTRiNWE1NjI4Njk2MTYwNDcxZjg5YTllNmFlNmUgTW9uIFNlcCAxNyAwMDowMDow MCAyMDAxCkZyb206IFdlbiBDb25neWFuZyA8d2VuY3lAY24uZnVqaXRzdS5jb20+CkRhdGU6IFdl ZCwgMTUgSnVsIDIwMTUgMTc6MTg6NTYgKzA4MDAKU3ViamVjdDogW1BBVENIIDI3LzI4XSBjbWRs aW5lIHN3aXRjaGVzIGFuZCBjb25maWcgdmFycyB0byBjb250cm9sIGNvbG8tcHJveHkKCkFkZCBj bWRsaW5lIHN3aXRjaGVzIHRvICd4bCBtaWdyYXRlLXJlY2VpdmUnIGNvbW1hbmQgdG8gc3BlY2lm eQphIGRvbWFpbi1zcGVjaWZpYyBob3RwbHVnIHNjcmlwdCB0byBzZXR1cCBDT0xPIHByb3h5LgoK QWRkIGEgbmV3IGNvbmZpZyB2YXIgJ2NvbG8uZGVmYXVsdC5hZ2VudHNjcmlwdCcgdG8geGwuY29u ZiwgdGhhdAphbGxvd3MgdGhlIHVzZXIgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQgZ2xvYmFsIHNj cmlwdCB1c2VkIHRvCnNldHVwIENPTE8gcHJveHkuCgpTaWduZWQtb2ZmLWJ5OiBZYW5nIEhvbmd5 YW5nIDxob25neWFuZy55YW5nQGVhc3lzdGFjay5jbj4KU2lnbmVkLW9mZi1ieTogV2VuIENvbmd5 YW5nIDx3ZW5jeUBjbi5mdWppdHN1LmNvbT4KU2lnbmVkLW9mZi1ieTogQ2hhbmdsb25nIFhpZSA8 eGllY2wuZm5zdEBjbi5mdWppdHN1LmNvbT4KLS0tCiBkb2NzL21hbi94bC5jb25mLnBvZC41ICAg ICAgICAgICB8ICAgIDYgKysrKysKIGRvY3MvbWFuL3hsLnBvZC4xICAgICAgICAgICAgICAgIHwg ICAgNyArKysrLS0KIHRvb2xzL2xpYnhsL2xpYnhsLmMgICAgICAgICAgICAgIHwgICAgNiArKysr KwogdG9vbHMvbGlieGwvbGlieGxfY29sb19yZXN0b3JlLmMgfCAgICA1ICsrKysKIHRvb2xzL2xp YnhsL2xpYnhsX2NyZWF0ZS5jICAgICAgIHwgICAgOSArKysrKystLQogdG9vbHMvbGlieGwvbGli eGxfdHlwZXMuaWRsICAgICAgfCAgICAxICsKIHRvb2xzL2xpYnhsL3hsLmMgICAgICAgICAgICAg ICAgIHwgICAgMyArKysKIHRvb2xzL2xpYnhsL3hsLmggICAgICAgICAgICAgICAgIHwgICAgMSAr CiB0b29scy9saWJ4bC94bF9jbWRpbXBsLmMgICAgICAgICB8ICAgNDcgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0KIDkgZmlsZXMgY2hhbmdlZCwgNzEgaW5zZXJ0aW9ucygr KSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jcy9tYW4veGwuY29uZi5wb2QuNSBi L2RvY3MvbWFuL3hsLmNvbmYucG9kLjUKaW5kZXggOGFlMTliYi4uOGY3ZmQyOCAxMDA2NDQKLS0t IGEvZG9jcy9tYW4veGwuY29uZi5wb2QuNQorKysgYi9kb2NzL21hbi94bC5jb25mLnBvZC41CkBA IC0xMTEsNiArMTExLDEyIEBAIENvbmZpZ3VyZXMgdGhlIGRlZmF1bHQgc2NyaXB0IHVzZWQgYnkg UmVtdXMgdG8gc2V0dXAgbmV0d29yayBidWZmZXJpbmcuCiAKIERlZmF1bHQ6IEM8L2V0Yy94ZW4v c2NyaXB0cy9yZW11cy1uZXRidWYtc2V0dXA+CiAKKz1pdGVtIEI8Y29sby5kZWZhdWx0LnByb3h5 c2NyaXB0PSJQQVRIIj4KKworQ29uZmlndXJlcyB0aGUgZGVmYXVsdCBzY3JpcHQgdXNlZCBieSBD T0xPIHRvIHNldHVwIGNvbG8tcHJveHkuCisKK0RlZmF1bHQ6IEM8L2V0Yy94ZW4vc2NyaXB0cy9j b2xvLXByb3h5LXNldHVwPgorCiA9aXRlbSBCPG91dHB1dF9mb3JtYXQ9Impzb258c3hwIj4KIAog Q29uZmlndXJlcyB0aGUgZGVmYXVsdCBvdXRwdXQgZm9ybWF0IHVzZWQgYnkgeGwgd2hlbiBwcmlu dGluZyAibWFjaGluZQpkaWZmIC0tZ2l0IGEvZG9jcy9tYW4veGwucG9kLjEgYi9kb2NzL21hbi94 bC5wb2QuMQppbmRleCAyNjY0NDAyLi45ZGYzMzAyIDEwMDY0NAotLS0gYS9kb2NzL21hbi94bC5w b2QuMQorKysgYi9kb2NzL21hbi94bC5wb2QuMQpAQCAtNDU4LDggKzQ1OCw2IEBAIFJlbXVzIHN1 cHBvcnQgaW4geGwgaXMgc3RpbGwgaW4gZXhwZXJpbWVudGFsIChwcm9vZi1vZi1jb25jZXB0KSBw aGFzZS4KIERpc2sgcmVwbGljYXRpb24gc3VwcG9ydCBpcyBsaW1pdGVkIHRvIERSQkQgZGlza3Mu CiAKIENPTE8gc3VwcG9ydCBpbiB4bCBpcyBzdGlsbCBpbiBleHBlcmltZW50YWwgKHByb29mLW9m LWNvbmNlcHQpIHBoYXNlLgotVGhlcmUgaXMgbm8gc3VwcG9ydCBmb3IgbmV0d29yaywgc28gdGhl IGd1ZXN0IHdpbGwgY29uZnVzZSBpdHMgbmV0d29yawotcGVlcnMgYXQgdGhlIG1vbWVudC4KIAog PWJhY2sKIApAQCAtNDgzLDYgKzQ4MSwxMSBAQCBhbmQgaXQncyB1c2VkIGJ5IHNlY29uZGFyeS4K ID1pdGVtIEI8aGlkZGVuLWRpc2s+ICAgIDpQcmltYXJ5J3MgbW9kaWZpZWQgY29udGVudHMgd2ls bCBiZSBidWZmZXJlZCBpbiB0aGlzCiBkaXNrLCBhbmQgaXQncyB1c2VkIGJ5IHNlY29uZGFyeS4K IAorKGIpIEFuIGV4YW1wbGUgZm9yIENPTE8gbmV0d29yayBjb25maWd1cmF0aW9uOiB2aWYgPVsg Jy4uLixmb3J3YXJkZGV2PXh4eCwuLi4nXQorCis9aXRlbSBCPGZvcndhcmRkZXY+ICAgICA6Rm9y d2FyZCBkZXZpY2VzIGZvciBwcmltYXJ5IGFuZCBzZWNvbmRhcnksIHRoZXJlIGFyZQorZGlyZWN0 bHkgY29ubmVjdGVkLgorCiBOb3RlIHRoYXQgdGhlIENPTE8gY29uZmlndXJhdGlvbiBzZXR0aW5n cyBzaG91bGQgYmUgY29uc2lkZXJlZCB1bnN0YWJsZS4gVGhleQogbWF5IGNoYW5nZSBpbmNvbXBh dGlibHkgaW4gZnV0dXJlIHZlcnNpb25zIG9mIFhlbi4KIApkaWZmIC0tZ2l0IGEvdG9vbHMvbGli eGwvbGlieGwuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsLmMKaW5kZXggNjNmYmUxNi4uYWFiZjNhNyAx MDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGwuYworKysgYi90b29scy9saWJ4bC9saWJ4bC5j CkBAIC0zMzc4LDYgKzMzNzgsMTEgQEAgdm9pZCBsaWJ4bF9fZGV2aWNlX25pY19hZGQobGlieGxf X2VnYyAqZWdjLCB1aW50MzJfdCBkb21pZCwKICAgICAgICAgZmxleGFycmF5X2FwcGVuZChiYWNr LCBuaWMtPmlmbmFtZSk7CiAgICAgfQogCisgICAgaWYgKG5pYy0+Y29sb2Z0X2ZvcndhcmRkZXYp IHsKKyAgICAgICAgZmxleGFycmF5X2FwcGVuZChiYWNrLCAiZm9yd2FyZGRldiIpOworICAgICAg ICBmbGV4YXJyYXlfYXBwZW5kKGJhY2ssIG5pYy0+Y29sb2Z0X2ZvcndhcmRkZXYpOworICAgIH0K KwogICAgIGZsZXhhcnJheV9hcHBlbmQoYmFjaywgIm1hYyIpOwogICAgIGZsZXhhcnJheV9hcHBl bmQoYmFjayxHQ1NQUklOVEYoTElCWExfTUFDX0ZNVCwgTElCWExfTUFDX0JZVEVTKG5pYy0+bWFj KSkpOwogICAgIGlmIChuaWMtPmlwKSB7CkBAIC0zNTAwLDYgKzM1MDUsNyBAQCBzdGF0aWMgaW50 IGxpYnhsX19kZXZpY2VfbmljX2Zyb21feHNfYmUobGlieGxfX2djICpnYywKICAgICBuaWMtPmlw ID0gUkVBRF9CQUNLRU5EKE5PR0MsICJpcCIpOwogICAgIG5pYy0+YnJpZGdlID0gUkVBRF9CQUNL RU5EKE5PR0MsICJicmlkZ2UiKTsKICAgICBuaWMtPnNjcmlwdCA9IFJFQURfQkFDS0VORChOT0dD LCAic2NyaXB0Iik7CisgICAgbmljLT5jb2xvZnRfZm9yd2FyZGRldiA9IFJFQURfQkFDS0VORChO T0dDLCAiZm9yd2FyZGRldiIpOwogCiAgICAgLyogdmlmX2lvZW11IG5pY3MgdXNlIHRoZSBzYW1l IHhlbnN0b3JlIGVudHJpZXMgYXMgdmlmIGludGVyZmFjZXMgKi8KICAgICB0bXAgPSBSRUFEX0JB Q0tFTkQoZ2MsICJ0eXBlIik7CmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9jb2xvX3Jl c3RvcmUuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2NvbG9fcmVzdG9yZS5jCmluZGV4IGM4YWQ3OTYu LjM0ODNmMzkgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX2NvbG9fcmVzdG9yZS5jCisr KyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2NvbG9fcmVzdG9yZS5jCkBAIC0yMzMsNiArMjMzLDExIEBA IHZvaWQgbGlieGxfX2NvbG9fcmVzdG9yZV9zZXR1cChsaWJ4bF9fZWdjICplZ2MsCiAgICAgY3Jj cy0+Y3JzID0gY3JzOwogICAgIGNycy0+cWRpc2tfc2V0dXBlZCA9IGZhbHNlOwogICAgIGNycy0+ cWRpc2tfdXNlZCA9IGZhbHNlOworICAgIGlmIChkY3MtPmNvbG9fcHJveHlfc2NyaXB0KQorICAg ICAgICBjcnMtPmNvbG9fcHJveHlfc2NyaXB0ID0gbGlieGxfX3N0cmR1cChnYywgZGNzLT5jb2xv X3Byb3h5X3NjcmlwdCk7CisgICAgZWxzZQorICAgICAgICBjcnMtPmNvbG9fcHJveHlfc2NyaXB0 ID0gR0NTUFJJTlRGKCIlcy9jb2xvLXByb3h5LXNldHVwIiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBsaWJ4bF9feGVuX3NjcmlwdF9kaXJfcGF0aCgpKTsKIAog ICAgIC8qIHNldHVwIGRzcHMgKi8KICAgICBjcmNzLT5kc3BzLmFvID0gYW87CmRpZmYgLS1naXQg YS90b29scy9saWJ4bC9saWJ4bF9jcmVhdGUuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5j CmluZGV4IGUyZWMyNWMuLmQ2MDI4YWEgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX2Ny ZWF0ZS5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jCkBAIC0xNjkwLDYgKzE2OTAs NyBAQCBzdGF0aWMgdm9pZCBkb21haW5fY3JlYXRlX2NiKGxpYnhsX19lZ2MgKmVnYywKIHN0YXRp YyBpbnQgZG9fZG9tYWluX2NyZWF0ZShsaWJ4bF9jdHggKmN0eCwgbGlieGxfZG9tYWluX2NvbmZp ZyAqZF9jb25maWcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgKmRvbWlk LCBpbnQgcmVzdG9yZV9mZCwgaW50IHNlbmRfYmFja19mZCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBsaWJ4bF9kb21haW5fcmVzdG9yZV9wYXJhbXMgKnBhcmFtcywKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpjb2xvX3Byb3h5X3NjcmlwdCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBsaWJ4bF9hc3luY29wX2hvdyAqYW9faG93 LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGxpYnhsX2FzeW5jcHJvZ3Jlc3Nf aG93ICphb3BfY29uc29sZV9ob3cpCiB7CkBAIC0xNzEzLDYgKzE3MTQsNyBAQCBzdGF0aWMgaW50 IGRvX2RvbWFpbl9jcmVhdGUobGlieGxfY3R4ICpjdHgsIGxpYnhsX2RvbWFpbl9jb25maWcgKmRf Y29uZmlnLAogICAgIH0KICAgICBjZGNzLT5kY3MuY2FsbGJhY2sgPSBkb21haW5fY3JlYXRlX2Ni OwogICAgIGNkY3MtPmRjcy5kb21pZF9zb2Z0X3Jlc2V0ID0gSU5WQUxJRF9ET01JRDsKKyAgICBj ZGNzLT5kY3MuY29sb19wcm94eV9zY3JpcHQgPSBjb2xvX3Byb3h5X3NjcmlwdDsKICAgICBsaWJ4 bF9fYW9fcHJvZ3Jlc3NfZ2V0aG93KCZjZGNzLT5kY3MuYW9wX2NvbnNvbGVfaG93LCBhb3BfY29u c29sZV9ob3cpOwogICAgIGNkY3MtPmRvbWlkX291dCA9IGRvbWlkOwogCkBAIC0xOTAwLDcgKzE5 MDIsNyBAQCBpbnQgbGlieGxfZG9tYWluX2NyZWF0ZV9uZXcobGlieGxfY3R4ICpjdHgsIGxpYnhs X2RvbWFpbl9jb25maWcgKmRfY29uZmlnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnN0IGxpYnhsX2FzeW5jcHJvZ3Jlc3NfaG93ICphb3BfY29uc29sZV9ob3cpCiB7CiAgICAgdW5z ZXRfZGlza19jb2xvX3Jlc3RvcmUoZF9jb25maWcpOwotICAgIHJldHVybiBkb19kb21haW5fY3Jl YXRlKGN0eCwgZF9jb25maWcsIGRvbWlkLCAtMSwgLTEsIE5VTEwsCisgICAgcmV0dXJuIGRvX2Rv bWFpbl9jcmVhdGUoY3R4LCBkX2NvbmZpZywgZG9taWQsIC0xLCAtMSwgTlVMTCwgTlVMTCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBhb19ob3csIGFvcF9jb25zb2xlX2hvdyk7CiB9CiAK QEAgLTE5MTEsMTQgKzE5MTMsMTcgQEAgaW50IGxpYnhsX2RvbWFpbl9jcmVhdGVfcmVzdG9yZShs aWJ4bF9jdHggKmN0eCwgbGlieGxfZG9tYWluX2NvbmZpZyAqZF9jb25maWcsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGxpYnhsX2FzeW5jb3BfaG93ICphb19ob3csCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGxpYnhsX2FzeW5jcHJvZ3Jlc3Nf aG93ICphb3BfY29uc29sZV9ob3cpCiB7CisgICAgY2hhciAqY29sb19wcm94eV9zY3JpcHQgPSBO VUxMOworCiAgICAgaWYgKHBhcmFtcy0+Y2hlY2twb2ludGVkX3N0cmVhbSA9PSBMSUJYTF9DSEVD S1BPSU5URURfU1RSRUFNX0NPTE8pIHsKKyAgICAgICAgY29sb19wcm94eV9zY3JpcHQgPSBwYXJh bXMtPmNvbG9fcHJveHlfc2NyaXB0OwogICAgICAgICBzZXRfZGlza19jb2xvX3Jlc3RvcmUoZF9j b25maWcpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHVuc2V0X2Rpc2tfY29sb19yZXN0b3JlKGRf Y29uZmlnKTsKICAgICB9CiAKICAgICByZXR1cm4gZG9fZG9tYWluX2NyZWF0ZShjdHgsIGRfY29u ZmlnLCBkb21pZCwgcmVzdG9yZV9mZCwgc2VuZF9iYWNrX2ZkLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHBhcmFtcywgYW9faG93LCBhb3BfY29uc29sZV9ob3cpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHBhcmFtcywgY29sb19wcm94eV9zY3JpcHQsIGFvX2hvdywgYW9wX2Nv bnNvbGVfaG93KTsKIH0KIAogaW50IGxpYnhsX2RvbWFpbl9zb2Z0X3Jlc2V0KGxpYnhsX2N0eCAq Y3R4LApkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfdHlwZXMuaWRsIGIvdG9vbHMvbGli eGwvbGlieGxfdHlwZXMuaWRsCmluZGV4IGY4OGZhZTAuLjE2NWI3ODggMTAwNjQ0Ci0tLSBhL3Rv b2xzL2xpYnhsL2xpYnhsX3R5cGVzLmlkbAorKysgYi90b29scy9saWJ4bC9saWJ4bF90eXBlcy5p ZGwKQEAgLTM4Niw2ICszODYsNyBAQCBsaWJ4bF9kb21haW5fY3JlYXRlX2luZm8gPSBTdHJ1Y3Qo ImRvbWFpbl9jcmVhdGVfaW5mbyIsWwogbGlieGxfZG9tYWluX3Jlc3RvcmVfcGFyYW1zID0gU3Ry dWN0KCJkb21haW5fcmVzdG9yZV9wYXJhbXMiLCBbCiAgICAgKCJjaGVja3BvaW50ZWRfc3RyZWFt IiwgaW50ZWdlciksCiAgICAgKCJzdHJlYW1fdmVyc2lvbiIsIHVpbnQzMiwgeydpbml0X3ZhbCc6 ICcxJ30pLAorICAgICgiY29sb19wcm94eV9zY3JpcHQiLCBzdHJpbmcpLAogICAgIF0pCiAKIGxp YnhsX2RvbWFpbl9zY2hlZF9wYXJhbXMgPSBTdHJ1Y3QoImRvbWFpbl9zY2hlZF9wYXJhbXMiLFsK ZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL3hsLmMgYi90b29scy9saWJ4bC94bC5jCmluZGV4IGRm YWU4NGEuLmEyNzIyNTggMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL3hsLmMKKysrIGIvdG9vbHMv bGlieGwveGwuYwpAQCAtNDUsNiArNDUsNyBAQCBjaGFyICpkZWZhdWx0X2JyaWRnZSA9IE5VTEw7 CiBjaGFyICpkZWZhdWx0X2dhdGV3YXlkZXYgPSBOVUxMOwogY2hhciAqZGVmYXVsdF92aWZiYWNr ZW5kID0gTlVMTDsKIGNoYXIgKmRlZmF1bHRfcmVtdXNfbmV0YnVmc2NyaXB0ID0gTlVMTDsKK2No YXIgKmRlZmF1bHRfY29sb19wcm94eV9zY3JpcHQgPSBOVUxMOwogZW51bSBvdXRwdXRfZm9ybWF0 IGRlZmF1bHRfb3V0cHV0X2Zvcm1hdCA9IE9VVFBVVF9GT1JNQVRfSlNPTjsKIGludCBjbGFpbV9t b2RlID0gMTsKIGJvb2wgcHJvZ3Jlc3NfdXNlX2NyID0gMDsKQEAgLTE3OSw2ICsxODAsOCBAQCBz dGF0aWMgdm9pZCBwYXJzZV9nbG9iYWxfY29uZmlnKGNvbnN0IGNoYXIgKmNvbmZpZ2ZpbGUsCiAK ICAgICB4bHVfY2ZnX3JlcGxhY2Vfc3RyaW5nIChjb25maWcsICJyZW11cy5kZWZhdWx0Lm5ldGJ1 ZnNjcmlwdCIsCiAgICAgICAgICZkZWZhdWx0X3JlbXVzX25ldGJ1ZnNjcmlwdCwgMCk7CisgICAg eGx1X2NmZ19yZXBsYWNlX3N0cmluZyAoY29uZmlnLCAiY29sby5kZWZhdWx0LnByb3h5c2NyaXB0 IiwKKyAgICAgICAgJmRlZmF1bHRfY29sb19wcm94eV9zY3JpcHQsIDApOwogCiAgICAgeGx1X2Nm Z19kZXN0cm95KGNvbmZpZyk7CiB9CmRpZmYgLS1naXQgYS90b29scy9saWJ4bC94bC5oIGIvdG9v bHMvbGlieGwveGwuaAppbmRleCAzMDk2MjdhLi5lNjAxY2ExIDEwMDY0NAotLS0gYS90b29scy9s aWJ4bC94bC5oCisrKyBiL3Rvb2xzL2xpYnhsL3hsLmgKQEAgLTE5NCw2ICsxOTQsNyBAQCBleHRl cm4gY2hhciAqZGVmYXVsdF9icmlkZ2U7CiBleHRlcm4gY2hhciAqZGVmYXVsdF9nYXRld2F5ZGV2 OwogZXh0ZXJuIGNoYXIgKmRlZmF1bHRfdmlmYmFja2VuZDsKIGV4dGVybiBjaGFyICpkZWZhdWx0 X3JlbXVzX25ldGJ1ZnNjcmlwdDsKK2V4dGVybiBjaGFyICpkZWZhdWx0X2NvbG9fcHJveHlfc2Ny aXB0OwogZXh0ZXJuIGNoYXIgKmJsa2Rldl9zdGFydDsKIAogZW51bSBvdXRwdXRfZm9ybWF0IHsK ZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL3hsX2NtZGltcGwuYyBiL3Rvb2xzL2xpYnhsL3hsX2Nt ZGltcGwuYwppbmRleCAyNWJkODFhLi45MWRjYjYzIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC94 bF9jbWRpbXBsLmMKKysrIGIvdG9vbHMvbGlieGwveGxfY21kaW1wbC5jCkBAIC0xNTgsNiArMTU4 LDcgQEAgc3RydWN0IGRvbWFpbl9jcmVhdGUgewogICAgIGNvbnN0IGNoYXIgKmNvbmZpZ19maWxl OwogICAgIGNoYXIgKmV4dHJhX2NvbmZpZzsgLyogZXh0cmEgY29uZmlnIHN0cmluZyAqLwogICAg IGNvbnN0IGNoYXIgKnJlc3RvcmVfZmlsZTsKKyAgICBjaGFyICpjb2xvX3Byb3h5X3NjcmlwdDsK ICAgICBpbnQgbWlncmF0ZV9mZDsgLyogLTEgbWVhbnMgbm9uZSAqLwogICAgIGludCBzZW5kX2Jh Y2tfZmQ7IC8qIC0xIG1lYW5zIG5vbmUgKi8KICAgICBjaGFyICoqbWlncmF0aW9uX2RvbW5hbWVf cjsgLyogZnJvbSBtYWxsb2MgKi8KQEAgLTEwNTMsNiArMTA1NCw4IEBAIHN0YXRpYyBpbnQgcGFy c2VfbmljX2NvbmZpZyhsaWJ4bF9kZXZpY2VfbmljICpuaWMsIFhMVV9Db25maWcgKipjb25maWcs IGNoYXIgKnRvCiAgICAgICAgIHJlcGxhY2Vfc3RyaW5nKCZuaWMtPm1vZGVsLCBvcGFyZyk7CiAg ICAgfSBlbHNlIGlmIChNQVRDSF9PUFRJT04oInJhdGUiLCB0b2tlbiwgb3BhcmcpKSB7CiAgICAg ICAgIHBhcnNlX3ZpZl9yYXRlKGNvbmZpZywgb3BhcmcsIG5pYyk7CisgICAgfSBlbHNlIGlmIChN QVRDSF9PUFRJT04oImZvcndhcmRkZXYiLCB0b2tlbiwgb3BhcmcpKSB7CisgICAgICAgIHJlcGxh Y2Vfc3RyaW5nKCZuaWMtPmNvbG9mdF9mb3J3YXJkZGV2LCBvcGFyZyk7CiAgICAgfSBlbHNlIGlm IChNQVRDSF9PUFRJT04oImFjY2VsIiwgdG9rZW4sIG9wYXJnKSkgewogICAgICAgICBmcHJpbnRm KHN0ZGVyciwgInRoZSBhY2NlbCBwYXJhbWV0ZXIgZm9yIHZpZnMgaXMgY3VycmVudGx5IG5vdCBz dXBwb3J0ZWRcbiIpOwogICAgIH0gZWxzZSB7CkBAIC0zMDAxLDYgKzMwMDQsNyBAQCBzdGFydDoK ICAgICAgICAgcGFyYW1zLmNoZWNrcG9pbnRlZF9zdHJlYW0gPSBkb21faW5mby0+Y2hlY2twb2lu dGVkX3N0cmVhbTsKICAgICAgICAgcGFyYW1zLnN0cmVhbV92ZXJzaW9uID0KICAgICAgICAgICAg IChoZHIubWFuZGF0b3J5X2ZsYWdzICYgWExfTUFOREFUT1JZX0ZMQUdfU1RSRUFNdjIpID8gMiA6 IDE7CisgICAgICAgIHBhcmFtcy5jb2xvX3Byb3h5X3NjcmlwdCA9IGRvbV9pbmZvLT5jb2xvX3By b3h5X3NjcmlwdDsKIAogICAgICAgICByZXQgPSBsaWJ4bF9kb21haW5fY3JlYXRlX3Jlc3RvcmUo Y3R4LCAmZF9jb25maWcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAmZG9taWQsIHJlc3RvcmVfZmQsCkBAIC00NzMzLDcgKzQ3MzcsOCBAQCBzdGF0aWMgdm9pZCBt aWdyYXRlX2RvbWFpbih1aW50MzJfdCBkb21pZCwgY29uc3QgY2hhciAqcnVuZSwgaW50IGRlYnVn LAogCiBzdGF0aWMgdm9pZCBtaWdyYXRlX3JlY2VpdmUoaW50IGRlYnVnLCBpbnQgZGFlbW9uaXpl LCBpbnQgbW9uaXRvciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgc2VuZF9mZCwg aW50IHJlY3ZfZmQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfY2hlY2twb2lu dGVkX3N0cmVhbSBjaGVja3BvaW50ZWQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGli eGxfY2hlY2twb2ludGVkX3N0cmVhbSBjaGVja3BvaW50ZWQsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY2hhciAqY29sb19wcm94eV9zY3JpcHQpCiB7CiAgICAgdWludDMyX3QgZG9taWQ7 CiAgICAgaW50IHJjLCByYzI7CkBAIC00NzYyLDYgKzQ3NjcsNyBAQCBzdGF0aWMgdm9pZCBtaWdy YXRlX3JlY2VpdmUoaW50IGRlYnVnLCBpbnQgZGFlbW9uaXplLCBpbnQgbW9uaXRvciwKICAgICBk b21faW5mby5zZW5kX2JhY2tfZmQgPSBzZW5kX2ZkOwogICAgIGRvbV9pbmZvLm1pZ3JhdGlvbl9k b21uYW1lX3IgPSAmbWlncmF0aW9uX2RvbW5hbWU7CiAgICAgZG9tX2luZm8uY2hlY2twb2ludGVk X3N0cmVhbSA9IGNoZWNrcG9pbnRlZDsKKyAgICBkb21faW5mby5jb2xvX3Byb3h5X3NjcmlwdCA9 IGNvbG9fcHJveHlfc2NyaXB0OwogCiAgICAgcmMgPSBjcmVhdGVfZG9tYWluKCZkb21faW5mbyk7 CiAgICAgaWYgKHJjIDwgMCkgewpAQCAtNDk1NSw4ICs0OTYxLDExIEBAIGludCBtYWluX21pZ3Jh dGVfcmVjZWl2ZShpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgaW50IGRlYnVnID0gMCwgZGFl bW9uaXplID0gMSwgbW9uaXRvciA9IDE7CiAgICAgbGlieGxfY2hlY2twb2ludGVkX3N0cmVhbSBj aGVja3BvaW50ZWQgPSBMSUJYTF9DSEVDS1BPSU5URURfU1RSRUFNX05PTkU7CiAgICAgaW50IG9w dDsKKyAgICBjaGFyICpzY3JpcHQgPSBOVUxMOwogICAgIHN0YXRpYyBzdHJ1Y3Qgb3B0aW9uIG9w dHNbXSA9IHsKICAgICAgICAgeyJjb2xvIiwgMCwgMCwgMHgxMDB9LAorICAgICAgICAvKiBJdCBp cyBhIHNoYW1lIHRoYXQgdGhlIG1hbmFnZW1lbnQgY29kZSBmb3IgZGlzayBpcyBub3QgaGVyZS4g Ki8KKyAgICAgICAgeyJjb2xvZnQtc2NyaXB0IiwgMSwgMCwgMHgyMDB9LAogICAgICAgICBDT01N T05fTE9OR19PUFRTCiAgICAgfTsKIApAQCAtNDk3Nyw2ICs0OTg2LDkgQEAgaW50IG1haW5fbWln cmF0ZV9yZWNlaXZlKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICBjYXNlIDB4MTAwOgogICAg ICAgICBjaGVja3BvaW50ZWQgPSBMSUJYTF9DSEVDS1BPSU5URURfU1RSRUFNX0NPTE87CiAgICAg ICAgIGJyZWFrOworICAgIGNhc2UgMHgyMDA6CisgICAgICAgIHNjcmlwdCA9IG9wdGFyZzsKKyAg ICAgICAgYnJlYWs7CiAgICAgfQogCiAgICAgaWYgKGFyZ2Mtb3B0aW5kICE9IDApIHsKQEAgLTQ5 ODUsNyArNDk5Nyw3IEBAIGludCBtYWluX21pZ3JhdGVfcmVjZWl2ZShpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAgICAgfQogICAgIG1pZ3JhdGVfcmVjZWl2ZShkZWJ1ZywgZGFlbW9uaXplLCBtb25p dG9yLAogICAgICAgICAgICAgICAgICAgICBTVERPVVRfRklMRU5PLCBTVERJTl9GSUxFTk8sCi0g ICAgICAgICAgICAgICAgICAgIGNoZWNrcG9pbnRlZCk7CisgICAgICAgICAgICAgICAgICAgIGNo ZWNrcG9pbnRlZCwgc2NyaXB0KTsKIAogICAgIHJldHVybiAwOwogfQpAQCAtODM5NSw4ICs4NDA3 LDEwIEBAIGludCBtYWluX3JlbXVzKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAgcl9p bmZvLmludGVydmFsID0gMjAwOwogCiAgICAgaWYgKGxpYnhsX2RlZmJvb2xfdmFsKHJfaW5mby5j b2xvKSkgewotICAgICAgICBpZiAocl9pbmZvLmludGVydmFsIHx8IGxpYnhsX2RlZmJvb2xfdmFs KHJfaW5mby5ibGFja2hvbGUpKSB7Ci0gICAgICAgICAgICBwZXJyb3IoIk9wdGlvbiAtYyBjb25m bGljdHMgd2l0aCAtaSBvciAtYiIpOworICAgICAgICBpZiAocl9pbmZvLmludGVydmFsIHx8IGxp YnhsX2RlZmJvb2xfdmFsKHJfaW5mby5ibGFja2hvbGUpIHx8CisgICAgICAgICAgICAhbGlieGxf ZGVmYm9vbF9pc19kZWZhdWx0KHJfaW5mby5uZXRidWYpIHx8CisgICAgICAgICAgICAhbGlieGxf ZGVmYm9vbF9pc19kZWZhdWx0KHJfaW5mby5kaXNrYnVmKSkgeworICAgICAgICAgICAgcGVycm9y KCJvcHRpb24gLWMgaXMgY29uZmxpY3Qgd2l0aCAtaSwgLWQsIC1uIG9yIC1iIik7CiAgICAgICAg ICAgICBleGl0KC0xKTsKICAgICAgICAgfQogCkBAIC04NDA3LDggKzg0MjEsMTIgQEAgaW50IG1h aW5fcmVtdXMoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgICAgICB9CiAgICAgfQogCi0gICAg aWYgKCFyX2luZm8ubmV0YnVmc2NyaXB0KQotICAgICAgICByX2luZm8ubmV0YnVmc2NyaXB0ID0g ZGVmYXVsdF9yZW11c19uZXRidWZzY3JpcHQ7CisgICAgaWYgKCFyX2luZm8ubmV0YnVmc2NyaXB0 KSB7CisgICAgICAgIGlmIChsaWJ4bF9kZWZib29sX3ZhbChyX2luZm8uY29sbykpCisgICAgICAg ICAgICByX2luZm8ubmV0YnVmc2NyaXB0ID0gZGVmYXVsdF9jb2xvX3Byb3h5X3NjcmlwdDsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgcl9pbmZvLm5ldGJ1ZnNjcmlwdCA9IGRlZmF1bHRfcmVt dXNfbmV0YnVmc2NyaXB0OworICAgIH0KIAogICAgIGlmIChsaWJ4bF9kZWZib29sX3ZhbChyX2lu Zm8uYmxhY2tob2xlKSkgewogICAgICAgICBzZW5kX2ZkID0gb3BlbigiL2Rldi9udWxsIiwgT19S RFdSLCAwNjQ0KTsKQEAgLTg0MjEsMTAgKzg0MzksMTkgQEAgaW50IG1haW5fcmVtdXMoaW50IGFy Z2MsIGNoYXIgKiphcmd2KQogICAgICAgICBpZiAoIXNzaF9jb21tYW5kWzBdKSB7CiAgICAgICAg ICAgICBydW5lID0gaG9zdDsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHhhc3ByaW50 ZigmcnVuZSwgImV4ZWMgJXMgJXMgeGwgbWlncmF0ZS1yZWNlaXZlICVzICVzIiwKLSAgICAgICAg ICAgICAgICAgICAgICBzc2hfY29tbWFuZCwgaG9zdCwKLSAgICAgICAgICAgICAgICAgICAgICBs aWJ4bF9kZWZib29sX3ZhbChyX2luZm8uY29sbykgPyAiLWMiIDogIi1yIiwKLSAgICAgICAgICAg ICAgICAgICAgICBkYWVtb25pemUgPyAiIiA6ICIgLWUiKTsKKyAgICAgICAgICAgIGlmICghbGli eGxfZGVmYm9vbF92YWwocl9pbmZvLmNvbG8pKSB7CisgICAgICAgICAgICAgICAgeGFzcHJpbnRm KCZydW5lLCAiZXhlYyAlcyAlcyB4bCBtaWdyYXRlLXJlY2VpdmUgJXMgJXMiLAorICAgICAgICAg ICAgICAgICAgICAgICAgICBzc2hfY29tbWFuZCwgaG9zdCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgIi1yIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgZGFlbW9uaXplID8gIiIgOiAi IC1lIik7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIHhhc3ByaW50Zigm cnVuZSwgImV4ZWMgJXMgJXMgeGwgbWlncmF0ZS1yZWNlaXZlICVzICVzICVzICVzIiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgc3NoX2NvbW1hbmQsIGhvc3QsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICItLWNvbG8iLAorICAgICAgICAgICAgICAgICAgICAgICAgICByX2luZm8ubmV0 YnVmc2NyaXB0ID8gIi0tY29sb2Z0LXNjcmlwdCIgOiAiIiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgcl9pbmZvLm5ldGJ1ZnNjcmlwdCA/IHJfaW5mby5uZXRidWZzY3JpcHQgOiAiIiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgZGFlbW9uaXplID8gIiIgOiAiIC1lIik7CisgICAgICAg ICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICBzYXZlX2RvbWFpbl9jb3JlX2JlZ2luKGRvbWlk LCBOVUxMLCAmY29uZmlnX2RhdGEsICZjb25maWdfbGVuKTsKLS0gCjEuNy4xMC40CgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4t ZGV2ZWwK