From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yannick Lamarre Subject: [RFC PATCH lttng-tools 01/18] Fix: Use platform-independant types in sessiond to consumerd communication Date: Thu, 18 Apr 2019 12:18:33 -0400 Message-ID: <20190418161850.1536-2-ylamarre__395.505321078815$1555604385$gmane$org@efficios.com> References: <20190418161850.1536-1-ylamarre@efficios.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.efficios.com (mail.efficios.com [IPv6:2607:5300:60:7898::beef]) by lists.lttng.org (Postfix) with ESMTPS id 44lPS03Qdxz1JlM for ; Thu, 18 Apr 2019 12:18:56 -0400 (EDT) In-Reply-To: <20190418161850.1536-1-ylamarre@efficios.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lttng-dev-bounces@lists.lttng.org Sender: "lttng-dev" To: lttng-dev@lists.lttng.org Cc: jgalar@efficios.com List-Id: lttng-dev@lists.lttng.org RnJvbTogSsOpcsOpbWllIEdhbGFybmVhdSA8amVyZW1pZS5nYWxhcm5lYXVAZWZmaWNpb3MuY29t PgoKVGhlIHNlc3Npb24gZGFlbW9uIHRvIGNvbnN1bWVyIGRhZW1vbiBpcyBwYXNzaW4gYXJvdW5k IHRoZQpsdHRjb21tX2NvbnN1bWVyX21zZyBzdHJ1Y3R1cmUgd2hpY2ggY29udGFpbnMgYSByZWxh eWRfc29jawpzdHJ1Y3R1cmUuCgpUaGlzIHN0cnVjdHVyZSwgaW4gdHVybiwgY29udGFpbnMgYSBs dHRjb21tX3JlbGF5ZF9zb2NrIHN0cnVjdHVyZSB3aGljaApjb250YWlucyBhbiBsdHRjb21tX3Nv Y2sgc3RydWN0dXJlLgoKSWYgeW91J3JlIHN0aWxsIGZvbGxvd2luZywgdGhpcyBsdHRjb21tX3Nv Y2sgc3RydWN0dXJlIGhhcyBhbgoib3BzIiBtZW1iZXIgd2hpY2ggaXMgYSBwb2ludGVyLiBPYnZp b3VzbHksIHRoaXMgcG9pbnRlciBkb2VzIG5vdCBoYXZlCnRoZSBzYW1lIHNpemUgYmV0d2VlbiBh IDY0LWJpdCBzZXNzaW9uIGRhZW1vbiBhbmQgYSAzMi1iaXQgY29uc3VtZXIKd2hpY2ggY2F1c2Vz IGNvbW11bmljYXRpb24gaXNzdWVzIHdoZW4gYWRkaW5nIGEgcmVsYXlkIHNvY2tldCAodGhlCkxU VG5nIHZlcnNpb24gaXMgZXJyb25vdXNseSBpbnRlcnByZXRlZCBhcyAwLjIpLgoKVGhpcyBmaXgg aW50cm9kdWNlcyAic2VyaWFsaXplZCIgdmVyc2lvbnMgb2YgdGhlIGFmb3JlbWVudGlvbmVkCnN0 cnVjdHVyZXMgd2hpY2ggb25seSB1c2UgZml4ZWQtc2l6ZSBtZW1iZXJzLiBBZGRpdGlvbmFseSwg dGhlc2UKInNlcmlhbGl6ZWQiIHN0cnVjdHVyZXMnIG1lbWJlcnMgYXJlIHN0b3JlZCBhcyBiaWct ZW5kaWFuIGFuZCB0aGUKcmVzdCBvZiB0aGUgY29tbXVuaWNhdGlvbiBzaG91bGQgdHJhbnNpdGlv biB0byB0aGlzIGNvbnZlbnRpb24uCgpTaWduZWQtb2ZmLWJ5OiBKw6lyw6ltaWUgR2FsYXJuZWF1 IDxqZXJlbWllLmdhbGFybmVhdUBlZmZpY2lvcy5jb20+ClNpZ25lZC1vZmYtYnk6IFlhbm5pY2sg TGFtYXJyZSA8eWxhbWFycmVAZWZmaWNpb3MuY29tPgotLS0KIHNyYy9iaW4vbHR0bmctc2Vzc2lv bmQvY29uc3VtZXIuYyAgICAgICAgICAgIHwgICA1ICstCiBzcmMvY29tbW9uL2tlcm5lbC1jb25z dW1lci9rZXJuZWwtY29uc3VtZXIuYyB8ICAxMSArLQogc3JjL2NvbW1vbi9zZXNzaW9uZC1jb21t L3Nlc3Npb25kLWNvbW0uYyAgICAgfCAxODYgKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBz cmMvY29tbW9uL3Nlc3Npb25kLWNvbW0vc2Vzc2lvbmQtY29tbS5oICAgICB8IDExMSArKysrKysr KysrKysrKystCiBzcmMvY29tbW9uL3VzdC1jb25zdW1lci91c3QtY29uc3VtZXIuYyAgICAgICB8 ICAxMSArLQogdGVzdHMvcmVncmVzc2lvbi90b29scy9saXZlL01ha2VmaWxlLmFtICAgICAgfCAg IDIgKy0KIHRlc3RzL3VuaXQvTWFrZWZpbGUuYW0gICAgICAgICAgICAgICAgICAgICAgIHwgICA2 ICstCiA3IGZpbGVzIGNoYW5nZWQsIDMyMyBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL3NyYy9iaW4vbHR0bmctc2Vzc2lvbmQvY29uc3VtZXIuYyBiL3NyYy9iaW4v bHR0bmctc2Vzc2lvbmQvY29uc3VtZXIuYwppbmRleCA4MGUzMTM3Ny4uZDIyYjBjYmMgMTAwNjQ0 Ci0tLSBhL3NyYy9iaW4vbHR0bmctc2Vzc2lvbmQvY29uc3VtZXIuYworKysgYi9zcmMvYmluL2x0 dG5nLXNlc3Npb25kL2NvbnN1bWVyLmMKQEAgLTEwNDgsNyArMTA0OCwxMCBAQCBpbnQgY29uc3Vt ZXJfc2VuZF9yZWxheWRfc29ja2V0KHN0cnVjdCBjb25zdW1lcl9zb2NrZXQgKmNvbnN1bWVyX3Nv Y2ssCiAJbXNnLnUucmVsYXlkX3NvY2submV0X2luZGV4ID0gY29uc3VtZXItPm5ldF9zZXFfaW5k ZXg7CiAJbXNnLnUucmVsYXlkX3NvY2sudHlwZSA9IHR5cGU7CiAJbXNnLnUucmVsYXlkX3NvY2su c2Vzc2lvbl9pZCA9IHNlc3Npb25faWQ7Ci0JbWVtY3B5KCZtc2cudS5yZWxheWRfc29jay5zb2Nr LCByc29jaywgc2l6ZW9mKG1zZy51LnJlbGF5ZF9zb2NrLnNvY2spKTsKKwlyZXQgPSBsdHRjb21t X3JlbGF5ZF9zb2NrX3NlcmlhbGl6ZSgmbXNnLnUucmVsYXlkX3NvY2suc29jaywgcnNvY2spOwor CWlmIChyZXQpIHsKKwkJZ290byBlcnJvcjsKKwl9CiAKIAlEQkczKCJTZW5kaW5nIHJlbGF5ZCBz b2NrIGluZm8gdG8gY29uc3VtZXIgb24gJWQiLCAqY29uc3VtZXJfc29jay0+ZmRfcHRyKTsKIAly ZXQgPSBjb25zdW1lcl9zZW5kX21zZyhjb25zdW1lcl9zb2NrLCAmbXNnKTsKZGlmZiAtLWdpdCBh L3NyYy9jb21tb24va2VybmVsLWNvbnN1bWVyL2tlcm5lbC1jb25zdW1lci5jIGIvc3JjL2NvbW1v bi9rZXJuZWwtY29uc3VtZXIva2VybmVsLWNvbnN1bWVyLmMKaW5kZXggNjI3Y2QyYTguLjE2ZTNi NTg4IDEwMDY0NAotLS0gYS9zcmMvY29tbW9uL2tlcm5lbC1jb25zdW1lci9rZXJuZWwtY29uc3Vt ZXIuYworKysgYi9zcmMvY29tbW9uL2tlcm5lbC1jb25zdW1lci9rZXJuZWwtY29uc3VtZXIuYwpA QCAtNDU0LDEwICs0NTQsMTkgQEAgaW50IGx0dG5nX2tjb25zdW1lcl9yZWN2X2NtZChzdHJ1Y3Qg bHR0bmdfY29uc3VtZXJfbG9jYWxfZGF0YSAqY3R4LAogCXN3aXRjaCAobXNnLmNtZF90eXBlKSB7 CiAJY2FzZSBMVFROR19DT05TVU1FUl9BRERfUkVMQVlEX1NPQ0tFVDoKIAl7CisJCXN0cnVjdCBs dHRjb21tX3JlbGF5ZF9zb2NrIHJlbGF5ZF9zb2NrOworCisJCXJldCA9IGx0dGNvbW1fcmVsYXlk X3NvY2tfZGVzZXJpYWxpemUoJnJlbGF5ZF9zb2NrLAorCQkJCSZtc2cudS5yZWxheWRfc29jay5z b2NrKTsKKwkJaWYgKHJldCkgeworCQkJLyogUmVjZWl2ZWQgYW4gaW52YWxpZCByZWxheWRfc29j ay4gKi8KKwkJCWdvdG8gZXJyb3JfZmF0YWw7CisJCX0KKwogCQkvKiBTZXNzaW9uIGRhZW1vbiBz dGF0dXMgbWVzc2FnZSBhcmUgaGFuZGxlZCBpbiB0aGUgZm9sbG93aW5nIGNhbGwuICovCiAJCWNv bnN1bWVyX2FkZF9yZWxheWRfc29ja2V0KG1zZy51LnJlbGF5ZF9zb2NrLm5ldF9pbmRleCwKIAkJ CQltc2cudS5yZWxheWRfc29jay50eXBlLCBjdHgsIHNvY2ssIGNvbnN1bWVyX3NvY2twb2xsLAot CQkJCSZtc2cudS5yZWxheWRfc29jay5zb2NrLCBtc2cudS5yZWxheWRfc29jay5zZXNzaW9uX2lk LAorCQkJCSZyZWxheWRfc29jaywgbXNnLnUucmVsYXlkX3NvY2suc2Vzc2lvbl9pZCwKIAkJCQlt c2cudS5yZWxheWRfc29jay5yZWxheWRfc2Vzc2lvbl9pZCk7CiAJCWdvdG8gZW5kX25vc2lnbmFs OwogCX0KZGlmZiAtLWdpdCBhL3NyYy9jb21tb24vc2Vzc2lvbmQtY29tbS9zZXNzaW9uZC1jb21t LmMgYi9zcmMvY29tbW9uL3Nlc3Npb25kLWNvbW0vc2Vzc2lvbmQtY29tbS5jCmluZGV4IDAwNjdi ZTE2Li44YWVlM2NkMSAxMDA2NDQKLS0tIGEvc3JjL2NvbW1vbi9zZXNzaW9uZC1jb21tL3Nlc3Np b25kLWNvbW0uYworKysgYi9zcmMvY29tbW9uL3Nlc3Npb25kLWNvbW0vc2Vzc2lvbmQtY29tbS5j CkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSA8dW5pc3RkLmg+CiAjaW5jbHVkZSA8ZXJybm8u aD4KICNpbmNsdWRlIDxpbnR0eXBlcy5oPgorI2luY2x1ZGUgPGVuZGlhbi5oPgogCiAjaW5jbHVk ZSA8Y29tbW9uL2NvbW1vbi5oPgogCkBAIC03NSw2ICs3NiwxOTEgQEAgc3RhdGljIGNvbnN0IGNo YXIgKmx0dGNvbW1fcmVhZGFibGVfY29kZVtdID0gewogCiBzdGF0aWMgdW5zaWduZWQgbG9uZyBu ZXR3b3JrX3RpbWVvdXQ7CiAKK0xUVE5HX0hJRERFTgoraW50IHNvY2thZGRyX2luX3NlcmlhbGl6 ZShzdHJ1Y3Qgc29ja2FkZHJfaW5fc2VyaWFsaXplZCAqZHN0LAorCQljb25zdCBzdHJ1Y3Qgc29j a2FkZHJfaW4gKnNyYykKK3sKKwlhc3NlcnQoc3JjICYmIGRzdCk7CisJZHN0LT5zaW5fZmFtaWx5 ID0gKHVpbnQzMl90KSBzcmMtPnNpbl9mYW1pbHk7CisJZHN0LT5zaW5fcG9ydCA9ICh1aW50MTZf dCkgc3JjLT5zaW5fcG9ydDsKKwlkc3QtPnNpbl9hZGRyLnNfYWRkciA9IHNyYy0+c2luX2FkZHIu c19hZGRyOworCXJldHVybiAwOworfQorCitMVFROR19ISURERU4KK2ludCBzb2NrYWRkcl9pbl9k ZXNlcmlhbGl6ZShzdHJ1Y3Qgc29ja2FkZHJfaW4gKmRzdCwKKwkJY29uc3Qgc3RydWN0IHNvY2th ZGRyX2luX3NlcmlhbGl6ZWQgKnNyYykKK3sKKwlhc3NlcnQoc3JjICYmIGRzdCk7CisJZHN0LT5z aW5fZmFtaWx5ID0gKHNhX2ZhbWlseV90KSBzcmMtPnNpbl9mYW1pbHk7CisJZHN0LT5zaW5fcG9y dCA9IChpbl9wb3J0X3QpIHNyYy0+c2luX3BvcnQ7CisJZHN0LT5zaW5fYWRkci5zX2FkZHIgPSBz cmMtPnNpbl9hZGRyLnNfYWRkcjsKKwlyZXR1cm4gMDsKK30KKworTFRUTkdfSElEREVOCitpbnQg c29ja2FkZHJfaW42X3NlcmlhbGl6ZShzdHJ1Y3Qgc29ja2FkZHJfaW42X3NlcmlhbGl6ZWQgKmRz dCwKKwkJY29uc3Qgc3RydWN0IHNvY2thZGRyX2luNiAqc3JjKQoreworCWFzc2VydChzcmMgJiYg ZHN0KTsKKworCWRzdC0+c2luNl9mYW1pbHkgPSAodWludDMyX3QpIHNyYy0+c2luNl9mYW1pbHk7 CisJZHN0LT5zaW42X3BvcnQgPSAodWludDE2X3QpIHNyYy0+c2luNl9wb3J0OworCWRzdC0+c2lu Nl9mbG93aW5mbyA9IHNyYy0+c2luNl9mbG93aW5mbzsKKwltZW1jcHkoJmRzdC0+c2luNl9hZGRy Ll9zNl9hZGRyLCBzcmMtPnNpbjZfYWRkci5zNl9hZGRyLAorCQkJc2l6ZW9mKGRzdC0+c2luNl9h ZGRyLl9zNl9hZGRyKSk7CisJZHN0LT5zaW42X3Njb3BlX2lkID0gc3JjLT5zaW42X3Njb3BlX2lk OworCXJldHVybiAwOworfQorCitMVFROR19ISURERU4KK2ludCBzb2NrYWRkcl9pbjZfZGVzZXJp YWxpemUoc3RydWN0IHNvY2thZGRyX2luNiAqZHN0LAorCQljb25zdCBzdHJ1Y3Qgc29ja2FkZHJf aW42X3NlcmlhbGl6ZWQgKnNyYykKK3sKKwlhc3NlcnQoc3JjICYmIGRzdCk7CisKKwlkc3QtPnNp bjZfZmFtaWx5ID0gKHNhX2ZhbWlseV90KSBzcmMtPnNpbjZfZmFtaWx5OworCWRzdC0+c2luNl9w b3J0ID0gKGluX3BvcnRfdCkgc3JjLT5zaW42X3BvcnQ7CisJZHN0LT5zaW42X2Zsb3dpbmZvID0g c3JjLT5zaW42X2Zsb3dpbmZvOworCW1lbWNweSgmZHN0LT5zaW42X2FkZHIuczZfYWRkciwgc3Jj LT5zaW42X2FkZHIuX3M2X2FkZHIsCisJICAgICAgIHNpemVvZihkc3QtPnNpbjZfYWRkci5zNl9h ZGRyKSk7CisJZHN0LT5zaW42X3Njb3BlX2lkID0gc3JjLT5zaW42X3Njb3BlX2lkOworCXJldHVy biAwOworfQorCitMVFROR19ISURERU4KK2ludCBsdHRjb21tX3NvY2thZGRyX3NlcmlhbGl6ZShz dHJ1Y3QgbHR0Y29tbV9zb2NrYWRkcl9zZXJpYWxpemVkICpkc3QsCisJCWNvbnN0IHN0cnVjdCBs dHRjb21tX3NvY2thZGRyICpzcmMpCit7CisJaW50IHJldCA9IDA7CisKKwlhc3NlcnQoc3JjICYm IGRzdCk7CisKKwlkc3QtPnR5cGUgPSAodWludDMyX3QpIHNyYy0+dHlwZTsKKworCXN3aXRjaCAo c3JjLT50eXBlKSB7CisJY2FzZSBMVFRDT01NX0lORVQ6CisJeworCQlzb2NrYWRkcl9pbl9zZXJp YWxpemUoJmRzdC0+YWRkci5zaW4sCisJCQkJJnNyYy0+YWRkci5zaW4pOworCQlicmVhazsKKwl9 CisJY2FzZSBMVFRDT01NX0lORVQ2OgorCXsKKwkJc29ja2FkZHJfaW42X3NlcmlhbGl6ZSgmZHN0 LT5hZGRyLnNpbjYsCisJCQkJJnNyYy0+YWRkci5zaW42KTsKKwkJYnJlYWs7CisJfQorCWRlZmF1 bHQ6CisJCXJldCA9IC1FSU5WQUw7CisJCWJyZWFrOworCX0KKworCXJldHVybiByZXQ7Cit9CisK K0xUVE5HX0hJRERFTgoraW50IGx0dGNvbW1fc29ja2FkZHJfZGVzZXJpYWxpemUoc3RydWN0IGx0 dGNvbW1fc29ja2FkZHIgKmRzdCwKKwkJY29uc3Qgc3RydWN0IGx0dGNvbW1fc29ja2FkZHJfc2Vy aWFsaXplZCAqc3JjKQoreworCWludCByZXQgPSAwOworCisJYXNzZXJ0KHNyYyAmJiBkc3QpOwor CisJZHN0LT50eXBlID0gKGVudW0gbHR0Y29tbV9zb2NrX2RvbWFpbikgc3JjLT50eXBlOworCisJ c3dpdGNoIChkc3QtPnR5cGUpIHsKKwljYXNlIExUVENPTU1fSU5FVDoKKwl7CisJCXNvY2thZGRy X2luX2Rlc2VyaWFsaXplKCZkc3QtPmFkZHIuc2luLAorCQkJCSZzcmMtPmFkZHIuc2luKTsKKwkJ YnJlYWs7CisJfQorCWNhc2UgTFRUQ09NTV9JTkVUNjoKKwl7CisJCXNvY2thZGRyX2luNl9kZXNl cmlhbGl6ZSgmZHN0LT5hZGRyLnNpbjYsCisJCQkJJnNyYy0+YWRkci5zaW42KTsKKwkJYnJlYWs7 CisJfQorCWRlZmF1bHQ6CisJCXJldCA9IC1FSU5WQUw7CisJCWJyZWFrOworCX0KKworCXJldHVy biByZXQ7Cit9CisKK0xUVE5HX0hJRERFTgoraW50IGx0dGNvbW1fc29ja19zZXJpYWxpemUoc3Ry dWN0IGx0dGNvbW1fc29ja19zZXJpYWxpemVkICpkc3QsCisJCWNvbnN0IHN0cnVjdCBsdHRjb21t X3NvY2sgKnNyYykKK3sKKwlpbnQgcmV0OworCisJYXNzZXJ0KHNyYyAmJiBkc3QpOworCisJZHN0 LT5mZCA9IHNyYy0+ZmQ7CisJaWYgKHNyYy0+cHJvdG8gIT0gTFRUQ09NTV9TT0NLX1VEUCAmJgor CQlzcmMtPnByb3RvICE9IExUVENPTU1fU09DS19UQ1ApIHsKKwkJLyogQ29kZSBmbG93IGVycm9y LiAqLworCQlhc3NlcnQoMCk7CisJfQorCWRzdC0+cHJvdG8gPSAodWludDMyX3QpIHNyYy0+cHJv dG87CisJcmV0ID0gbHR0Y29tbV9zb2NrYWRkcl9zZXJpYWxpemUoJmRzdC0+c29ja2FkZHIsICZz cmMtPnNvY2thZGRyKTsKKworCXJldHVybiByZXQ7Cit9CisKK0xUVE5HX0hJRERFTgoraW50IGx0 dGNvbW1fc29ja19kZXNlcmlhbGl6ZShzdHJ1Y3QgbHR0Y29tbV9zb2NrICpkc3QsCisJCWNvbnN0 IHN0cnVjdCBsdHRjb21tX3NvY2tfc2VyaWFsaXplZCAqc3JjKQoreworCWludCByZXQ7CisKKwlh c3NlcnQoc3JjICYmIGRzdCk7CisKKwlkc3QtPmZkID0gc3JjLT5mZDsKKwlkc3QtPnByb3RvID0g KGVudW0gbHR0Y29tbV9zb2NrX3Byb3RvKSBzcmMtPnByb3RvOworCWlmIChkc3QtPnByb3RvICE9 IExUVENPTU1fU09DS19VRFAgJiYKKwkJZHN0LT5wcm90byAhPSBMVFRDT01NX1NPQ0tfVENQKSB7 CisJCXJldCA9IC1FSU5WQUw7CisJCWdvdG8gZW5kOworCX0KKwlkc3QtPm9wcyA9IE5VTEw7CisJ cmV0ID0gbHR0Y29tbV9zb2NrYWRkcl9kZXNlcmlhbGl6ZSgmZHN0LT5zb2NrYWRkciwgJnNyYy0+ c29ja2FkZHIpOworCitlbmQ6CisJcmV0dXJuIHJldDsKK30KKworTFRUTkdfSElEREVOCitpbnQg bHR0Y29tbV9yZWxheWRfc29ja19zZXJpYWxpemUoc3RydWN0IGx0dGNvbW1fcmVsYXlkX3NvY2tf c2VyaWFsaXplZCAqZHN0LAorCQljb25zdCBzdHJ1Y3QgbHR0Y29tbV9yZWxheWRfc29jayAqc3Jj KQoreworCWludCByZXQ7CisKKwlhc3NlcnQoc3JjICYmIGRzdCk7CisJZHN0LT5tYWpvciA9IHNy Yy0+bWFqb3I7CisJZHN0LT5taW5vciA9IHNyYy0+bWlub3I7CisJcmV0ID0gbHR0Y29tbV9zb2Nr X3NlcmlhbGl6ZSgmZHN0LT5zb2NrLCAmc3JjLT5zb2NrKTsKKworCXJldHVybiByZXQ7Cit9CisK K0xUVE5HX0hJRERFTgoraW50IGx0dGNvbW1fcmVsYXlkX3NvY2tfZGVzZXJpYWxpemUoCisJCXN0 cnVjdCBsdHRjb21tX3JlbGF5ZF9zb2NrICpkc3QsCisJCWNvbnN0IHN0cnVjdCBsdHRjb21tX3Jl bGF5ZF9zb2NrX3NlcmlhbGl6ZWQgKnNyYykKK3sKKwlpbnQgcmV0OworCisJYXNzZXJ0KHNyYyAm JiBkc3QpOworCWRzdC0+bWFqb3IgPSBzcmMtPm1ham9yOworCWRzdC0+bWlub3IgPSBzcmMtPm1p bm9yOworCXJldCA9IGx0dGNvbW1fc29ja19kZXNlcmlhbGl6ZSgmZHN0LT5zb2NrLCAmc3JjLT5z b2NrKTsKKworCXJldHVybiByZXQ7Cit9CisKIC8qCiAgKiBSZXR1cm4gcHRyIHRvIHN0cmluZyBy ZXByZXNlbnRpbmcgYSBodW1hbiByZWFkYWJsZSBlcnJvciBjb2RlIGZyb20gdGhlCiAgKiBsdHRj b21tX3JldHVybl9jb2RlIGVudW0uCmRpZmYgLS1naXQgYS9zcmMvY29tbW9uL3Nlc3Npb25kLWNv bW0vc2Vzc2lvbmQtY29tbS5oIGIvc3JjL2NvbW1vbi9zZXNzaW9uZC1jb21tL3Nlc3Npb25kLWNv bW0uaAppbmRleCBjMGM2YThiYi4uNTU2YzI3N2YgMTAwNjQ0Ci0tLSBhL3NyYy9jb21tb24vc2Vz c2lvbmQtY29tbS9zZXNzaW9uZC1jb21tLmgKKysrIGIvc3JjL2NvbW1vbi9zZXNzaW9uZC1jb21t L3Nlc3Npb25kLWNvbW0uaApAQCAtMiw2ICsyLDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAxMSAt IERhdmlkIEdvdWxldCA8ZGF2aWQuZ291bGV0QHBvbHltdGwuY2E+CiAgKiAgICAgICAgICAgICAg ICAgICAgICBKdWxpZW4gRGVzZm9zc2V6IDxqdWxpZW4uZGVzZm9zc2V6QHBvbHltdGwuY2E+CiAg KiAgICAgICAgICAgICAgICAgICAgICBNYXRoaWV1IERlc25veWVycyA8bWF0aGlldS5kZXNub3ll cnNAZWZmaWNpb3MuY29tPgorICogICAgICAgICAgICAgICAgICAgICAgSsOpcsOpbWllIEdhbGFy bmVhdSA8amVyZW1pZS5nYWxhcm5lYXVAZWZmaWNpb3MuY29tPgogICoKICAqIFRoaXMgcHJvZ3Jh bSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5 CiAgKiBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNl LCB2ZXJzaW9uIDIgb25seSwKQEAgLTIwOSwzMSArMjEwLDEzNyBAQCBzdHJ1Y3QgbHR0Y29tbV9t ZXRhZGF0YV9yZXF1ZXN0X21zZyB7CiAJdWludDY0X3Qga2V5OyAvKiBNZXRhZGF0YSBjaGFubmVs IGtleS4gKi8KIH0gTFRUTkdfUEFDS0VEOwogCisvKiBGb3IgaW50ZXJuYWwgdXNlIG9ubHkgKi8K IHN0cnVjdCBsdHRjb21tX3NvY2thZGRyIHsKIAllbnVtIGx0dGNvbW1fc29ja19kb21haW4gdHlw ZTsKIAl1bmlvbiB7CiAJCXN0cnVjdCBzb2NrYWRkcl9pbiBzaW47CiAJCXN0cnVjdCBzb2NrYWRk cl9pbjYgc2luNjsKIAl9IGFkZHI7Cit9OworCisvKgorICogU2VyaWFsaXplZCB2ZXJzaW9uIG9m IHRoZSBzb2NrYWRkcl9pbiBzeXN0ZW0gc3RydWN0dXJlIChtYXkgb25seSBiZSB1c2VkCisgKiBm b3IgY29tbXVuaWNhdGlvbikuCisgKiBGaWVsZHMgYXJlIGZpeGVkLXNpemUsIGJpZyBlbmRpYW4g YW5kIHBhY2tlZC4KKyAqLworc3RydWN0IHNvY2thZGRyX2luX3NlcmlhbGl6ZWQgeworCXVpbnQz Ml90IHNpbl9mYW1pbHk7CisJdWludDE2X3Qgc2luX3BvcnQ7CisJc3RydWN0IGluX2FkZHJfc2Vy aWFsaXplZCB7CisJCXVpbnQzMl90IHNfYWRkcjsKKwl9IExUVE5HX1BBQ0tFRCBzaW5fYWRkcjsK K30gTFRUTkdfUEFDS0VEOworCitleHRlcm4KK2ludCBzb2NrYWRkcl9pbl9zZXJpYWxpemUoc3Ry dWN0IHNvY2thZGRyX2luX3NlcmlhbGl6ZWQgKmRzdCwKKwkJY29uc3Qgc3RydWN0IHNvY2thZGRy X2luICpzcmMpOworZXh0ZXJuCitpbnQgc29ja2FkZHJfaW5fZGVzZXJpYWxpemUoc3RydWN0IHNv Y2thZGRyX2luICpkc3QsCisJCWNvbnN0IHN0cnVjdCBzb2NrYWRkcl9pbl9zZXJpYWxpemVkICpz cmMpOworCisvKgorICogU2VyaWFsaXplZCB2ZXJzaW9uIG9mIHRoZSBzb2NrYWRkcl9pbjYgc3lz dGVtIHN0cnVjdHVyZSAobWF5IG9ubHkgYmUgdXNlZAorICogZm9yIGNvbW11bmljYXRpb24pLgor ICogRmllbGRzIGFyZSBmaXhlZC1zaXplLCBiaWcgZW5kaWFuIGFuZCBwYWNrZWQuCisgKi8KK3N0 cnVjdCBzb2NrYWRkcl9pbjZfc2VyaWFsaXplZCB7CisJdWludDMyX3Qgc2luNl9mYW1pbHk7CisJ dWludDE2X3Qgc2luNl9wb3J0OworCXVpbnQzMl90IHNpbjZfZmxvd2luZm87CisJc3RydWN0IGlu Nl9hZGRyX3NlcmlhbGl6ZWQgeworCQkvKgorCQkgKiBQcmVmaXhpbmcgd2l0aCAiXyIgc2luY2Ug czZfYWRkciBpcyBhICJERUZJTkUiCisJCSAqIHdoaWNoIGNsYXNoZXMgd2l0aCB0aGlzLgorCQkg Ki8KKwkJdWludDhfdCBfczZfYWRkclsxNl07CisJfSBMVFROR19QQUNLRUQgc2luNl9hZGRyOwor CXVpbnQzMl90IHNpbjZfc2NvcGVfaWQ7Cit9IExUVE5HX1BBQ0tFRDsKKworZXh0ZXJuCitpbnQg c29ja2FkZHJfaW42X3NlcmlhbGl6ZShzdHJ1Y3Qgc29ja2FkZHJfaW42X3NlcmlhbGl6ZWQgKmRz dCwKKwkJY29uc3Qgc3RydWN0IHNvY2thZGRyX2luNiAqc3JjKTsKK2V4dGVybgoraW50IHNvY2th ZGRyX2luNl9kZXNlcmlhbGl6ZShzdHJ1Y3Qgc29ja2FkZHJfaW42ICpkc3QsCisJCWNvbnN0IHN0 cnVjdCBzb2NrYWRkcl9pbjZfc2VyaWFsaXplZCAqc3JjKTsKKworLyoKKyAqIFNlcmlhbGl6ZWQg dmVyc2lvbiBvZiBzdHJ1Y3QgbHR0Y29tbV9zb2NrYWRkciAobWF5IGJlIHVzZWQgZm9yCisgKiBj b21tdW5pY2F0aW9uIG9ubHkpLgorICogVGhlIHN0cnVjdCBhbmQgaXRzIG1lbWJlcnMgYXJlIHBh Y2tlZCBhbmQgaXRzIGZpZWxkcyBhcmUgZml4ZWQtc2l6ZSwgYmlnCisgKiBlbmRpYW4uCisgKi8K K3N0cnVjdCBsdHRjb21tX3NvY2thZGRyX3NlcmlhbGl6ZWQgeworCXVpbnQzMl90IHR5cGU7IC8q IE1hcHMgdG8gZW51bSBsdHRjb21tX3NvY2tfZG9tYWluICovCisJdW5pb24geworCQlzdHJ1Y3Qg c29ja2FkZHJfaW5fc2VyaWFsaXplZCBzaW47CisJCXN0cnVjdCBzb2NrYWRkcl9pbjZfc2VyaWFs aXplZCBzaW42OworCX0gYWRkcjsKIH0gTFRUTkdfUEFDS0VEOwogCitleHRlcm4KK2ludCBzb2Nr YWRkcl9pbjZfc2VyaWFsaXplKHN0cnVjdCBzb2NrYWRkcl9pbjZfc2VyaWFsaXplZCAqZHN0LAor CQljb25zdCBzdHJ1Y3Qgc29ja2FkZHJfaW42ICpzcmMpOworZXh0ZXJuCitpbnQgc29ja2FkZHJf aW42X2Rlc2VyaWFsaXplKHN0cnVjdCBzb2NrYWRkcl9pbjYgKmRzdCwKKwkJY29uc3Qgc3RydWN0 IHNvY2thZGRyX2luNl9zZXJpYWxpemVkICpzcmMpOworCisvKiBGb3IgaW50ZXJuYWwgdXNlIG9u bHkgKi8KIHN0cnVjdCBsdHRjb21tX3NvY2sgewogCWludDMyX3QgZmQ7CiAJZW51bSBsdHRjb21t X3NvY2tfcHJvdG8gcHJvdG87CiAJc3RydWN0IGx0dGNvbW1fc29ja2FkZHIgc29ja2FkZHI7CiAJ Y29uc3Qgc3RydWN0IGx0dGNvbW1fcHJvdG9fb3BzICpvcHM7Cit9OworCisvKgorICogU2VyaWFs aXplZCB2ZXJzaW9uIG9mIHN0cnVjdCBsdHRjb21tX3NvY2sgKG1heSBiZSB1c2VkIGZvcgorICog Y29tbXVuaWNhdGlvbiBvbmx5KS4KKyAqIEZpZWxkcyBhcmUgZml4ZWQtc2l6ZSwgYmlnIGVuZGlh bi4gU3RydWN0dXJlIGlzIHBhY2tlZC4KKyAqLworc3RydWN0IGx0dGNvbW1fc29ja19zZXJpYWxp emVkIHsKKwlpbnQzMl90IGZkOworCXVpbnQzMl90IHByb3RvOyAvKiBNYXBzIHRvIGVudW0gbHR0 Y29tbV9zb2NrX3Byb3RvICovCisJc3RydWN0IGx0dGNvbW1fc29ja2FkZHJfc2VyaWFsaXplZCBz b2NrYWRkcjsKIH0gTFRUTkdfUEFDS0VEOwogCitleHRlcm4KK2ludCBsdHRjb21tX3NvY2tfc2Vy aWFsaXplKHN0cnVjdCBsdHRjb21tX3NvY2tfc2VyaWFsaXplZCAqZHN0LAorCQljb25zdCBzdHJ1 Y3QgbHR0Y29tbV9zb2NrICpzcmMpOworZXh0ZXJuCitpbnQgbHR0Y29tbV9zb2NrX2Rlc2VyaWFs aXplKHN0cnVjdCBsdHRjb21tX3NvY2sgKmRzdCwKKwkJY29uc3Qgc3RydWN0IGx0dGNvbW1fc29j a19zZXJpYWxpemVkICpzcmMpOworCiAvKgogICogUmVsYXlkIHNvY2suIEFkZHMgdGhlIHByb3Rv Y29sIHZlcnNpb24gdG8gdXNlIGZvciB0aGUgY29tbXVuaWNhdGlvbnMgd2l0aAotICogdGhlIHJl bGF5ZC4KKyAqIHRoZSByZWxheWQuIEludGVybmFsIHVzZSBvbmx5LgogICovCiBzdHJ1Y3QgbHR0 Y29tbV9yZWxheWRfc29jayB7CiAJc3RydWN0IGx0dGNvbW1fc29jayBzb2NrOwogCXVpbnQzMl90 IG1ham9yOwogCXVpbnQzMl90IG1pbm9yOworfTsKKworLyoKKyAqIFNlcmlhbGl6ZWQgdmVyc2lv biBvZiBzdHJ1Y3QgbHR0Y29tbV9yZWxheWRfc29jayAobWF5IGJlIHVzZWQgZm9yCisgKiBjb21t dW5pY2F0aW9ucyBvbmx5KS4KKyAqIEZpZWxkcyBhcmUgZml4ZWQtc2l6ZSwgYmlnIGVuZGlhbi4g U3RydWN0dXJlIGlzIHBhY2tlZC4KKyAqLworc3RydWN0IGx0dGNvbW1fcmVsYXlkX3NvY2tfc2Vy aWFsaXplZCB7CisJc3RydWN0IGx0dGNvbW1fc29ja19zZXJpYWxpemVkIHNvY2s7CisJdWludDMy X3QgbWFqb3I7CisJdWludDMyX3QgbWlub3I7CiB9IExUVE5HX1BBQ0tFRDsKIAorZXh0ZXJuCitp bnQgbHR0Y29tbV9yZWxheWRfc29ja19zZXJpYWxpemUoc3RydWN0IGx0dGNvbW1fcmVsYXlkX3Nv Y2tfc2VyaWFsaXplZCAqZHN0LAorCQljb25zdCBzdHJ1Y3QgbHR0Y29tbV9yZWxheWRfc29jayAq c3JjKTsKK2V4dGVybgoraW50IGx0dGNvbW1fcmVsYXlkX3NvY2tfZGVzZXJpYWxpemUoCisJCXN0 cnVjdCBsdHRjb21tX3JlbGF5ZF9zb2NrICpkc3QsCisJCWNvbnN0IHN0cnVjdCBsdHRjb21tX3Jl bGF5ZF9zb2NrX3NlcmlhbGl6ZWQgKnNyYyk7CisKIHN0cnVjdCBsdHRjb21tX25ldF9mYW1pbHkg ewogCWludCBmYW1pbHk7CiAJaW50ICgqY3JlYXRlKSAoc3RydWN0IGx0dGNvbW1fc29jayAqc29j aywgaW50IHR5cGUsIGludCBwcm90byk7CkBAIC00ODYsNyArNTkzLDcgQEAgc3RydWN0IGx0dGNv bW1fY29uc3VtZXJfbXNnIHsKIAkJCXVpbnQ2NF90IG5ldF9pbmRleDsKIAkJCWVudW0gbHR0bmdf c3RyZWFtX3R5cGUgdHlwZTsKIAkJCS8qIE9wZW4gc29ja2V0IHRvIHRoZSByZWxheWQgKi8KLQkJ CXN0cnVjdCBsdHRjb21tX3JlbGF5ZF9zb2NrIHNvY2s7CisJCQlzdHJ1Y3QgbHR0Y29tbV9yZWxh eWRfc29ja19zZXJpYWxpemVkIHNvY2s7CiAJCQkvKiBUcmFjaW5nIHNlc3Npb24gaWQgYXNzb2Np YXRlZCB0byB0aGUgcmVsYXlkLiAqLwogCQkJdWludDY0X3Qgc2Vzc2lvbl9pZDsKIAkJCS8qIFJl bGF5ZCBzZXNzaW9uIGlkLCBvbmx5IHVzZWQgd2l0aCBjb250cm9sIHNvY2tldC4gKi8KZGlmZiAt LWdpdCBhL3NyYy9jb21tb24vdXN0LWNvbnN1bWVyL3VzdC1jb25zdW1lci5jIGIvc3JjL2NvbW1v bi91c3QtY29uc3VtZXIvdXN0LWNvbnN1bWVyLmMKaW5kZXggOTRiNzYxY2IuLjA2Zjg1OGMzIDEw MDY0NAotLS0gYS9zcmMvY29tbW9uL3VzdC1jb25zdW1lci91c3QtY29uc3VtZXIuYworKysgYi9z cmMvY29tbW9uL3VzdC1jb25zdW1lci91c3QtY29uc3VtZXIuYwpAQCAtMTM1NCwxMCArMTM1NCwx OSBAQCBpbnQgbHR0bmdfdXN0Y29uc3VtZXJfcmVjdl9jbWQoc3RydWN0IGx0dG5nX2NvbnN1bWVy X2xvY2FsX2RhdGEgKmN0eCwKIAlzd2l0Y2ggKG1zZy5jbWRfdHlwZSkgewogCWNhc2UgTFRUTkdf Q09OU1VNRVJfQUREX1JFTEFZRF9TT0NLRVQ6CiAJeworCQlzdHJ1Y3QgbHR0Y29tbV9yZWxheWRf c29jayByZWxheWRfc29jazsKKworCQlyZXQgPSBsdHRjb21tX3JlbGF5ZF9zb2NrX2Rlc2VyaWFs aXplKCZyZWxheWRfc29jaywKKwkJCQkmbXNnLnUucmVsYXlkX3NvY2suc29jayk7CisJCWlmIChy ZXQpIHsKKwkJCS8qIFJlY2VpdmVkIGFuIGludmFsaWQgcmVsYXlkX3NvY2suICovCisJCQlnb3Rv IGVycm9yX2ZhdGFsOworCQl9CisKIAkJLyogU2Vzc2lvbiBkYWVtb24gc3RhdHVzIG1lc3NhZ2Ug YXJlIGhhbmRsZWQgaW4gdGhlIGZvbGxvd2luZyBjYWxsLiAqLwogCQljb25zdW1lcl9hZGRfcmVs YXlkX3NvY2tldChtc2cudS5yZWxheWRfc29jay5uZXRfaW5kZXgsCiAJCQkJbXNnLnUucmVsYXlk X3NvY2sudHlwZSwgY3R4LCBzb2NrLCBjb25zdW1lcl9zb2NrcG9sbCwKLQkJCQkmbXNnLnUucmVs YXlkX3NvY2suc29jaywgbXNnLnUucmVsYXlkX3NvY2suc2Vzc2lvbl9pZCwKKwkJCQkmcmVsYXlk X3NvY2ssIG1zZy51LnJlbGF5ZF9zb2NrLnNlc3Npb25faWQsCiAJCQkJbXNnLnUucmVsYXlkX3Nv Y2sucmVsYXlkX3Nlc3Npb25faWQpOwogCQlnb3RvIGVuZF9ub3NpZ25hbDsKIAl9CmRpZmYgLS1n aXQgYS90ZXN0cy9yZWdyZXNzaW9uL3Rvb2xzL2xpdmUvTWFrZWZpbGUuYW0gYi90ZXN0cy9yZWdy ZXNzaW9uL3Rvb2xzL2xpdmUvTWFrZWZpbGUuYW0KaW5kZXggN2EyNmI0MmMuLjg1NzQ2M2U2IDEw MDY0NAotLS0gYS90ZXN0cy9yZWdyZXNzaW9uL3Rvb2xzL2xpdmUvTWFrZWZpbGUuYW0KKysrIGIv dGVzdHMvcmVncmVzc2lvbi90b29scy9saXZlL01ha2VmaWxlLmFtCkBAIC0yMCw3ICsyMCw3IEBA IEVYVFJBX0RJU1QgKz0gdGVzdF91c3QgdGVzdF91c3RfdHJhY2VmaWxlX2NvdW50IHRlc3RfbHR0 bmdfdXN0CiBlbmRpZgogCiBsaXZlX3Rlc3RfU09VUkNFUyA9IGxpdmVfdGVzdC5jCi1saXZlX3Rl c3RfTERBREQgPSAkKExJQlRBUCkgJChMSUJDT01NT04pICQoTElCUkVMQVlEKSAkKExJQlNFU1NJ T05EX0NPTU0pIFwKK2xpdmVfdGVzdF9MREFERCA9ICQoTElCVEFQKSAkKExJQlNFU1NJT05EX0NP TU0pICQoTElCQ09NTU9OKSAkKExJQlJFTEFZRCkgXAogCQkkKExJQkhBU0hUQUJMRSkgJChMSUJI RUFMVEgpICQoRExfTElCUykgLWxydAogbGl2ZV90ZXN0X0xEQUREICs9ICQoTElWRSkgXAogCQkk KHRvcF9idWlsZGRpcikvc3JjL2xpYi9sdHRuZy1jdGwvbGlibHR0bmctY3RsLmxhCmRpZmYgLS1n aXQgYS90ZXN0cy91bml0L01ha2VmaWxlLmFtIGIvdGVzdHMvdW5pdC9NYWtlZmlsZS5hbQppbmRl eCA1ZjQ4NWYwMC4uMjY5ODlmYTAgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3VuaXQvTWFrZWZpbGUuYW0K KysrIGIvdGVzdHMvdW5pdC9NYWtlZmlsZS5hbQpAQCAtODgsNyArODgsNyBAQCBTRVNTSU9ORF9P QkpTICs9ICQodG9wX2J1aWxkZGlyKS9zcmMvYmluL2x0dG5nLXNlc3Npb25kL3RyYWNlLXVzdC4k KE9CSkVYVCkgXAogZW5kaWYKIAogdGVzdF9zZXNzaW9uX1NPVVJDRVMgPSB0ZXN0X3Nlc3Npb24u YwotdGVzdF9zZXNzaW9uX0xEQUREID0gJChMSUJUQVApICQoTElCQ09NTU9OKSAkKExJQlJFTEFZ RCkgJChMSUJTRVNTSU9ORF9DT01NKSBcCit0ZXN0X3Nlc3Npb25fTERBREQgPSAkKExJQlRBUCkg JChMSUJTRVNTSU9ORF9DT01NKSAkKExJQkNPTU1PTikgJChMSUJSRUxBWUQpIFwKIAkJICAgICAk KExJQkhBU0hUQUJMRSkgJChETF9MSUJTKSAtbHJ0IC1sdXJjdS1jb21tb24gLWx1cmN1IFwKIAkJ ICAgICAkKEtNT0RfTElCUykgXAogCQkgICAgICQodG9wX2J1aWxkZGlyKS9zcmMvbGliL2x0dG5n LWN0bC9saWJsdHRuZy1jdGwubGEgXApAQCAtMTA4LDcgKzEwOCw3IEBAIGVuZGlmCiAjIFVTVCBk YXRhIHN0cnVjdHVyZXMgdW5pdCB0ZXN0CiBpZiBIQVZFX0xJQkxUVE5HX1VTVF9DVEwKIHRlc3Rf dXN0X2RhdGFfU09VUkNFUyA9IHRlc3RfdXN0X2RhdGEuYwotdGVzdF91c3RfZGF0YV9MREFERCA9 ICQoTElCVEFQKSAkKExJQkNPTU1PTikgJChMSUJSRUxBWUQpICQoTElCU0VTU0lPTkRfQ09NTSkg XAordGVzdF91c3RfZGF0YV9MREFERCA9ICQoTElCVEFQKSAkKExJQlNFU1NJT05EX0NPTU0pICQo TElCQ09NTU9OKSAkKExJQlJFTEFZRCkgXAogCQkgICAgICAkKExJQkhBU0hUQUJMRSkgJChETF9M SUJTKSAtbHJ0IC1sdXJjdS1jb21tb24gLWx1cmN1IFwKIAkJICAgICAgLWxsdHRuZy11c3QtY3Rs IFwKIAkJICAgICAgJChLTU9EX0xJQlMpIFwKQEAgLTEzMSw3ICsxMzEsNyBAQCBLRVJOX0RBVEFf VFJBQ0U9JCh0b3BfYnVpbGRkaXIpL3NyYy9iaW4vbHR0bmctc2Vzc2lvbmQvdHJhY2Uta2VybmVs LiQoT0JKRVhUKSBcCiAJCSQoTElCTFRUTkdfQ1RMKQogCiB0ZXN0X2tlcm5lbF9kYXRhX1NPVVJD RVMgPSB0ZXN0X2tlcm5lbF9kYXRhLmMKLXRlc3Rfa2VybmVsX2RhdGFfTERBREQgPSAkKExJQlRB UCkgJChMSUJDT01NT04pICQoTElCUkVMQVlEKSAkKExJQlNFU1NJT05EX0NPTU0pIFwKK3Rlc3Rf a2VybmVsX2RhdGFfTERBREQgPSAkKExJQlRBUCkgJChMSUJTRVNTSU9ORF9DT01NKSAkKExJQkNP TU1PTikgJChMSUJSRUxBWUQpIFwKIAkJCSAkKExJQkhBU0hUQUJMRSkgJChETF9MSUJTKSAtbHJ0 CiB0ZXN0X2tlcm5lbF9kYXRhX0xEQUREICs9ICQoS0VSTl9EQVRBX1RSQUNFKQogCi0tIAoyLjEx LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmx0dG5n LWRldiBtYWlsaW5nIGxpc3QKbHR0bmctZGV2QGxpc3RzLmx0dG5nLm9yZwpodHRwczovL2xpc3Rz Lmx0dG5nLm9yZy9jZ2ktYmluL21haWxtYW4vbGlzdGluZm8vbHR0bmctZGV2Cg==