diff options
Diffstat (limited to 'avahi-utils/avahi-browse.in')
| -rwxr-xr-x | avahi-utils/avahi-browse.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/avahi-utils/avahi-browse.in b/avahi-utils/avahi-browse.in index 1acc165..6ae00ba 100755 --- a/avahi-utils/avahi-browse.in +++ b/avahi-utils/avahi-browse.in @@ -88,25 +88,25 @@ def lookup_service_type(stype): except KeyError: return "n/a" -def service_resolved(interface, protocol, name, stype, domain, host, aprotocol, address, port, txt): +def service_resolved(interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): print "Service data for service '%s' of type '%s' (%s) in domain '%s' on %s.%i:" % (name, stype, lookup_service_type(stype), domain, siocgifname(interface), protocol) print "\tHost %s (%s), port %i, TXT data: %s" % (host, address, port, avahi.txt_array_to_string_array(txt)) def print_error(err): print "Error:", str(err) -def new_service(interface, protocol, name, stype, domain): +def new_service(interface, protocol, name, stype, domain, flags): global server print "Found service '%s' of type '%s' (%s) in domain '%s' on %s.%i." % (name, stype, lookup_service_type(stype), domain, siocgifname(interface), protocol) # Asynchronous resolving - server.ResolveService(interface, protocol, name, stype, domain, avahi.PROTO_UNSPEC, reply_handler=service_resolved, error_handler=print_error) + server.ResolveService(interface, protocol, name, stype, domain, avahi.PROTO_UNSPEC, 0, reply_handler=service_resolved, error_handler=print_error) -def remove_service(interface, protocol, name, stype, domain): +def remove_service(interface, protocol, name, stype, domain, flags): print "Service '%s' of type '%s' (%s) in domain '%s' on %s.%i disappeared." % (name, stype, lookup_service_type(stype), domain, siocgifname(interface), protocol) -def new_service_type(interface, protocol, stype, domain): +def new_service_type(interface, protocol, stype, domain, flags): global server, service_browsers # Are we already browsing this domain for this type? @@ -115,7 +115,7 @@ def new_service_type(interface, protocol, stype, domain): print "Browsing for services of type '%s' (%s) in domain '%s' on %s.%i ..." % (stype, lookup_service_type(stype), domain, siocgifname(interface), protocol) - b = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.ServiceBrowserNew(interface, protocol, stype, domain)), avahi.DBUS_INTERFACE_SERVICE_BROWSER) + b = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.ServiceBrowserNew(interface, protocol, stype, domain, 0)), avahi.DBUS_INTERFACE_SERVICE_BROWSER) b.connect_to_signal('ItemNew', new_service) b.connect_to_signal('ItemRemove', remove_service) @@ -131,14 +131,14 @@ def browse_domain(interface, protocol, domain): if stype is None: print "Browsing domain '%s' on %s.%i ..." % (domain, siocgifname(interface), protocol) - b = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.ServiceTypeBrowserNew(interface, protocol, domain)), avahi.DBUS_INTERFACE_SERVICE_TYPE_BROWSER) + b = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.ServiceTypeBrowserNew(interface, protocol, domain, 0)), avahi.DBUS_INTERFACE_SERVICE_TYPE_BROWSER) b.connect_to_signal('ItemNew', new_service_type) service_type_browsers[(interface, protocol, domain)] = b else: - new_service_type(interface, protocol, stype, domain) + new_service_type(interface, protocol, stype, domain, 0) -def new_domain(interface, protocol, domain): +def new_domain(interface, protocol, domain, flags): # We browse for .local anyway... if domain != "local": @@ -153,7 +153,7 @@ if domain is None: browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local") # Browse for other browsable domains - 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 = dbus.Interface(bus.get_object(avahi.DBUS_NAME, server.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "", avahi.DOMAIN_BROWSER_BROWSE, 0)), avahi.DBUS_INTERFACE_DOMAIN_BROWSER) db.connect_to_signal('ItemNew', new_domain) else: |