1 files changed, 14 insertions, 6 deletions
diff --git a/Swiften/FileTransfer/IncomingFileTransferManager.cpp b/Swiften/FileTransfer/IncomingFileTransferManager.cpp
index 79d2391..c01c906 100644
--- a/Swiften/FileTransfer/IncomingFileTransferManager.cpp
+++ b/Swiften/FileTransfer/IncomingFileTransferManager.cpp
@@ -18,7 +18,9 @@
 
 namespace Swift {
 
-IncomingFileTransferManager::IncomingFileTransferManager(JingleSessionManager* jingleSessionManager, IQRouter* router) : jingleSessionManager(jingleSessionManager), router(router) {
+IncomingFileTransferManager::IncomingFileTransferManager(const JID& ourFullJID, JingleSessionManager* jingleSessionManager, IQRouter* router,
+							RemoteJingleTransportCandidateSelectorFactory* remoteFactory,
+														 LocalJingleTransportCandidateGeneratorFactory* localFactory, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, TimerFactory* timerFactory) : ourJID(ourFullJID), jingleSessionManager(jingleSessionManager), router(router), remoteFactory(remoteFactory), localFactory(localFactory), bytestreamRegistry(bytestreamRegistry), bytestreamProxy(bytestreamProxy), timerFactory(timerFactory) {
 	jingleSessionManager->addIncomingSessionHandler(this);
 }
 
@@ -29,13 +31,19 @@ IncomingFileTransferManager::~IncomingFileTransferManager() {
 bool IncomingFileTransferManager::handleIncomingJingleSession(JingleSession::ref session, const std::vector<JingleContentPayload::ref>& contents) {
 	if (JingleContentPayload::ref content = Jingle::getContentWithDescription<JingleFileTransferDescription>(contents)) {
 		if (content->getTransport<JingleIBBTransportPayload>() || content->getTransport<JingleS5BTransportPayload>()) {
-			RemoteJingleTransportCandidateSelectorFactory* a;
-			LocalJingleTransportCandidateGeneratorFactory* b;
-			IncomingJingleFileTransfer::ref transfer = boost::make_shared<IncomingJingleFileTransfer>(session, content, a, b, router);
-			onIncomingFileTransfer(transfer);
+
+			JingleFileTransferDescription::ref description = content->getDescription<JingleFileTransferDescription>();
+
+			if (description && description->getOffers().size() == 1) {
+				IncomingJingleFileTransfer::ref transfer = boost::make_shared<IncomingJingleFileTransfer>(ourJID, session, content, remoteFactory, localFactory, router, bytestreamRegistry, bytestreamProxy, timerFactory);
+				onIncomingFileTransfer(transfer);
+			} else {
+				std::cerr << "Received a file-transfer request with no description or more than one file!" << std::endl;
+				session->sendTerminate(JinglePayload::Reason::FailedApplication);
+			}
 		}
 		else {
-			session->terminate(JinglePayload::Reason::UnsupportedTransports);
+			session->sendTerminate(JinglePayload::Reason::UnsupportedTransports);
 		}
 		return true;
 	}