1 files changed, 16 insertions, 13 deletions
diff --git a/Swiften/LinkLocal/LinkLocalConnector.h b/Swiften/LinkLocal/LinkLocalConnector.h
index d296804..134656c 100644
--- a/Swiften/LinkLocal/LinkLocalConnector.h
+++ b/Swiften/LinkLocal/LinkLocalConnector.h
@@ -15,45 +15,48 @@ namespace Swift {
 	class Element;
 	class PayloadParserFactoryCollection;
 	class PayloadSerializerCollection;
-	class DNSSDService;
+	class DNSSDQuerier;
+	class DNSSDResolveHostnameQuery;
 
 	class LinkLocalConnector : public boost::enable_shared_from_this<LinkLocalConnector> {
 		public:
 			LinkLocalConnector(
 					const JID& remoteJID,
 					const String& hostname,
+					int interfaceIndex,
 					int port,
-					boost::shared_ptr<DNSSDService> resolver,
+					boost::shared_ptr<DNSSDQuerier> querier,
 					boost::shared_ptr<Connection> connection);
 
 			const JID& getRemoteJID() const {
-				return remoteJID_;
+				return remoteJID;
 			}
 
 			void connect();
 			void queueElement(boost::shared_ptr<Element> element);
 
 			const std::vector<boost::shared_ptr<Element> >& getQueuedElements() const {
-				return queuedElements_;
+				return queuedElements;
 			}
 
 			boost::shared_ptr<Connection> getConnection() const {
-				return connection_;
+				return connection;
 			}
 
 			boost::signal<void (bool)> onConnectFinished;
 
 		private:
-			void handleHostnameResolved(const String& hostname, const boost::optional<HostAddress>& address);
+			void handleHostnameResolved(const boost::optional<HostAddress>& address);
 			void handleConnected(bool error);
 
 		private:
-			JID remoteJID_;
-			String hostname_;
-			int port_;
-			boost::shared_ptr<DNSSDService> resolver_;
-			boost::shared_ptr<Connection> connection_;
-			bool resolving_;
-			std::vector<boost::shared_ptr<Element> > queuedElements_;
+			JID remoteJID;
+			String hostname;
+			int interfaceIndex;
+			int port;
+			boost::shared_ptr<DNSSDQuerier> querier;
+			boost::shared_ptr<DNSSDResolveHostnameQuery> resolveQuery;
+			boost::shared_ptr<Connection> connection;
+			std::vector<boost::shared_ptr<Element> > queuedElements;
 	};
 }