Do not reallocate FileTransferManager on connect of Clientswift-3.0beta2

Now Client allocates a FileTransferManager in its ctor and frees it in its dtor, like all the other resources of the Client class. This fixes an ASAN crash in the use case where you do a file transfer, go offline and online again and try to start another file transfer. Test-Information: Tested that the mentioned use case does not crash anymore, that file transfers still work, and that FileTransferTest still passes. Change-Id: Iddbcd8522af7df528bdc2b030fe616ad3f0c4701
author: Tobias Markmann <tm@ayena.de> 2015-07-17 08:18:04 (GMT)
committer: Kevin Smith <kevin.smith@isode.com> 2015-07-20 11:24:07 (GMT)
commit: f10bd4cc1f570b27943d27e536d1dcfbcd55ec6a (patch)
tree: eaa855d6b961ea70c854db571ace7127a36f9d8c
parent: 3e982c0a39d1d1833afaf558fc7b0f7aeffd2d64 (diff)
download: swift-f10bd4cc1f570b27943d27e536d1dcfbcd55ec6a.zip
swift-f10bd4cc1f570b27943d27e536d1dcfbcd55ec6a.tar.bz2
3 files changed, 43 insertions, 47 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 613249b..3bfdd3f 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -71,7 +71,6 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
        
        jingleSessionManager = new JingleSessionManager(getIQRouter());
        blockListManager = new ClientBlockListManager(getIQRouter());
-        fileTransferManager = NULL;
        whiteboardSessionManager = NULL;
 #ifdef SWIFT_EXPERIMENTAL_WB
@@ -79,6 +78,24 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
 #endif
        pubsubManager = new PubSubManagerImpl(getStanzaChannel(), getIQRouter());
