* add proper error codes and patch everything to make use of it

* parameter validity checkin in all user visible functions of libavahi-core
* two new python tools/examples avahi-resolve-host-name and avahi-resolve-address


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@238 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

3 files changed, 120 insertions, 2 deletions

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 90b908c..144ee12 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -24,14 +24,18 @@ pythonscripts = \
 	avahi-publish-service \
 	avahi-dump-all \
 	avahi-discover \
-	avahi-bookmarks
+	avahi-bookmarks \
+	avahi-resolve-host-name \
+	avahi-resolve-address
 
 EXTRA_DIST = \
 	avahi-publish-address.in \
 	avahi-publish-service.in \
 	avahi-dump-all.in \
 	avahi-discover.in \
-	avahi-bookmarks.in
+	avahi-bookmarks.in \
+	avahi-resolve-host-name.in \
+	avahi-resolve-address.in
 
 if HAVE_PYTHON
 bin_SCRIPTS = $(pythonscripts)
@@ -58,4 +62,12 @@ avahi-bookmarks: avahi-bookmarks.in
 	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
 	chmod +x $@
 
+avahi-resolve-host-name: avahi-resolve-host-name.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	chmod +x $@
+
+avahi-resolve-address: avahi-resolve-address.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	chmod +x $@
+
 CLEANFILES = $(pythonscripts)
diff --git a/avahi-utils/avahi-resolve-address.in b/avahi-utils/avahi-resolve-address.in
new file mode 100755
index 0000000..b72a95b
--- /dev/null
+++ b/avahi-utils/avahi-resolve-address.in
@@ -0,0 +1,53 @@
+#!@PYTHON@
+# -*-python-*-
+# $Id$
+
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+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
+except ImportError, e:
+    pass
+
+
+if len(sys.argv) <= 1:
+    print "Please specify host name(s) to resolve."
+    sys.exit(1)
+
+bus = dbus.SystemBus()
+server = dbus.Interface(bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER)
+
+ret = 0
+
+for a in sys.argv[1:]:
+    try:
+        r = server.ResolveAddress(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, a)
+        print r[3], r[4]
+    except dbus.DBusException, e:
+        print "Resolving '%s' failed: %s" % (a, str(e))
+        ret = 1
+
+sys.exit(ret)
diff --git a/avahi-utils/avahi-resolve-host-name.in b/avahi-utils/avahi-resolve-host-name.in
new file mode 100755
index 0000000..cc24526
--- /dev/null
+++ b/avahi-utils/avahi-resolve-host-name.in
@@ -0,0 +1,53 @@
+#!@PYTHON@
+# -*-python-*-
+# $Id$
+
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+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
+except ImportError, e:
+    pass
+
+
+if len(sys.argv) <= 1:
+    print "Please specify host name(s) to resolve."
+    sys.exit(1)
+
+bus = dbus.SystemBus()
+server = dbus.Interface(bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER)
+
+ret = 0
+
+for name in sys.argv[1:]:
+    try:
+        r = server.ResolveHostName(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, name, avahi.PROTO_UNSPEC)
+        print r[2], r[4]
+    except dbus.DBusException, e:
+        print "Resolving '%s' failed: %s" % (name, str(e))
+        ret = 1
+
+sys.exit(ret)