1 files changed, 10 insertions, 52 deletions
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h
index e9c4db1..a39d732 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h
@@ -6,11 +6,13 @@
 
 #pragma once
 
-#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"
+#include <avahi-client/lookup.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;
@@ -20,59 +22,15 @@ namespace Swift {
 			AvahiResolveServiceQuery(const DNSSDServiceID& service, boost::shared_ptr<AvahiQuerier> querier, EventLoop* eventLoop) : AvahiQuery(querier, eventLoop), service(service), resolver(NULL) {
 			}
 
-			void 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());
-			}
-
-			void 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());
-			}
+			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);
 			}
 
-			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) {
-				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, txtRecord.getData(), txtRecord.getSize());
-
-						// 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;
-					}
-				}
-			}
+			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;