12 files changed, 333 insertions, 328 deletions
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.cpp b/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.cpp
index 1b162ce..a1bdb3e 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.cpp
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.cpp
@@ -1,60 +1,61 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h>
 
-#include <boost/bind.hpp>
 #include <iostream>
 
+#include <boost/bind.hpp>
+
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h>
 
 namespace Swift {
 
 void AvahiBrowseQuery::startBrowsing() {
-	std::cout << "Start browsing" << std::endl;
-	assert(!browser);
-	avahi_threaded_poll_lock(querier->getThreadedPoll());
-	browser = avahi_service_browser_new(querier->getClient(), AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_presence._tcp", NULL, static_cast<AvahiLookupFlags>(0), &handleServiceDiscoveredStatic, this);
-	if (!browser) {
-		std::cout << "Error" << std::endl;
-		eventLoop->postEvent(boost::bind(boost::ref(onError)), shared_from_this());
-	}
-	avahi_threaded_poll_unlock(querier->getThreadedPoll());
+    std::cout << "Start browsing" << std::endl;
+    assert(!browser);
+    avahi_threaded_poll_lock(querier->getThreadedPoll());
+    browser = avahi_service_browser_new(querier->getClient(), AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_presence._tcp", NULL, static_cast<AvahiLookupFlags>(0), &handleServiceDiscoveredStatic, this);
+    if (!browser) {
+        std::cout << "Error" << std::endl;
+        eventLoop->postEvent(boost::bind(boost::ref(onError)), shared_from_this());
+    }
+    avahi_threaded_poll_unlock(querier->getThreadedPoll());
 }
 
 void AvahiBrowseQuery::stopBrowsing() {
-	std::cout << "Stop browsing" << std::endl;
-	avahi_threaded_poll_lock(querier->getThreadedPoll());
-	avahi_service_browser_free(browser);
-	browser = NULL;
-	avahi_threaded_poll_unlock(querier->getThreadedPoll());
+    std::cout << "Stop browsing" << std::endl;
+    avahi_threaded_poll_lock(querier->getThreadedPoll());
+    avahi_service_browser_free(browser);
+    browser = NULL;
+    avahi_threaded_poll_unlock(querier->getThreadedPoll());
 }
 
 void AvahiBrowseQuery::handleServiceDiscovered(AvahiServiceBrowser *, AvahiIfIndex interfaceIndex, AvahiProtocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags) {
-	switch (event) {
-		case AVAHI_BROWSER_FAILURE:	
-			std::cout << "Service browse error" << std::endl;
-			eventLoop->postEvent(boost::bind(boost::ref(onError)), shared_from_this());
-			break;
-		case AVAHI_BROWSER_NEW: {
-			DNSSDServiceID service(name, domain, type, interfaceIndex);
-			std::cout << "Service discovered " << name << " " << domain << " " << type << " " << interfaceIndex << std::endl;
-			eventLoop->postEvent(boost::bind(boost::ref(onServiceAdded), service), shared_from_this());
-			break;
-		}
-		case AVAHI_BROWSER_REMOVE: {
-			std::cout << "Service went away " << name << " " << domain << " " << type << " " << interfaceIndex << std::endl;
-			DNSSDServiceID service(name, domain, type, interfaceIndex);
-			eventLoop->postEvent(boost::bind(boost::ref(onServiceRemoved), service), shared_from_this());
-			break;
-		}
-		case AVAHI_BROWSER_ALL_FOR_NOW:
-		case AVAHI_BROWSER_CACHE_EXHAUSTED:
-			break;
-	}
+    switch (event) {
+        case AVAHI_BROWSER_FAILURE:
+            std::cout << "Service browse error" << std::endl;
+            eventLoop->postEvent(boost::bind(boost::ref(onError)), shared_from_this());
+            break;
+        case AVAHI_BROWSER_NEW: {
+            DNSSDServiceID service(name, domain, type, interfaceIndex);
+            std::cout << "Service discovered " << name << " " << domain << " " << type << " " << interfaceIndex << std::endl;
+            eventLoop->postEvent(boost::bind(boost::ref(onServiceAdded), service), shared_from_this());
+            break;
+        }
+        case AVAHI_BROWSER_REMOVE: {
+            std::cout << "Service went away " << name << " " << domain << " " << type << " " << interfaceIndex << std::endl;
+            DNSSDServiceID service(name, domain, type, interfaceIndex);
+            eventLoop->postEvent(boost::bind(boost::ref(onServiceRemoved), service), shared_from_this());
+            break;
+        }
+        case AVAHI_BROWSER_ALL_FOR_NOW:
+        case AVAHI_BROWSER_CACHE_EXHAUSTED:
+            break;
+    }
 }
 
 }
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h
index efa31ac..a227613 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,30 +8,30 @@
 
 #include <avahi-client/lookup.h>
 
+#include <Swiften/EventLoop/EventLoop.h>
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h>
 #include <Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h>
-#include <Swiften/EventLoop/EventLoop.h>
 
 namespace Swift {
-	class AvahiQuerier;
+    class AvahiQuerier;
+
+    class AvahiBrowseQuery : public DNSSDBrowseQuery, public AvahiQuery {
+        public:
+            AvahiBrowseQuery(std::shared_ptr<AvahiQuerier> q, EventLoop* eventLoop) : AvahiQuery(q, eventLoop), browser(NULL) {
+            }
 
-	class AvahiBrowseQuery : public DNSSDBrowseQuery, public AvahiQuery {
-		public:	
-			AvahiBrowseQuery(boost::shared_ptr<AvahiQuerier> q, EventLoop* eventLoop) : AvahiQuery(q, eventLoop), browser(NULL) {
-			}
+            void startBrowsing();
+            void stopBrowsing();
 
-			void startBrowsing();
-			void stopBrowsing();
+        private:
+            static void handleServiceDiscoveredStatic(AvahiServiceBrowser *b, AvahiIfIndex interfaceIndex, AvahiProtocol protocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags flags, void* context) {
+                static_cast<AvahiBrowseQuery*>(context)->handleServiceDiscovered(b, interfaceIndex, protocol, event, name, type, domain, flags);
+            }
 
-		private:
-			static void handleServiceDiscoveredStatic(AvahiServiceBrowser *b, AvahiIfIndex interfaceIndex, AvahiProtocol protocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags flags, void* context) {
-				static_cast<AvahiBrowseQuery*>(context)->handleServiceDiscovered(b, interfaceIndex, protocol, event, name, type, domain, flags);
-			}
+            void handleServiceDiscovered(AvahiServiceBrowser *, AvahiIfIndex interfaceIndex, AvahiProtocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags);
 
-			void handleServiceDiscovered(AvahiServiceBrowser *, AvahiIfIndex interfaceIndex, AvahiProtocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags);
+        private:
+            AvahiServiceBrowser* browser;
 
-		private:
-			AvahiServiceBrowser* browser;
-			
-	};
+    };
 }
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp
index 1e2e08f..1b79946 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,9 +9,9 @@
 #include <iostream>
 
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h>
-#include <Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h>
-#include <Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h>
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.h>
+#include <Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h>
+#include <Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h>
 
 namespace Swift {
 
@@ -21,46 +21,46 @@ AvahiQuerier::AvahiQuerier(EventLoop* eventLoop) : eventLoop(eventLoop), client(
 AvahiQuerier::~AvahiQuerier() {
 }
 
-boost::shared_ptr<DNSSDBrowseQuery> AvahiQuerier::createBrowseQuery() {
-	return boost::shared_ptr<DNSSDBrowseQuery>(new AvahiBrowseQuery(shared_from_this(), eventLoop));
+std::shared_ptr<DNSSDBrowseQuery> AvahiQuerier::createBrowseQuery() {
+    return std::make_shared<AvahiBrowseQuery>(shared_from_this(), eventLoop);
 }
 
-boost::shared_ptr<DNSSDRegisterQuery> AvahiQuerier::createRegisterQuery(const std::string& name, int port, const ByteArray& info) {
-	return boost::shared_ptr<DNSSDRegisterQuery>(new AvahiRegisterQuery(name, port, info, shared_from_this(), eventLoop));
+std::shared_ptr<DNSSDRegisterQuery> AvahiQuerier::createRegisterQuery(const std::string& name, int port, const ByteArray& info) {
+    return std::make_shared<AvahiRegisterQuery>(name, port, info, shared_from_this(), eventLoop);
 }
 
-boost::shared_ptr<DNSSDResolveServiceQuery> AvahiQuerier::createResolveServiceQuery(const DNSSDServiceID& service) {
-	return boost::shared_ptr<DNSSDResolveServiceQuery>(new AvahiResolveServiceQuery(service, shared_from_this(), eventLoop));
+std::shared_ptr<DNSSDResolveServiceQuery> AvahiQuerier::createResolveServiceQuery(const DNSSDServiceID& service) {
+    return std::make_shared<AvahiResolveServiceQuery>(service, shared_from_this(), eventLoop);
 }
 
-boost::shared_ptr<DNSSDResolveHostnameQuery> AvahiQuerier::createResolveHostnameQuery(const std::string& hostname, int interfaceIndex) {
-	return boost::shared_ptr<DNSSDResolveHostnameQuery>(new AvahiResolveHostnameQuery(hostname, interfaceIndex, shared_from_this(), eventLoop));
+std::shared_ptr<DNSSDResolveHostnameQuery> AvahiQuerier::createResolveHostnameQuery(const std::string& hostname, int interfaceIndex) {
+    return std::make_shared<AvahiResolveHostnameQuery>(hostname, interfaceIndex, shared_from_this(), eventLoop);
 }
 
 void AvahiQuerier::start() {
-	std::cout << "Starrting querier" << std::endl;
-	assert(!threadedPoll);
-	threadedPoll = avahi_threaded_poll_new();
-	int error;
-	assert(!client);
-	client = avahi_client_new(
-			avahi_threaded_poll_get(threadedPoll), 
-			static_cast<AvahiClientFlags>(0), NULL, this, &error); // TODO
-	if (!client) {
-		// TODO
-		std::cerr << "Avahi Error: " << avahi_strerror(error) << std::endl;
-		return;
-	}
-	std::cout << "Starrting event loop" << std::endl;
-	avahi_threaded_poll_start(threadedPoll);
+    std::cout << "Starrting querier" << std::endl;
+    assert(!threadedPoll);
+    threadedPoll = avahi_threaded_poll_new();
+    int error;
+    assert(!client);
+    client = avahi_client_new(
+            avahi_threaded_poll_get(threadedPoll),
+            static_cast<AvahiClientFlags>(0), NULL, this, &error); // TODO
+    if (!client) {
+        // TODO
+        std::cerr << "Avahi Error: " << avahi_strerror(error) << std::endl;
+        return;
+    }
+    std::cout << "Starrting event loop" << std::endl;
+    avahi_threaded_poll_start(threadedPoll);
 }
 
 void AvahiQuerier::stop() {
-	assert(threadedPoll);
-	avahi_threaded_poll_stop(threadedPoll);
-	assert(client);
-	avahi_client_free(client);
-	avahi_threaded_poll_free(threadedPoll);
+    assert(threadedPoll);
+    avahi_threaded_poll_stop(threadedPoll);
+    assert(client);
+    avahi_client_free(client);
+    avahi_threaded_poll_free(threadedPoll);
 }
 
 }
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h
index 2109be4..5dce19d 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h
@@ -1,55 +1,55 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
+
 #include <avahi-client/client.h>
 #include <avahi-client/lookup.h>
+#include <avahi-common/error.h>
+#include <avahi-common/malloc.h>
 #include <avahi-common/thread-watch.h>
 #include <avahi-common/watch.h>
-#include <avahi-common/malloc.h>
-#include <avahi-common/error.h>
 
-#include <Swiften/LinkLocal/DNSSD/DNSSDQuerier.h>
 #include <Swiften/Base/ByteArray.h>
+#include <Swiften/LinkLocal/DNSSD/DNSSDQuerier.h>
 
 namespace Swift {
-	class EventLoop;
-
-	class AvahiQuerier : 
-			public DNSSDQuerier, 
-			public boost::enable_shared_from_this<AvahiQuerier> {
-		public:
-			AvahiQuerier(EventLoop* eventLoop);
-			~AvahiQuerier();
-
-			boost::shared_ptr<DNSSDBrowseQuery> createBrowseQuery();
-			boost::shared_ptr<DNSSDRegisterQuery> createRegisterQuery(
-					const std::string& name, int port, const ByteArray& info);
-			boost::shared_ptr<DNSSDResolveServiceQuery> createResolveServiceQuery(
-					const DNSSDServiceID&);
-			boost::shared_ptr<DNSSDResolveHostnameQuery> createResolveHostnameQuery(
-					const std::string& hostname, int interfaceIndex);
-
-			void start();
-			void stop();
-			
-			AvahiThreadedPoll* getThreadedPoll() const {
-				return threadedPoll;
-			}
-
-			AvahiClient* getClient() const {
-				return client;
-			}
-
-		private:
-			EventLoop* eventLoop;
-			AvahiClient* client;
-			AvahiThreadedPoll* threadedPoll;
-	};
+    class EventLoop;
+
+    class AvahiQuerier :
+            public DNSSDQuerier,
+            public std::enable_shared_from_this<AvahiQuerier> {
+        public:
+            AvahiQuerier(EventLoop* eventLoop);
+            ~AvahiQuerier();
+
+            std::shared_ptr<DNSSDBrowseQuery> createBrowseQuery();
+            std::shared_ptr<DNSSDRegisterQuery> createRegisterQuery(
+                    const std::string& name, int port, const ByteArray& info);
+            std::shared_ptr<DNSSDResolveServiceQuery> createResolveServiceQuery(
+                    const DNSSDServiceID&);
+            std::shared_ptr<DNSSDResolveHostnameQuery> createResolveHostnameQuery(
+                    const std::string& hostname, int interfaceIndex);
+
+            void start();
+            void stop();
+
+            AvahiThreadedPoll* getThreadedPoll() const {
+                return threadedPoll;
+            }
+
+            AvahiClient* getClient() const {
+                return client;
+            }
+
+        private:
+            EventLoop* eventLoop;
+            AvahiClient* client;
+            AvahiThreadedPoll* threadedPoll;
+    };
 }
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.cpp b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.cpp
index bfd7822..08997f6 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.cpp
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.cpp
@@ -1,15 +1,16 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h>
+
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h>
 
 namespace Swift {
 
-AvahiQuery::AvahiQuery(boost::shared_ptr<AvahiQuerier> q, EventLoop* eventLoop) : querier(q), eventLoop(eventLoop) {
+AvahiQuery::AvahiQuery(std::shared_ptr<AvahiQuerier> q, EventLoop* eventLoop) : querier(q), eventLoop(eventLoop) {
 }
 
 AvahiQuery::~AvahiQuery() {
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h
index 35c02e4..1b98bbf 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h
@@ -1,30 +1,29 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
 
 #include <Swiften/EventLoop/EventOwner.h>
 
 namespace Swift {
-	class AvahiQuerier;
-	class EventLoop;
+    class AvahiQuerier;
+    class EventLoop;
 
-	class AvahiQuery : 
-			public EventOwner,
-			public boost::enable_shared_from_this<AvahiQuery> {
-		public:
-			AvahiQuery(boost::shared_ptr<AvahiQuerier>, EventLoop* eventLoop);
-			virtual ~AvahiQuery();
-			
-		protected:
-			boost::shared_ptr<AvahiQuerier> querier;
-			EventLoop* eventLoop;
-	};
+    class AvahiQuery :
+            public EventOwner,
+            public std::enable_shared_from_this<AvahiQuery> {
+        public:
+            AvahiQuery(std::shared_ptr<AvahiQuerier>, EventLoop* eventLoop);
+            virtual ~AvahiQuery();
+
+        protected:
+            std::shared_ptr<AvahiQuerier> querier;
+            EventLoop* eventLoop;
+    };
 }
 
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp b/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp
index d163ec9..04790d5 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,6 +7,7 @@
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.h>
 
 #include <iostream>
+
 #include <boost/bind.hpp>
 
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h>
@@ -14,87 +15,87 @@
 namespace Swift {
 
 void AvahiRegisterQuery::registerService() {
-	std::cout << "Registering service " << name << ":" << port << std::endl;
-	avahi_threaded_poll_lock(querier->getThreadedPoll());
-	if (!group) {
-		std::cout << "Creating entry group" << std::endl;
-		group = avahi_entry_group_new(querier->getClient(), handleEntryGroupChange, this);
-		if (!group) {
-			std::cout << "Error ceating entry group" << std::endl;
-			eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>()), shared_from_this());
-		}
-	}
-
-	doRegisterService();
-	avahi_threaded_poll_unlock(querier->getThreadedPoll());
+    std::cout << "Registering service " << name << ":" << port << std::endl;
+    avahi_threaded_poll_lock(querier->getThreadedPoll());
+    if (!group) {
+        std::cout << "Creating entry group" << std::endl;
+        group = avahi_entry_group_new(querier->getClient(), handleEntryGroupChange, this);
+        if (!group) {
+            std::cout << "Error ceating entry group" << std::endl;
+            eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>()), shared_from_this());
+        }
+    }
+
+    doRegisterService();
+    avahi_threaded_poll_unlock(querier->getThreadedPoll());
 }
 
 void AvahiRegisterQuery::unregisterService() {
-	if (group) {
-		avahi_entry_group_free(group);
-		group = NULL;
-	}
+    if (group) {
+        avahi_entry_group_free(group);
+        group = NULL;
+    }
 }
 
 void AvahiRegisterQuery::updateServiceInfo(const ByteArray& txtRecord) {
-	this->txtRecord = txtRecord;
-	avahi_threaded_poll_lock(querier->getThreadedPoll());
-	assert(group);
-	avahi_entry_group_reset(group);
-	doRegisterService();
-	avahi_threaded_poll_unlock(querier->getThreadedPoll());
+    this->txtRecord = txtRecord;
+    avahi_threaded_poll_lock(querier->getThreadedPoll());
+    assert(group);
+    avahi_entry_group_reset(group);
+    doRegisterService();
+    avahi_threaded_poll_unlock(querier->getThreadedPoll());
 }
 
 void AvahiRegisterQuery::doRegisterService() {
-	AvahiStringList* txtList;
-	avahi_string_list_parse(vecptr(txtRecord), txtRecord.size(), &txtList);
-
-	int result = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, static_cast<AvahiPublishFlags>(0), name.c_str(), "_presence._tcp", NULL, NULL, port, txtList);
-	if (result < 0) {
-		std::cout << "Error registering service: " << avahi_strerror(result) << std::endl;
-		eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>()), shared_from_this());
-	}
-	result = avahi_entry_group_commit(group);
-	if (result < 0) {
-		std::cout << "Error registering service: " << avahi_strerror(result) << std::endl;
-	}
+    AvahiStringList* txtList;
+    avahi_string_list_parse(vecptr(txtRecord), txtRecord.size(), &txtList);
+
+    int result = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, static_cast<AvahiPublishFlags>(0), name.c_str(), "_presence._tcp", NULL, NULL, port, txtList);
+    if (result < 0) {
+        std::cout << "Error registering service: " << avahi_strerror(result) << std::endl;
+        eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>()), shared_from_this());
+    }
+    result = avahi_entry_group_commit(group);
+    if (result < 0) {
+        std::cout << "Error registering service: " << avahi_strerror(result) << std::endl;
+    }
 }
 
 void AvahiRegisterQuery::handleEntryGroupChange(AvahiEntryGroup* g, AvahiEntryGroupState state) {
-	std::cout << "ENtry group callback: " << state << std::endl;
-	switch (state) {
-		case AVAHI_ENTRY_GROUP_ESTABLISHED :
-			// Domain is a hack!
-			eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>(DNSSDServiceID(name, "local", "_presence._tcp", 0))), shared_from_this());
-			std::cout << "Entry group established" << std::endl;
-			break;
-	case AVAHI_ENTRY_GROUP_COLLISION : {
-			std::cout << "Entry group collision" << std::endl;
-			/*char *n;
-			n = avahi_alternative_service_name(name);
-			avahi_free(name);
-			name = n;*/
-			break;
-	}
-
-	case AVAHI_ENTRY_GROUP_FAILURE :
-			std::cout << "Entry group failure " << avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))) << std::endl;
-			break;
-
-	case AVAHI_ENTRY_GROUP_UNCOMMITED:
-	case AVAHI_ENTRY_GROUP_REGISTERING:
-			;
-
-	/*
-	DNSServiceErrorType result = DNSServiceRegister(
-			&sdRef, 0, 0, name.c_str(), "_presence._tcp", NULL, NULL, port, 
-			txtRecord.getSize(), txtRecord.getData(), 
-			&AvahiRegisterQuery::handleServiceRegisteredStatic, this);
-	if (result != kDNSServiceErr_NoError) {
-		sdRef = NULL;
-	}*/
-	//eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>()), shared_from_this());
-	}
+    std::cout << "ENtry group callback: " << state << std::endl;
+    switch (state) {
+        case AVAHI_ENTRY_GROUP_ESTABLISHED :
+            // Domain is a hack!
+            eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>(DNSSDServiceID(name, "local", "_presence._tcp", 0))), shared_from_this());
+            std::cout << "Entry group established" << std::endl;
+            break;
+    case AVAHI_ENTRY_GROUP_COLLISION : {
+            std::cout << "Entry group collision" << std::endl;
+            /*char *n;
+            n = avahi_alternative_service_name(name);
+            avahi_free(name);
+            name = n;*/
+            break;
+    }
+
+    case AVAHI_ENTRY_GROUP_FAILURE :
+            std::cout << "Entry group failure " << avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))) << std::endl;
+            break;
+
+    case AVAHI_ENTRY_GROUP_UNCOMMITED:
+    case AVAHI_ENTRY_GROUP_REGISTERING:
+            ;
+
+    /*
+    DNSServiceErrorType result = DNSServiceRegister(
+            &sdRef, 0, 0, name.c_str(), "_presence._tcp", NULL, NULL, port,
+            txtRecord.getSize(), txtRecord.getData(),
+            &AvahiRegisterQuery::handleServiceRegisteredStatic, this);
+    if (result != kDNSServiceErr_NoError) {
+        sdRef = NULL;
+    }*/
+    //eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>()), shared_from_this());
+    }
 }
 
 
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.h
index 6f2f221..68281d0 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,50 +8,50 @@
 
 #include <avahi-client/publish.h>
 
