diff options
| -rwxr-xr-x | hcid/simple-agent | 2 | ||||
| -rwxr-xr-x | hcid/simple-service | 16 | ||||
| -rwxr-xr-x | hcid/test-device | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/hcid/simple-agent b/hcid/simple-agent index 86a5fa85..7cd29be6 100755 --- a/hcid/simple-agent +++ b/hcid/simple-agent @@ -2,10 +2,10 @@ import gobject +import sys import dbus import dbus.service import dbus.mainloop.glib -import sys class Agent(dbus.service.Object): @dbus.service.method("org.bluez.Agent", diff --git a/hcid/simple-service b/hcid/simple-service index 4c2bce4e..5279a3a6 100755 --- a/hcid/simple-service +++ b/hcid/simple-service @@ -1,10 +1,9 @@ #!/usr/bin/python +import sys import time import dbus -bus = dbus.SystemBus() - xml = ' \ <?xml version="1.0" encoding="UTF-8" ?> \ <record> \ @@ -101,8 +100,17 @@ xml = ' \ </record> \ ' -adapter = dbus.Interface(bus.get_object('org.bluez', '/'), - 'org.bluez.Adapter') +bus = dbus.SystemBus() +manager = dbus.Interface(bus.get_object("org.bluez", "/"), + "org.bluez.Manager") + +if len(sys.argv) > 1: + path = manager.FindAdapter(sys.argv[1]) +else: + path = manager.DefaultAdapter() + +adapter = dbus.Interface(bus.get_object("org.bluez", path), + "org.bluez.Adapter") handle = adapter.AddServiceRecord(xml) diff --git a/hcid/test-device b/hcid/test-device index a4dd0969..f82e8d38 100755 --- a/hcid/test-device +++ b/hcid/test-device @@ -5,8 +5,6 @@ import dbus bus = dbus.SystemBus() -bus = dbus.SystemBus() - manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager") adapter = dbus.Interface(bus.get_object("org.bluez", manager.DefaultAdapter()), |