libtransport.git Changeset - 4055180802ab

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

src/tests/basictest.cpp

src/tests/usermanager.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

backends/libpurple/utils.cpp

➞

Show inline comments

@@ @@ -152,13 +152,13 @@ int create_socket(const char *host, int portno) { @@
+	}
 	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;
+	}

src/tests/basictest.cpp

➞

Show inline comments

@@ @@ -199,12 +199,13 @@ void BasicTest::connectUser() { @@
 	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(),
@@ @@ -233,12 +234,13 @@ void BasicTest::connectSecondResource() { @@
 	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());

src/tests/usermanager.cpp

➞

Show inline comments

 		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();

src/usermanager.cpp

➞

Show inline comments

 				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
 		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 {

0 comments (0 inline, 0 general)