-#include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h>
-#include <Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h>
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/EventLoop/EventLoop.h>
+#include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h>
+#include <Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h>
 
 namespace Swift {
-	class AvahiQuerier;
+    class AvahiQuerier;
 
-	class AvahiRegisterQuery : public DNSSDRegisterQuery, public AvahiQuery {
-		public:	
-			AvahiRegisterQuery(const std::string& name, int port, const ByteArray& txtRecord, boost::shared_ptr<AvahiQuerier> querier, EventLoop* eventLoop) : AvahiQuery(querier, eventLoop), name(name), port(port), txtRecord(txtRecord), group(0) {
-			}
+    class AvahiRegisterQuery : public DNSSDRegisterQuery, public AvahiQuery {
+        public:
+            AvahiRegisterQuery(const std::string& name, int port, const ByteArray& txtRecord, std::shared_ptr<AvahiQuerier> querier, EventLoop* eventLoop) : AvahiQuery(querier, eventLoop), name(name), port(port), txtRecord(txtRecord), group(0) {
+            }
 
-			void registerService();
-			void unregisterService();
-			void updateServiceInfo(const ByteArray& txtRecord);
+            void registerService();
+            void unregisterService();
+            void updateServiceInfo(const ByteArray& txtRecord);
 
-		private:
-			void doRegisterService();
+        private:
+            void doRegisterService();
 
-			static void handleEntryGroupChange(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) {
-				static_cast<AvahiRegisterQuery*>(userdata)->handleEntryGroupChange(g, state);
-			}
+            static void handleEntryGroupChange(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) {
+                static_cast<AvahiRegisterQuery*>(userdata)->handleEntryGroupChange(g, state);
+            }
 
-			void handleEntryGroupChange(AvahiEntryGroup* g, AvahiEntryGroupState state);
+            void handleEntryGroupChange(AvahiEntryGroup* g, AvahiEntryGroupState state);
 
 /*
-			static void handleServiceRegisteredStatic(DNSServiceRef, DNSServiceFlags, DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain, void *context) {
-				static_cast<AvahiRegisterQuery*>(context)->handleServiceRegistered(errorCode, name, regtype, domain);
-			}
-
-			void handleServiceRegistered(DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain) {
-				if (errorCode != kDNSServiceErr_NoError) {
-					eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>()), shared_from_this());
-				}
-				else {
-				}
-			}
-			*/
-
-		private:
-			std::string name;
-			int port;
-			ByteArray txtRecord;
-			AvahiEntryGroup* group;
-	};
+            static void handleServiceRegisteredStatic(DNSServiceRef, DNSServiceFlags, DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain, void *context) {
+                static_cast<AvahiRegisterQuery*>(context)->handleServiceRegistered(errorCode, name, regtype, domain);
+            }
+
+            void handleServiceRegistered(DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain) {
+                if (errorCode != kDNSServiceErr_NoError) {
+                    eventLoop->postEvent(boost::bind(boost::ref(onRegisterFinished), boost::optional<DNSSDServiceID>()), shared_from_this());
+                }
+                else {
+                }
+            }
+            */
+
+        private:
+            std::string name;
+            int port;
+            ByteArray txtRecord;
+            AvahiEntryGroup* group;
+    };
 }
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.cpp b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.cpp
index bfd0067..08de722 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.cpp
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.cpp
@@ -1,22 +1,25 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h>
 
