Return-Path: Message-ID: <5f84803c0711130824u2ad55b4bn36f42781b3c7ffe@mail.gmail.com> Date: Tue, 13 Nov 2007 11:24:56 -0500 From: "Chris Rivera" To: "BlueZ development" In-Reply-To: <1193847868.31723.99.camel@cookie.hadess.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_15350_11336247.1194971096147" References: <5f84803c0710161138i6123770dk22c1b63d03f45f59@mail.gmail.com> <1192631052.6184.25.camel@violet> <5f84803c0710170748j57f46eebh37a6707b9ec02b86@mail.gmail.com> <1192633908.10179.2.camel@snoogens.fab.redhat.com> <47173238.5070508@free.fr> <1193847250.32459.36.camel@violet> <1193847868.31723.99.camel@cookie.hadess.net> Subject: Re: [Bluez-devel] [PATCH] make bluez GNOME UIs singletons Reply-To: BlueZ development List-Id: BlueZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: bluez-devel-bounces@lists.sourceforge.net Errors-To: bluez-devel-bounces@lists.sourceforge.net ------=_Part_15350_11336247.1194971096147 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline On Oct 31, 2007 11:24 AM, Bastien Nocera wrote: > > On Wed, 2007-10-31 at 17:14 +0100, Marcel Holtmann wrote: > > > actually I do think that the current behavior should be default. I > > really want that behavior. There are corner cases that need to be > > thought of and making it a singleton only hides these issues. > > > > However having a special switch that makes it a singleton would be a > > good enhancement and I agree with you that any application started by > > the applet should only exists once. The applet can use that specific > > switch easily and we don't break current behavior. > > As long as the switch exists, I don't mind. I'd probably make it the > default for Fedora, in the .desktop files, and it wouldn't break normal > development use. > > Chris, can you update the patches for that? Sorry for the delayed response. Attached is an updated patch that adds a flag to enable the singleton behavior. Thanks, Chris ------=_Part_15350_11336247.1194971096147 Content-Type: text/x-patch; name=bluez-gnome-singleton.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_f8yp6mmi0 Content-Disposition: attachment; filename=bluez-gnome-singleton.patch SW5kZXg6IGFwcGxldC9tYWluLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvYmx1ZXov Z25vbWUvYXBwbGV0L21haW4uYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS44NwpkaWZmIC11IC1w IC1yMS44NyBtYWluLmMKLS0tIGFwcGxldC9tYWluLmMJMjkgQXVnIDIwMDcgMjA6NDI6MTggLTAw MDAJMS44NworKysgYXBwbGV0L21haW4uYwkxMyBOb3YgMjAwNyAxNjoxNjo1NCAtMDAwMApAQCAt MzIsOSArMzIsOSBAQAogI2luY2x1ZGUgPHN0cmluZy5oPgogCiAjaW5jbHVkZSA8ZGJ1cy9kYnVz LWdsaWIuaD4KKyNpbmNsdWRlIDxkYnVzL2RidXMtZ2xpYi1sb3dsZXZlbC5oPgogCiAjaWZkZWYg SEFWRV9IQUwKLSNpbmNsdWRlIDxkYnVzL2RidXMtZ2xpYi1sb3dsZXZlbC5oPgogI2luY2x1ZGUg PGhhbC9saWJoYWwuaD4KICNlbmRpZgogCkBAIC0xNTUzLDcgKzE1NTMsNyBAQCBzdGF0aWMgdm9p ZCBhYm91dF9jYWxsYmFjayhHdGtXaWRnZXQgKml0CiAKIHN0YXRpYyB2b2lkIHNldHRpbmdzX2Nh bGxiYWNrKEdPYmplY3QgKndpZGdldCwgZ3BvaW50ZXIgdXNlcl9kYXRhKQogewotCWNvbnN0IGNo YXIgKmNvbW1hbmQgPSAiYmx1ZXRvb3RoLXByb3BlcnRpZXMiOworCWNvbnN0IGNoYXIgKmNvbW1h bmQgPSAiYmx1ZXRvb3RoLXByb3BlcnRpZXMgLS1zaW5nbGV0b24iOwogCiAJaWYgKCFnX3NwYXdu X2NvbW1hbmRfbGluZV9hc3luYyhjb21tYW5kLCBOVUxMKSkKIAkJZ19wcmludGVycigiQ291bGRu J3QgZXhlY3V0ZSBjb21tYW5kOiAlc1xuIiwgY29tbWFuZCk7CkBAIC0xNjQyLDcgKzE2NDIsNyBA QCBzdGF0aWMgdm9pZCBzZW5kdG9fY2FsbGJhY2soR09iamVjdCAqd2lkCiAjaWYgMAogc3RhdGlj IHZvaWQgd2l6YXJkX2NhbGxiYWNrKEdPYmplY3QgKndpZGdldCwgZ3BvaW50ZXIgdXNlcl9kYXRh KQogewotCWNvbnN0IGNoYXIgKmNvbW1hbmQgPSAiYmx1ZXRvb3RoLXdpemFyZCI7CisJY29uc3Qg Y2hhciAqY29tbWFuZCA9ICJibHVldG9vdGgtd2l6YXJkIC0tc2luZ2xldG9uIjsKIAogCWlmICgh Z19zcGF3bl9jb21tYW5kX2xpbmVfYXN5bmMoY29tbWFuZCwgTlVMTCkpCiAJCWdfcHJpbnRlcnIo IkNvdWxkbid0IGV4ZWN1dGUgY29tbWFuZDogJXNcbiIsIGNvbW1hbmQpOwpAQCAtMTc4MywxMSAr MTc3OSw3MCBAQCBzdGF0aWMgdm9pZCBnY29uZl9jYWxsYmFjayhHQ29uZkNsaWVudCAqCiAJCWF1 dG9fYXV0aG9yaXplID0gZ2NvbmZfdmFsdWVfZ2V0X2Jvb2wodmFsdWUpOwogfQogCitzdGF0aWMg REJ1c0dDb25uZWN0aW9uICpyZWdpc3Rlcl9pbnN0YW5jZSAoaW50ICpyZXR2YWwsIGdib29sZWFu IHNpbmdsZXRvbikKK3sKKwlEQnVzR0Nvbm5lY3Rpb24gKnNjOworCURCdXNHUHJveHkgKnByb3h5 OworCUdFcnJvciAqZXJyb3IgPSBOVUxMOworCWd1aW50IHJlcXVlc3RfcmVzdWx0OworCWdib29s ZWFuIHJldDsKKworCXNjID0gZGJ1c19nX2J1c19nZXQoREJVU19CVVNfU0VTU0lPTiwgJmVycm9y KTsKKwlpZiAoZXJyb3IgIT0gTlVMTCkgeworCQlnX3ByaW50ZXJyKCJDb25uZWN0aW5nIHRvIHNl c3Npb24gYnVzIGZhaWxlZDogJXNcbiIsCisJCQkJCWVycm9yLT5tZXNzYWdlKTsKKwkJZ19lcnJv cl9mcmVlKGVycm9yKTsKKwkJKnJldHZhbCA9IDE7CisJCXJldHVybiBOVUxMOworCX0KKworCXBy b3h5ID0gZGJ1c19nX3Byb3h5X25ld19mb3JfbmFtZShzYywKKwkJCQkJCQkJCSAgREJVU19TRVJW SUNFX0RCVVMsCisJCQkJCQkJCQkgIERCVVNfUEFUSF9EQlVTLAorCQkJCQkJCQkJICBEQlVTX0lO VEVSRkFDRV9EQlVTKTsKKworCXJldCA9IGRidXNfZ19wcm94eV9jYWxsKHByb3h5LCAiUmVxdWVz dE5hbWUiLCBOVUxMLAorCQkJCQkJCUdfVFlQRV9TVFJJTkcsICJvcmcuYmx1ZXouR25vbWVBcHBs ZXQiLAorCQkJCQkJCUdfVFlQRV9VSU5ULCAwLAorCQkJCQkJCUdfVFlQRV9JTlZBTElELAorCQkJ CQkJCUdfVFlQRV9VSU5ULCAmcmVxdWVzdF9yZXN1bHQsCisJCQkJCQkJR19UWVBFX0lOVkFMSUQp OworCWdfb2JqZWN0X3VucmVmKEdfT0JKRUNUKHByb3h5KSk7CisJaWYgKCFyZXQpIHsKKwkJZ19w cmludGVycigiRmFpbGVkIHRvIHJlcXVlc3QgbmFtZSBvbiB0aGUgc2Vzc2lvbiBidXNcbiIpOwor CQlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihzYyk7CisJCSpyZXR2YWwgPSAxOworCQlyZXR1cm4g TlVMTDsKKwl9CisKKwlpZiAocmVxdWVzdF9yZXN1bHQgIT0gREJVU19SRVFVRVNUX05BTUVfUkVQ TFlfUFJJTUFSWV9PV05FUikgeworCQkqcmV0dmFsID0gMDsKKwkJCisJCWlmIChzaW5nbGV0b24p IHsKKwkJCWdfcHJpbnQoIkFub3RoZXIgaW5zdGFuY2UgaXMgYWxyZWFkeSBydW5uaW5nLlxuIik7 CisJCQlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihzYyk7CisJCQlyZXR1cm4gTlVMTDsKKwkJfQor CX0KKworCXJldHVybiBzYzsKK30KKwogaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkK IHsKKwlHT3B0aW9uQ29udGV4dCAqY3R4OwogCUd0a1dpZGdldCAqbWVudTsKIAlHRXJyb3IgKmVy cm9yID0gTlVMTDsKKwlEQnVzR0Nvbm5lY3Rpb24gKnNlc3Npb25fY29ubiA9IE5VTEw7CiAJY2hh ciAqc3RyOworCWludCByZXR2YWwgPSAwOworCWdib29sZWFuIHNpbmdsZXRvbiA9IEZBTFNFOwor CisJR09wdGlvbkVudHJ5IGVudHJpZXNbXSA9IHsKKyAgICAgICAgeyAic2luZ2xldG9uIiwgMCwg MCwgR19PUFRJT05fQVJHX05PTkUsICZzaW5nbGV0b24sCisJCSAgTl8oIk9ubHkgYWxsb3cgb25l IGluc3RhbmNlIG9mIHRoaXMgYXBwbGljYXRpb24iKSwgTlVMTCB9LAorICAgICAgICB7IE5VTEws IDAsIDAsIDAsIE5VTEwsIE5VTEwsIE5VTEwgfQorCX07CiAKIAliaW5kdGV4dGRvbWFpbihHRVRU RVhUX1BBQ0tBR0UsIExPQ0FMRURJUik7CiAJYmluZF90ZXh0ZG9tYWluX2NvZGVzZXQoR0VUVEVY VF9QQUNLQUdFLCAiVVRGLTgiKTsKQEAgLTE3OTUsNiArMTg1MCwxNSBAQCBpbnQgbWFpbihpbnQg YXJnYywgY2hhciAqYXJndltdKQogCiAJZ3RrX2luaXQoJmFyZ2MsICZhcmd2KTsKIAorCWN0eCA9 IGdfb3B0aW9uX2NvbnRleHRfbmV3KCIiKTsKKwlnX29wdGlvbl9jb250ZXh0X2FkZF9tYWluX2Vu dHJpZXMoY3R4LCBlbnRyaWVzLCBOVUxMKTsKKwlpZiAoIWdfb3B0aW9uX2NvbnRleHRfcGFyc2Uo Y3R4LCAmYXJnYywgJmFyZ3YsICZlcnJvcikpIHsKKwkJZ19wcmludGVycihfKCJwYXJzaW5nIGZh aWxlZDogJXNcbiIpLCBlcnJvci0+bWVzc2FnZSk7CisJCWdfZXJyb3JfZnJlZShlcnJvcik7CisJ CWdfb3B0aW9uX2NvbnRleHRfZnJlZShjdHgpOworCQlyZXR1cm4gcmV0dmFsOworCX0KKwogI2lm ZGVmIEhBVkVfTElCTk9USUZZCiAJbm90aWZ5X2luaXQoImJsdWV0b290aC1tYW5hZ2VyIik7CiAj ZW5kaWYKQEAgLTE4MDYsNiArMTg3MCwxMCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJn dltdKQogCQlnX2Vycm9yX2ZyZWUoZXJyb3IpOwogCQlleGl0KEVYSVRfRkFJTFVSRSk7CiAJfQor CQorCXNlc3Npb25fY29ubiA9IHJlZ2lzdGVyX2luc3RhbmNlKCZyZXR2YWwsIHNpbmdsZXRvbik7 CisJaWYgKCFzZXNzaW9uX2Nvbm4pCisJCWV4aXQocmV0dmFsKTsKIAogCWdjb25mID0gZ2NvbmZf Y2xpZW50X2dldF9kZWZhdWx0KCk7CiAKQEAgLTE4NjMsNiArMTkzMSw5IEBAIGludCBtYWluKGlu dCBhcmdjLCBjaGFyICphcmd2W10pCiAJZ19saXN0X2ZvcmVhY2goYWRhcHRlcl9saXN0LCBhZGFw dGVyX2ZyZWUsIE5VTEwpOwogCiAJZGJ1c19nX2Nvbm5lY3Rpb25fdW5yZWYoY29ubik7CisJZGJ1 c19nX2Nvbm5lY3Rpb25fdW5yZWYoc2Vzc2lvbl9jb25uKTsKIAorCWdfb3B0aW9uX2NvbnRleHRf ZnJlZShjdHgpOworCQogCXJldHVybiAwOwogfQpJbmRleDogcHJvcGVydGllcy9tYWluLmMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvYmx1ZXovZ25vbWUvcHJvcGVydGllcy9tYWluLmMs dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDgKZGlmZiAtdSAtcCAtcjEuNDggbWFpbi5jCi0tLSBw cm9wZXJ0aWVzL21haW4uYwkzMSBKdWwgMjAwNyAyMTozNzoyOSAtMDAwMAkxLjQ4CisrKyBwcm9w ZXJ0aWVzL21haW4uYwkxMyBOb3YgMjAwNyAxNjoxNjo1NCAtMDAwMApAQCAtMzIsNiArMzIsNyBA QAogI2luY2x1ZGUgPHN0cmluZy5oPgogCiAjaW5jbHVkZSA8ZGJ1cy9kYnVzLWdsaWIuaD4KKyNp bmNsdWRlIDxkYnVzL2RidXMtZ2xpYi1sb3dsZXZlbC5oPgogCiAjaW5jbHVkZSA8Z2xpYi9naTE4 bi5oPgogCkBAIC00MSw2ICs0Miw5IEBACiAjaW5jbHVkZSAic2VydmljZS5oIgogI2luY2x1ZGUg ImFkYXB0ZXIuaCIKIAorI2RlZmluZSBQUk9QRVJUSUVTX0RCVVNfUEFUSCAiL29yZy9ibHVlei9H bm9tZVByb3BlcnRpZXMiCisjZGVmaW5lIFBST1BFUlRJRVNfREJVU19TRVJWSUNFICJvcmcuYmx1 ZXouR25vbWVQcm9wZXJ0aWVzIgorCiBzdGF0aWMgdm9pZCBkZWxldGVfY2FsbGJhY2soR3RrV2lk Z2V0ICp3aW5kb3csIEdka0V2ZW50ICpldmVudCwKIAkJCQkJCWdwb2ludGVyIHVzZXJfZGF0YSkK IHsKQEAgLTU4LDcgKzYyLDcgQEAgc3RhdGljIHZvaWQgY2xvc2VfY2FsbGJhY2soR3RrV2lkZ2V0 ICpidQogCWd0a19tYWluX3F1aXQoKTsKIH0KIAotc3RhdGljIHZvaWQgY3JlYXRlX3dpbmRvdyhH dGtXaWRnZXQgKm5vdGVib29rKQorc3RhdGljIEd0a1dpZGdldCAqY3JlYXRlX3dpbmRvdyhHdGtX aWRnZXQgKm5vdGVib29rKQogewogCUd0a1dpZGdldCAqd2luZG93OwogCUd0a1dpZGdldCAqd2lk Z2V0OwpAQCAtMTA4LDYgKzExMiw3IEBAIHN0YXRpYyB2b2lkIGNyZWF0ZV93aW5kb3coR3RrV2lk Z2V0ICpub3QKIAkJCQkJCXdpZGdldCwgXygiR2VuZXJhbCIpKTsKIAogCWd0a193aWRnZXRfc2hv d19hbGwod2luZG93KTsKKwlyZXR1cm4gd2luZG93OwogfQogCiBzdGF0aWMgdm9pZCBuYW1lX293 bmVyX2NoYW5nZWQoREJ1c0dQcm94eSAqb2JqZWN0LCBjb25zdCBjaGFyICpuYW1lLApAQCAtMTM5 LDE5ICsxNDQsMTA1IEBAIHN0YXRpYyBEQnVzR1Byb3h5ICpzZXR1cF9tYW5hZ2VyKERCdXNHQ28K IAlyZXR1cm4gcHJveHk7CiB9CiAKK3N0YXRpYyBEQnVzSGFuZGxlclJlc3VsdCBNZXNzYWdlRnVu YyAoREJ1c0Nvbm5lY3Rpb24gKmMsIERCdXNNZXNzYWdlICptLCB2b2lkICp1c2VyX2RhdGEpCit7 CisJaWYgKGRidXNfbWVzc2FnZV9nZXRfdHlwZShtKSA9PSBEQlVTX01FU1NBR0VfVFlQRV9NRVRI T0RfQ0FMTCAmJgorCQkhc3RybmNtcChQUk9QRVJUSUVTX0RCVVNfUEFUSCwgZGJ1c19tZXNzYWdl X2dldF9wYXRoKG0pLCBzdHJsZW4oUFJPUEVSVElFU19EQlVTX1BBVEgpKSAmJgorCQkhc3RybmNt cChQUk9QRVJUSUVTX0RCVVNfU0VSVklDRSwgZGJ1c19tZXNzYWdlX2dldF9pbnRlcmZhY2UobSks IHN0cmxlbihQUk9QRVJUSUVTX0RCVVNfU0VSVklDRSkpICYmCisJCSFzdHJuY21wKCJQcmVzZW50 IiwgZGJ1c19tZXNzYWdlX2dldF9tZW1iZXIobSksIDcpKSB7CisJCUd0a1dpbmRvdyAqd2luZG93 ID0gdXNlcl9kYXRhOworCQlndGtfd2luZG93X3ByZXNlbnQod2luZG93KTsKKwl9CisKKwlyZXR1 cm4gREJVU19IQU5ETEVSX1JFU1VMVF9IQU5ETEVEOworfQorCitzdGF0aWMgREJ1c0dDb25uZWN0 aW9uICpyZWdpc3Rlcl9pbnN0YW5jZSAoaW50ICpyZXR2YWwsIGdib29sZWFuIHNpbmdsZXRvbikK K3sKKwlEQnVzR0Nvbm5lY3Rpb24gKnNjOworCURCdXNHUHJveHkgKnByb3h5OworCUdFcnJvciAq ZXJyb3IgPSBOVUxMOworCWd1aW50IHJlcXVlc3RfcmVzdWx0OworCWdib29sZWFuIHJldDsKKwor CXNjID0gZGJ1c19nX2J1c19nZXQoREJVU19CVVNfU0VTU0lPTiwgJmVycm9yKTsKKwlpZiAoZXJy b3IgIT0gTlVMTCkgeworCQlnX3ByaW50ZXJyKCJDb25uZWN0aW5nIHRvIHNlc3Npb24gYnVzIGZh aWxlZDogJXNcbiIsCisJCQkJCWVycm9yLT5tZXNzYWdlKTsKKwkJZ19lcnJvcl9mcmVlKGVycm9y KTsKKwkJKnJldHZhbCA9IDE7CisJCXJldHVybiBOVUxMOworCX0KKworCXByb3h5ID0gZGJ1c19n X3Byb3h5X25ld19mb3JfbmFtZShzYywKKwkJCQkJCQkJCSAgREJVU19TRVJWSUNFX0RCVVMsCisJ CQkJCQkJCQkgIERCVVNfUEFUSF9EQlVTLAorCQkJCQkJCQkJICBEQlVTX0lOVEVSRkFDRV9EQlVT KTsKKworCXJldCA9IGRidXNfZ19wcm94eV9jYWxsKHByb3h5LCAiUmVxdWVzdE5hbWUiLCBOVUxM LAorCQkJCQkJCUdfVFlQRV9TVFJJTkcsIFBST1BFUlRJRVNfREJVU19TRVJWSUNFLAorCQkJCQkJ CUdfVFlQRV9VSU5ULCAwLAorCQkJCQkJCUdfVFlQRV9JTlZBTElELAorCQkJCQkJCUdfVFlQRV9V SU5ULCAmcmVxdWVzdF9yZXN1bHQsCisJCQkJCQkJR19UWVBFX0lOVkFMSUQpOworCWdfb2JqZWN0 X3VucmVmKEdfT0JKRUNUKHByb3h5KSk7CisJaWYgKCFyZXQpIHsKKwkJZ19wcmludGVycigiRmFp bGVkIHRvIHJlcXVlc3QgbmFtZSBvbiB0aGUgc2Vzc2lvbiBidXNcbiIpOworCQlkYnVzX2dfY29u bmVjdGlvbl91bnJlZihzYyk7CisJCSpyZXR2YWwgPSAxOworCQlyZXR1cm4gTlVMTDsKKwl9CisK KwlpZiAocmVxdWVzdF9yZXN1bHQgIT0gREJVU19SRVFVRVNUX05BTUVfUkVQTFlfUFJJTUFSWV9P V05FUiAmJiBzaW5nbGV0b24pIHsKKwkJcHJveHkgPSBkYnVzX2dfcHJveHlfbmV3X2Zvcl9uYW1l KHNjLAorCQkJCQkJCQkJCSAgUFJPUEVSVElFU19EQlVTX1NFUlZJQ0UsCisJCQkJCQkJCQkJICBQ Uk9QRVJUSUVTX0RCVVNfUEFUSCwKKwkJCQkJCQkJCQkgIFBST1BFUlRJRVNfREJVU19TRVJWSUNF KTsKKwkJZGJ1c19nX3Byb3h5X2NhbGxfbm9fcmVwbHkocHJveHksICJQcmVzZW50IiwgR19UWVBF X0lOVkFMSUQsIEdfVFlQRV9JTlZBTElEKTsKKwkJZ19vYmplY3RfdW5yZWYoR19PQkpFQ1QocHJv eHkpKTsKKwkJKnJldHZhbCA9IDA7CisJCisJCWdfcHJpbnQoIkFub3RoZXIgaW5zdGFuY2UgaXMg YWxyZWFkeSBydW5uaW5nLlxuIik7CisJCWRidXNfZ19jb25uZWN0aW9uX3VucmVmKHNjKTsKKwkJ cmV0dXJuIE5VTEw7CisJfQorCisJcmV0dXJuIHNjOworfQorCiBpbnQgbWFpbihpbnQgYXJnYywg Y2hhciAqYXJndltdKQogeworCUdPcHRpb25Db250ZXh0ICpjdHg7CiAJR3RrV2lkZ2V0ICpub3Rl Ym9vazsKLQlEQnVzR0Nvbm5lY3Rpb24gKmNvbm47Ci0JREJ1c0dQcm94eSAqbWFuYWdlcjsKKwlH dGtXaWRnZXQgKndpbmRvdzsKIAlHRXJyb3IgKmVycm9yID0gTlVMTDsKLQorCURCdXNHQ29ubmVj dGlvbiAqY29ubiwgKnNlc3Npb25fY29ubiA9IE5VTEw7CisJREJ1c0dQcm94eSAqbWFuYWdlcjsK KwlEQnVzT2JqZWN0UGF0aFZUYWJsZSB2dGFibGU7CisJaW50IHJldHZhbCA9IDA7CisJZ2Jvb2xl YW4gc2luZ2xldG9uID0gRkFMU0U7CisKKwlHT3B0aW9uRW50cnkgZW50cmllc1tdID0geworICAg ICAgICB7ICJzaW5nbGV0b24iLCAwLCAwLCBHX09QVElPTl9BUkdfTk9ORSwgJnNpbmdsZXRvbiwK KwkJICBOXygiT25seSBhbGxvdyBvbmUgaW5zdGFuY2Ugb2YgdGhpcyBhcHBsaWNhdGlvbiIpLCBO VUxMIH0sCisgICAgICAgIHsgTlVMTCwgMCwgMCwgMCwgTlVMTCwgTlVMTCwgTlVMTCB9CisJfTsK KwkKIAliaW5kdGV4dGRvbWFpbihHRVRURVhUX1BBQ0tBR0UsIExPQ0FMRURJUik7CiAJYmluZF90 ZXh0ZG9tYWluX2NvZGVzZXQoR0VUVEVYVF9QQUNLQUdFLCAiVVRGLTgiKTsKIAl0ZXh0ZG9tYWlu KEdFVFRFWFRfUEFDS0FHRSk7CiAKIAlndGtfaW5pdCgmYXJnYywgJmFyZ3YpOwogCisJY3R4ID0g Z19vcHRpb25fY29udGV4dF9uZXcoIiIpOworCWdfb3B0aW9uX2NvbnRleHRfYWRkX21haW5fZW50 cmllcyhjdHgsIGVudHJpZXMsIE5VTEwpOworCWlmICghZ19vcHRpb25fY29udGV4dF9wYXJzZShj dHgsICZhcmdjLCAmYXJndiwgJmVycm9yKSkgeworCQlnX3ByaW50ZXJyKF8oInBhcnNpbmcgZmFp bGVkOiAlc1xuIiksIGVycm9yLT5tZXNzYWdlKTsKKwkJZ19lcnJvcl9mcmVlKGVycm9yKTsKKwkJ Z19vcHRpb25fY29udGV4dF9mcmVlKGN0eCk7CisJCXJldHVybiByZXR2YWw7CisJfQorCQogCWNv bm4gPSBkYnVzX2dfYnVzX2dldChEQlVTX0JVU19TWVNURU0sICZlcnJvcik7CiAJaWYgKGVycm9y ICE9IE5VTEwpIHsKIAkJZ19wcmludGVycigiQ29ubmVjdGluZyB0byBzeXN0ZW0gYnVzIGZhaWxl ZDogJXNcbiIsCkBAIC0xNjAsMTUgKzI1MSwyNCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAq YXJndltdKQogCQlleGl0KEVYSVRfRkFJTFVSRSk7CiAJfQogCisJc2Vzc2lvbl9jb25uID0gcmVn aXN0ZXJfaW5zdGFuY2UoJnJldHZhbCwgc2luZ2xldG9uKTsKKwlpZiAoIXNlc3Npb25fY29ubikK KwkJZXhpdChyZXR2YWwpOworCiAJc2V0dXBfZ2VuZXJhbCgpOwogCiAJbm90ZWJvb2sgPSBndGtf bm90ZWJvb2tfbmV3KCk7Ci0KKyAgICAKIAlhc3NpZ25fYWRhcHRlcihub3RlYm9vayk7CiAKIAlt YW5hZ2VyID0gc2V0dXBfbWFuYWdlcihjb25uKTsKIAotCWNyZWF0ZV93aW5kb3cobm90ZWJvb2sp OworCXdpbmRvdyA9IGNyZWF0ZV93aW5kb3cobm90ZWJvb2spOworCisJdnRhYmxlLm1lc3NhZ2Vf ZnVuY3Rpb24gPSBNZXNzYWdlRnVuYzsKKwl2dGFibGUudW5yZWdpc3Rlcl9mdW5jdGlvbiA9IE5V TEw7CisJZGJ1c19jb25uZWN0aW9uX3JlZ2lzdGVyX29iamVjdF9wYXRoKGRidXNfZ19jb25uZWN0 aW9uX2dldF9jb25uZWN0aW9uIChzZXNzaW9uX2Nvbm4pLAorCQkJCQkJCQkJCSAiL29yZy9ibHVl ei9Hbm9tZVByb3BlcnRpZXMiLCAmdnRhYmxlLCB3aW5kb3cpOwogCiAJZ3RrX21haW4oKTsKIApA QCAtMTgxLDYgKzI4MSw5IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJZ19v YmplY3RfdW5yZWYobWFuYWdlcik7CiAKIAlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihjb25uKTsK KwlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihzZXNzaW9uX2Nvbm4pOwogCisJZ19vcHRpb25fY29u dGV4dF9mcmVlKGN0eCk7CisJCiAJcmV0dXJuIDA7CiB9CkluZGV4OiB3aXphcmQvbWFpbi5jCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290L2JsdWV6L2dub21lL3dpemFyZC9tYWluLmMsdgpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuMjMKZGlmZiAtdSAtcCAtcjEuMjMgbWFpbi5jCi0tLSB3aXph cmQvbWFpbi5jCTE1IEF1ZyAyMDA3IDA3OjA0OjAzIC0wMDAwCTEuMjMKKysrIHdpemFyZC9tYWlu LmMJMTMgTm92IDIwMDcgMTY6MTY6NTQgLTAwMDAKQEAgLTI2LDggKzI2LDEwIEBACiAjZW5kaWYK IAogI2luY2x1ZGUgPHN0cmluZy5oPgorI2luY2x1ZGUgPHN0ZGxpYi5oPgogCiAjaW5jbHVkZSA8 ZGJ1cy9kYnVzLWdsaWIuaD4KKyNpbmNsdWRlIDxkYnVzL2RidXMtZ2xpYi1sb3dsZXZlbC5oPgog CiAjaW5jbHVkZSA8Z2xpYi9naTE4bi5oPgogCkBAIC0zOSw2ICs0MSw5IEBACiAKICNpbmNsdWRl ICJibHVldG9vdGgtZGV2aWNlLXNlbGVjdGlvbi5oIgogCisjZGVmaW5lIFdJWkFSRF9EQlVTX1BB VEggIi9vcmcvYmx1ZXovR25vbWVXaXphcmQiCisjZGVmaW5lIFdJWkFSRF9EQlVTX1NFUlZJQ0Ug Im9yZy5ibHVlei5Hbm9tZVdpemFyZCIKKwogc3RhdGljIEJsdWV0b290aENsaWVudCAqY2xpZW50 OwogCiBzdGF0aWMgZ2NoYXIgKmFkZHJlc3MgPSBOVUxMOwpAQCAtMzg3LDcgKzM5Miw3IEBAIHN0 YXRpYyB2b2lkIGNyZWF0ZV9zdW1tYXJ5KEd0a1dpZGdldCAqYXMKIAlwYWdlX3N1bW1hcnkgPSB2 Ym94OwogfQogCi1zdGF0aWMgdm9pZCBjcmVhdGVfd2l6YXJkKHZvaWQpCitzdGF0aWMgR3RrV2lk Z2V0ICpjcmVhdGVfd2l6YXJkKHZvaWQpCiB7CiAJR3RrV2lkZ2V0ICphc3Npc3RhbnQ7CiAKQEAg LTQzMCwyMyArNDM1LDEyNiBAQCBzdGF0aWMgdm9pZCBjcmVhdGVfd2l6YXJkKHZvaWQpCiAJZ3Rr X3dpZGdldF9zaG93X2FsbChhc3Npc3RhbnQpOwogCiAJZ3RrX2Fzc2lzdGFudF91cGRhdGVfYnV0 dG9uc19zdGF0ZShHVEtfQVNTSVNUQU5UKGFzc2lzdGFudCkpOworCXJldHVybiBhc3Npc3RhbnQ7 Cit9CisKK3N0YXRpYyBEQnVzSGFuZGxlclJlc3VsdCBNZXNzYWdlRnVuYyAoREJ1c0Nvbm5lY3Rp b24gKmMsIERCdXNNZXNzYWdlICptLCB2b2lkICp1c2VyX2RhdGEpCit7CisJaWYgKGRidXNfbWVz c2FnZV9nZXRfdHlwZShtKSA9PSBEQlVTX01FU1NBR0VfVFlQRV9NRVRIT0RfQ0FMTCAmJgorCQkh c3RybmNtcChXSVpBUkRfREJVU19QQVRILCBkYnVzX21lc3NhZ2VfZ2V0X3BhdGgobSksIHN0cmxl bihXSVpBUkRfREJVU19QQVRIKSkgJiYKKwkJIXN0cm5jbXAoV0laQVJEX0RCVVNfU0VSVklDRSwg ZGJ1c19tZXNzYWdlX2dldF9pbnRlcmZhY2UobSksIHN0cmxlbihXSVpBUkRfREJVU19TRVJWSUNF KSkgJiYKKwkJIXN0cm5jbXAoIlByZXNlbnQiLCBkYnVzX21lc3NhZ2VfZ2V0X21lbWJlcihtKSwg NykpIHsKKwkJR3RrV2luZG93ICp3aW5kb3cgPSB1c2VyX2RhdGE7CisJCWd0a193aW5kb3dfcHJl c2VudCh3aW5kb3cpOworCX0KKworCXJldHVybiBEQlVTX0hBTkRMRVJfUkVTVUxUX0hBTkRMRUQ7 Cit9CisKK3N0YXRpYyBEQnVzR0Nvbm5lY3Rpb24gKnJlZ2lzdGVyX2luc3RhbmNlIChpbnQgKnJl dHZhbCwgZ2Jvb2xlYW4gc2luZ2xldG9uKQoreworCURCdXNHQ29ubmVjdGlvbiAqc2M7CisJREJ1 c0dQcm94eSAqcHJveHk7CisJR0Vycm9yICplcnJvciA9IE5VTEw7CisJZ3VpbnQgcmVxdWVzdF9y ZXN1bHQ7CisJZ2Jvb2xlYW4gcmV0OworCisJc2MgPSBkYnVzX2dfYnVzX2dldChEQlVTX0JVU19T RVNTSU9OLCAmZXJyb3IpOworCWlmIChlcnJvciAhPSBOVUxMKSB7CisJCWdfcHJpbnRlcnIoIkNv bm5lY3RpbmcgdG8gc2Vzc2lvbiBidXMgZmFpbGVkOiAlc1xuIiwKKwkJCQkJZXJyb3ItPm1lc3Nh Z2UpOworCQlnX2Vycm9yX2ZyZWUoZXJyb3IpOworCQkqcmV0dmFsID0gMTsKKwkJcmV0dXJuIE5V TEw7CisJfQorCisJcHJveHkgPSBkYnVzX2dfcHJveHlfbmV3X2Zvcl9uYW1lKHNjLAorCQkJCQkJ CQkJICBEQlVTX1NFUlZJQ0VfREJVUywKKwkJCQkJCQkJCSAgREJVU19QQVRIX0RCVVMsCisJCQkJ CQkJCQkgIERCVVNfSU5URVJGQUNFX0RCVVMpOworCisJcmV0ID0gZGJ1c19nX3Byb3h5X2NhbGwo cHJveHksICJSZXF1ZXN0TmFtZSIsIE5VTEwsCisJCQkJCQkJR19UWVBFX1NUUklORywgV0laQVJE X0RCVVNfU0VSVklDRSwKKwkJCQkJCQlHX1RZUEVfVUlOVCwgMCwKKwkJCQkJCQlHX1RZUEVfSU5W QUxJRCwKKwkJCQkJCQlHX1RZUEVfVUlOVCwgJnJlcXVlc3RfcmVzdWx0LAorCQkJCQkJCUdfVFlQ RV9JTlZBTElEKTsKKwlnX29iamVjdF91bnJlZihHX09CSkVDVChwcm94eSkpOworCWlmICghcmV0 KSB7CisJCWdfcHJpbnRlcnIoIkZhaWxlZCB0byByZXF1ZXN0IG5hbWUgb24gdGhlIHNlc3Npb24g YnVzXG4iKTsKKwkJZGJ1c19nX2Nvbm5lY3Rpb25fdW5yZWYoc2MpOworCQkqcmV0dmFsID0gMTsK KwkJcmV0dXJuIE5VTEw7CisJfQorCisJaWYgKHJlcXVlc3RfcmVzdWx0ICE9IERCVVNfUkVRVUVT VF9OQU1FX1JFUExZX1BSSU1BUllfT1dORVIgJiYgc2luZ2xldG9uKSB7CisJCXByb3h5ID0gZGJ1 c19nX3Byb3h5X25ld19mb3JfbmFtZShzYywKKwkJCQkJCQkJCQkgIFdJWkFSRF9EQlVTX1NFUlZJ Q0UsCisJCQkJCQkJCQkJICBXSVpBUkRfREJVU19QQVRILAorCQkJCQkJCQkJCSAgV0laQVJEX0RC VVNfU0VSVklDRSk7CisJCWRidXNfZ19wcm94eV9jYWxsX25vX3JlcGx5KHByb3h5LCAiUHJlc2Vu dCIsIEdfVFlQRV9JTlZBTElELCBHX1RZUEVfSU5WQUxJRCk7CisJCWdfb2JqZWN0X3VucmVmKEdf T0JKRUNUKHByb3h5KSk7CisJCSpyZXR2YWwgPSAwOworCQkKKwkJZ19wcmludCgiQW5vdGhlciBp bnN0YW5jZSBpcyBhbHJlYWR5IHJ1bm5pbmcuXG4iKTsKKwkJZGJ1c19nX2Nvbm5lY3Rpb25fdW5y ZWYoc2MpOworCQlyZXR1cm4gTlVMTDsKKwl9CisKKwlyZXR1cm4gc2M7CiB9CiAKIGludCBtYWlu KGludCBhcmdjLCBjaGFyICphcmd2W10pCiB7CisJR09wdGlvbkNvbnRleHQgKmN0eDsKKwlHdGtX aWRnZXQgKndpbmRvdzsKKwlEQnVzR0Nvbm5lY3Rpb24gKnNlc3Npb25fY29ubiA9IE5VTEw7CisJ R0Vycm9yICplcnJvciA9IE5VTEw7CisJREJ1c09iamVjdFBhdGhWVGFibGUgdnRhYmxlOworCWlu dCByZXR2YWwgPSAwOworCWdib29sZWFuIHNpbmdsZXRvbiA9IEZBTFNFOworCisJR09wdGlvbkVu dHJ5IGVudHJpZXNbXSA9IHsKKyAgICAgICAgeyAic2luZ2xldG9uIiwgMCwgMCwgR19PUFRJT05f QVJHX05PTkUsICZzaW5nbGV0b24sCisJCSAgTl8oIk9ubHkgYWxsb3cgb25lIGluc3RhbmNlIG9m IHRoaXMgYXBwbGljYXRpb24iKSwgTlVMTCB9LAorICAgICAgICB7IE5VTEwsIDAsIDAsIDAsIE5V TEwsIE5VTEwsIE5VTEwgfQorCX07CisJCiAJYmluZHRleHRkb21haW4oR0VUVEVYVF9QQUNLQUdF LCBMT0NBTEVESVIpOwogCWJpbmRfdGV4dGRvbWFpbl9jb2Rlc2V0KEdFVFRFWFRfUEFDS0FHRSwg IlVURi04Iik7CiAJdGV4dGRvbWFpbihHRVRURVhUX1BBQ0tBR0UpOwogCiAJZ3RrX2luaXQoJmFy Z2MsICZhcmd2KTsKIAorCWN0eCA9IGdfb3B0aW9uX2NvbnRleHRfbmV3KCIiKTsKKwlnX29wdGlv bl9jb250ZXh0X2FkZF9tYWluX2VudHJpZXMoY3R4LCBlbnRyaWVzLCBOVUxMKTsKKwlpZiAoIWdf b3B0aW9uX2NvbnRleHRfcGFyc2UoY3R4LCAmYXJnYywgJmFyZ3YsICZlcnJvcikpIHsKKwkJZ19w cmludGVycihfKCJwYXJzaW5nIGZhaWxlZDogJXNcbiIpLCBlcnJvci0+bWVzc2FnZSk7CisJCWdf ZXJyb3JfZnJlZShlcnJvcik7CisJCWdfb3B0aW9uX2NvbnRleHRfZnJlZShjdHgpOworCQlyZXR1 cm4gcmV0dmFsOworCX0KKwkKKwlzZXNzaW9uX2Nvbm4gPSByZWdpc3Rlcl9pbnN0YW5jZSgmcmV0 dmFsLCBzaW5nbGV0b24pOworCWlmICghc2Vzc2lvbl9jb25uKQorCQlleGl0KHJldHZhbCk7CisK IAljbGllbnQgPSBibHVldG9vdGhfY2xpZW50X25ldygpOwogCi0JY3JlYXRlX3dpemFyZCgpOwor CXdpbmRvdyA9IGNyZWF0ZV93aXphcmQoKTsKKyAgICAKKwl2dGFibGUubWVzc2FnZV9mdW5jdGlv biA9IE1lc3NhZ2VGdW5jOworCXZ0YWJsZS51bnJlZ2lzdGVyX2Z1bmN0aW9uID0gTlVMTDsKKwlk YnVzX2Nvbm5lY3Rpb25fcmVnaXN0ZXJfb2JqZWN0X3BhdGgoZGJ1c19nX2Nvbm5lY3Rpb25fZ2V0 X2Nvbm5lY3Rpb24gKHNlc3Npb25fY29ubiksCisJCQkJCQkJCQkJIFdJWkFSRF9EQlVTX1BBVEgs ICZ2dGFibGUsIHdpbmRvdyk7CiAKIAlndGtfbWFpbigpOwogCiAJZ19vYmplY3RfdW5yZWYoY2xp ZW50KTsKIAorCWRidXNfZ19jb25uZWN0aW9uX3VucmVmKHNlc3Npb25fY29ubik7CisKKwlnX29w dGlvbl9jb250ZXh0X2ZyZWUoY3R4KTsKKwkKIAlyZXR1cm4gMDsKIH0K ------=_Part_15350_11336247.1194971096147 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ------=_Part_15350_11336247.1194971096147 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Bluez-devel mailing list Bluez-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bluez-devel ------=_Part_15350_11336247.1194971096147--