+#ifdef SWIFT_EXPERIMENTAL_FT
+        fileTransferManager = new FileTransferManagerImpl(
+                        getJID(),
+                        jingleSessionManager,
+                        getIQRouter(),
+                        getEntityCapsProvider(),
+                        presenceOracle,
+                        getNetworkFactories()->getConnectionFactory(),
+                        getNetworkFactories()->getConnectionServerFactory(),
+                        getNetworkFactories()->getTimerFactory(),
+                        getNetworkFactories()->getDomainNameResolver(),
+                        getNetworkFactories()->getNetworkEnvironment(),
+                        getNetworkFactories()->getNATTraverser(),
+                        getNetworkFactories()->getCryptoProvider());
+#else
+        fileTransferManager = new DummyFileTransferManager();
+#endif
 }
 Client::~Client() {
@@ -126,24 +143,6 @@ void Client::setSoftwareVersion(const std::string& name, const std::string& vers
 }
 void Client::handleConnected() {
-        delete fileTransferManager;
-#ifdef SWIFT_EXPERIMENTAL_FT
-        fileTransferManager = new FileTransferManagerImpl(
-                        getJID(), 
-                        jingleSessionManager, 
-                        getIQRouter(), 
-                        getEntityCapsProvider(), 
-                        presenceOracle, 
-                        getNetworkFactories()->getConnectionFactory(), 
-                        getNetworkFactories()->getConnectionServerFactory(), 
-                        getNetworkFactories()->getTimerFactory(), 
-                        getNetworkFactories()->getDomainNameResolver(),
-                        getNetworkFactories()->getNetworkEnvironment(),
-                        getNetworkFactories()->getNATTraverser(),
-                        getNetworkFactories()->getCryptoProvider());
-#else
-        fileTransferManager = new DummyFileTransferManager();
-#endif
        discoManager->handleConnected();
 }
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
index ab08c45..f4f9517 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -13,34 +13,34 @@
 #include <Swiften/FileTransfer/FileTransferManagerImpl.h>
 #include <boost/bind.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/cstdint.hpp>
+#include <boost/filesystem.hpp>
-#include <Swiften/Base/foreach.h>
+#include "Swiften/Disco/EntityCapsProvider.h"
+#include <Swiften/Base/BoostFilesystemVersion.h>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/Path.h>
-#include "Swiften/Disco/EntityCapsProvider.h"
+#include <Swiften/Base/foreach.h>
-#include <Swiften/JID/JID.h>
 #include <Swiften/Elements/JingleFileTransferFileInfo.h>
-#include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
+#include <Swiften/Elements/Presence.h>
-#include <Swiften/FileTransfer/OutgoingFileTransferManager.h>
-#include <Swiften/FileTransfer/IncomingFileTransferManager.h>
 #include <Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h>
-#include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
+#include <Swiften/FileTransfer/IncomingFileTransferManager.h>
+#include <Swiften/FileTransfer/OutgoingFileTransferManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
-#include <Swiften/Presence/PresenceOracle.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
-#include <Swiften/Elements/Presence.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
+#include <Swiften/JID/JID.h>
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/ConnectionServerFactory.h>
 #include <Swiften/Network/HostAddress.h>
 #include <Swiften/Network/NATTraverser.h>
+#include <Swiften/Presence/PresenceOracle.h>
-#include <Swiften/Base/BoostFilesystemVersion.h>
+#include <Swiften/Queries/IQRouter.h>
 namespace Swift {
 FileTransferManagerImpl::FileTransferManagerImpl(
-                const JID& ownFullJID, 
+                const JID& ownJID,
                JingleSessionManager* jingleSessionManager, 
                IQRouter* router, 
                EntityCapsProvider* capsProvider, 
@@ -52,16 +52,13 @@ FileTransferManagerImpl::FileTransferManagerImpl(
                NetworkEnvironment* networkEnvironment,
                NATTraverser* natTraverser,
                CryptoProvider* crypto) : 
-                        ownJID(ownFullJID), 
                        iqRouter(router), 
                        capsProvider(capsProvider), 
                        presenceOracle(presOracle) {
-        assert(!ownFullJID.isBare());
        bytestreamRegistry = new SOCKS5BytestreamRegistry();
        s5bServerManager = new SOCKS5BytestreamServerManager(
                        bytestreamRegistry, connectionServerFactory, networkEnvironment, natTraverser);
-        bytestreamProxy = new SOCKS5BytestreamProxiesManager(connectionFactory, timerFactory, domainNameResolver, iqRouter, JID(ownFullJID.getDomain()));
+        bytestreamProxy = new SOCKS5BytestreamProxiesManager(connectionFactory, timerFactory, domainNameResolver, iqRouter, JID(ownJID.getDomain()));
        transporterFactory = new DefaultFileTransferTransporterFactory(
                        bytestreamRegistry,
@@ -166,8 +163,10 @@ OutgoingFileTransfer::ref FileTransferManagerImpl::createOutgoingFileTransfer(
                        return OutgoingFileTransfer::ref();
                }
        }
-        
-        return outgoingFTManager->createOutgoingFileTransfer(ownJID, receipient, bytestream, fileInfo, config);
+        assert(!iqRouter->getJID().isBare());
+        return outgoingFTManager->createOutgoingFileTransfer(iqRouter->getJID(), receipient, bytestream, fileInfo, config);
 }
 }
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.h b/Swiften/FileTransfer/FileTransferManagerImpl.h
index de6e857..7a77564 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.h
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.h
@@ -12,23 +12,22 @@
 #pragma once
-#include <vector>
 #include <string>
+#include <vector>
-#include <boost/filesystem/path.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/optional.hpp>
 #include <Swiften/Base/API.h>
+#include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Base/Override.h>
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Elements/S5BProxyRequest.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
-#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/Base/IDGenerator.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 #include <Swiften/FileTransfer/IncomingFileTransfer.h>
-#include <Swiften/Elements/S5BProxyRequest.h>
+#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 namespace Swift {
        class ConnectionFactory;
@@ -39,6 +38,7 @@ namespace Swift {
        class FileTransferTransporterFactory;
        class IQRouter;
        class IncomingFileTransferManager;
+        class JID;
        class JingleSessionManager;
        class NATTraverser;
        class NetworkEnvironment;
@@ -89,8 +89,6 @@ namespace Swift {
                        boost::optional<JID> highestPriorityJIDSupportingFileTransfer(const JID& bareJID);
                        
                private:
-                        JID ownJID;
-                        
                        OutgoingFileTransferManager* outgoingFTManager;
                        IncomingFileTransferManager* incomingFTManager;
                        FileTransferTransporterFactory* transporterFactory;
author	Tobias Markmann <tm@ayena.de>	2015-07-17 08:18:04 (GMT)
committer	Kevin Smith <kevin.smith@isode.com>	2015-07-20 11:24:07 (GMT)
commit	f10bd4cc1f570b27943d27e536d1dcfbcd55ec6a (patch)
tree	eaa855d6b961ea70c854db571ace7127a36f9d8c
parent	3e982c0a39d1d1833afaf558fc7b0f7aeffd2d64 (diff)
download	swift-f10bd4cc1f570b27943d27e536d1dcfbcd55ec6a.zip swift-f10bd4cc1f570b27943d27e536d1dcfbcd55ec6a.tar.bz2

diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp index 613249b..3bfdd3f 100644 --- a/Swiften/Client/Client.cpp +++ b/Swiften/Client/Client.cpp
@@ -71,7 +71,6 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
71		71
72	jingleSessionManager = new JingleSessionManager(getIQRouter());	72	jingleSessionManager = new JingleSessionManager(getIQRouter());
73	blockListManager = new ClientBlockListManager(getIQRouter());	73	blockListManager = new ClientBlockListManager(getIQRouter());
74	fileTransferManager = NULL;
75		74
76	whiteboardSessionManager = NULL;	75	whiteboardSessionManager = NULL;
77	#ifdef SWIFT_EXPERIMENTAL_WB	76	#ifdef SWIFT_EXPERIMENTAL_WB
@@ -79,6 +78,24 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
79	#endif	78	#endif
80		79
81	pubsubManager = new PubSubManagerImpl(getStanzaChannel(), getIQRouter());	80	pubsubManager = new PubSubManagerImpl(getStanzaChannel(), getIQRouter());
		81
		82	#ifdef SWIFT_EXPERIMENTAL_FT
		83	fileTransferManager = new FileTransferManagerImpl(
		84	getJID(),
		85	jingleSessionManager,
		86	getIQRouter(),
		87	getEntityCapsProvider(),
		88	presenceOracle,
		89	getNetworkFactories()->getConnectionFactory(),
		90	getNetworkFactories()->getConnectionServerFactory(),
		91	getNetworkFactories()->getTimerFactory(),
		92	getNetworkFactories()->getDomainNameResolver(),
		93	getNetworkFactories()->getNetworkEnvironment(),
		94	getNetworkFactories()->getNATTraverser(),
		95	getNetworkFactories()->getCryptoProvider());
		96	#else
		97	fileTransferManager = new DummyFileTransferManager();
		98	#endif
82	}	99	}
83		100
84	Client::~Client() {	101	Client::~Client() {
@@ -126,24 +143,6 @@ void Client::setSoftwareVersion(const std::string& name, const std::string& vers
126	}	143	}
127		144
128	void Client::handleConnected() {	145	void Client::handleConnected() {
129	delete fileTransferManager;
130	#ifdef SWIFT_EXPERIMENTAL_FT
131	fileTransferManager = new FileTransferManagerImpl(
132	getJID(),
133	jingleSessionManager,
134	getIQRouter(),
135	getEntityCapsProvider(),
136	presenceOracle,
137	getNetworkFactories()->getConnectionFactory(),
138	getNetworkFactories()->getConnectionServerFactory(),
139	getNetworkFactories()->getTimerFactory(),
140	getNetworkFactories()->getDomainNameResolver(),
141	getNetworkFactories()->getNetworkEnvironment(),
142	getNetworkFactories()->getNATTraverser(),
143	getNetworkFactories()->getCryptoProvider());
144	#else
145	fileTransferManager = new DummyFileTransferManager();
146	#endif
147	discoManager->handleConnected();	146	discoManager->handleConnected();
148	}	147	}
149		148


diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp index ab08c45..f4f9517 100644 --- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp +++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -13,34 +13,34 @@
13	#include <Swiften/FileTransfer/FileTransferManagerImpl.h>	13	#include <Swiften/FileTransfer/FileTransferManagerImpl.h>
14		14
15	#include <boost/bind.hpp>	15	#include <boost/bind.hpp>
16	#include <boost/filesystem.hpp>
17	#include <boost/cstdint.hpp>	16	#include <boost/cstdint.hpp>
		17	#include <boost/filesystem.hpp>
18		18
19	#include <Swiften/Base/foreach.h>	19	#include "Swiften/Disco/EntityCapsProvider.h"
		20	#include <Swiften/Base/BoostFilesystemVersion.h>
20	#include <Swiften/Base/Log.h>	21	#include <Swiften/Base/Log.h>
21	#include <Swiften/Base/Path.h>	22	#include <Swiften/Base/Path.h>
22	#include "Swiften/Disco/EntityCapsProvider.h"	23	#include <Swiften/Base/foreach.h>
23	#include <Swiften/JID/JID.h>
24	#include <Swiften/Elements/JingleFileTransferFileInfo.h>	24	#include <Swiften/Elements/JingleFileTransferFileInfo.h>
25	#include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>	25	#include <Swiften/Elements/Presence.h>
26	#include <Swiften/FileTransfer/OutgoingFileTransferManager.h>
27	#include <Swiften/FileTransfer/IncomingFileTransferManager.h>
28	#include <Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h>	26	#include <Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h>
29	#include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>	27	#include <Swiften/FileTransfer/IncomingFileTransferManager.h>
		28	#include <Swiften/FileTransfer/OutgoingFileTransferManager.h>
30	#include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>	29	#include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
31	#include <Swiften/Presence/PresenceOracle.h>	30	#include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
32	#include <Swiften/Elements/Presence.h>	31	#include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
		32	#include <Swiften/JID/JID.h>
33	#include <Swiften/Network/ConnectionFactory.h>	33	#include <Swiften/Network/ConnectionFactory.h>
34	#include <Swiften/Network/ConnectionServerFactory.h>	34	#include <Swiften/Network/ConnectionServerFactory.h>
35	#include <Swiften/Network/HostAddress.h>	35	#include <Swiften/Network/HostAddress.h>
36	#include <Swiften/Network/NATTraverser.h>	36	#include <Swiften/Network/NATTraverser.h>
37		37	#include <Swiften/Presence/PresenceOracle.h>
38	#include <Swiften/Base/BoostFilesystemVersion.h>	38	#include <Swiften/Queries/IQRouter.h>
39		39
40	namespace Swift {	40	namespace Swift {
41		41
42	FileTransferManagerImpl::FileTransferManagerImpl(	42	FileTransferManagerImpl::FileTransferManagerImpl(
43	const JID& ownFullJID,	43	const JID& ownJID,
44	JingleSessionManager* jingleSessionManager,	44	JingleSessionManager* jingleSessionManager,
45	IQRouter* router,	45	IQRouter* router,
46	EntityCapsProvider* capsProvider,	46	EntityCapsProvider* capsProvider,
@@ -52,16 +52,13 @@ FileTransferManagerImpl::FileTransferManagerImpl(
52	NetworkEnvironment* networkEnvironment,	52	NetworkEnvironment* networkEnvironment,
53	NATTraverser* natTraverser,	53	NATTraverser* natTraverser,
54	CryptoProvider* crypto) :	54	CryptoProvider* crypto) :
55	ownJID(ownFullJID),
56	iqRouter(router),	55	iqRouter(router),
57	capsProvider(capsProvider),	56	capsProvider(capsProvider),
58	presenceOracle(presOracle) {	57	presenceOracle(presOracle) {
59	assert(!ownFullJID.isBare());
60
61	bytestreamRegistry = new SOCKS5BytestreamRegistry();	58	bytestreamRegistry = new SOCKS5BytestreamRegistry();
62	s5bServerManager = new SOCKS5BytestreamServerManager(	59	s5bServerManager = new SOCKS5BytestreamServerManager(
63	bytestreamRegistry, connectionServerFactory, networkEnvironment, natTraverser);	60	bytestreamRegistry, connectionServerFactory, networkEnvironment, natTraverser);
64	bytestreamProxy = new SOCKS5BytestreamProxiesManager(connectionFactory, timerFactory, domainNameResolver, iqRouter, JID(ownFullJID.getDomain()));	61	bytestreamProxy = new SOCKS5BytestreamProxiesManager(connectionFactory, timerFactory, domainNameResolver, iqRouter, JID(ownJID.getDomain()));
65		62
66	transporterFactory = new DefaultFileTransferTransporterFactory(	63	transporterFactory = new DefaultFileTransferTransporterFactory(
67	bytestreamRegistry,	64	bytestreamRegistry,
@@ -166,8 +163,10 @@ OutgoingFileTransfer::ref FileTransferManagerImpl::createOutgoingFileTransfer(
166	return OutgoingFileTransfer::ref();	163	return OutgoingFileTransfer::ref();
167	}	164	}
168	}	165	}
169		166
170	return outgoingFTManager->createOutgoingFileTransfer(ownJID, receipient, bytestream, fileInfo, config);	167	assert(!iqRouter->getJID().isBare());
		168
		169	return outgoingFTManager->createOutgoingFileTransfer(iqRouter->getJID(), receipient, bytestream, fileInfo, config);
171	}	170	}
172		171
173	}	172	}


diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.h b/Swiften/FileTransfer/FileTransferManagerImpl.h index de6e857..7a77564 100644 --- a/Swiften/FileTransfer/FileTransferManagerImpl.h +++ b/Swiften/FileTransfer/FileTransferManagerImpl.h
@@ -12,23 +12,22 @@
12		12
13	#pragma once	13	#pragma once
14		14
15	#include <vector>
16	#include <string>	15	#include <string>
		16	#include <vector>
17		17
18	#include <boost/filesystem/path.hpp>
19	#include <boost/date_time/posix_time/posix_time.hpp>	18	#include <boost/date_time/posix_time/posix_time.hpp>
		19	#include <boost/filesystem/path.hpp>
20	#include <boost/optional.hpp>	20	#include <boost/optional.hpp>
21		21
22	#include <Swiften/Base/API.h>	22	#include <Swiften/Base/API.h>
		23	#include <Swiften/Base/IDGenerator.h>
23	#include <Swiften/Base/Override.h>	24	#include <Swiften/Base/Override.h>
		25	#include <Swiften/Base/boost_bsignals.h>
		26	#include <Swiften/Elements/S5BProxyRequest.h>
24	#include <Swiften/FileTransfer/FileTransferManager.h>	27	#include <Swiften/FileTransfer/FileTransferManager.h>
25	#include <Swiften/FileTransfer/FileTransferOptions.h>	28	#include <Swiften/FileTransfer/FileTransferOptions.h>
26	#include <Swiften/Base/boost_bsignals.h>
27	#include <Swiften/Base/IDGenerator.h>
28	#include <Swiften/JID/JID.h>
29	#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
30	#include <Swiften/FileTransfer/IncomingFileTransfer.h>	29	#include <Swiften/FileTransfer/IncomingFileTransfer.h>
31	#include <Swiften/Elements/S5BProxyRequest.h>	30	#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
32		31
33	namespace Swift {	32	namespace Swift {
34	class ConnectionFactory;	33	class ConnectionFactory;
@@ -39,6 +38,7 @@ namespace Swift {
39	class FileTransferTransporterFactory;	38	class FileTransferTransporterFactory;
40	class IQRouter;	39	class IQRouter;
41	class IncomingFileTransferManager;	40	class IncomingFileTransferManager;
		41	class JID;
42	class JingleSessionManager;	42	class JingleSessionManager;
43	class NATTraverser;	43	class NATTraverser;
44	class NetworkEnvironment;	44	class NetworkEnvironment;
@@ -89,8 +89,6 @@ namespace Swift {
89	boost::optional<JID> highestPriorityJIDSupportingFileTransfer(const JID& bareJID);	89	boost::optional<JID> highestPriorityJIDSupportingFileTransfer(const JID& bareJID);
90		90
91	private:	91	private:
92	JID ownJID;
93
94	OutgoingFileTransferManager* outgoingFTManager;	92	OutgoingFileTransferManager* outgoingFTManager;
95	IncomingFileTransferManager* incomingFTManager;	93	IncomingFileTransferManager* incomingFTManager;
96	FileTransferTransporterFactory* transporterFactory;	94	FileTransferTransporterFactory* transporterFactory;