diff options
Diffstat (limited to 'avahi-utils')
-rwxr-xr-x | avahi-utils/avahi-dump-all | 27 | ||||
-rwxr-xr-x | avahi-utils/avahi-publish | 99 |
2 files changed, 120 insertions, 6 deletions
diff --git a/avahi-utils/avahi-dump-all b/avahi-utils/avahi-dump-all index acd922d..03efa85 100755 --- a/avahi-utils/avahi-dump-all +++ b/avahi-utils/avahi-dump-all @@ -2,7 +2,7 @@ # -*-python-*- # $Id$ -import avahi, dbus, gobject +import avahi, dbus, gobject, sys try: import dbus.glib @@ -20,6 +20,8 @@ def print_error(err): print "Error:", str(err) def new_service(interface, protocol, name, type, domain): + global server + print "Found service '%s' of type '%s' in domain '%s' on %i.%i." % (name, type, domain, interface, protocol) # Asynchronous resolving @@ -29,6 +31,7 @@ def remove_service(interface, protocol, name, type, domain): print "Service '%s' of type '%s' in domain '%s' on %i.%i disappeared." % (name, type, domain, interface, protocol) def new_service_type(interface, protocol, type, domain): + global server, service_browsers # Are we already browsing this domain for this type? if service_browsers.has_key((interface, protocol, type, domain)): @@ -43,6 +46,7 @@ def new_service_type(interface, protocol, type, domain): service_browsers[(interface, protocol, type, domain)] = b def browse_domain(interface, protocol, domain): + global server, service_type_browsers # Are we already browsing this domain? if service_type_browsers.has_key((interface, protocol, domain)): @@ -60,16 +64,27 @@ def new_domain(interface, protocol, domain): # We browse for .local anyway... if domain != "local": browse_domain(interface, protocol, domain) + + +domain = None + +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') -# Explicitly browse .local -browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local") +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.connect_to_signal('ItemNew', new_domain) -# 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.connect_to_signal('ItemNew', new_domain) +else: + # Just browse the domain the user wants us to browse + browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, domain) try: gobject.MainLoop().run() diff --git a/avahi-utils/avahi-publish b/avahi-utils/avahi-publish new file mode 100755 index 0000000..4375d1a --- /dev/null +++ b/avahi-utils/avahi-publish @@ -0,0 +1,99 @@ +#!/usr/bin/python2.4 +# -*-python-*- +# $Id$ + +import avahi, dbus, gobject, sys, getopt + +try: + import dbus.glib +except ImportError, e: + pass + +def usage(retval = 0): + print "%s [options] <name> <type> <port> [<txt> ...]\n" % sys.argv[0] + print " -h --help Show this help" + print " -d --domain Domain where to register this service" + print " -H --host Host where this service resides" + sys.exit(retval) + +try: + opts, args = getopt.getopt(sys.argv[1:], "d:H:", ["help", "domain=", "host="]) +except getopt.GetoptError: + usage(2) + +domain = "" +host = "" + +for o, a in opts: + if o in ("-h", "--help"): + usage() + + if o in ("-d", "--domain"): + domain = a + + if o in ("-H", "--host"): + host = a + +if len(args) < 3: + sys.stderr.write("Invalid number of arguments\n") + sys.exit(1) + +name = args[0] +stype = args[1] +port = int(args[2]) +txt = args[3:] + +# python-dbus doesn't allow transmission of empty arrays, therefore we "fix" it with a bogus entry +if len(txt) == 0: + txt.append("python-dbus=brain-damage") + +group = None + +def remove_service(): + global group + + if not (group is None): + group.Free() + group = None + +def add_service(): + global group, name, stype, domain, host, port, txt + + assert group is None + + print "Adding service '%s' of type '%s' ..." % (name, args[1]) + + group = dbus.Interface(bus.get_object("org.freedesktop.Avahi", server.EntryGroupNew()), 'org.freedesktop.Avahi.EntryGroup') + 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() + +def entry_group_state_changed(state): + global name, server + + if state == avahi.ENTRY_GROUP_ESTABLISHED: + print "Service established." + elif state == avahi.ENTRY_GROUP_COLLISION: + name = server.GetAlternativeServiceName(name) + print "WARNING: Service name collision, changing name to '%s' ..." % name + remove_service() + add_service() + +def server_state_changed(state): + if state == avahi.SERVER_COLLISION: + print "WARNING: Server name collision" + remove_service() + elif state == avahi.SERVER_RUNNING: + add_service() + +bus = dbus.SystemBus() +server = dbus.Interface(bus.get_object("org.freedesktop.Avahi", '/org/freedesktop/Avahi/Server'), 'org.freedesktop.Avahi.Server') +server.connect_to_signal("StateChanged", server_state_changed) +server_state_changed(server.GetState()) + +try: + gobject.MainLoop().run() +except KeyboardInterrupt, k: + pass + +remove_service() |