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/AppleDNSSDService.cpp | |
| parent | c4660f404c9a0dbf1c00a20baacfc738d93eaff5 (diff) | |
| download | swift-15103cc6eb3dd62c0e84c68bb08995247c653094.zip swift-15103cc6eb3dd62c0e84c68bb08995247c653094.tar.bz2 | |
Introduce LinkLocalServiceID to identify Link-Local services.
Diffstat (limited to 'Swiften/LinkLocal/AppleDNSSDService.cpp')
| -rw-r--r-- | Swiften/LinkLocal/AppleDNSSDService.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/LinkLocal/AppleDNSSDService.cpp b/Swiften/LinkLocal/AppleDNSSDService.cpp index 969cbb2..5262357 100644 --- a/Swiften/LinkLocal/AppleDNSSDService.cpp +++ b/Swiften/LinkLocal/AppleDNSSDService.cpp @@ -70,11 +70,11 @@ void AppleDNSSDService::unregisterService() { registerSDRef = NULL; } -void AppleDNSSDService::startResolvingService(const Service& service) { +void AppleDNSSDService::startResolvingService(const LinkLocalServiceID& service) { boost::lock_guard<boost::mutex> lock(sdRefsMutex); DNSServiceRef resolveSDRef; - DNSServiceErrorType result = DNSServiceResolve(&resolveSDRef, 0, service.networkInterface, service.name.getUTF8Data(), service.type.getUTF8Data(), service.domain.getUTF8Data(), &AppleDNSSDService::handleServiceResolvedGlobal, this); + DNSServiceErrorType result = DNSServiceResolve(&resolveSDRef, 0, service.getNetworkInterfaceID(), service.getName().getUTF8Data(), service.getType().getUTF8Data(), service.getDomain().getUTF8Data(), &AppleDNSSDService::handleServiceResolvedGlobal, this); if (result != kDNSServiceErr_NoError) { std::cerr << "Error creating service resolve query" << std::endl; haveError = true; @@ -87,7 +87,7 @@ void AppleDNSSDService::startResolvingService(const Service& service) { interruptSelect(); } -void AppleDNSSDService::stopResolvingService(const Service& service) { +void AppleDNSSDService::stopResolvingService(const LinkLocalServiceID& service) { boost::lock_guard<boost::mutex> lock(sdRefsMutex); ServiceSDRefMap::iterator i = resolveSDRefs.find(service); @@ -238,7 +238,7 @@ void AppleDNSSDService::handleServiceDiscovered(DNSServiceRef, DNSServiceFlags f return; } else { - Service service(serviceName, regtype, replyDomain, interfaceIndex); + LinkLocalServiceID service(serviceName, regtype, replyDomain, interfaceIndex); if (flags & kDNSServiceFlagsAdd) { MainEventLoop::postEvent(boost::bind(boost::ref(onServiceAdded), service), shared_from_this()); } @@ -258,7 +258,7 @@ void AppleDNSSDService::handleServiceRegistered(DNSServiceRef, DNSServiceFlags, haveError = true; } else { - MainEventLoop::postEvent(boost::bind(boost::ref(onServiceRegistered), Service(name, regtype, domain, 0)), shared_from_this()); + MainEventLoop::postEvent(boost::bind(boost::ref(onServiceRegistered), LinkLocalServiceID(name, regtype, domain, 0)), shared_from_this()); } } |