Changeset - 88607aff3c0b
Parent rev.
Child rev.
[Not reviewed]
0 6 0
HanzZ - 13 years ago 2012-09-22 20:19:19
hanzz.k@gmail.com
Do not disconnect from room when user uses two clients and shutdown one.
6 files changed with 100 insertions and 7 deletions:
include/transport/conversation.h
13
src/conversation.cpp
6
2
src/networkpluginserver.cpp
1
1
src/tests/conversationmanager.cpp
2
2
src/tests/user.cpp
63
src/user.cpp
15
2
0 comments (0 inline, 0 general)
include/transport/conversation.h
➞
Show inline comments
 
@@ -79,12 +79,24 @@ class Conversation {
 
		}
 

			




	
	
	
		
 
		void setJID(const Swift::JID &jid) {

			




	
	
	
		
 
			m_jid = jid;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void addJID(const Swift::JID &jid) {

			




	
	
	
		
 
			m_jids.push_back(jid);

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void removeJID(const Swift::JID &jid) {

			




	
	
	
		
 
			m_jids.remove(jid);

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		const std::list<Swift::JID> &getJIDs() {

			




	
	
	
		
 
			return m_jids;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		/// Sends message to Legacy network.

			




	
	
	
		
 

			




	
	
	
		
 
		/// \param message Message.

			




	
	
	
		
 
		virtual void sendMessage(boost::shared_ptr<Swift::Message> &message) = 0;

			




	
	
	
		
 

			




	
	
	
		
 
		/// Returns ConversationManager associated with this Conversation.

			




	
	
		
 
@@ -120,9 +132,10 @@ class Conversation {

			




	
	
	
		
 
		ConversationManager *m_conversationManager;

			




	
	
	
		
 
		std::string m_legacyName;

			




	
	
	
		
 
		std::string m_nickname;

			




	
	
	
		
 
		std::string m_room;

			




	
	
	
		
 
		bool m_muc;

			




	
	
	
		
 
		Swift::JID m_jid;

			




	
	
	
		
 
		std::list<Swift::JID> m_jids;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/conversation.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -112,29 +112,30 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		std::string n = nickname;

			




	
	
	
		
 
		if (n.empty()) {

			




	
	
	
		
 
			n = " ";

			




	
	
	
		
 
		}

			




	
	
	
		
 
		message->setTo(m_jid);

			




	
	
	
		
 
		BOOST_FOREACH(const Swift::JID &jid, m_jids) {

			




	
	
	
		
 
			message->setTo(jid);

			




	
	
	
		
 
			message->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), n));

			




	
	
	
		
 
			m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(message);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Conversation::handleParticipantChanged(const std::string &nick, int flag, int status, const std::string &statusMessage, const std::string &newname) {

			




	
	
	
		
 
	std::string nickname = nick;

			




	
	
	
		
 
	Swift::Presence::ref presence = Swift::Presence::create();

			




	
	
	
		
 
	std::string legacyName = m_legacyName;

			




	
	
	
		
 
	if (m_muc) {

			




	
	
	
		
 
		if (legacyName.find_last_of("@") != std::string::npos) {

			




	
	
	
		
 
			legacyName.replace(legacyName.find_last_of("@"), 1, "%"); // OK

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
	presence->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), nickname));

			




	
	
	
		
 
	presence->setTo(m_jid);

			




	
	
	
		
 
	presence->setType(Swift::Presence::Available);

			




	
	
	
		
 

			




	
	
	
		
 
	if (!statusMessage.empty())

			




	
	
	
		
 
		presence->setStatus(statusMessage);

			




	
	
	
		
 

			




	
	
	
		
 
	Swift::StatusShow s((Swift::StatusShow::Type) status);

			




	
	
		
 
@@ -171,13 +172,16 @@ void Conversation::handleParticipantChanged(const std::string &nick, int flag, i

			




	
	
	
		
 
		presence->setType(Swift::Presence::Unavailable);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	p->addItem(item);

			




	
	
	
		
 

			




	
	
	
		
 
	presence->addPayload(boost::shared_ptr<Swift::Payload>(p));

			




	
	
	
		
 
	BOOST_FOREACH(const Swift::JID &jid, m_jids) {

			




	
	
	
		
 
		presence->setTo(jid);

			




	
	
	
		
 
		m_conversationManager->getComponent()->getStanzaChannel()->sendPresence(presence);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	if (!newname.empty()) {

			




	
	
	
		
 
		handleParticipantChanged(newname, flag, status, statusMessage);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/networkpluginserver.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1189,13 +1189,13 @@ void NetworkPluginServer::handleRoomJoined(User *user, const Swift::JID &who, co

			




	
	
	
		
 
	send(c->connection, message);

			




	
	
	
		
 

			




	
	
	
		
 
	NetworkConversation *conv = new NetworkConversation(user->getConversationManager(), r, true);

			




	
	
	
		
 
	user->getConversationManager()->addConversation(conv);

			




	
	
	
		
 
	conv->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, this, _1, _2));

			




	
	
	
		
 
	conv->setNickname(nickname);

			




	
	
	
		
 
	conv->setJID(who);

			




	
	
	
		
 
	conv->addJID(who);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void NetworkPluginServer::handleRoomLeft(User *user, const std::string &r) {

			




	
	
	
		
 
	UserInfo userInfo = user->getUserInfo();

			




	
	
	
		
 

			




	
	
	
		
 
	pbnetwork::Room room;

			




        

    


    
    

    

        

                

                    src/tests/conversationmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -155,13 +155,13 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 
	void handleGroupchatMessages() {

			




	
	
	
		
 
		User *user = userManager->getUser("user@localhost");

			




	
	
	
		
 
		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);

			




	
	
	
		
 
		user->getConversationManager()->addConversation(conv);

			




	
	
	
		
 
		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));

			




	
	
	
		
 
		conv->setNickname("nickname");

			




	
	
	
		
 
		conv->setJID("user@localhost/resource");

			




	
	
	
		
 
		conv->addJID("user@localhost/resource");

			




	
	
	
		
 

			




	
	
	
		
 
		// reset resources should not touch this resource

			




	
	
	
		
 
		user->getConversationManager()->resetResources();

			




	
	
	
		
 

			




	
	
	
		
 
		boost::shared_ptr<Swift::Message> msg(new Swift::Message());

			




	
	
	
		
 
		msg->setBody("hi there!");

			




	
	
		
 
@@ -194,13 +194,13 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe

			




	
	
	
		
 
	void handleParticipantChanged() {

			




	
	
	
		
 
		User *user = userManager->getUser("user@localhost");

			




	
	
	
		
 
		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);

			




	
	
	
		
 
		

			




	
	
	
		
 
		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));

			




	
	
	
		
 
		conv->setNickname("nickname");

			




	
	
	
		
 
		conv->setJID("user@localhost/resource");

			




	
	
	
		
 
		conv->addJID("user@localhost/resource");

			




	
	
	
		
 

			




	
	
	
		
 
		// normal presence

			




	
	
	
		
 
		conv->handleParticipantChanged("anotheruser", 0, Swift::StatusShow::Away, "my status message");

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());

			




        

    


    
    

    

        

                

                    src/tests/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,13 +22,15 @@ using namespace Transport;

			




	
	
	
		
 

			




	
	
	
		
 
class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
	CPPUNIT_TEST_SUITE(UserTest);

			




	
	
	
		
 
	CPPUNIT_TEST(sendCurrentPresence);

			




	
	
	
		
 
    CPPUNIT_TEST(handlePresence);

			




	
	
	
		
 
	CPPUNIT_TEST(handlePresenceJoinRoom);

			




	
	
	
		
 
	CPPUNIT_TEST(handlePresenceJoinRoomTwoResources);

			




	
	
	
		
 
	CPPUNIT_TEST(handlePresenceLeaveRoom);

			




	
	
	
		
 
	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResources);

			




	
	
	
		
 
	CPPUNIT_TEST(leaveJoinedRoom);

			




	
	
	
		
 
	CPPUNIT_TEST(handleDisconnected);

			




	
	
	
		
 
	CPPUNIT_TEST(handleDisconnectedReconnect);

			




	
	
	
		
 
	CPPUNIT_TEST_SUITE_END();

			




	
	
	
		
 

			




	
	
	
		
 
	public:

			




	
	
		
 
