1 files changed, 26 insertions, 10 deletions
diff --git a/Swiften/Network/BoostNetworkFactories.h b/Swiften/Network/BoostNetworkFactories.h
index 1968acd..9c3bab1 100644
--- a/Swiften/Network/BoostNetworkFactories.h
+++ b/Swiften/Network/BoostNetworkFactories.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <Swiften/Base/API.h>
+#include <Swiften/Base/Override.h>
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/Network/BoostIOServiceThread.h>
 
@@ -20,11 +21,11 @@ namespace Swift {
 			BoostNetworkFactories(EventLoop* eventLoop);
 			~BoostNetworkFactories();
 
-			virtual TimerFactory* getTimerFactory() const {
+			virtual TimerFactory* getTimerFactory() const SWIFTEN_OVERRIDE {
 				return timerFactory;
 			}
 
-			virtual ConnectionFactory* getConnectionFactory() const {
+			virtual ConnectionFactory* getConnectionFactory() const SWIFTEN_OVERRIDE {
 				return connectionFactory;
 			}
 
@@ -32,32 +33,44 @@ namespace Swift {
 				return &ioServiceThread;
 			}
 
-			DomainNameResolver* getDomainNameResolver() const {
+			DomainNameResolver* getDomainNameResolver() const SWIFTEN_OVERRIDE {
 				return domainNameResolver;
 			}
 
-			ConnectionServerFactory* getConnectionServerFactory() const {
+			ConnectionServerFactory* getConnectionServerFactory() const SWIFTEN_OVERRIDE {
 				return connectionServerFactory;
 			}
 
-			NATTraverser* getNATTraverser() const {
+			NetworkEnvironment* getNetworkEnvironment() const SWIFTEN_OVERRIDE {
+				return networkEnvironment;
+			}
+
+			NATTraverser* getNATTraverser() const SWIFTEN_OVERRIDE {
 				return natTraverser;
 			}
 
-			virtual XMLParserFactory* getXMLParserFactory() const {
+			virtual XMLParserFactory* getXMLParserFactory() const SWIFTEN_OVERRIDE {
 				return xmlParserFactory;
 			}
 
-			virtual TLSContextFactory* getTLSContextFactory() const;
+			virtual TLSContextFactory* getTLSContextFactory() const SWIFTEN_OVERRIDE;
 
-			virtual ProxyProvider* getProxyProvider() const {
+			virtual ProxyProvider* getProxyProvider() const SWIFTEN_OVERRIDE {
 				return proxyProvider;
 			}
 
-			virtual EventLoop* getEventLoop() const {
+			virtual EventLoop* getEventLoop() const SWIFTEN_OVERRIDE {
 				return eventLoop;
 			}
 
+			virtual IDNConverter* getIDNConverter() const SWIFTEN_OVERRIDE {
+				return idnConverter;
+			}
+
+			virtual CryptoProvider* getCryptoProvider() const SWIFTEN_OVERRIDE {
+				return cryptoProvider;
+			}
+
 		private:
 			BoostIOServiceThread ioServiceThread;
 			TimerFactory* timerFactory;
@@ -65,9 +78,12 @@ namespace Swift {
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;
 			NATTraverser* natTraverser;
+			NetworkEnvironment* networkEnvironment;
 			XMLParserFactory* xmlParserFactory;
 			PlatformTLSFactories* tlsFactories;
 			ProxyProvider* proxyProvider;
 			EventLoop* eventLoop;
+			IDNConverter* idnConverter;
+			CryptoProvider* cryptoProvider;
 	};
 }