From f68a3a04e407e5bae5fffb703de8d4b981e4de53 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 30 Jul 2005 16:30:18 +0000 Subject: * fix Server introspection data * define interface, path and service names in avahi.py * DBUS: server object is now available on path "/" git-svn-id: file:///home/lennart/svn/public/avahi/trunk@202 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-utils/avahi-dump-all | 8 ++++---- avahi-utils/avahi-publish-address | 4 ++-- avahi-utils/avahi-publish-service | 4 ++-- avahi-utils/avahi.py | 8 ++++++++ 4 files changed, 16 insertions(+), 8 deletions(-) (limited to 'avahi-utils') diff --git a/avahi-utils/avahi-dump-all b/avahi-utils/avahi-dump-all index 03efa85..035f581 100755 --- a/avahi-utils/avahi-dump-all +++ b/avahi-utils/avahi-dump-all @@ -39,7 +39,7 @@ def new_service_type(interface, protocol, type, domain): print "Browsing for services of type '%s' in domain '%s' on %i.%i ..." % (type, domain, interface, protocol) - b = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.ServiceBrowserNew(interface, protocol, type, domain)), 'org.freedesktop.Avahi.ServiceBrowser') + b = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.ServiceBrowserNew(interface, protocol, type, domain)), avahi.DBUS_INTERFACE_SERVICE_BROWSER) b.connect_to_signal('ItemNew', new_service) b.connect_to_signal('ItemRemove', remove_service) @@ -54,7 +54,7 @@ def browse_domain(interface, protocol, domain): print "Browsing domain '%s' on %i.%i ..." % (domain, interface, protocol) - b = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.ServiceTypeBrowserNew(interface, protocol, domain)), 'org.freedesktop.Avahi.ServiceTypeBrowser') + b = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.ServiceTypeBrowserNew(interface, protocol, domain)), avahi.DBUS_INTERFACE_SERVICE_TYPE_BROWSER) b.connect_to_signal('ItemNew', new_service_type) service_type_browsers[(interface, protocol, domain)] = b @@ -72,14 +72,14 @@ if len(sys.argv) > 1: domain = sys.argv[1] bus = dbus.SystemBus() -server = dbus.Interface(bus.get_object("org.freedesktop.Avahi", '/org/freedesktop/Avahi/Server'), 'org.freedesktop.Avahi.Server') +server = dbus.Interface(bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) if domain is None: # Explicitly browse .local browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local") # Browse for other browsable domains - db = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "", avahi.DOMAIN_BROWSER_BROWSE)), 'org.freedesktop.Avahi.DomainBrowser') + db = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "", avahi.DOMAIN_BROWSER_BROWSE)), avahi.DBUS_INTERFACE_DOMAIN_BROWSER) db.connect_to_signal('ItemNew', new_domain) else: diff --git a/avahi-utils/avahi-publish-address b/avahi-utils/avahi-publish-address index dce00bd..d03f928 100755 --- a/avahi-utils/avahi-publish-address +++ b/avahi-utils/avahi-publish-address @@ -34,7 +34,7 @@ def add_address(): assert group is None print "Adding address '%s' for '%s' ..." % (name, address) - group = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.EntryGroupNew()), 'org.freedesktop.Avahi.EntryGroup') + group = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.EntryGroupNew()), avahi.DBUS_INTERFACE_ENTRY_GROUP) group.connect_to_signal('StateChanged', entry_group_state_changed) group.AddAddress(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, name, address) group.Commit() @@ -61,7 +61,7 @@ def entry_group_state_changed(state): main_loop = gobject.MainLoop() bus = dbus.SystemBus() -server = dbus.Interface(bus.get_object("org.freedesktop.Avahi", '/org/freedesktop/Avahi/Server'), 'org.freedesktop.Avahi.Server') +server = dbus.Interface(bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) add_address() diff --git a/avahi-utils/avahi-publish-service b/avahi-utils/avahi-publish-service index 376df34..d823f14 100755 --- a/avahi-utils/avahi-publish-service +++ b/avahi-utils/avahi-publish-service @@ -62,7 +62,7 @@ def add_service(): assert group is None print "Adding service '%s' of type '%s' ..." % (name, stype) - group = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.EntryGroupNew()), 'org.freedesktop.Avahi.EntryGroup') + group = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.EntryGroupNew()), avahi.DBUS_INTERFACE_ENTRY_GROUP) group.connect_to_signal('StateChanged', entry_group_state_changed) group.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, name, stype, domain, host, dbus.UInt16(port), txt) group.Commit() @@ -94,7 +94,7 @@ def server_state_changed(state): main_loop = gobject.MainLoop() bus = dbus.SystemBus() -server = dbus.Interface(bus.get_object("org.freedesktop.Avahi", '/org/freedesktop/Avahi/Server'), 'org.freedesktop.Avahi.Server') +server = dbus.Interface(bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) server.connect_to_signal("StateChanged", server_state_changed) server_state_changed(server.GetState()) diff --git a/avahi-utils/avahi.py b/avahi-utils/avahi.py index 40e9fbf..1e2761c 100644 --- a/avahi-utils/avahi.py +++ b/avahi-utils/avahi.py @@ -13,3 +13,11 @@ DOMAIN_BROWSER_REGISTER, DOMAIN_BROWSER_REGISTER_DEFAULT, DOMAIN_BROWSER_BROWSE, PROTO_INET, PROTO_INET6, PROTO_UNSPEC = socket.AF_INET, socket.AF_INET6, socket.AF_UNSPEC IF_UNSPEC = -1 + +DBUS_NAME = "org.freedesktop.Avahi" +DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server" +DBUS_PATH_SERVER = "/" +DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup" +DBUS_INTERFACE_DOMAIN_BROWSER = DBUS_NAME + ".DomainBrowser" +DBUS_INTERFACE_SERVICE_TYPE_BROWSER = DBUS_NAME + ".ServiceTypeBrowser" +DBUS_INTERFACE_SERVICE_BROWSER = DBUS_NAME + ".ServiceBrowser" -- cgit