@@ -136,12 +138,13 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
		room = "";

			




	
	
	
		
 
		roomNickname = "";

			




	
	
	
		
 
		roomPassword = "";

			




	
	
	
		
 

			




	
	
	
		
 
		// simulate that backend joined the room

			




	
	
	
		
 
		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);

			




	
	
	
		
 
		conv->addJID("user@localhost/resource");

			




	
	
	
		
 
		user->getConversationManager()->addConversation(conv);

			




	
	
	
		
 

			




	
	
	
		
 
		received.clear();

			




	
	
	
		
 
		injectPresence(response);

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
		
 
@@ -151,12 +154,30 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), room);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void handlePresenceJoinRoomTwoResources() {

			




	
	
	
		
 
		handlePresenceJoinRoom();

			




	
	
	
		
 
		connectSecondResource();

			




	
	
	
		
 
		Swift::Presence::ref response = Swift::Presence::create();

			




	
	
	
		
 
		response->setTo("#room@localhost/hanzz");

			




	
	
	
		
 
		response->setFrom("user@localhost/resource2");

			




	
	
	
		
 

			




	
	
	
		
 
		Swift::MUCPayload *payload = new Swift::MUCPayload();

			




	
	
	
		
 
		payload->setPassword("password");

			




	
	
	
		
 
		response->addPayload(boost::shared_ptr<Swift::Payload>(payload));

			




	
	
	
		
 
		injectPresence(response);

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), room);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void handlePresenceLeaveRoom() {

			




	
	
	
		
 
		Swift::Presence::ref response = Swift::Presence::create();

			




	
	
	
		
 
		response->setTo("#room@localhost/hanzz");

			




	
	
	
		
 
		response->setFrom("user@localhost/resource");

			




	
	
	
		
 
		response->setType(Swift::Presence::Unavailable);

			




	
	
	
		
 

			




	
	
		
 
@@ -170,12 +191,54 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("#room"), room);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void handlePresenceLeaveRoomTwoResources() {

			




	
	
	
		
 
		handlePresenceJoinRoomTwoResources();

			




	
	
	
		
 
		received.clear();

			




	
	
	
		
 

			




	
	
	
		
 
		// User is still connected from resource2, so he should not leave the room

			




	
	
	
		
 
		Swift::Presence::ref response = Swift::Presence::create();

			




	
	
	
		
 
		response->setTo("#room@localhost/hanzz");

			




	
	
	
		
 
		response->setFrom("user@localhost/resource");

			




	
	
	
		
 
		response->setType(Swift::Presence::Unavailable);

			




	
	
	
		
 

			




	
	
	
		
 
		Swift::MUCPayload *payload = new Swift::MUCPayload();

			




	
	
	
		
 
		payload->setPassword("password");

			




	
	
	
		
 
		response->addPayload(boost::shared_ptr<Swift::Payload>(payload));

			




	
	
	
		
 
		injectPresence(response);

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), room);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);

			




	
	
	
		
 

			




	
	
	
		
 
		// disconnect also from resource

			




	
	
	
		
 
		// User is still connected from resource2, so he should not leave the room

			




	
	
	
		
 
		response = Swift::Presence::create();

			




	
	
	
		
 
		response->setTo("#room@localhost/hanzz");

			




	
	
	
		
 
		response->setFrom("user@localhost/resource2");

			




	
	
	
		
 
		response->setType(Swift::Presence::Unavailable);

			




	
	
	
		
 

			




	
	
	
		
 
		payload = new Swift::MUCPayload();

			




	
	
	
		
 
		payload->setPassword("password");

			




	
	
	
		
 
		response->addPayload(boost::shared_ptr<Swift::Payload>(payload));

			




	
	
	
		
 
		injectPresence(response);

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("#room"), room);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void leaveJoinedRoom() {

			




	
	
	
		
 
		User *user = userManager->getUser("user@localhost");

			




	
	
	
		
 
		handlePresenceJoinRoom();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT(user->getConversationManager()->getConversation("#room"));

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -215,16 +215,23 @@ void User::handlePresence(Swift::Presence::ref presence) {

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	bool isMUC = presence->getPayload<Swift::MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';

			




	
	
	
		
 
	if (isMUC) {

			




	
	
	
		
 
		if (presence->getType() == Swift::Presence::Unavailable) {

			




	
	
	
		
 
			std::string room = Buddy::JIDToLegacyName(presence->getTo());

			




	
	
	
		
 
			Conversation *conv = m_conversationManager->getConversation(room);

			




	
	
	
		
 
			if (conv) {

			




	
	
	
		
 
				conv->removeJID(presence->getFrom());

			




	
	
	
		
 
				if (!conv->getJIDs().empty()) {

			




	
	
	
		
 
					return;

			




	
	
	
		
 
				}

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			LOG4CXX_INFO(logger, m_jid.toString() << ": Going to left room " << room);

			




	
	
	
		
 
			onRoomLeft(room);

			




	
	
	
		
 

			




	
	
	
		
 
			Conversation *conv = m_conversationManager->getConversation(room);

			




	
	
	
		
 
			if (conv) {

			




	
	
	
		
 
				m_conversationManager->removeConversation(conv);

			




	
	
	
		
 
				delete conv;

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 
		else {

			




	
	
		
 
@@ -232,14 +239,20 @@ void User::handlePresence(Swift::Presence::ref presence) {

			




	
	
	
		
 
			if (!m_readyForConnect) {

			




	
	
	
		
 
				LOG4CXX_INFO(logger, m_jid.toString() << ": Ready to be connected to legacy network");

			




	
	
	
		
 
				m_readyForConnect = true;

			




	
	
	
		
 
				onReadyToConnect();

			




	
	
	
		
 
			}

			




	
	
	
		
 
			std::string room = Buddy::JIDToLegacyName(presence->getTo());

			




	
	
	
		
 
			if (m_conversationManager->getConversation(room) != NULL) {

			




	
	
	
		
 
			Conversation *conv = m_conversationManager->getConversation(room);

			




	
	
	
		
 
			if (conv != NULL) {

			




	
	
	
		
 
				if (std::find(conv->getJIDs().begin(), conv->getJIDs().end(), presence->getFrom()) != conv->getJIDs().end()) {

			




	
	
	
		
 
					LOG4CXX_INFO(logger, m_jid.toString() << ": User has already tried to join room " << room << " as " << presence->getTo().getResource());

			




	
	
	
		
 
				}

			




	
	
	
		
 
				else {

			




	
	
	
		
 
					conv->addJID(presence->getFrom());

			




	
	
	
		
 
				}

			




	
	
	
		
 
				return;

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			LOG4CXX_INFO(logger, m_jid.toString() << ": Going to join room " << room << " as " << presence->getTo().getResource());

			




	
	
	
		
 
			std::string password = "";

			




	
	
	
		
 
			if (presence->getPayload<Swift::MUCPayload>() != NULL) {

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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