From 522fb5c25acf2af440e5203e41d07f5fc97ad0a6 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 29 Jul 2005 20:32:07 +0000
Subject: * add avahi-publish * avahi-dump-all: allow user to specify domain to
 browse * DBUS: implement new methods Server.GetState(),
 Server.GetAlternativeHostName(), Server.GetAlternativeServiceName() * Add
 dbust-test.py to EXTRA_DIST * doc fix for alternative.h

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@192 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 avahi-utils/avahi-dump-all | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'avahi-utils/avahi-dump-all')

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()
-- 
cgit