From f7f1455b4691752abc6753a26dad13060ddb6695 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 20 Oct 2006 12:29:11 -0400 Subject: [PATCH] Revert to IP4 only since Avahi mixes up IP4 and IP6 when using PROTO_UNSPEC --- services/presence/PresenceService.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/presence/PresenceService.py b/services/presence/PresenceService.py index 1c3990b8..d466caf9 100644 --- a/services/presence/PresenceService.py +++ b/services/presence/PresenceService.py @@ -340,10 +340,10 @@ class PresenceService(object): avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) # Always browse .local - self._new_domain_cb(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local") + self._new_domain_cb(avahi.IF_UNSPEC, avahi.PROTO_INET, "local") # Connect to Avahi and start looking for stuff - domain_browser = self._mdns_service.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, + domain_browser = self._mdns_service.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_INET, "", avahi.DOMAIN_BROWSER_BROWSE, dbus.UInt32(0)) db = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, domain_browser), avahi.DBUS_INTERFACE_DOMAIN_BROWSER) db.connect_to_signal('ItemNew', self._new_domain_cb_glue) @@ -573,7 +573,7 @@ class PresenceService(object): # Ask avahi to resolve this particular service path = self._mdns_service.ServiceResolverNew(dbus.Int32(adv.interface()), dbus.Int32(adv.protocol()), adv.name(), adv.stype(), adv.domain(), - avahi.PROTO_UNSPEC, dbus.UInt32(0)) + avahi.PROTO_INET, dbus.UInt32(0)) resolver = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, path), avahi.DBUS_INTERFACE_SERVICE_RESOLVER) resolver.connect_to_signal('Found', lambda *args: self._service_resolved_cb_glue(adv, *args))