15 files changed, 254 insertions, 29 deletions
diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h
index c605175..2dec2fb 100644
--- a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h
@@ -41,7 +41,7 @@ namespace Swift {
 					MainEventLoop::postEvent(boost::bind(boost::ref(onError)), shared_from_this());
 				}
 				else {
-					std::cout << "Discovered service: name:" << name << " domain:" << domain << " type: " << type << std::endl;
+					//std::cout << "Discovered service: name:" << name << " domain:" << domain << " type: " << type << std::endl;
 					DNSSDServiceID service(name, domain, type, interfaceIndex);
 					if (flags & kDNSServiceFlagsAdd) {
 						MainEventLoop::postEvent(boost::bind(boost::ref(onServiceAdded), service), shared_from_this());
diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h
index 886b87b..1c38179 100644
--- a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h
@@ -45,7 +45,7 @@ namespace Swift {
 					MainEventLoop::postEvent(boost::bind(boost::ref(onServiceResolved), boost::optional<Result>()), shared_from_this());
 				}
 				else {
-					std::cout << "Service resolved: name:" << fullName << " host:" << host << " port:" << port << std::endl;
+					//std::cout << "Service resolved: name:" << fullName << " host:" << host << " port:" << port << std::endl;
 					MainEventLoop::postEvent(
 							boost::bind(
 								boost::ref(onServiceResolved), 
diff --git a/Swiften/LinkLocal/DNSSD/DNSSDQuerier.h b/Swiften/LinkLocal/DNSSD/DNSSDQuerier.h
index 799bc0c..efcc140 100644
--- a/Swiften/LinkLocal/DNSSD/DNSSDQuerier.h
+++ b/Swiften/LinkLocal/DNSSD/DNSSDQuerier.h
@@ -15,6 +15,9 @@ namespace Swift {
 		public:
 			virtual ~DNSSDQuerier();
 
+			virtual void start() = 0;
+			virtual void stop() = 0;
+
 			virtual boost::shared_ptr<DNSSDBrowseQuery> createBrowseQuery() = 0;
 			virtual boost::shared_ptr<DNSSDRegisterQuery> createRegisterQuery(
 					const String& name, int port, const ByteArray& info) = 0;
diff --git a/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.cpp b/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.cpp
index 5079192..c26f8ee 100644
--- a/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.cpp
+++ b/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.cpp
@@ -13,6 +13,12 @@ namespace Swift {
 FakeDNSSDQuerier::FakeDNSSDQuerier(const String& domain) : domain(domain) {
 }
 
+FakeDNSSDQuerier::~FakeDNSSDQuerier() {
+	if (!runningQueries.empty()) {
+		std::cerr << "FakeDNSSDQuerier: Running queries not empty at destruction time" << std::endl;
+	}
+}
+
 boost::shared_ptr<DNSSDBrowseQuery> FakeDNSSDQuerier::createBrowseQuery() {
 	return boost::shared_ptr<DNSSDBrowseQuery>(new FakeDNSSDBrowseQuery(shared_from_this()));
 }
@@ -47,6 +53,15 @@ void FakeDNSSDQuerier::addRunningQuery(boost::shared_ptr<FakeDNSSDQuery> query)
 		DNSSDServiceID service(registerQuery->name, domain);
 		MainEventLoop::postEvent(boost::bind(boost::ref(registerQuery->onRegisterFinished), service), shared_from_this());
 	}
+	else if (boost::shared_ptr<FakeDNSSDResolveHostnameQuery> resolveHostnameQuery = boost::dynamic_pointer_cast<FakeDNSSDResolveHostnameQuery>(query)) {
+		std::map<String,boost::optional<HostAddress> >::const_iterator i = addresses.find(resolveHostnameQuery->hostname);
+		if (i != addresses.end()) {
+			MainEventLoop::postEvent(
+					boost::bind(
+						boost::ref(resolveHostnameQuery->onHostnameResolved), i->second), 
+					shared_from_this());
+		}
+	}
 }
 
 void FakeDNSSDQuerier::removeRunningQuery(boost::shared_ptr<FakeDNSSDQuery> query) {
@@ -102,4 +117,14 @@ void FakeDNSSDQuerier::setRegisterError() {
 	}
 }
 
+void FakeDNSSDQuerier::setAddress(const String& hostname, boost::optional<HostAddress> address) {
+	addresses[hostname] = address;
+	foreach(const boost::shared_ptr<FakeDNSSDResolveHostnameQuery>& query, getQueries<FakeDNSSDResolveHostnameQuery>()) {
+		if (query->hostname == hostname) {
+			MainEventLoop::postEvent(boost::bind(
+					boost::ref(query->onHostnameResolved), address), shared_from_this());
+		}
+	}
+}
+
 }
diff --git a/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h b/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h
index f2ec17b..22bca0c 100644
--- a/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h
+++ b/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h
@@ -6,9 +6,11 @@
 #include <set>
 
 #include "Swiften/Base/foreach.h"
+#include "Swiften/Base/String.h"
 #include "Swiften/EventLoop/EventOwner.h"
 #include "Swiften/LinkLocal/DNSSD/DNSSDQuerier.h"
 #include "Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h"
+#include "Swiften/Network/HostAddress.h"
 
 namespace Swift {
 	class ByteArray;
@@ -21,6 +23,10 @@ namespace Swift {
 			public boost::enable_shared_from_this<FakeDNSSDQuerier> {
 		public:
 			FakeDNSSDQuerier(const String& domain);
+			~FakeDNSSDQuerier();
+
+			void start() {}
+			void stop() {}
 
 			boost::shared_ptr<DNSSDBrowseQuery> createBrowseQuery();
 			boost::shared_ptr<DNSSDRegisterQuery> createRegisterQuery(
@@ -37,6 +43,7 @@ namespace Swift {
 			void removeService(const DNSSDServiceID& id);
 			void setServiceInfo(const DNSSDServiceID& id, const DNSSDResolveServiceQuery::Result& info);
 			bool isServiceRegistered(const String& name, int port, const ByteArray& info);
+			void setAddress(const String& hostname, boost::optional<HostAddress> address);
 
 			void setBrowseError();
 			void setRegisterError();
@@ -59,5 +66,6 @@ namespace Swift {
 			std::set<DNSSDServiceID> services;
 			typedef std::map<DNSSDServiceID,DNSSDResolveServiceQuery::Result> ServiceInfoMap;
 			ServiceInfoMap serviceInfo;
+			std::map<String, boost::optional<HostAddress> > addresses;
 	};
 }
diff --git a/Swiften/LinkLocal/DNSSD/Makefile.inc b/Swiften/LinkLocal/DNSSD/Makefile.inc
index f6997ef..4b014f3 100644
--- a/Swiften/LinkLocal/DNSSD/Makefile.inc
+++ b/Swiften/LinkLocal/DNSSD/Makefile.inc
@@ -4,7 +4,8 @@ SWIFTEN_SOURCES += \
 	Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.cpp \
 	Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.cpp \
 	Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.cpp \
-	Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.cpp
+	Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.cpp \
+	Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp
 
 ifeq ($(HAVE_BONJOUR),yes)
 include Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc
diff --git a/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp b/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp
new file mode 100644
index 0000000..e704b72
--- /dev/null
+++ b/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp
@@ -0,0 +1,25 @@
+#include "Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h"
+
+#ifdef HAVE_SWIFTEN_CONFIG_H
+#include "Swiften/config.h"
+#endif
+#if defined(HAVE_BONJOUR)
+#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h"
+#elif defined(HAVE_AVAHI)
+#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h"
+#endif
+
+
+namespace Swift {
+
+boost::shared_ptr<DNSSDQuerier> PlatformDNSSDQuerierFactory::createQuerier() {
+#if defined(HAVE_BONJOUR)
+	return boost::shared_ptr<DNSSDQuerier>(new BonjourQuerier());
+#elif defined(HAVE_AVAHI)
+	return boost::shared_ptr<DNSSDQuerier>(new AvahiQuerier());
+#else
+	return boost::shared_ptr<DNSSDQuerier>();
+#endif
+}
+
+}
diff --git a/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h b/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h
new file mode 100644
index 0000000..b52814b
--- /dev/null
+++ b/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+
+namespace Swift {
+	class DNSSDQuerier;
+
+	class PlatformDNSSDQuerierFactory {
+		public:
+			 boost::shared_ptr<DNSSDQuerier> createQuerier();
+	};
+}
diff --git a/Swiften/LinkLocal/LinkLocalConnector.cpp b/Swiften/LinkLocal/LinkLocalConnector.cpp
index 18b5d6a..fba4a4e 100644
--- a/Swiften/LinkLocal/LinkLocalConnector.cpp
+++ b/Swiften/LinkLocal/LinkLocalConnector.cpp
@@ -12,22 +12,22 @@
 namespace Swift {
 
 LinkLocalConnector::LinkLocalConnector(
-		const JID& remoteJID,
-		const String& hostname,
-		int interfaceIndex,
-		int port,
+		const LinkLocalService& service,
 		boost::shared_ptr<DNSSDQuerier> querier,
 		boost::shared_ptr<Connection> connection) : 
-			remoteJID(remoteJID),
-			hostname(hostname),
-			interfaceIndex(interfaceIndex),
-			port(port),
+			service(service),
 			querier(querier),
 			connection(connection) {
 }
 
+LinkLocalConnector::~LinkLocalConnector() {
+	assert(!resolveQuery);
+}
+
 void LinkLocalConnector::connect() {
-	resolveQuery = querier->createResolveHostnameQuery(hostname, interfaceIndex);
+	resolveQuery = querier->createResolveHostnameQuery(
+			service.getHostname(), 
+			service.getID().getNetworkInterfaceID());
 	resolveQuery->onHostnameResolved.connect(boost::bind(
 			&LinkLocalConnector::handleHostnameResolved, 
 			boost::dynamic_pointer_cast<LinkLocalConnector>(shared_from_this()), 
@@ -35,16 +35,24 @@ void LinkLocalConnector::connect() {
 	resolveQuery->run();
 }
 
+void LinkLocalConnector::cancel() {
+	if (resolveQuery) {
+		resolveQuery->finish();
+	}
+	resolveQuery.reset();
+	connection->disconnect();
+}
+
 void LinkLocalConnector::handleHostnameResolved(const boost::optional<HostAddress>& address) {
+	resolveQuery->finish();
+	resolveQuery.reset();
 	if (address) {
-		resolveQuery->finish();
-		resolveQuery.reset();
 		connection->onConnectFinished.connect(
 				boost::bind(boost::ref(onConnectFinished), _1));
-		connection->connect(HostAddressPort(*address, port));
+		connection->connect(HostAddressPort(*address, service.getPort()));
 	}
 	else {
-		onConnectFinished(false);
+		onConnectFinished(true);
 	}
 }
 
diff --git a/Swiften/LinkLocal/LinkLocalConnector.h b/Swiften/LinkLocal/LinkLocalConnector.h
index 134656c..0b6baef 100644
--- a/Swiften/LinkLocal/LinkLocalConnector.h
+++ b/Swiften/LinkLocal/LinkLocalConnector.h
@@ -5,13 +5,12 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <vector>
 
-#include "Swiften/JID/JID.h"
 #include "Swiften/Network/Connection.h"
+#include "Swiften/LinkLocal/LinkLocalService.h"
 
 namespace Swift {
 	class ConnectionFactory;
 	class HostAddress;
-	class String;
 	class Element;
 	class PayloadParserFactoryCollection;
 	class PayloadSerializerCollection;
@@ -21,18 +20,17 @@ namespace Swift {
 	class LinkLocalConnector : public boost::enable_shared_from_this<LinkLocalConnector> {
 		public:
 			LinkLocalConnector(
-					const JID& remoteJID,
-					const String& hostname,
-					int interfaceIndex,
-					int port,
+					const LinkLocalService& service, 
 					boost::shared_ptr<DNSSDQuerier> querier,
 					boost::shared_ptr<Connection> connection);
+			~LinkLocalConnector();
 
-			const JID& getRemoteJID() const {
-				return remoteJID;
+			const LinkLocalService& getService() const {
+				return service;
 			}
 
 			void connect();
+			void cancel();
 			void queueElement(boost::shared_ptr<Element> element);
 
 			const std::vector<boost::shared_ptr<Element> >& getQueuedElements() const {
@@ -50,10 +48,7 @@ namespace Swift {
 			void handleConnected(bool error);
 
 		private:
-			JID remoteJID;
-			String hostname;
-			int interfaceIndex;
-			int port;
+			LinkLocalService service;
 			boost::shared_ptr<DNSSDQuerier> querier;
 			boost::shared_ptr<DNSSDResolveHostnameQuery> resolveQuery;
 			boost::shared_ptr<Connection> connection;
diff --git a/Swiften/LinkLocal/LinkLocalService.cpp b/Swiften/LinkLocal/LinkLocalService.cpp
index f567a63..f1114ed 100644
--- a/Swiften/LinkLocal/LinkLocalService.cpp
+++ b/Swiften/LinkLocal/LinkLocalService.cpp
@@ -20,4 +20,8 @@ String LinkLocalService::getDescription() const {
 	return getName();
 }
 
+JID LinkLocalService::getJID() const {
+	return JID(getName());
+}
+
 }
diff --git a/Swiften/LinkLocal/LinkLocalService.h b/Swiften/LinkLocal/LinkLocalService.h
index f7e9e3c..8ae593c 100644
--- a/Swiften/LinkLocal/LinkLocalService.h
+++ b/Swiften/LinkLocal/LinkLocalService.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Swiften/Base/String.h"
+#include "Swiften/JID/JID.h"
 #include "Swiften/LinkLocal/DNSSD/DNSSDServiceID.h"
 #include "Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h"
 #include "Swiften/LinkLocal/LinkLocalServiceInfo.h"
@@ -36,6 +37,8 @@ namespace Swift {
 
 			String getDescription() const;
 
+			JID getJID() const;
+
 		private:
 			DNSSDServiceID id;
 			DNSSDResolveServiceQuery::Result info;
diff --git a/Swiften/LinkLocal/LinkLocalServiceBrowser.h b/Swiften/LinkLocal/LinkLocalServiceBrowser.h
index 7ef661c..66973d5 100644
--- a/Swiften/LinkLocal/LinkLocalServiceBrowser.h
+++ b/Swiften/LinkLocal/LinkLocalServiceBrowser.h
@@ -36,6 +36,11 @@ namespace Swift {
 
 			std::vector<LinkLocalService> getServices() const;
 
+			// FIXME: Ugly that we need this
+			boost::shared_ptr<DNSSDQuerier> getQuerier() const {
+				return querier;
+			}
+
 			boost::signal<void (const LinkLocalService&)> onServiceAdded;
 			boost::signal<void (const LinkLocalService&)> onServiceChanged;
 			boost::signal<void (const LinkLocalService&)> onServiceRemoved;
diff --git a/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp b/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp
new file mode 100644
index 0000000..ee5e414
--- /dev/null
+++ b/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp
@@ -0,0 +1,135 @@
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/LinkLocal/LinkLocalConnector.h"
+#include "Swiften/LinkLocal/LinkLocalService.h"
+#include "Swiften/LinkLocal/DNSSD/DNSSDServiceID.h"
+#include "Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h"
+#include "Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h"
+#include "Swiften/EventLoop/DummyEventLoop.h"
+#include "Swiften/Network/FakeConnection.h"
+
+using namespace Swift;
+
+class LinkLocalConnectorTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(LinkLocalConnectorTest);
+		CPPUNIT_TEST(testConnect);
+		CPPUNIT_TEST(testConnect_UnableToResolve);
+		CPPUNIT_TEST(testConnect_UnableToConnect);
+		CPPUNIT_TEST(testCancel_DuringResolve);
+		CPPUNIT_TEST(testCancel_DuringConnect);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void setUp() {
+			eventLoop = new DummyEventLoop();
+			querier = boost::shared_ptr<FakeDNSSDQuerier>(
+					new FakeDNSSDQuerier("rabbithole.local"));
+			connection = boost::shared_ptr<FakeConnection>(new FakeConnection());
+			connectFinished = false;
+		}
+
+		void tearDown() {
+			delete eventLoop;
+		}
+
+		void testConnect() {
+			boost::shared_ptr<LinkLocalConnector> 
+					testling(createConnector("rabbithole.local", 1234));
+			querier->setAddress("rabbithole.local", HostAddress("192.168.1.1"));
+
+			testling->connect();
+			eventLoop->processEvents();
+
+			CPPUNIT_ASSERT(connectFinished);
+			CPPUNIT_ASSERT(!connectError);
+			CPPUNIT_ASSERT(connection->connectedTo);
+			CPPUNIT_ASSERT_EQUAL(String(connection->connectedTo->getAddress().toString()), String("192.168.1.1"));
+			CPPUNIT_ASSERT_EQUAL(connection->connectedTo->getPort(), 1234);
+		}
+
+		void testConnect_UnableToResolve() {
+			boost::shared_ptr<LinkLocalConnector> 
+					testling(createConnector("rabbithole.local", 1234));
+			querier->setAddress("rabbithole.local", boost::optional<HostAddress>());
+
+			testling->connect();
+			eventLoop->processEvents();
+
+			CPPUNIT_ASSERT(connectFinished);
+			CPPUNIT_ASSERT(connectError);
+			CPPUNIT_ASSERT(!connection->connectedTo);
+		}
+
+		void testConnect_UnableToConnect() {
+			boost::shared_ptr<LinkLocalConnector> 
+					testling(createConnector("rabbithole.local", 1234));
+			querier->setAddress("rabbithole.local", HostAddress("192.168.1.1"));
+			connection->setError(Connection::ReadError);
+
+			testling->connect();
+			eventLoop->processEvents();
+
+			CPPUNIT_ASSERT(connectFinished);
+			CPPUNIT_ASSERT(connectError);
+			CPPUNIT_ASSERT(!connection->connectedTo);
+		}
+
+		void testCancel_DuringResolve() {
+			boost::shared_ptr<LinkLocalConnector> 
+					testling(createConnector("rabbithole.local", 1234));
+			testling->connect();
+			eventLoop->processEvents();
+			CPPUNIT_ASSERT(!connectFinished);
+
+			testling->cancel();
+			eventLoop->processEvents();
+			querier->setAddress("rabbithole.local", HostAddress("192.168.1.1"));
+			eventLoop->processEvents();
+
+			CPPUNIT_ASSERT(FakeConnection::Disconnected == connection->state);
+		}
+
+		void testCancel_DuringConnect() {
+			boost::shared_ptr<LinkLocalConnector> 
+					testling(createConnector("rabbithole.local", 1234));
+			querier->setAddress("rabbithole.local", HostAddress("192.168.1.1"));
+			connection->setDelayConnect();
+			testling->connect();
+			eventLoop->processEvents();
+			CPPUNIT_ASSERT(FakeConnection::Connecting == connection->state);
+
+			testling->cancel();
+			eventLoop->processEvents();
+
+			CPPUNIT_ASSERT(FakeConnection::Disconnected == connection->state);
+		}
+	
+	private:
+		boost::shared_ptr<LinkLocalConnector> createConnector(const String& hostname, int port) {
+			LinkLocalService service(
+					DNSSDServiceID("myname", "local."),
+					DNSSDResolveServiceQuery::Result(
+						"myname._presence._tcp.local", hostname, port,
+						LinkLocalServiceInfo().toTXTRecord()));
+			boost::shared_ptr<LinkLocalConnector> result(
+					new LinkLocalConnector(service, querier, connection));
+			result->onConnectFinished.connect(
+					boost::bind(&LinkLocalConnectorTest::handleConnected, this, _1));
+			return result;
+		}
+
+		void handleConnected(bool e) {
+			connectFinished = true;
+			connectError = e;
+		}
+	
+	private:
+		DummyEventLoop* eventLoop;
+		boost::shared_ptr<FakeDNSSDQuerier> querier;
+		boost::shared_ptr<FakeConnection> connection;
+		bool connectFinished;
+		bool connectError;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(LinkLocalConnectorTest);
diff --git a/Swiften/LinkLocal/UnitTest/Makefile.inc b/Swiften/LinkLocal/UnitTest/Makefile.inc
index e5f1bf0..330808a 100644
--- a/Swiften/LinkLocal/UnitTest/Makefile.inc
+++ b/Swiften/LinkLocal/UnitTest/Makefile.inc
@@ -1,4 +1,5 @@
 UNITTEST_SOURCES += \
 	Swiften/LinkLocal/UnitTest/LinkLocalServiceTest.cpp \
 	Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp \
-	Swiften/LinkLocal/UnitTest/LinkLocalServiceInfoTest.cpp
+	Swiften/LinkLocal/UnitTest/LinkLocalServiceInfoTest.cpp \
+	Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp