-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
# -*-python-*-
# $Id$
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-import avahi, dbus, gobject, sys, getopt
+import sys, getopt
+
+try:
+ import avahi, gobject, dbus
+except ImportError:
+ print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus."
+ sys.exit(1)
try:
import dbus.glib
sys.exit(retval)
try:
- opts, args = getopt.getopt(sys.argv[1:], "d:H:", ["help", "domain=", "host="])
+ opts, args = getopt.getopt(sys.argv[1:], "hd:H:", ["help", "domain=", "host="])
except getopt.GetoptError:
usage(2)
host = a
if len(args) < 3:
- sys.stderr.write("Invalid number of arguments\n")
- sys.exit(1)
+ usage(2)
name = args[0]
stype = args[1]
def remove_service():
global group
- if not (group is None):
- group.Free()
- group = None
+ if not group is None:
+ group.Reset()
def add_service():
global server, group, name, stype, domain, host, port, txt
- assert group is None
+
+ if group is None:
+ 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)
+
+ assert group.IsEmpty()
print "Adding service '%s' of type '%s' ..." % (name, stype)
- 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.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, dbus.UInt32(0), name, stype, domain, host, dbus.UInt16(port), avahi.string_array_to_txt_array(txt))
group.Commit()
def entry_group_state_changed(state):
global name, server, n_rename
+
+# print "state change: %i" % state
if state == avahi.ENTRY_GROUP_ESTABLISHED:
print "Service established."
except KeyboardInterrupt, k:
pass
-remove_service()
+if not group is None:
+ group.Free()