Changeset - 4055180802ab
Parent rev.
Child rev.
[Not reviewed]
0 4 0
HanzZ - 13 years ago 2012-10-23 18:27:04
hanzz.k@gmail.com
Send subscribe/subscribed presence from transport contact when connecting
4 files changed with 37 insertions and 6 deletions:
backends/libpurple/utils.cpp
1
1
src/tests/basictest.cpp
2
src/tests/usermanager.cpp
9
1
src/usermanager.cpp
25
4
0 comments (0 inline, 0 general)
backends/libpurple/utils.cpp
➞
Show inline comments
 
@@ -146,25 +146,25 @@ int create_socket(const char *host, int portno) {
 

			




	
	
	
		
 
	hostent *hos;

			




	
	
	
		
 
	if ((hos = gethostbyname(host)) == NULL) {

			




	
	
	
		
 
		// strerror() will not work for gethostbyname() and hstrerror() 

			




	
	
	
		
 
		// is supposedly obsolete

			




	
	
	
		
 
		return 0;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	memset(&stSockAddr, 0, sizeof(stSockAddr));

			




	
	
	
		
 

			




	
	
	
		
 
	stSockAddr.sin_family = AF_INET;

			




	
	
	
		
 
	stSockAddr.sin_port = htons(portno);

			




	
	
	
		
 
	bcopy(hos->h_addr, &(stSockAddr.sin_addr.s_addr), hos->h_length);

			




	
	
	
		
 
	memcpy(&(stSockAddr.sin_addr.s_addr), hos->h_addr,  hos->h_length);

			




	
	
	
		
 

			




	
	
	
		
 
	if (-1 == connect(SocketFD, (struct sockaddr *)&stSockAddr, sizeof(stSockAddr))) {

			




	
	
	
		
 
		close(SocketFD);

			




	
	
	
		
 
		return 0;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return SocketFD;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#ifdef _WIN32

			




	
	
	
		
 
std::wstring utf8ToUtf16(const std::string& str)

			




	
	
	
		
 
{

			




        

    


    
    

    

        

                

                    src/tests/basictest.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -193,24 +193,25 @@ void BasicTest::connectUser() {

			




	
	
	
		
 
	CPPUNIT_ASSERT(user);

			




	
	
	
		
 

			




	
	
	
		
 
	UserInfo userInfo = user->getUserInfo();

			




	
	
	
		
 
	CPPUNIT_ASSERT_EQUAL(std::string("password"), userInfo.password);

			




	
	
	
		
 
	CPPUNIT_ASSERT(user->isReadyToConnect() == true);

			




	
	
	
		
 
	CPPUNIT_ASSERT(user->isConnected() == false);

			




	
	
	
		
 

			




	
	
	
		
 
	user->setConnected(true);

			




	
	
	
		
 
	CPPUNIT_ASSERT(user->isConnected() == true);

			




	
	
	
		
 

			




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

			




	
	
	
		
 
	CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoInfo>());

			




	
	
	
		
 

			




	
	
	
		
 
	received.clear();

			




	
	
	
		
 
	receivedData.clear();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void BasicTest::connectSecondResource() {

			




	
	
	
		
 
	serverFromClientSession2 = boost::shared_ptr<Swift::ServerFromClientSession>(new Swift::ServerFromClientSession("id", factories->getConnectionFactory()->createConnection(),

			




	
	
	
		
 
			payloadParserFactories, payloadSerializers, userRegistry, factories->getXMLParserFactory(), Swift::JID("user@localhost/resource2")));

			




	
	
	
		
 
	serverFromClientSession2->startSession();

			




	
	
	
		
 

			




	
	
	
		
 
	serverFromClientSession2->onDataWritten.connect(boost::bind(&BasicTest::handleDataReceived2, this, _1));

			




	
	
	
		
 

			




	
	
	
		
 
	dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->addSession(serverFromClientSession2);

			




	
	
		
 
@@ -227,24 +228,25 @@ void BasicTest::connectSecondResource() {

			




	
	
	
		
 
	loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
	CPPUNIT_ASSERT_EQUAL(1, userManager->getUserCount());

			




	
	
	
		
 

			




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

			




	
	
	
		
 
	CPPUNIT_ASSERT(user);

			




	
	
	
		
 
	CPPUNIT_ASSERT_EQUAL(2, user->getResourceCount());

			




	
	
	
		
 

			




	
	
	
		
 
	CPPUNIT_ASSERT(getStanza(received2[1])->getPayload<Swift::DiscoInfo>());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void BasicTest::disconnectUser() {

			




	
	
	
		
 
	received.clear();

			




	
	
	
		
 
	userManager->disconnectUser("user@localhost");

			




	
	
	
		
 
	dynamic_cast<Swift::DummyTimerFactory *>(factories->getTimerFactory())->setTime(10);

			




	
	
	
		
 
	loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
	CPPUNIT_ASSERT_EQUAL(0, userManager->getUserCount());

			




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

			




	
	
	
		
 
	CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void BasicTest::add2Buddies() {

			




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

			




	
	
	
		
 
	CPPUNIT_ASSERT(user);

			




        

    


    
    

    

        

                

                    src/tests/usermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -70,30 +70,38 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(1, userManager->getUserCount());

			




	
	
	
		
 
		CPPUNIT_ASSERT(!streamEnded);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void handleProbePresence() {

			




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

			




	
	
	
		
 
		response->setTo("localhost");

			




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

			




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

			




	
	
	
		
 
		dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->onPresenceReceived(response);

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 
		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoInfo>());

			




	
	
	
		
 

			




	
	
	
		
 
		Swift::Presence *presence = dynamic_cast<Swift::Presence *>(getStanza(received[1]));

			




	
	
	
		
 
		CPPUNIT_ASSERT(presence);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Unavailable, presence->getType());

			




	
	
	
		
 

			




	
	
	
		
 
		presence = dynamic_cast<Swift::Presence *>(getStanza(received[2]));

			




	
	
	
		
 
		CPPUNIT_ASSERT(presence);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Subscribe, presence->getType());

			




	
	
	
		
 

			




	
	
	
		
 
		presence = dynamic_cast<Swift::Presence *>(getStanza(received[3]));

			




	
	
	
		
 
		CPPUNIT_ASSERT(presence);

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::Presence::Subscribed, presence->getType());

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void connectTwoResources() {

			




	
	
	
		
 
		connectUser();

			




	
	
	
		
 
		add2Buddies();

			




	
	
	
		
 
		connectSecondResource();

			




	
	
	
		
 

			




	
	
	
		
 
		// we should get presences

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(4, (int) received2.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received2[2])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(Swift::StatusShow::Away, dynamic_cast<Swift::Presence *>(getStanza(received2[2]))->getShow());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("status1"), dynamic_cast<Swift::Presence *>(getStanza(received2[2]))->getStatus());

			




        

    


    
    

    

        

                

                    src/usermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -175,46 +175,62 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {

			




	
	
	
		
 

			




	
	
	
		
 
				Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, presence->getFrom(), m_component->getIQRouter());

			




	
	
	
		
 
				request->send();

			




	
	
	
		
 

			




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

			




	
	
	
		
 
				response->setTo(presence->getFrom());

			




	
	
	
		
 
				response->setFrom(m_component->getJID());

			




	
	
	
		
 
				m_component->getStanzaChannel()->sendPresence(response);

			




	
	
	
		
 
				return;

			




	
	
	
		
 
		    }

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		UserInfo res;

			




	
	
	
		
 
		bool registered = m_storageBackend ? m_storageBackend->getUser(userkey, res) : false;

			




	
	
	
		
 

			




	
	
	
		
 
		// No user and unavailable presence -> answer with unavailable

			




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

			




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

			




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

			




	
	
	
		
 
			response->setTo(presence->getFrom());

			




	
	
	
		
 
			response->setFrom(presence->getTo());

			




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

			




	
	
	
		
 
			m_component->getStanzaChannel()->sendPresence(response);

			




	
	
	
		
 

			




	
	
	
		
 
			// bother him with subscribe presence, just to be

			




	
	
	
		
 
			// sure he is subscribed to us.

			




	
	
	
		
 
			if (/*registered && */presence->getType() == Swift::Presence::Probe) {

			




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

			




	
	
	
		
 
				response->setTo(presence->getFrom());

			




	
	
	
		
 
				response->setFrom(presence->getTo());

			




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

			




	
	
	
		
 
				m_component->getStanzaChannel()->sendPresence(response);

			




	
	
	
		
 

			




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

			




	
	
	
		
 
				response->setTo(presence->getFrom());

			




	
	
	
		
 
				response->setFrom(presence->getTo());

			




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

			




	
	
	
		
 
				m_component->getStanzaChannel()->sendPresence(response);

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			// Set user offline in database

			




	
	
	
		
 
			if (m_storageBackend) {

			




	
	
	
		
 
				UserInfo res;

			




	
	
	
		
 
				bool registered = m_storageBackend->getUser(userkey, res);

			




	
	
	
		
 
				if (registered) {

			




	
	
	
		
 
					m_storageBackend->setUserOnline(res.id, false);

			




	
	
	
		
 
				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
			return;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		UserInfo res;

			




	
	
	
		
 
		bool registered = m_storageBackend ? m_storageBackend->getUser(userkey, res) : false;

			




	
	
	
		
 

			




	
	
	
		
 
		// In server mode, we don't need registration normally, but for networks like IRC

			




	
	
	
		
 
		// or Twitter where there's no real authorization using password, we have to force

			




	
	
	
		
 
		// registration otherwise some data (like bookmarked rooms) could leak.

			




	
	
	
		
 
		if (m_component->inServerMode()) {

			




	
	
	
		
 
			if (!registered) {

			




	
	
	
		
 
				// If we need registration, stop login process because user is not registered

			




	
	
	
		
 
				if (CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", false)) {

			




	
	
	
		
 
					m_userRegistry->onPasswordInvalid(presence->getFrom());

			




	
	
	
		
 
					return;

			




	
	
	
		
 
				}

			




	
	
	
		
 
				res.password = "";

			




	
	
	
		
 
				res.uin = presence->getFrom().getNode();

			




	
	
		
 
@@ -369,24 +385,29 @@ void UserManager::handleGeneralPresenceReceived(Swift::Presence::ref presence) {

			




	
	
	
		
 
		case Swift::Presence::Available:

			




	
	
	
		
 
		case Swift::Presence::Unavailable:

			




	
	
	
		
 
			break;

			




	
	
	
		
 
		case Swift::Presence::Probe:

			




	
	
	
		
 
			handleProbePresence(presence);

			




	
	
	
		
 
			break;

			




	
	
	
		
 
		default:

			




	
	
	
		
 
			break;

			




	
	
	
		
 
	};

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UserManager::handleProbePresence(Swift::Presence::ref presence) {

			




	
	
	
		
 
	// Don't let RosterManager to handle presences for us

			




	
	
	
		
 
	if (presence->getTo().getNode().empty()) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	User *user = getUser(presence->getFrom().toBare().toString());

			




	
	
	
		
 

			




	
	
	
		
 
 	if (user) {

			




	
	
	
		
 
 		user->getRosterManager()->sendCurrentPresence(presence->getTo(), presence->getFrom());

			




	
	
	
		
 
 	}

			




	
	
	
		
 
 	else {

			




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

			




	
	
	
		
 
		response->setFrom(presence->getTo());

			




	
	
	
		
 
		response->setTo(presence->getFrom());

			




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

			




	
	
	
		
 
		m_component->getStanzaChannel()->sendPresence(response);

			




	
	
	
		
 
	}

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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