From: Lennart Poettering Date: Fri, 29 Jul 2005 20:35:55 +0000 (+0000) Subject: * rename avahi-publish to avahi-publish-service X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=712dd72492edccc28fbd5f4c0fd756d4c3a76c4d;p=catta * rename avahi-publish to avahi-publish-service git-svn-id: file:///home/lennart/svn/public/avahi/trunk@193 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- diff --git a/avahi-utils/avahi-publish b/avahi-utils/avahi-publish deleted file mode 100755 index 4375d1a..0000000 --- a/avahi-utils/avahi-publish +++ /dev/null @@ -1,99 +0,0 @@ -#!/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] [ ...]\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() diff --git a/avahi-utils/avahi-publish-service b/avahi-utils/avahi-publish-service new file mode 100755 index 0000000..4375d1a --- /dev/null +++ b/avahi-utils/avahi-publish-service @@ -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] [ ...]\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()