Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-07-22 19:28:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-07-22 21:40:20 (GMT) |
| commit | 15103cc6eb3dd62c0e84c68bb08995247c653094 (patch) | |
| tree | 2948d38f076874c10dbb029c8ad1328b9afdffd3 /Swiften/LinkLocal/AvahiDNSSDService.cpp | |
| parent | c4660f404c9a0dbf1c00a20baacfc738d93eaff5 (diff) | |
| download | swift-15103cc6eb3dd62c0e84c68bb08995247c653094.zip swift-15103cc6eb3dd62c0e84c68bb08995247c653094.tar.bz2 | |
Introduce LinkLocalServiceID to identify Link-Local services.
Diffstat (limited to 'Swiften/LinkLocal/AvahiDNSSDService.cpp')
| -rw-r--r-- | Swiften/LinkLocal/AvahiDNSSDService.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/LinkLocal/AvahiDNSSDService.cpp b/Swiften/LinkLocal/AvahiDNSSDService.cpp index 1dd5c28..72039b7 100644 --- a/Swiften/LinkLocal/AvahiDNSSDService.cpp +++ b/Swiften/LinkLocal/AvahiDNSSDService.cpp @@ -62,16 +62,16 @@ void AvahiDNSSDService::unregisterService() { avahi_threaded_poll_unlock(threadedPoll); } -void AvahiDNSSDService::startResolvingService(const Service& service) { +void AvahiDNSSDService::startResolvingService(const LinkLocalServiceID& service) { avahi_threaded_poll_lock(threadedPoll); AvahiServiceResolver* resolver = avahi_service_resolver_new( client, - service.networkInterface, + service.getNetworkInterfaceID(), AVAHI_PROTO_INET, - service.name.getUTF8Data(), - service.type.getUTF8Data(), - service.domain.getUTF8Data(), + service.getName().getUTF8Data(), + service.getType().getUTF8Data(), + service.getDomain().getUTF8Data(), AVAHI_PROTO_UNSPEC, static_cast<AvahiLookupFlags>(0), &AvahiDNSSDService::handleServiceResolvedGlobal, @@ -112,13 +112,13 @@ void AvahiDNSSDService::handleServiceDiscovered(AvahiServiceBrowser *, AvahiIfIn return; case AVAHI_BROWSER_NEW: { std::cerr << "Service added: " << name << " " << type << " " << domain << std::endl; - Service service(name, type, domain, interfaceIndex); + LinkLocalServiceID service(name, type, domain, interfaceIndex); MainEventLoop::postEvent(boost::bind(boost::ref(onServiceAdded), service), shared_from_this()); } break; case AVAHI_BROWSER_REMOVE: { std::cerr << "Service removed: " << name << " " << type << " " << domain << std::endl; - Service service(name, type, domain, interfaceIndex); + LinkLocalServiceID service(name, type, domain, interfaceIndex); MainEventLoop::postEvent(boost::bind(boost::ref(onServiceRemoved), service), shared_from_this()); } break; @@ -146,7 +146,7 @@ void AvahiDNSSDService::handleServiceResolved(AvahiServiceResolver *, AvahiIfInd HostAddress hostAddress(reinterpret_cast<const unsigned char*>(&address->data.ipv4.address), 4); hostnameAddresses[String(hostname)] = hostAddress; MainEventLoop::postEvent(boost::bind(boost::ref(onServiceResolved), - Service(name, type, domain, interfaceIndex), + LinkLocalServiceID(name, type, domain, interfaceIndex), ResolveResult(hostname, port, LinkLocalServiceInfo::createFromTXTRecord(data))), shared_from_this()); |