Changeset - 46f5c51d006f
Parent rev.
Child rev.
[Not reviewed]
0 6 0
HanzZ - 14 years ago 2011-10-02 11:11:08
hanzz.k@gmail.com
Working FT rejecting
6 files changed with 29 insertions and 1 deletions:
CMakeLists.txt
1
1
backends/libpurple/main.cpp
8
include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp
1
include/transport/networkplugin.h
2
src/networkplugin.cpp
13
src/networkpluginserver.cpp
4
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -87,49 +87,49 @@ if (PROTOBUF_FOUND)
 
		message("IRC plugin        : yes")
 
		include_directories(${IRC_INCLUDE_DIR})
 
		include(${QT_USE_FILE})
 
	else()
 
		message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")
 
	endif()
 

			




	
	
	
		
 
	message("Frotz plugin      : yes")

			




	
	
	
		
 

			




	
	
	
		
 
else()

			




	
	
	
		
 
	message("Network plugins   : no (install libprotobuf-dev)")

			




	
	
	
		
 
	message("Libpurple plugin  : no (install libpurple and libprotobuf-dev)")

			




	
	
	
		
 
	message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")

			




	
	
	
		
 
	message("Frotz plugin      : no (install libprotobuf-dev)")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (LOG4CXX_FOUND)

			




	
	
	
		
 
	message("Logging           : yes")

			




	
	
	
		
 
	include_directories(${LOG4CXX_INCLUDE_DIR})

			




	
	
	
		
 
else()

			




	
	
	
		
 
	message(FATAL_ERROR "Logging           : no (install log4cxx-devel)")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if(CMAKE_BUILD_TYPE MATCHES Debug)

			




	
	
	
		
 
	ADD_DEFINITIONS(-O3)

			




	
	
	
		
 
	ADD_DEFINITIONS(-O0)

			




	
	
	
		
 
	ADD_DEFINITIONS(-ggdb)

			




	
	
	
		
 
	ADD_DEFINITIONS(-DDEBUG)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wall)

			




	
	
	
		
 
	ADD_DEFINITIONS(-W)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wcast-align)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wextra -Wno-sign-compare -Wno-unused-parameter)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Winit-self)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wmissing-declarations)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wpointer-arith)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wreorder)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Woverloaded-virtual)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wsign-promo)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wundef -Wunused)

			




	
	
	
		
 
	message("Debug             : yes")

			




	
	
	
		
 
else(CMAKE_BUILD_TYPE MATCHES Debug)

			




	
	
	
		
 
	message("Debug             : no (run \"cmake . -DCMAKE_BUILD_TYPE=Debug\")")

			




	
	
	
		
 
