Return-Path: Message-ID: <5f84803c0710241254g413df936h3dc073ed8630354c@mail.gmail.com> Date: Wed, 24 Oct 2007 15:54:49 -0400 From: "Chris Rivera" To: "BlueZ development" In-Reply-To: <1192633908.10179.2.camel@snoogens.fab.redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_8382_21430031.1193255689178" References: <5f84803c0710161138i6123770dk22c1b63d03f45f59@mail.gmail.com> <1192631052.6184.25.camel@violet> <5f84803c0710170748j57f46eebh37a6707b9ec02b86@mail.gmail.com> <1192633908.10179.2.camel@snoogens.fab.redhat.com> 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_8382_21430031.1193255689178 Content-Type: multipart/alternative; boundary="----=_Part_8383_9686078.1193255689178" ------=_Part_8383_9686078.1193255689178 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Here's an updated patch that will ignore the singleton behavior if the BLUEZ_IGNORE_SINGLETON environment variable is set. Marcel, is this acceptable? Chris On 10/17/07, Bastien Nocera wrote: > > > Both of you are right. Developers should be able to launch another > applet or prefs for testing, but users should only ever see one applet > and prefs dialogue. > > Maybe a command-line flag or envvar to disable the singleton behaviour > in Chris' patch would be acceptable for Marcel? > > Cheers > ------=_Part_8383_9686078.1193255689178 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Here's an updated patch that will ignore the singleton behavior if  the BLUEZ_IGNORE_SINGLETON environment variable is set.  Marcel, is this acceptable?

Chris

On 10/17/07, Bastien Nocera <hadess@hadess.net> wrote:

Both of you are right. Developers should be able to launch another
applet or prefs for testing, but users should only ever see one applet
and prefs dialogue.

Maybe a command-line flag or envvar to disable the singleton behaviour
in Chris' patch would be acceptable for Marcel?

Cheers

