libtransport.git Changeset - 69ef086b175e

Changeset - 69ef086b175e

Parent rev.

Child rev.

[Not reviewed]

Merge

0 7 0

Daniel Henninger - 13 years ago 2012-09-18 16:47:12
daniel@vorpalcloud.org

Merge remote branch 'upstream/master'

7 files changed with 62 insertions and 11 deletions:

CMakeLists.txt

backends/libpurple/main.cpp

spectrum/src/sample.cfg

src/tests/conversationmanager.cpp

src/tests/user.cpp

src/user.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

 message(STATUS "|- protobuf: -DPROTOBUF_INCLUDE_DIR, -DPROTOBUF_LIBRARY")
 message(STATUS "           : -DPROTOBUF_PROTOC_EXECUTABLE")
 message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR,  -DLOG4CXX_LIBRARY")
 message(STATUS "|- purple  : -DPURPLE_INCLUDE_DIR,   -DPURPLE_LIBRARY")
 message(STATUS "           : -DPURPLE_NOT_RUNTIME - enables compilation with libpurple.lib")
 MACRO(LIST_CONTAINS var value)
 	SET(${var})
 	FOREACH (value2 ${ARGN})
 		IF (${value} STREQUAL ${value2})
 		SET(${var} TRUE)
 		ENDIF (${value} STREQUAL ${value2})
 	ENDFOREACH (value2)
 ENDMACRO(LIST_CONTAINS)
 if(NOT LIB_INSTALL_DIR)
 	set(LIB_INSTALL_DIR "lib")
 endif()
 set(CMAKE_MODULE_PATH "cmake_modules")
@@ @@ -128,13 +137,18 @@ set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") @@
 if (WIN32)
 	set(Boost_USE_STATIC_LIBS      ON)
 	set(Boost_USE_MULTITHREADED      ON)
 	set(Boost_USE_STATIC_RUNTIME    OFF)
 	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)
 else(WIN32)
 	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)
 	LIST_CONTAINS(contains -lboost_program_options ${SWIFTEN_LIBRARY})
 	if(contains)
 		message(STATUS "Using non-multithreaded boost")
 		set(Boost_USE_MULTITHREADED 0)
 	endif(contains)
 	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread-mt signals REQUIRED)
 endif(WIN32)
 message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
 set(Protobuf_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Protobuf)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -558,12 +558,13 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
+			}
+		}
 		void handleTypingRequest(const std::string &user, const std::string &buddyName) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				LOG4CXX_INFO(logger, user << ": sending typing notify to " << buddyName);
 				serv_send_typing_wrapped(purple_account_get_connection_wrapped(account), buddyName.c_str(), PURPLE_TYPING);
+			}
+		}
 		void handleTypedRequest(const std::string &user, const std::string &buddyName) {
 			PurpleAccount *account = m_sessions[user];

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -10,16 +10,16 @@ pidfile=./test.pid @@
 #backend_port=10001
 #admin_jid=admin@localhost
 admin_password=test
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
-#backend=../..//backends/swiften/spectrum2_swiften_backend
+backend=../..//backends/libpurple/spectrum2_libpurple_backend
 #backend=../../backends/twitter/spectrum2_twitter_backend
 backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum2_libpurple_backend
 protocol=prpl-jabber
 #backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum2_communi_backend
 protocol=prpl-icq
 #protocol=prpl-msn
 #protocol=any
 #protocol=prpl-icq
 working_dir=./
 portfile=$jid.port

src/tests/conversationmanager.cpp

➞

Show inline comments

@@ @@ -22,12 +22,13 @@ @@
 using namespace Transport;
 class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(ConversationManagerTest);
 	CPPUNIT_TEST(handleNormalMessages);
 	CPPUNIT_TEST(handleGroupchatMessages);
 	CPPUNIT_TEST(handleChatstateMessages);
 	CPPUNIT_TEST(handleParticipantChanged);
 	CPPUNIT_TEST(handlePMFromXMPP);
 	CPPUNIT_TEST_SUITE_END();
 	public:
 		TestingConversation *m_conv;
 	void handleMessageReceived(TestingConversation *_conv, boost::shared_ptr<Swift::Message> &_msg) {
 		m_conv = _conv;
 		m_msg = _msg;
+	}
 	void handleChatstateMessages() {
 		User *user = userManager->getUser("user@localhost");
 		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "buddy1");
 		user->getConversationManager()->addConversation(conv);
 		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));
 		boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 		msg->addPayload(boost::make_shared<Swift::ChatState>(Swift::ChatState::Composing));
 		// Forward it
 		conv->handleMessage(msg);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0]))->getPayload<Swift::ChatState>());
 		received.clear();
 		// send response
 		msg->setFrom("user@localhost/resource");
 		msg->setTo("buddy1@localhost/bot");
 		injectMessage(msg);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		CPPUNIT_ASSERT(m_msg);
 		CPPUNIT_ASSERT(m_msg->getPayload<Swift::ChatState>());
 		received.clear();
+	}
 	void handleNormalMessages() {
 		User *user = userManager->getUser("user@localhost");
 		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "buddy1");
 		user->getConversationManager()->addConversation(conv);
 		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));

src/tests/user.cpp

➞

Show inline comments

 		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), dynamic_cast<Swift::StreamError *>(received[1].get())->getText());
 		disconnected = true;
+	}
 	void handleDisconnectedReconnect() {
 		readyToConnect = false;
 		User *user = userManager->getUser("user@localhost");
 		user->handleDisconnected("Connection error");
 		loop->processEvents();
 		CPPUNIT_ASSERT(!streamEnded);
 		user = userManager->getUser("user@localhost");
 		CPPUNIT_ASSERT(user);
 		CPPUNIT_ASSERT(readyToConnect);
+	}
 };
 CPPUNIT_TEST_SUITE_REGISTRATION (UserTest);

src/user.cpp

➞

Show inline comments

 			m_reconnectCounter++;
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnecting from legacy network " << error << ", trying to reconnect automatically.");
 			// Simulate destruction/resurrection :)
 			// TODO: If this stops working, create onReconnect signal
 			m_userManager->onUserDestroyed(this);
 			m_userManager->onUserCreated(this);
 			onReadyToConnect();
 			return;
+		}
+	}
 	if (error.empty()) {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnected from legacy network");

src/usermanager.cpp

➞

Show inline comments

 void UserManager::handleMessageReceived(Swift::Message::ref message) {
 	if (message->getType() == Swift::Message::Error) {
 		return;
+	}
 	if (message->getBody().empty()) {
 	// Do not count chatstate notification...
 	boost::shared_ptr<Swift::ChatState> statePayload = message->getPayload<Swift::ChatState>();
 	if (!statePayload) {
 		messageToBackendSent();
+	}
 	if (message->getBody().empty() && !statePayload) {
 		return;
+	}
 	User *user = getUser(message->getFrom().toBare().toString());
 	if (!user){
 		return;
+	}
 	user->getConversationManager()->handleMessageReceived(message);
 	// Do not count chatstate notification...
 	boost::shared_ptr<Swift::ChatState> statePayload = message->getPayload<Swift::ChatState>();
 	if (!statePayload) {
 		messageToBackendSent();
+	}
+}
 void UserManager::handleGeneralPresenceReceived(Swift::Presence::ref presence) {
 	switch(presence->getType()) {
 		case Swift::Presence::Subscribe:
 		case Swift::Presence::Subscribed:

0 comments (0 inline, 0 general)