endif(CMAKE_BUILD_TYPE MATCHES Debug)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
SET(TRANSPORT_VERSION 2.0)

			




	
	
	
		
 
SET(PROJECT_VERSION 2.0)

			




	
	
	
		
 
include_directories(include)

			




	
	
	
		
 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    backends/libpurple/main.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -808,48 +808,56 @@ class SpectrumNetworkPlugin : public NetworkPlugin {

			




	
	
	
		
 
				serv_send_typing(purple_account_get_connection(account), buddyName.c_str(), PURPLE_NOT_TYPING);

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleAttentionRequest(const std::string &user, const std::string &buddyName, const std::string &message) {

			




	
	
	
		
 
			PurpleAccount *account = m_sessions[user];

			




	
	
	
		
 
			if (account) {

			




	
	
	
		
 
				purple_prpl_send_attention(purple_account_get_connection(account), buddyName.c_str(), 0);

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleFTStartRequest(const std::string &user, const std::string &buddyName, const std::string &fileName, unsigned long size, unsigned long ftID) {

			




	
	
	
		
 
			PurpleXfer *xfer = m_unhandledXfers[user + fileName + buddyName];

			




	
	
	
		
 
			if (xfer) {

			




	
	
	
		
 
				m_unhandledXfers.erase(user + fileName + buddyName);

			




	
	
	
		
 
				FTData *ftData = (FTData *) xfer->ui_data;

			




	
	
	
		
 
				

			




	
	
	
		
 
				ftData->id = ftID;

			




	
	
	
		
 
				m_xfers[ftID] = xfer;

			




	
	
	
		
 
				purple_xfer_request_accepted(xfer, fileName.c_str());

			




	
	
	
		
 
				purple_xfer_ui_ready(xfer);

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleFTFinishRequest(const std::string &user, const std::string &buddyName, const std::string &fileName, unsigned long size, unsigned long ftID) {

			




	
	
	
		
 
			PurpleXfer *xfer = m_unhandledXfers[user + fileName + buddyName];

			




	
	
	
		
 
			if (xfer) {

			




	
	
	
		
 
				m_unhandledXfers.erase(user + fileName + buddyName);

			




	
	
	
		
 
				purple_xfer_request_denied(xfer);

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleFTPauseRequest(unsigned long ftID) {

			




	
	
	
		
 
			PurpleXfer *xfer = m_xfers[ftID];

			




	
	
	
		
 
			if (!xfer)

			




	
	
	
		
 
				return;

			




	
	
	
		
 
			FTData *ftData = (FTData *) xfer->ui_data;

			




	
	
	
		
 
			ftData->paused = true;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleFTContinueRequest(unsigned long ftID) {

			




	
	
	
		
 
			PurpleXfer *xfer = m_xfers[ftID];

			




	
	
	
		
 
			if (!xfer)

			




	
	
	
		
 
				return;

			




	
	
	
		
 
			FTData *ftData = (FTData *) xfer->ui_data;

			




	
	
	
		
 
			ftData->paused = false;

			




	
	
	
		
 
			purple_xfer_ui_ready(xfer);

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void readyForData() {

			




	
	
	
		
 
			if (m_waitingXfers.empty())

			




	
	
	
		
 
				return;

			




	
	
	
		
 
			std::vector<PurpleXfer *> tmp;

			




	
	
	
		
 
			tmp.swap(m_waitingXfers);

			




	
	
	
		
 

			




	
	
	
		
 
			BOOST_FOREACH(PurpleXfer *xfer, tmp) {

			




        

    


    
    

    

        

                

                    include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -59,32 +59,33 @@ void MyOutgoingSIFileTransfer::handleStreamInitiationRequestResponse(StreamIniti

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MyOutgoingSIFileTransfer::handleBytestreamsRequestResponse(Bytestreams::ref, ErrorPayload::ref error) {

			




	
	
	
		
 
	if (error) {

			




	
	
	
		
 
		finish(FileTransferError());

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	SOCKS5BytestreamServerSession *serverSession = registry->getConnectedSession(SOCKS5BytestreamRegistry::getHostname(id, from, to));

			




	
	
	
		
 
// 	serverSession->onBytesSent.connect(boost::bind(boost::ref(onProcessedBytes), _1));

			




	
	
	
		
 
// 	serverSession->onFinished.connect(boost::bind(&OutgoingJingleFileTransfer::handleTransferFinished, this, _1));

			




	
	
	
		
 
	serverSession->startTransfer();

			




	
	
	
		
 
	onStateChange(FileTransfer::State(FileTransfer::State::Transferring));

			




	
	
	
		
 
	

			




	
	
	
		
 
	//socksServer->onTransferFinished.connect();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MyOutgoingSIFileTransfer::finish(boost::optional<FileTransferError> error) {

			




	
	
	
		
 
	if (ibbSession) {

			




	
	
	
		
 
		ibbSession->onFinished.disconnect(boost::bind(&MyOutgoingSIFileTransfer::handleIBBSessionFinished, this, _1));

			




	
	
	
		
 
		ibbSession.reset();

			




	
	
	
		
 
	}

			




	
	
	
		
 
	socksServer->removeReadBytestream(id, from, to);

			




	
	
	
		
 
	onStateChange(FileTransfer::State(FileTransfer::State::Canceled));

			




	
	
	
		
 
	onFinished(error);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MyOutgoingSIFileTransfer::handleIBBSessionFinished(boost::optional<FileTransferError> error) {

			




	
	
	
		
 
	finish(error);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    include/transport/networkplugin.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -195,68 +195,70 @@ class NetworkPlugin {

			




	
	
	
		
 
			\endmsc

			




	
	
	
		
 
		*/

			




	
	
	
		
 
		virtual void handleVCardRequest(const std::string &/*user*/, const std::string &/*legacyName*/, unsigned int /*id*/) {}

			




	
	
	
		
 

			




	
	
	
		
 
		/// Called when XMPP user updates his own VCard.

			




	
	
	
		
 
		/// You should update the VCard in legacy network too.

			




	
	
	
		
 
		/// \param user XMPP JID of user for which this event occurs.

			




	
	
	
		
 
		/// \param photo Raw photo data.

			




	
	
	
		
 
		virtual void handleVCardUpdatedRequest(const std::string &/*user*/, const std::string &/*photo*/) {}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
		virtual void handleJoinRoomRequest(const std::string &/*user*/, const std::string &/*room*/, const std::string &/*nickname*/, const std::string &/*pasword*/) {}

			




	
	
	
		
 
		virtual void handleLeaveRoomRequest(const std::string &/*user*/, const std::string &/*room*/) {}

			




	
	
	
		
 
		virtual void handleStatusChangeRequest(const std::string &/*user*/, int status, const std::string &statusMessage) {}

			




	
	
	
		
 
		virtual void handleBuddyUpdatedRequest(const std::string &/*user*/, const std::string &/*buddyName*/, const std::string &/*alias*/, const std::string &/*groups*/) {}

			




	
	
	
		
 
		virtual void handleBuddyRemovedRequest(const std::string &/*user*/, const std::string &/*buddyName*/, const std::string &/*groups*/) {}

			




	
	
	
		
 
		virtual void handleBuddyBlockToggled(const std::string &/*user*/, const std::string &/*buddyName*/, bool /*blocked*/) {}

			




	
	
	
		
 

			




	
	
	
		
 
		virtual void handleTypingRequest(const std::string &/*user*/, const std::string &/*buddyName*/) {}

			




	
	
	
		
 
		virtual void handleTypedRequest(const std::string &/*user*/, const std::string &/*buddyName*/) {}

			




	
	
	
		
 
		virtual void handleStoppedTypingRequest(const std::string &/*user*/, const std::string &/*buddyName*/) {}

			




	
	
	
		
 
		virtual void handleAttentionRequest(const std::string &/*user*/, const std::string &/*buddyName*/, const std::string &/*message*/) {}

			




	
	
	
		
 

			




	
	
	
		
 
		virtual void handleFTStartRequest(const std::string &/*user*/, const std::string &/*buddyName*/, const std::string &/*fileName*/, unsigned long size, unsigned long ftID) {}

			




	
	
	
		
 
		virtual void handleFTFinishRequest(const std::string &/*user*/, const std::string &/*buddyName*/, const std::string &/*fileName*/, unsigned long size, unsigned long ftID) {}

			




	
	
	
		
 
		virtual void handleFTPauseRequest(unsigned long ftID) {}

			




	
	
	
		
 
		virtual void handleFTContinueRequest(unsigned long ftID) {}

			




	
	
	
		
 

			




	
	
	
		
 
		virtual void handleExit() { std::cout << "EXITING\n"; exit(1); }

			




	
	
	
		
 
		

			




	
	
	
		
 

			




	
	
	
		
 
	private:

			




	
	
	
		
 
		void connect();

			




	
	
	
		
 
		void handleLoginPayload(const std::string &payload);

			




	
	
	
		
 
		void handleLogoutPayload(const std::string &payload);

			




	
	
	
		
 
		void handleStatusChangedPayload(const std::string &payload);

			




	
	
	
		
 
		void handleConvMessagePayload(const std::string &payload);

			




	
	
	
		
 
		void handleJoinRoomPayload(const std::string &payload);

			




	
	
	
		
 
		void handleLeaveRoomPayload(const std::string &payload);

			




	
	
	
		
 
		void handleVCardPayload(const std::string &payload);

			




	
	
	
		
 
		void handleBuddyChangedPayload(const std::string &payload);

			




	
	
	
		
 
		void handleBuddyRemovedPayload(const std::string &payload);

			




	
	
	
		
 
		void handleChatStatePayload(const std::string &payload, Swift::ChatState::ChatStateType type);

			




	
	
	
		
 
		void handleAttentionPayload(const std::string &payload);

			




	
	
	
		
 
		void handleFTStartPayload(const std::string &payload);

			




	
	
	
		
 
		void handleFTFinishPayload(const std::string &payload);

			




	
	
	
		
 
		void handleFTPausePayload(const std::string &payload);

			




	
	
	
		
 
		void handleFTContinuePayload(const std::string &payload);

			




	
	
	
		
 
		void handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data);

			




	
	
	
		
 
		void _handleConnected(bool error);

			




	
	
	
		
 
		void handleDisconnected();

			




	
	
	
		
 

			




	
	
	
		
 
		void send(const std::string &data);

			




	
	
	
		
 
		void sendPong();

			




	
	
	
		
 
		void sendMemoryUsage();

			




	
	
	
		
 
		void pingTimeout();

			




	
	
	
		
 

			




	
	
	
		
 
		Swift::SafeByteArray m_data;

			




	
	
	
		
 
		std::string m_host;

			




	
	
	
		
 
		int m_port;

			




	
	
	
		
 
		Swift::BoostNetworkFactories *m_factories;

			




	
	
	
		
 
		Swift::BoostIOServiceThread m_boostIOServiceThread;

			




	
	
	
		
 
		boost::shared_ptr<Swift::Connection> m_conn;

			




	
	
	
		
 
		Swift::EventLoop *m_loop;

			




	
	
	
		
 
		Swift::Timer::ref m_pingTimer;

			




	
	
	
		
 
		bool m_pingReceived;

			




	
	
	
		
 
		double m_init_res;

			




	
	
	
		
 

			




	
	
	
		
 
};

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/networkplugin.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -352,48 +352,58 @@ void NetworkPlugin::handleConvMessagePayload(const std::string &data) {

			




	
	
	
		
 

			




	
	
	
		
 
	handleMessageSendRequest(payload.username(), payload.buddyname(), payload.message(), payload.xhtml());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPlugin::handleAttentionPayload(const std::string &data) {

			




	
	
	
		
 
	pbnetwork::ConversationMessage payload;

			




	
	
	
		
 
	if (payload.ParseFromString(data) == false) {

			




	
	
	
		
 
		// TODO: ERROR

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	handleAttentionRequest(payload.username(), payload.buddyname(), payload.message());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPlugin::handleFTStartPayload(const std::string &data) {

			




	
	
	
		
 
	pbnetwork::File payload;

			




	
	
	
		
 
	if (payload.ParseFromString(data) == false) {

			




	
	
	
		
 
		// TODO: ERROR

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	handleFTStartRequest(payload.username(), payload.buddyname(), payload.filename(), payload.size(), payload.ftid());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPlugin::handleFTFinishPayload(const std::string &data) {

			




	
	
	
		
 
	pbnetwork::File payload;

			




	
	
	
		
 
	if (payload.ParseFromString(data) == false) {

			




	
	
	
		
 
		// TODO: ERROR

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	handleFTFinishRequest(payload.username(), payload.buddyname(), payload.filename(), payload.size(), payload.ftid());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPlugin::handleFTPausePayload(const std::string &data) {

			




	
	
	
		
 
	pbnetwork::FileTransferData payload;

			




	
	
	
		
 
	if (payload.ParseFromString(data) == false) {

			




	
	
	
		
 
		// TODO: ERROR

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	handleFTPauseRequest(payload.ftid());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPlugin::handleFTContinuePayload(const std::string &data) {

			




	
	
	
		
 
	pbnetwork::FileTransferData payload;

			




	
	
	
		
 
	if (payload.ParseFromString(data) == false) {

			




	
	
	
		
 
		// TODO: ERROR

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	handleFTContinueRequest(payload.ftid());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPlugin::handleJoinRoomPayload(const std::string &data) {

			




	
	
	
		
 
	pbnetwork::Room payload;

			




	
	
	
		
 
	if (payload.ParseFromString(data) == false) {

			




	
	
	
		
 
		// TODO: ERROR

			




	
	
		
 
@@ -522,48 +532,51 @@ void NetworkPlugin::handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data)

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED:

			




	
	
	
		
 
				handleBuddyChangedPayload(wrapper.payload());

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_BUDDY_REMOVED:

			




	
	
	
		
 
				handleBuddyRemovedPayload(wrapper.payload());

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_STATUS_CHANGED:

			




	
	
	
		
 
				handleStatusChangedPayload(wrapper.payload());

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_BUDDY_TYPING:

			




	
	
	
		
 
				handleChatStatePayload(wrapper.payload(), Swift::ChatState::Composing);

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_BUDDY_TYPED:

			




	
	
	
		
 
				handleChatStatePayload(wrapper.payload(), Swift::ChatState::Paused);

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_BUDDY_STOPPED_TYPING:

			




	
	
	
		
 
				handleChatStatePayload(wrapper.payload(), Swift::ChatState::Active);

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_ATTENTION:

			




	
	
	
		
 
				handleAttentionPayload(wrapper.payload());

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_FT_START:

			




	
	
	
		
 
				handleFTStartPayload(wrapper.payload());

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_FT_FINISH:

			




	
	
	
		
 
				handleFTFinishPayload(wrapper.payload());

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_FT_PAUSE:

			




	
	
	
		
 
				handleFTPausePayload(wrapper.payload());

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			case pbnetwork::WrapperMessage_Type_TYPE_FT_CONTINUE:

			




	
	
	
		
 
				handleFTContinuePayload(wrapper.payload());

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			default:

			




	
	
	
		
 
				return;

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPlugin::send(const std::string &data) {

			




	
	
	
		
 
	char header[4];

			




	
	
	
		
 
	*((int*)(header)) = htonl(data.size());

			




	
	
	
		
 
	m_conn->write(Swift::createSafeByteArray(std::string(header, 4) + data));

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPlugin::sendPong() {

			




	
	
	
		
 
	m_pingReceived = true;

			




	
	
	
		
 
	std::string message;

			




	
	
	
		
 
	pbnetwork::WrapperMessage wrap;

			




	
	
	
		
 
	wrap.set_type(pbnetwork::WrapperMessage_Type_TYPE_PONG);

			




	
	
	
		
 
	wrap.SerializeToString(&message);

			




        

    


    
    

    

        

                

                    src/networkpluginserver.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1231,69 +1231,73 @@ void NetworkPluginServer::handleFTAccepted(User *user, const std::string &buddyN

			




	
	
	
		
 
	f.set_username(user->getJID().toBare());

			




	
	
	
		
 
	f.set_buddyname(buddyName);

			




	
	
	
		
 
	f.set_filename(fileName);

			




	
	
	
		
 
	f.set_size(size);

			




	
	
	
		
 
	f.set_ftid(ftID);

			




	
	
	
		
 

			




	
	
	
		
 
	std::string message;

			




	
	
	
		
 
	f.SerializeToString(&message);

			




	
	
	
		
 

			




	
	
	
		
 
	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_FT_START);

			




	
	
	
		
 

			




	
	
	
		
 
	Backend *c = (Backend *) user->getData();

			




	
	
	
		
 
	if (!c) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	send(c->connection, message);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleFTRejected(User *user, const std::string &buddyName, const std::string &fileName, unsigned long size) {

			




	
	
	
		
 
	pbnetwork::File f;

			




	
	
	
		
 
	f.set_username(user->getJID().toBare());

			




	
	
	
		
 
	f.set_buddyname(buddyName);

			




	
	
	
		
 
	f.set_filename(fileName);

			




	
	
	
		
 
	f.set_size(size);

			




	
	
	
		
 
	f.set_ftid(0);

			




	
	
	
		
 

			




	
	
	
		
 
	std::string message;

			




	
	
	
		
 
	f.SerializeToString(&message);

			




	
	
	
		
 

			




	
	
	
		
 
	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_FT_FINISH);

			




	
	
	
		
 

			




	
	
	
		
 
	Backend *c = (Backend *) user->getData();

			




	
	
	
		
 
	if (!c) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	send(c->connection, message);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleFTStateChanged(Swift::FileTransfer::State state, const std::string &userName, const std::string &buddyName, const std::string &fileName, unsigned long size, unsigned long id) {

			




	
	
	
		
 
	User *user = m_userManager->getUser(userName);

			




	
	
	
		
 
	if (!user) {

			




	
	
	
		
 
		// TODO: reject and remove filetransfer

			




	
	
	
		
 
	}

			




	
	
	
		
 
	if (state.state == Swift::FileTransfer::State::Transferring) {

			




	
	
	
		
 
		handleFTAccepted(user, buddyName, fileName, size, id);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else if (state.state == Swift::FileTransfer::State::Canceled) {

			




	
	
	
		
 
		handleFTRejected(user, buddyName, fileName, size);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::sendPing(Backend *c) {

			




	
	
	
		
 

			




	
	
	
		
 
	std::string message;

			




	
	
	
		
 
	pbnetwork::WrapperMessage wrap;

			




	
	
	
		
 
	wrap.set_type(pbnetwork::WrapperMessage_Type_TYPE_PING);

			




	
	
	
		
 
	wrap.SerializeToString(&message);

			




	
	
	
		
 

			




	
	
	
		
 
	if (c->connection) {

			




	
	
	
		
 
		send(c->connection, message);

			




	
	
	
		
 
		c->pongReceived = false;

			




	
	
	
		
 
	}

			




	
	
	
		
 
// 	LOG4CXX_INFO(logger, "PING to " << c);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
NetworkPluginServer::Backend *NetworkPluginServer::getFreeClient(bool acceptUsers, bool longRun) {

			




	
	
	
		
 
	NetworkPluginServer::Backend *c = NULL;

			




	
	
	
		
 

			




	
	
	
		
 
	// Check all backends and find free one

			




	
	
	
		
 
	for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {

			




	
	
	
		
 
		if ((*it)->acceptUsers == acceptUsers && (*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend") && (*it)->connection && (*it)->longRun == longRun) {

			




	
	
	
		
 
			c = *it;

			




	
	
	
		
 
			// if we're not reusing all backends and backend is full, stop accepting new users on this backend

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-3934
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support