-#include <iostream>
 #include <boost/bind.hpp>
 
+#include <netinet/in.h>
+
+#include <Swiften/Base/Log.h>
+
 namespace Swift {
 
-AvahiResolveHostnameQuery::AvahiResolveHostnameQuery(const std::string& hostname, int, boost::shared_ptr<AvahiQuerier> querier, EventLoop* eventLoop) : AvahiQuery(querier, eventLoop), hostname(hostname) {
-	std::cout << "Resolving hostname " << hostname << std::endl;
+AvahiResolveHostnameQuery::AvahiResolveHostnameQuery(const std::string& hostname, int, std::shared_ptr<AvahiQuerier> querier, EventLoop* eventLoop) : AvahiQuery(querier, eventLoop), hostname(hostname) {
+    SWIFT_LOG(debug) << "Resolving hostname " << hostname << std::endl;
 }
 
 void AvahiResolveHostnameQuery::run() {
-		eventLoop->postEvent(boost::bind(boost::ref(onHostnameResolved), boost::optional<HostAddress>(HostAddress(hostname))), shared_from_this());
+        eventLoop->postEvent(boost::bind(boost::ref(onHostnameResolved), HostAddress::fromString(hostname)), shared_from_this());
 }
 
 }
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h
index a29c0a8..33c425f 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,27 +7,26 @@
 #pragma once
 
 #include <string>
+
+#include <Swiften/EventLoop/EventLoop.h>
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h>
 #include <Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h>
-#include <Swiften/EventLoop/EventLoop.h>
 #include <Swiften/Network/HostAddress.h>
 
-#include <netinet/in.h>
-
 namespace Swift {
-	class AvahiQuerier;
+    class AvahiQuerier;
 
-	class AvahiResolveHostnameQuery : public DNSSDResolveHostnameQuery, public AvahiQuery {
-		public: 
-			AvahiResolveHostnameQuery(const std::string& hostname, int, boost::shared_ptr<AvahiQuerier> querier, EventLoop* eventLoop);
+    class AvahiResolveHostnameQuery : public DNSSDResolveHostnameQuery, public AvahiQuery {
+        public:
+            AvahiResolveHostnameQuery(const std::string& hostname, int, std::shared_ptr<AvahiQuerier> querier, EventLoop* eventLoop);
 
-			void run();
+            void run();
 
-			void finish() {
-			}
+            void finish() {
+            }
 
-		private:
-			HostAddress hostAddress;
-			std::string hostname;
-	};
+        private:
+            HostAddress hostAddress;
+            std::string hostname;
+    };
 }
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.cpp b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.cpp
index d4ff0c8..a5e52b2 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.cpp
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.cpp
@@ -1,65 +1,66 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h>
 
-#include <boost/bind.hpp>
 #include <iostream>
 
+#include <boost/bind.hpp>
+
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h>
 
 namespace Swift {
 
 void AvahiResolveServiceQuery::start() {
-	std::cout << "Start resolving " << service.getName() << " " << service.getType() << " " << service.getDomain() << std::endl;
-	avahi_threaded_poll_lock(querier->getThreadedPoll());
-	assert(!resolver);
-	resolver = avahi_service_resolver_new(querier->getClient(), service.getNetworkInterfaceID(), AVAHI_PROTO_UNSPEC, service.getName().c_str(), service.getType().c_str(), service.getDomain().c_str(), AVAHI_PROTO_UNSPEC, static_cast<AvahiLookupFlags>(0), handleServiceResolvedStatic, this);
-	if (!resolver) {
-		std::cout << "Error starting resolver" << std::endl;
-		eventLoop->postEvent(boost::bind(boost::ref(onServiceResolved), boost::optional<Result>()), shared_from_this());
-	}
-	avahi_threaded_poll_unlock(querier->getThreadedPoll());
+    std::cout << "Start resolving " << service.getName() << " " << service.getType() << " " << service.getDomain() << std::endl;
+    avahi_threaded_poll_lock(querier->getThreadedPoll());
+    assert(!resolver);
+    resolver = avahi_service_resolver_new(querier->getClient(), service.getNetworkInterfaceID(), AVAHI_PROTO_UNSPEC, service.getName().c_str(), service.getType().c_str(), service.getDomain().c_str(), AVAHI_PROTO_UNSPEC, static_cast<AvahiLookupFlags>(0), handleServiceResolvedStatic, this);
+    if (!resolver) {
+        std::cout << "Error starting resolver" << std::endl;
+        eventLoop->postEvent(boost::bind(boost::ref(onServiceResolved), boost::optional<Result>()), shared_from_this());
+    }
+    avahi_threaded_poll_unlock(querier->getThreadedPoll());
 }
 
 void AvahiResolveServiceQuery::stop() {
-	std::cout << "Stop resolving" << std::endl;
-	avahi_threaded_poll_lock(querier->getThreadedPoll());
-	avahi_service_resolver_free(resolver);
-	resolver = NULL;
-	avahi_threaded_poll_unlock(querier->getThreadedPoll());
+    std::cout << "Stop resolving" << std::endl;
+    avahi_threaded_poll_lock(querier->getThreadedPoll());
+    avahi_service_resolver_free(resolver);
+    resolver = NULL;
+    avahi_threaded_poll_unlock(querier->getThreadedPoll());
 }
 
 void AvahiResolveServiceQuery::handleServiceResolved(AvahiServiceResolver* resolver, AvahiIfIndex, AvahiProtocol, AvahiResolverEvent event, const char *name, const char * type, const char* domain, const char * /*host_name*/, const AvahiAddress *address, uint16_t port, AvahiStringList *txt, AvahiLookupResultFlags) {
-	std::cout << "Resolve finished" << std::endl;
-	switch(event) {
-		case AVAHI_RESOLVER_FAILURE:
-			std::cout << "Resolve error " << avahi_strerror(avahi_client_errno(avahi_service_resolver_get_client(resolver))) << std::endl;
-			eventLoop->postEvent(boost::bind(boost::ref(onServiceResolved), boost::optional<Result>()), shared_from_this());
-			break;
-		case AVAHI_RESOLVER_FOUND: {
-			std::cout << "Success" << std::endl;
-			char a[AVAHI_ADDRESS_STR_MAX];
-			avahi_address_snprint(a, sizeof(a), address);
+    std::cout << "Resolve finished" << std::endl;
+    switch(event) {
+        case AVAHI_RESOLVER_FAILURE:
+            std::cout << "Resolve error " << avahi_strerror(avahi_client_errno(avahi_service_resolver_get_client(resolver))) << std::endl;
+            eventLoop->postEvent(boost::bind(boost::ref(onServiceResolved), boost::optional<Result>()), shared_from_this());
+            break;
+        case AVAHI_RESOLVER_FOUND: {
+            std::cout << "Success" << std::endl;
+            char a[AVAHI_ADDRESS_STR_MAX];
+            avahi_address_snprint(a, sizeof(a), address);
 
-			ByteArray txtRecord;
-			txtRecord.resize(1024);
-			avahi_string_list_serialize(txt, vecptr(txtRecord), txtRecord.size());
+            ByteArray txtRecord;
+            txtRecord.resize(1024);
+            avahi_string_list_serialize(txt, vecptr(txtRecord), txtRecord.size());
 
-			// FIXME: Probably not accurate
-			std::string fullname = std::string(name) + "." + std::string(type) + "." + std::string(domain) + ".";
-			std::cout << "Result: " << fullname << "->" << std::string(a) << ":" << port << std::endl;
-			eventLoop->postEvent(
-					boost::bind(
-						boost::ref(onServiceResolved), 
-						Result(fullname, std::string(a), port, txtRecord)),
-					shared_from_this());
-			break;
-		}
-	}
+            // FIXME: Probably not accurate
+            std::string fullname = std::string(name) + "." + std::string(type) + "." + std::string(domain) + ".";
+            std::cout << "Result: " << fullname << "->" << std::string(a) << ":" << port << std::endl;
+            eventLoop->postEvent(
+                    boost::bind(
+                        boost::ref(onServiceResolved),
+                        Result(fullname, std::string(a), port, txtRecord)),
+                    shared_from_this());
+            break;
+        }
+    }
 }
 
 }
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h
index a370344..c05c73e 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,32 +8,32 @@
 
 #include <avahi-client/lookup.h>
 
+#include <Swiften/Base/ByteArray.h>
+#include <Swiften/EventLoop/EventLoop.h>
 #include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h>
 #include <Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h>
 #include <Swiften/LinkLocal/LinkLocalServiceInfo.h>
-#include <Swiften/Base/ByteArray.h>
-#include <Swiften/EventLoop/EventLoop.h>
 
 namespace Swift {
-	class AvahiQuerier;
+    class AvahiQuerier;
 
-	class AvahiResolveServiceQuery : public DNSSDResolveServiceQuery, public AvahiQuery {
-		public:	
-			AvahiResolveServiceQuery(const DNSSDServiceID& service, boost::shared_ptr<AvahiQuerier> querier, EventLoop* eventLoop) : AvahiQuery(querier, eventLoop), service(service), resolver(NULL) {
-			}
+    class AvahiResolveServiceQuery : public DNSSDResolveServiceQuery, public AvahiQuery {
+        public:
+            AvahiResolveServiceQuery(const DNSSDServiceID& service, std::shared_ptr<AvahiQuerier> querier, EventLoop* eventLoop) : AvahiQuery(querier, eventLoop), service(service), resolver(NULL) {
+            }
 
-			void start();
-			void stop();
+            void start();
+            void stop();
 
-		private:
-			static void handleServiceResolvedStatic(AvahiServiceResolver* resolver, AvahiIfIndex interfaceIndex, AvahiProtocol protocol, AvahiResolverEvent event, const char *name, const char *type, const char *domain, const char *host_name, const AvahiAddress *address, uint16_t port, AvahiStringList *txt, AvahiLookupResultFlags flags, void* context) {
-				static_cast<AvahiResolveServiceQuery*>(context)->handleServiceResolved(resolver, interfaceIndex, protocol, event, name, type, domain, host_name, address, port, txt, flags);
-			}
+        private:
+            static void handleServiceResolvedStatic(AvahiServiceResolver* resolver, AvahiIfIndex interfaceIndex, AvahiProtocol protocol, AvahiResolverEvent event, const char *name, const char *type, const char *domain, const char *host_name, const AvahiAddress *address, uint16_t port, AvahiStringList *txt, AvahiLookupResultFlags flags, void* context) {
+                static_cast<AvahiResolveServiceQuery*>(context)->handleServiceResolved(resolver, interfaceIndex, protocol, event, name, type, domain, host_name, address, port, txt, flags);
+            }
 
-			void handleServiceResolved(AvahiServiceResolver* resolver, AvahiIfIndex, AvahiProtocol, AvahiResolverEvent event, const char *name, const char * type, const char* domain, const char * /*host_name*/, const AvahiAddress *address, uint16_t port, AvahiStringList *txt, AvahiLookupResultFlags);
+            void handleServiceResolved(AvahiServiceResolver* resolver, AvahiIfIndex, AvahiProtocol, AvahiResolverEvent event, const char *name, const char * type, const char* domain, const char * /*host_name*/, const AvahiAddress *address, uint16_t port, AvahiStringList *txt, AvahiLookupResultFlags);
 
-		private:
-			DNSSDServiceID service;
-			AvahiServiceResolver* resolver;
-	};
+        private:
+            DNSSDServiceID service;
+            AvahiServiceResolver* resolver;
+    };
 }