5 files changed, 8 insertions, 3 deletions
diff --git a/Swiften/Network/BoostNetworkFactories.cpp b/Swiften/Network/BoostNetworkFactories.cpp
index 6d1cc71..1d9479a 100644
--- a/Swiften/Network/BoostNetworkFactories.cpp
+++ b/Swiften/Network/BoostNetworkFactories.cpp
@@ -14,16 +14,16 @@ namespace Swift {
 
 BoostNetworkFactories::BoostNetworkFactories(EventLoop* eventLoop) {
 	timerFactory = new BoostTimerFactory(ioServiceThread.getIOService(), eventLoop);
 	connectionFactory = new BoostConnectionFactory(ioServiceThread.getIOService(), eventLoop);
 	domainNameResolver = new PlatformDomainNameResolver(eventLoop);
 	connectionServerFactory = new BoostConnectionServerFactory(ioServiceThread.getIOService(), eventLoop);
 }
 
 BoostNetworkFactories::~BoostNetworkFactories() {
+	delete connectionServerFactory;
 	delete domainNameResolver;
 	delete connectionFactory;
 	delete timerFactory;
-	delete connectionServerFactory;
 }
 
 }
diff --git a/Swiften/Network/BoostNetworkFactories.h b/Swiften/Network/BoostNetworkFactories.h
index d9fb566..e4d3128 100644
--- a/Swiften/Network/BoostNetworkFactories.h
+++ b/Swiften/Network/BoostNetworkFactories.h
@@ -36,12 +36,12 @@ namespace Swift {
 			ConnectionServerFactory* getConnectionServerFactory() const {
 				return connectionServerFactory;
 			}
 
 		private:
 			BoostIOServiceThread ioServiceThread;
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
 			DomainNameResolver* domainNameResolver;
-			ConnectionServerFactory *connectionServerFactory;
+			ConnectionServerFactory* connectionServerFactory;
 	};
 }
diff --git a/Swiften/Network/ConnectionServerFactory.h b/Swiften/Network/ConnectionServerFactory.h
index c516007..df5f912 100644
--- a/Swiften/Network/ConnectionServerFactory.h
+++ b/Swiften/Network/ConnectionServerFactory.h
@@ -12,12 +12,12 @@ namespace Swift {
 	class ConnectionServer;
 	class HostAddress;
 
 	class ConnectionServerFactory {
 		public:
 			virtual ~ConnectionServerFactory();
 
 			virtual boost::shared_ptr<ConnectionServer> createConnectionServer(int port) = 0;
 
-			virtual boost::shared_ptr<ConnectionServer> createConnectionServer(const Swift::HostAddress &hostAddress, int port) = 0;
+			virtual boost::shared_ptr<ConnectionServer> createConnectionServer(const Swift::HostAddress& hostAddress, int port) = 0;
 	};
 }
diff --git a/Swiften/Network/HostAddress.cpp b/Swiften/Network/HostAddress.cpp
index 7acd407..2ca1414 100644
--- a/Swiften/Network/HostAddress.cpp
+++ b/Swiften/Network/HostAddress.cpp
@@ -51,10 +51,14 @@ HostAddress::HostAddress(const boost::asio::ip::address& address) : address_(add
 
 std::string HostAddress::toString() const {
 	return address_.to_string();
 }
 
 bool HostAddress::isValid() const {
 	return !(address_.is_v4() && address_.to_v4().to_ulong() == 0);
 }
 
+boost::asio::ip::address HostAddress::getRawAddress() const {
+	return address_;
+}
+
 }
diff --git a/Swiften/Network/HostAddress.h b/Swiften/Network/HostAddress.h
index 34ccd24..4b05c32 100644
--- a/Swiften/Network/HostAddress.h
+++ b/Swiften/Network/HostAddress.h
@@ -15,18 +15,19 @@ namespace Swift {
 
 	class HostAddress {
 		public:
 			HostAddress();
 			HostAddress(const std::string&);
 			HostAddress(const unsigned char* address, int length);
 			HostAddress(const boost::asio::ip::address& address);
 
 			std::string toString() const;
+			boost::asio::ip::address getRawAddress() const;
 
 			bool operator==(const HostAddress& o) const {
 				return address_ == o.address_;
 			}
 
 			bool isValid() const;
 
 		private:
 			boost::asio::ip::address address_;