4 files changed, 42 insertions, 19 deletions
diff --git a/Swiften/LinkLocal/AppleDNSSDService.cpp b/Swiften/LinkLocal/AppleDNSSDService.cpp
index 18cdcb0..d4befd1 100644
--- a/Swiften/LinkLocal/AppleDNSSDService.cpp
+++ b/Swiften/LinkLocal/AppleDNSSDService.cpp
@@ -55,6 +55,13 @@ void AppleDNSSDService::registerService(const String& name, int port, const Link
 	interruptSelect();
 }
 
+void AppleDNSSDService::updateService(const LinkLocalServiceInfo& info) {
+	boost::lock_guard<boost::mutex> lock(sdRefsMutex);
+	assert(registerSDRef);
+	ByteArray txtRecord = info.toTXTRecord();
+	DNSServiceUpdateRecord(registerSDRef, NULL, NULL, txtRecord.getSize(), txtRecord.getData(), 0);
+}
+
 void AppleDNSSDService::unregisterService() {
 	boost::lock_guard<boost::mutex> lock(sdRefsMutex);
 
@@ -91,6 +98,7 @@ void AppleDNSSDService::stopResolvingService(const Service& service) {
 
 void AppleDNSSDService::resolveHostname(const String& hostname, int interfaceIndex) {
 	boost::lock_guard<boost::mutex> lock(sdRefsMutex);
+	std::cout << "Resolve " << hostname << std::endl;
 
 	DNSServiceRef hostnameResolveSDRef;
 	DNSServiceErrorType result = DNSServiceGetAddrInfo(&hostnameResolveSDRef, 0, interfaceIndex, kDNSServiceProtocol_IPv4, hostname.getUTF8Data(), &AppleDNSSDService::handleHostnameResolvedGlobal, this);
@@ -110,11 +118,14 @@ void AppleDNSSDService::doStart() {
 	onStarted();
 
 	// Listen for new services
-	assert(!browseSDRef);
-	DNSServiceErrorType result = DNSServiceBrowse(&browseSDRef, 0, 0, "_presence._tcp", 0, &AppleDNSSDService::handleServiceDiscoveredGlobal , this);
-	if (result != kDNSServiceErr_NoError) {
-		std::cerr << "Error creating browse query" << std::endl;
-		haveError = true;
+	{
+		boost::lock_guard<boost::mutex> lock(sdRefsMutex);
+		assert(!browseSDRef);
+		DNSServiceErrorType result = DNSServiceBrowse(&browseSDRef, 0, 0, "_presence._tcp", 0, &AppleDNSSDService::handleServiceDiscoveredGlobal , this);
+		if (result != kDNSServiceErr_NoError) {
+			std::cerr << "Error creating browse query" << std::endl;
+			haveError = true;
+		}
 	}
 
 	// Run the main loop
@@ -148,6 +159,7 @@ void AppleDNSSDService::doStart() {
 
 			// Hostname resolving
 			for (HostnameSDRefs::const_iterator i = hostnameResolveSDRefs.begin(); i != hostnameResolveSDRefs.end(); ++i) {
+				std::cout << "Adding ostname resolve " << std::endl;
 				int hostnameResolveSocket = DNSServiceRefSockFD(*i);
 				maxSocket = std::max(maxSocket, hostnameResolveSocket);
 				FD_SET(hostnameResolveSocket, &fdSet);
@@ -181,6 +193,7 @@ void AppleDNSSDService::doStart() {
 			for (HostnameSDRefs::const_iterator i = hostnameResolveSDRefs.begin(); i != hostnameResolveSDRefs.end(); ++i) {
 				if (FD_ISSET(DNSServiceRefSockFD(*i), &fdSet)) {
 					DNSServiceProcessResult(*i);
+					std::cout << "Removing hostnameResolve" << std::endl;
 					hostnameResolveSDRefs.erase(std::remove(hostnameResolveSDRefs.begin(), hostnameResolveSDRefs.end(), *i), hostnameResolveSDRefs.end());
 					DNSServiceRefDeallocate(*i);
 					break; // Stop the loop, because we removed an element
@@ -189,23 +202,28 @@ void AppleDNSSDService::doStart() {
 		}
 	}
 
-	for (ServiceSDRefMap::const_iterator i = resolveSDRefs.begin(); i != resolveSDRefs.end(); ++i) {
-		DNSServiceRefDeallocate(i->second);
-	}
-	resolveSDRefs.clear();
+	{
+		boost::lock_guard<boost::mutex> lock(sdRefsMutex);
 
-	for (HostnameSDRefs::const_iterator i = hostnameResolveSDRefs.begin(); i != hostnameResolveSDRefs.end(); ++i) {
-		DNSServiceRefDeallocate(*i);
-	}
-	hostnameResolveSDRefs.clear();
+		for (ServiceSDRefMap::const_iterator i = resolveSDRefs.begin(); i != resolveSDRefs.end(); ++i) {
+			DNSServiceRefDeallocate(i->second);
+		}
+		resolveSDRefs.clear();
 
-	if (registerSDRef) {
-		DNSServiceRefDeallocate(registerSDRef);
-		registerSDRef = NULL;
-	}
+		for (HostnameSDRefs::const_iterator i = hostnameResolveSDRefs.begin(); i != hostnameResolveSDRefs.end(); ++i) {
+			std::cout << "Removing hostnameResolve" << std::endl;
+			DNSServiceRefDeallocate(*i);
+		}
+		hostnameResolveSDRefs.clear();
+
+		if (registerSDRef) {
+			DNSServiceRefDeallocate(registerSDRef);
+			registerSDRef = NULL;
+		}
 
-	DNSServiceRefDeallocate(browseSDRef);
-	browseSDRef = NULL;
+		DNSServiceRefDeallocate(browseSDRef);
+		browseSDRef = NULL;
+	}
 
 	MainEventLoop::postEvent(boost::bind(boost::ref(onStopped), haveError), shared_from_this());
 }
diff --git a/Swiften/LinkLocal/AppleDNSSDService.h b/Swiften/LinkLocal/AppleDNSSDService.h
index cdeafed..fe4a648 100644
--- a/Swiften/LinkLocal/AppleDNSSDService.h
+++ b/Swiften/LinkLocal/AppleDNSSDService.h
@@ -18,6 +18,7 @@ namespace Swift {
 			virtual void stop();
 
 			virtual void registerService(const String& name, int port, const LinkLocalServiceInfo&);
+			virtual void updateService(const LinkLocalServiceInfo&);
 			virtual void unregisterService();
 
 			virtual void startResolvingService(const Service&);
diff --git a/Swiften/LinkLocal/DNSSDService.h b/Swiften/LinkLocal/DNSSDService.h
index 3dd8c7b..9689352 100644
--- a/Swiften/LinkLocal/DNSSDService.h
+++ b/Swiften/LinkLocal/DNSSDService.h
@@ -55,6 +55,7 @@ namespace Swift {
 			virtual void stop() = 0;
 
 			virtual void registerService(const String& name, int port, const LinkLocalServiceInfo&) = 0;
+			virtual void updateService(const LinkLocalServiceInfo&) = 0;
 			virtual void unregisterService() = 0;
 
 			virtual void startResolvingService(const Service&) = 0;
diff --git a/Swiften/LinkLocal/LinkLocalRoster.cpp b/Swiften/LinkLocal/LinkLocalRoster.cpp
index aedea77..89bfa55 100644
--- a/Swiften/LinkLocal/LinkLocalRoster.cpp
+++ b/Swiften/LinkLocal/LinkLocalRoster.cpp
@@ -81,6 +81,9 @@ void LinkLocalRoster::handleServiceAdded(const DNSSDService::Service& service) {
 }
 
 void LinkLocalRoster::handleServiceRemoved(const DNSSDService::Service& service) {
+	if (selfService && *selfService == service) {
+		return;
+	}
 	dnsSDService->stopResolvingService(service);
 	services.erase(service);
 	boost::shared_ptr<RosterPayload> roster(new RosterPayload());