------=_Part_8383_9686078.1193255689178-- ------=_Part_8382_21430031.1193255689178 Content-Type: text/x-patch; name=bluez-gnome-singleton.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_f869ktq8 Content-Disposition: attachment; filename=bluez-gnome-singleton.patch SW5kZXg6IGFwcGxldC9tYWluLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvYmx1ZXov Z25vbWUvYXBwbGV0L21haW4uYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS44NwpkaWZmIC11IC1y MS44NyBtYWluLmMKLS0tIGFwcGxldC9tYWluLmMJMjkgQXVnIDIwMDcgMjA6NDI6MTggLTAwMDAJ MS44NworKysgYXBwbGV0L21haW4uYwkyNCBPY3QgMjAwNyAxOTo0NzoyNSAtMDAwMApAQCAtMzIs OSArMzIsOSBAQAogI2luY2x1ZGUgPHN0cmluZy5oPgogCiAjaW5jbHVkZSA8ZGJ1cy9kYnVzLWds aWIuaD4KKyNpbmNsdWRlIDxkYnVzL2RidXMtZ2xpYi1sb3dsZXZlbC5oPgogCiAjaWZkZWYgSEFW RV9IQUwKLSNpbmNsdWRlIDxkYnVzL2RidXMtZ2xpYi1sb3dsZXZlbC5oPgogI2luY2x1ZGUgPGhh bC9saWJoYWwuaD4KICNlbmRpZgogCkBAIC0xNzgzLDExICsxNzc5LDYyIEBACiAJCWF1dG9fYXV0 aG9yaXplID0gZ2NvbmZfdmFsdWVfZ2V0X2Jvb2wodmFsdWUpOwogfQogCitzdGF0aWMgREJ1c0dD b25uZWN0aW9uICpjaGVja19mb3JfaW5zdGFuY2UgKGludCAqcmV0dmFsKQoreworCURCdXNHQ29u bmVjdGlvbiAqc2M7CisJREJ1c0dQcm94eSAqcHJveHk7CisJR0Vycm9yICplcnJvciA9IE5VTEw7 CisJZ3VpbnQgcmVxdWVzdF9yZXN1bHQ7CisJZ2Jvb2xlYW4gcmV0OworCisJc2MgPSBkYnVzX2df YnVzX2dldChEQlVTX0JVU19TRVNTSU9OLCAmZXJyb3IpOworCWlmIChlcnJvciAhPSBOVUxMKSB7 CisJCWdfcHJpbnRlcnIoIkNvbm5lY3RpbmcgdG8gc2Vzc2lvbiBidXMgZmFpbGVkOiAlc1xuIiwK KwkJCQkJZXJyb3ItPm1lc3NhZ2UpOworCQlnX2Vycm9yX2ZyZWUoZXJyb3IpOworCQkqcmV0dmFs ID0gMTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisJcHJveHkgPSBkYnVzX2dfcHJveHlfbmV3X2Zv cl9uYW1lKHNjLAorCQkJCQkJCQkJICBEQlVTX1NFUlZJQ0VfREJVUywKKwkJCQkJCQkJCSAgREJV U19QQVRIX0RCVVMsCisJCQkJCQkJCQkgIERCVVNfSU5URVJGQUNFX0RCVVMpOworCisJcmV0ID0g ZGJ1c19nX3Byb3h5X2NhbGwocHJveHksICJSZXF1ZXN0TmFtZSIsIE5VTEwsCisJCQkJCQkJR19U WVBFX1NUUklORywgIm9yZy5ibHVlei5Hbm9tZUFwcGxldCIsCisJCQkJCQkJR19UWVBFX1VJTlQs IDAsCisJCQkJCQkJR19UWVBFX0lOVkFMSUQsCisJCQkJCQkJR19UWVBFX1VJTlQsICZyZXF1ZXN0 X3Jlc3VsdCwKKwkJCQkJCQlHX1RZUEVfSU5WQUxJRCk7CisJZ19vYmplY3RfdW5yZWYoR19PQkpF Q1QocHJveHkpKTsKKwlpZiAoIXJldCkgeworCQlnX3ByaW50ZXJyKCJGYWlsZWQgdG8gcmVxdWVz dCBuYW1lIG9uIHRoZSBzZXNzaW9uIGJ1c1xuIik7CisJCWRidXNfZ19jb25uZWN0aW9uX3VucmVm KHNjKTsKKwkJKnJldHZhbCA9IDE7CisJCXJldHVybiBOVUxMOworCX0KKworCWlmIChyZXF1ZXN0 X3Jlc3VsdCAhPSBEQlVTX1JFUVVFU1RfTkFNRV9SRVBMWV9QUklNQVJZX09XTkVSKSB7CisJCSpy ZXR2YWwgPSAwOworCQkKKwkJaWYgKCFnX2dldGVudigiQkxVRVpfSUdOT1JFX1NJTkdMRVRPTiIp KSB7CisJCQlnX3ByaW50KCJBbm90aGVyIGluc3RhbmNlIGlzIGFscmVhZHkgcnVubmluZy5cbiIp OworCQkJZGJ1c19nX2Nvbm5lY3Rpb25fdW5yZWYoc2MpOworCQkJcmV0dXJuIE5VTEw7CisJCX0K Kwl9CisKKwlyZXR1cm4gc2M7Cit9CisKIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10p CiB7CiAJR3RrV2lkZ2V0ICptZW51OwogCUdFcnJvciAqZXJyb3IgPSBOVUxMOwogCWNoYXIgKnN0 cjsKKwlEQnVzR0Nvbm5lY3Rpb24gKnNlc3Npb25fY29ubiA9IE5VTEw7CisJaW50IHJldHZhbCA9 IDA7CiAKIAliaW5kdGV4dGRvbWFpbihHRVRURVhUX1BBQ0tBR0UsIExPQ0FMRURJUik7CiAJYmlu ZF90ZXh0ZG9tYWluX2NvZGVzZXQoR0VUVEVYVF9QQUNLQUdFLCAiVVRGLTgiKTsKQEAgLTE4MDYs NiArMTg1MywxMCBAQAogCQlnX2Vycm9yX2ZyZWUoZXJyb3IpOwogCQlleGl0KEVYSVRfRkFJTFVS RSk7CiAJfQorCQorCXNlc3Npb25fY29ubiA9IGNoZWNrX2Zvcl9pbnN0YW5jZSgmcmV0dmFsKTsK KwlpZiAoIXNlc3Npb25fY29ubikKKwkJZXhpdChyZXR2YWwpOwogCiAJZ2NvbmYgPSBnY29uZl9j bGllbnRfZ2V0X2RlZmF1bHQoKTsKIApAQCAtMTg2Myw2ICsxOTE0LDcgQEAKIAlnX2xpc3RfZm9y ZWFjaChhZGFwdGVyX2xpc3QsIGFkYXB0ZXJfZnJlZSwgTlVMTCk7CiAKIAlkYnVzX2dfY29ubmVj dGlvbl91bnJlZihjb25uKTsKKwlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihzZXNzaW9uX2Nvbm4p OwogCiAJcmV0dXJuIDA7CiB9CkluZGV4OiBwcm9wZXJ0aWVzL21haW4uYwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJD UyBmaWxlOiAvY3Zzcm9vdC9ibHVlei9nbm9tZS9wcm9wZXJ0aWVzL21haW4uYyx2CnJldHJpZXZp bmcgcmV2aXNpb24gMS40OApkaWZmIC11IC1yMS40OCBtYWluLmMKLS0tIHByb3BlcnRpZXMvbWFp bi5jCTMxIEp1bCAyMDA3IDIxOjM3OjI5IC0wMDAwCTEuNDgKKysrIHByb3BlcnRpZXMvbWFpbi5j CTI0IE9jdCAyMDA3IDE5OjQ3OjI1IC0wMDAwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSA8 c3RyaW5nLmg+CiAKICNpbmNsdWRlIDxkYnVzL2RidXMtZ2xpYi5oPgorI2luY2x1ZGUgPGRidXMv ZGJ1cy1nbGliLWxvd2xldmVsLmg+CiAKICNpbmNsdWRlIDxnbGliL2dpMThuLmg+CiAKQEAgLTQx LDYgKzQyLDkgQEAKICNpbmNsdWRlICJzZXJ2aWNlLmgiCiAjaW5jbHVkZSAiYWRhcHRlci5oIgog CisjZGVmaW5lIFBST1BFUlRJRVNfREJVU19QQVRIICIvb3JnL2JsdWV6L0dub21lUHJvcGVydGll cyIKKyNkZWZpbmUgUFJPUEVSVElFU19EQlVTX1NFUlZJQ0UgIm9yZy5ibHVlei5Hbm9tZVByb3Bl cnRpZXMiCisKIHN0YXRpYyB2b2lkIGRlbGV0ZV9jYWxsYmFjayhHdGtXaWRnZXQgKndpbmRvdywg R2RrRXZlbnQgKmV2ZW50LAogCQkJCQkJZ3BvaW50ZXIgdXNlcl9kYXRhKQogewpAQCAtNTgsNyAr NjIsNyBAQAogCWd0a19tYWluX3F1aXQoKTsKIH0KIAotc3RhdGljIHZvaWQgY3JlYXRlX3dpbmRv dyhHdGtXaWRnZXQgKm5vdGVib29rKQorc3RhdGljIEd0a1dpZGdldCAqY3JlYXRlX3dpbmRvdyhH dGtXaWRnZXQgKm5vdGVib29rKQogewogCUd0a1dpZGdldCAqd2luZG93OwogCUd0a1dpZGdldCAq d2lkZ2V0OwpAQCAtMTA4LDYgKzExMiw3IEBACiAJCQkJCQl3aWRnZXQsIF8oIkdlbmVyYWwiKSk7 CiAKIAlndGtfd2lkZ2V0X3Nob3dfYWxsKHdpbmRvdyk7CisJcmV0dXJuIHdpbmRvdzsKIH0KIAog c3RhdGljIHZvaWQgbmFtZV9vd25lcl9jaGFuZ2VkKERCdXNHUHJveHkgKm9iamVjdCwgY29uc3Qg Y2hhciAqbmFtZSwKQEAgLTEzOSwxMiArMTQ0LDgyIEBACiAJcmV0dXJuIHByb3h5OwogfQogCitz dGF0aWMgREJ1c0hhbmRsZXJSZXN1bHQgTWVzc2FnZUZ1bmMgKERCdXNDb25uZWN0aW9uICpjLCBE QnVzTWVzc2FnZSAqbSwgdm9pZCAqdXNlcl9kYXRhKQoreworCWlmIChkYnVzX21lc3NhZ2VfZ2V0 X3R5cGUobSkgPT0gREJVU19NRVNTQUdFX1RZUEVfTUVUSE9EX0NBTEwgJiYKKwkJIXN0cm5jbXAo UFJPUEVSVElFU19EQlVTX1BBVEgsIGRidXNfbWVzc2FnZV9nZXRfcGF0aChtKSwgc3RybGVuKFBS T1BFUlRJRVNfREJVU19QQVRIKSkgJiYKKwkJIXN0cm5jbXAoUFJPUEVSVElFU19EQlVTX1NFUlZJ Q0UsIGRidXNfbWVzc2FnZV9nZXRfaW50ZXJmYWNlKG0pLCBzdHJsZW4oUFJPUEVSVElFU19EQlVT X1NFUlZJQ0UpKSAmJgorCQkhc3RybmNtcCgiUHJlc2VudCIsIGRidXNfbWVzc2FnZV9nZXRfbWVt YmVyKG0pLCA3KSkgeworCQlHdGtXaW5kb3cgKndpbmRvdyA9IHVzZXJfZGF0YTsKKwkJZ3RrX3dp bmRvd19wcmVzZW50KHdpbmRvdyk7CisJfQorCisJcmV0dXJuIERCVVNfSEFORExFUl9SRVNVTFRf SEFORExFRDsKK30KKworc3RhdGljIERCdXNHQ29ubmVjdGlvbiAqY2hlY2tfZm9yX2luc3RhbmNl IChpbnQgKnJldHZhbCkKK3sKKwlEQnVzR0Nvbm5lY3Rpb24gKnNjOworCURCdXNHUHJveHkgKnBy b3h5OworCUdFcnJvciAqZXJyb3IgPSBOVUxMOworCWd1aW50IHJlcXVlc3RfcmVzdWx0OworCWdi b29sZWFuIHJldDsKKworCXNjID0gZGJ1c19nX2J1c19nZXQoREJVU19CVVNfU0VTU0lPTiwgJmVy cm9yKTsKKwlpZiAoZXJyb3IgIT0gTlVMTCkgeworCQlnX3ByaW50ZXJyKCJDb25uZWN0aW5nIHRv IHNlc3Npb24gYnVzIGZhaWxlZDogJXNcbiIsCisJCQkJCWVycm9yLT5tZXNzYWdlKTsKKwkJZ19l cnJvcl9mcmVlKGVycm9yKTsKKwkJKnJldHZhbCA9IDE7CisJCXJldHVybiBOVUxMOworCX0KKwor CXByb3h5ID0gZGJ1c19nX3Byb3h5X25ld19mb3JfbmFtZShzYywKKwkJCQkJCQkJCSAgREJVU19T RVJWSUNFX0RCVVMsCisJCQkJCQkJCQkgIERCVVNfUEFUSF9EQlVTLAorCQkJCQkJCQkJICBEQlVT X0lOVEVSRkFDRV9EQlVTKTsKKworCXJldCA9IGRidXNfZ19wcm94eV9jYWxsKHByb3h5LCAiUmVx dWVzdE5hbWUiLCBOVUxMLAorCQkJCQkJCUdfVFlQRV9TVFJJTkcsIFBST1BFUlRJRVNfREJVU19T RVJWSUNFLAorCQkJCQkJCUdfVFlQRV9VSU5ULCAwLAorCQkJCQkJCUdfVFlQRV9JTlZBTElELAor CQkJCQkJCUdfVFlQRV9VSU5ULCAmcmVxdWVzdF9yZXN1bHQsCisJCQkJCQkJR19UWVBFX0lOVkFM SUQpOworCWdfb2JqZWN0X3VucmVmKEdfT0JKRUNUKHByb3h5KSk7CisJaWYgKCFyZXQpIHsKKwkJ Z19wcmludGVycigiRmFpbGVkIHRvIHJlcXVlc3QgbmFtZSBvbiB0aGUgc2Vzc2lvbiBidXNcbiIp OworCQlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihzYyk7CisJCSpyZXR2YWwgPSAxOworCQlyZXR1 cm4gTlVMTDsKKwl9CisKKwlpZiAocmVxdWVzdF9yZXN1bHQgIT0gREJVU19SRVFVRVNUX05BTUVf UkVQTFlfUFJJTUFSWV9PV05FUiAmJgorCSAgICAhZ19nZXRlbnYoIkJMVUVaX0lHTk9SRV9TSU5H TEVUT04iKSkgeworCQlwcm94eSA9IGRidXNfZ19wcm94eV9uZXdfZm9yX25hbWUoc2MsCisJCQkJ CQkJCQkJICBQUk9QRVJUSUVTX0RCVVNfU0VSVklDRSwKKwkJCQkJCQkJCQkgIFBST1BFUlRJRVNf REJVU19QQVRILAorCQkJCQkJCQkJCSAgUFJPUEVSVElFU19EQlVTX1NFUlZJQ0UpOworCQlkYnVz X2dfcHJveHlfY2FsbF9ub19yZXBseShwcm94eSwgIlByZXNlbnQiLCBHX1RZUEVfSU5WQUxJRCwg R19UWVBFX0lOVkFMSUQpOworCQlnX29iamVjdF91bnJlZihHX09CSkVDVChwcm94eSkpOworCQkq cmV0dmFsID0gMDsKKwkKKwkJZ19wcmludCgiQW5vdGhlciBpbnN0YW5jZSBpcyBhbHJlYWR5IHJ1 bm5pbmcuXG4iKTsKKwkJZGJ1c19nX2Nvbm5lY3Rpb25fdW5yZWYoc2MpOworCQlyZXR1cm4gTlVM TDsKKwl9CisKKwlyZXR1cm4gc2M7Cit9CisKIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2 W10pCiB7CiAJR3RrV2lkZ2V0ICpub3RlYm9vazsKLQlEQnVzR0Nvbm5lY3Rpb24gKmNvbm47Ci0J REJ1c0dQcm94eSAqbWFuYWdlcjsKKwlHdGtXaWRnZXQgKndpbmRvdzsKIAlHRXJyb3IgKmVycm9y ID0gTlVMTDsKKwlEQnVzR0Nvbm5lY3Rpb24gKmNvbm4sICpzZXNzaW9uX2Nvbm4gPSBOVUxMOwor CURCdXNHUHJveHkgKm1hbmFnZXI7CisJREJ1c09iamVjdFBhdGhWVGFibGUgdnRhYmxlOworCWlu dCByZXR2YWwgPSAwOwogCiAJYmluZHRleHRkb21haW4oR0VUVEVYVF9QQUNLQUdFLCBMT0NBTEVE SVIpOwogCWJpbmRfdGV4dGRvbWFpbl9jb2Rlc2V0KEdFVFRFWFRfUEFDS0FHRSwgIlVURi04Iik7 CkBAIC0xNjAsMTUgKzIzNSwyNCBAQAogCQlleGl0KEVYSVRfRkFJTFVSRSk7CiAJfQogCisJc2Vz c2lvbl9jb25uID0gY2hlY2tfZm9yX2luc3RhbmNlKCZyZXR2YWwpOworCWlmICghc2Vzc2lvbl9j b25uKQorCQlleGl0KHJldHZhbCk7CisKIAlzZXR1cF9nZW5lcmFsKCk7CiAKIAlub3RlYm9vayA9 IGd0a19ub3RlYm9va19uZXcoKTsKLQorICAgIAogCWFzc2lnbl9hZGFwdGVyKG5vdGVib29rKTsK IAogCW1hbmFnZXIgPSBzZXR1cF9tYW5hZ2VyKGNvbm4pOwogCi0JY3JlYXRlX3dpbmRvdyhub3Rl Ym9vayk7CisJd2luZG93ID0gY3JlYXRlX3dpbmRvdyhub3RlYm9vayk7CisKKwl2dGFibGUubWVz c2FnZV9mdW5jdGlvbiA9IE1lc3NhZ2VGdW5jOworCXZ0YWJsZS51bnJlZ2lzdGVyX2Z1bmN0aW9u ID0gTlVMTDsKKwlkYnVzX2Nvbm5lY3Rpb25fcmVnaXN0ZXJfb2JqZWN0X3BhdGgoZGJ1c19nX2Nv bm5lY3Rpb25fZ2V0X2Nvbm5lY3Rpb24gKHNlc3Npb25fY29ubiksCisJCQkJCQkJCQkJICIvb3Jn L2JsdWV6L0dub21lUHJvcGVydGllcyIsICZ2dGFibGUsIHdpbmRvdyk7CiAKIAlndGtfbWFpbigp OwogCkBAIC0xODEsNiArMjY1LDcgQEAKIAlnX29iamVjdF91bnJlZihtYW5hZ2VyKTsKIAogCWRi dXNfZ19jb25uZWN0aW9uX3VucmVmKGNvbm4pOworCWRidXNfZ19jb25uZWN0aW9uX3VucmVmKHNl c3Npb25fY29ubik7CiAKIAlyZXR1cm4gMDsKIH0KSW5kZXg6IHdpemFyZC9tYWluLmMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvYmx1ZXovZ25vbWUvd2l6YXJkL21haW4uYyx2CnJldHJp ZXZpbmcgcmV2aXNpb24gMS4yMwpkaWZmIC11IC1yMS4yMyBtYWluLmMKLS0tIHdpemFyZC9tYWlu LmMJMTUgQXVnIDIwMDcgMDc6MDQ6MDMgLTAwMDAJMS4yMworKysgd2l6YXJkL21haW4uYwkyNCBP Y3QgMjAwNyAxOTo0NzoyNSAtMDAwMApAQCAtMjYsOCArMjYsMTAgQEAKICNlbmRpZgogCiAjaW5j bHVkZSA8c3RyaW5nLmg+CisjaW5jbHVkZSA8c3RkbGliLmg+CiAKICNpbmNsdWRlIDxkYnVzL2Ri dXMtZ2xpYi5oPgorI2luY2x1ZGUgPGRidXMvZGJ1cy1nbGliLWxvd2xldmVsLmg+CiAKICNpbmNs dWRlIDxnbGliL2dpMThuLmg+CiAKQEAgLTM5LDYgKzQxLDkgQEAKIAogI2luY2x1ZGUgImJsdWV0 b290aC1kZXZpY2Utc2VsZWN0aW9uLmgiCiAKKyNkZWZpbmUgV0laQVJEX0RCVVNfUEFUSCAiL29y Zy9ibHVlei9Hbm9tZVdpemFyZCIKKyNkZWZpbmUgV0laQVJEX0RCVVNfU0VSVklDRSAib3JnLmJs dWV6Lkdub21lV2l6YXJkIgorCiBzdGF0aWMgQmx1ZXRvb3RoQ2xpZW50ICpjbGllbnQ7CiAKIHN0 YXRpYyBnY2hhciAqYWRkcmVzcyA9IE5VTEw7CkBAIC0zODcsNyArMzkyLDcgQEAKIAlwYWdlX3N1 bW1hcnkgPSB2Ym94OwogfQogCi1zdGF0aWMgdm9pZCBjcmVhdGVfd2l6YXJkKHZvaWQpCitzdGF0 aWMgR3RrV2lkZ2V0ICpjcmVhdGVfd2l6YXJkKHZvaWQpCiB7CiAJR3RrV2lkZ2V0ICphc3Npc3Rh bnQ7CiAKQEAgLTQzMCwyMyArNDM1LDEwNyBAQAogCWd0a193aWRnZXRfc2hvd19hbGwoYXNzaXN0 YW50KTsKIAogCWd0a19hc3Npc3RhbnRfdXBkYXRlX2J1dHRvbnNfc3RhdGUoR1RLX0FTU0lTVEFO VChhc3Npc3RhbnQpKTsKKwlyZXR1cm4gYXNzaXN0YW50OworfQorCitzdGF0aWMgREJ1c0hhbmRs ZXJSZXN1bHQgTWVzc2FnZUZ1bmMgKERCdXNDb25uZWN0aW9uICpjLCBEQnVzTWVzc2FnZSAqbSwg dm9pZCAqdXNlcl9kYXRhKQoreworCWlmIChkYnVzX21lc3NhZ2VfZ2V0X3R5cGUobSkgPT0gREJV U19NRVNTQUdFX1RZUEVfTUVUSE9EX0NBTEwgJiYKKwkJIXN0cm5jbXAoV0laQVJEX0RCVVNfUEFU SCwgZGJ1c19tZXNzYWdlX2dldF9wYXRoKG0pLCBzdHJsZW4oV0laQVJEX0RCVVNfUEFUSCkpICYm CisJCSFzdHJuY21wKFdJWkFSRF9EQlVTX1NFUlZJQ0UsIGRidXNfbWVzc2FnZV9nZXRfaW50ZXJm YWNlKG0pLCBzdHJsZW4oV0laQVJEX0RCVVNfU0VSVklDRSkpICYmCisJCSFzdHJuY21wKCJQcmVz ZW50IiwgZGJ1c19tZXNzYWdlX2dldF9tZW1iZXIobSksIDcpKSB7CisJCUd0a1dpbmRvdyAqd2lu ZG93ID0gdXNlcl9kYXRhOworCQlndGtfd2luZG93X3ByZXNlbnQod2luZG93KTsKKwl9CisKKwly ZXR1cm4gREJVU19IQU5ETEVSX1JFU1VMVF9IQU5ETEVEOworfQorCitzdGF0aWMgREJ1c0dDb25u ZWN0aW9uICpjaGVja19mb3JfaW5zdGFuY2UgKGludCAqcmV0dmFsKQoreworCURCdXNHQ29ubmVj dGlvbiAqc2M7CisJREJ1c0dQcm94eSAqcHJveHk7CisJR0Vycm9yICplcnJvciA9IE5VTEw7CisJ Z3VpbnQgcmVxdWVzdF9yZXN1bHQ7CisJZ2Jvb2xlYW4gcmV0OworCisJc2MgPSBkYnVzX2dfYnVz X2dldChEQlVTX0JVU19TRVNTSU9OLCAmZXJyb3IpOworCWlmIChlcnJvciAhPSBOVUxMKSB7CisJ CWdfcHJpbnRlcnIoIkNvbm5lY3RpbmcgdG8gc2Vzc2lvbiBidXMgZmFpbGVkOiAlc1xuIiwKKwkJ CQkJZXJyb3ItPm1lc3NhZ2UpOworCQlnX2Vycm9yX2ZyZWUoZXJyb3IpOworCQkqcmV0dmFsID0g MTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisJcHJveHkgPSBkYnVzX2dfcHJveHlfbmV3X2Zvcl9u YW1lKHNjLAorCQkJCQkJCQkJICBEQlVTX1NFUlZJQ0VfREJVUywKKwkJCQkJCQkJCSAgREJVU19Q QVRIX0RCVVMsCisJCQkJCQkJCQkgIERCVVNfSU5URVJGQUNFX0RCVVMpOworCisJcmV0ID0gZGJ1 c19nX3Byb3h5X2NhbGwocHJveHksICJSZXF1ZXN0TmFtZSIsIE5VTEwsCisJCQkJCQkJR19UWVBF X1NUUklORywgV0laQVJEX0RCVVNfU0VSVklDRSwKKwkJCQkJCQlHX1RZUEVfVUlOVCwgMCwKKwkJ CQkJCQlHX1RZUEVfSU5WQUxJRCwKKwkJCQkJCQlHX1RZUEVfVUlOVCwgJnJlcXVlc3RfcmVzdWx0 LAorCQkJCQkJCUdfVFlQRV9JTlZBTElEKTsKKwlnX29iamVjdF91bnJlZihHX09CSkVDVChwcm94 eSkpOworCWlmICghcmV0KSB7CisJCWdfcHJpbnRlcnIoIkZhaWxlZCB0byByZXF1ZXN0IG5hbWUg b24gdGhlIHNlc3Npb24gYnVzXG4iKTsKKwkJZGJ1c19nX2Nvbm5lY3Rpb25fdW5yZWYoc2MpOwor CQkqcmV0dmFsID0gMTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisJaWYgKHJlcXVlc3RfcmVzdWx0 ICE9IERCVVNfUkVRVUVTVF9OQU1FX1JFUExZX1BSSU1BUllfT1dORVIgJiYKKwkJIWdfZ2V0ZW52 KCJCTFVFWl9JR05PUkVfU0lOR0xFVE9OIikpIHsKKwkJcHJveHkgPSBkYnVzX2dfcHJveHlfbmV3 X2Zvcl9uYW1lKHNjLAorCQkJCQkJCQkJCSAgV0laQVJEX0RCVVNfU0VSVklDRSwKKwkJCQkJCQkJ CQkgIFdJWkFSRF9EQlVTX1BBVEgsCisJCQkJCQkJCQkJICBXSVpBUkRfREJVU19TRVJWSUNFKTsK KwkJZGJ1c19nX3Byb3h5X2NhbGxfbm9fcmVwbHkocHJveHksICJQcmVzZW50IiwgR19UWVBFX0lO VkFMSUQsIEdfVFlQRV9JTlZBTElEKTsKKwkJZ19vYmplY3RfdW5yZWYoR19PQkpFQ1QocHJveHkp KTsKKwkJKnJldHZhbCA9IDA7CisJCQorCQlnX3ByaW50KCJBbm90aGVyIGluc3RhbmNlIGlzIGFs cmVhZHkgcnVubmluZy5cbiIpOworCQlkYnVzX2dfY29ubmVjdGlvbl91bnJlZihzYyk7CisJCXJl dHVybiBOVUxMOworCX0KKworCXJldHVybiBzYzsKIH0KIAogaW50IG1haW4oaW50IGFyZ2MsIGNo YXIgKmFyZ3ZbXSkKIHsKKwlHdGtXaWRnZXQgKndpbmRvdzsKKwlEQnVzR0Nvbm5lY3Rpb24gKnNl c3Npb25fY29ubiA9IE5VTEw7CisJREJ1c09iamVjdFBhdGhWVGFibGUgdnRhYmxlOworCWludCBy ZXR2YWwgPSAwOworCQogCWJpbmR0ZXh0ZG9tYWluKEdFVFRFWFRfUEFDS0FHRSwgTE9DQUxFRElS KTsKIAliaW5kX3RleHRkb21haW5fY29kZXNldChHRVRURVhUX1BBQ0tBR0UsICJVVEYtOCIpOwog CXRleHRkb21haW4oR0VUVEVYVF9QQUNLQUdFKTsKIAogCWd0a19pbml0KCZhcmdjLCAmYXJndik7 CiAKKwlzZXNzaW9uX2Nvbm4gPSBjaGVja19mb3JfaW5zdGFuY2UoJnJldHZhbCk7CisJaWYgKCFz ZXNzaW9uX2Nvbm4pCisJCWV4aXQocmV0dmFsKTsKKwogCWNsaWVudCA9IGJsdWV0b290aF9jbGll bnRfbmV3KCk7CiAKLQljcmVhdGVfd2l6YXJkKCk7CisJd2luZG93ID0gY3JlYXRlX3dpemFyZCgp OworICAgIAorCXZ0YWJsZS5tZXNzYWdlX2Z1bmN0aW9uID0gTWVzc2FnZUZ1bmM7CisJdnRhYmxl LnVucmVnaXN0ZXJfZnVuY3Rpb24gPSBOVUxMOworCWRidXNfY29ubmVjdGlvbl9yZWdpc3Rlcl9v YmplY3RfcGF0aChkYnVzX2dfY29ubmVjdGlvbl9nZXRfY29ubmVjdGlvbiAoc2Vzc2lvbl9jb25u KSwKKwkJCQkJCQkJCQkgV0laQVJEX0RCVVNfUEFUSCwgJnZ0YWJsZSwgd2luZG93KTsKIAogCWd0 a19tYWluKCk7CiAKIAlnX29iamVjdF91bnJlZihjbGllbnQpOwogCisJZGJ1c19nX2Nvbm5lY3Rp b25fdW5yZWYoc2Vzc2lvbl9jb25uKTsKKwogCXJldHVybiAwOwogfQo= ------=_Part_8382_21430031.1193255689178 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_8382_21430031.1193255689178 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_8382_21430031.1193255689178--