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
15
1
backends/libpurple/main.cpp
1
spectrum/src/sample.cfg
3
3
src/tests/conversationmanager.cpp
33
src/tests/user.cpp
2
src/user.cpp
1
src/usermanager.cpp
7
7
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
cmake_minimum_required(VERSION 2.6)
 
project(libtransport)
 

			




	
	
	
		
 
message(STATUS "Variables to override default places where to find libraries:")

			




	
	
	
		
 
message(STATUS "|- cppunit : -DCPPUNIT_INCLUDE_DIR,  -DCPPUNIT_LIBRARY")

			




	
	
	
		
 
message(STATUS "|- swiften : -DSWIFTEN_INCLUDE_DIR,  -DSWIFTEN_LIBRARY")

			




	
	
	
		
 
message(STATUS "  |- zlib  :                         -DZLIB_LIBRARY")

			




	
	
	
		
 
message(STATUS "  |- expat :                         -DEXPAT_LIBRARY")

			




	
	
	
		
 
message(STATUS "  |-libidn :                         -DLIBIDN_LIBRARY")

			




	
	
	
		
 
message(STATUS "  |-libxml :                         -DLIBXML_LIBRARY")

			




	
	
	
		
 
message(STATUS "|- boost   : -DBOOST_INCLUDEDIR,     -DBOOST_LIBRARYDIR")

			




	
	
	
		
 
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")

			




	
	
	
		
 

			




	
	
	
		
 
# FIND CPPUNIT

			




	
	
	
		
 
set(cppunit_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(cppunit)

			




	
	
	
		
 

			




	
	
	
		
 
if(NOT CPPUNIT_FOUND AND CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)

			




	
	
	
		
 
	set(CCPUNIT_LIBRARIES ${CPPUNIT_LIBRARY})

			




	
	
	
		
 
	set(CPPUNIT_FOUND 1)

			




	
	
	
		
 
	message(STATUS "Using cppunit: ${CPPUNIT_INCLUDE_DIR} ${CPPUNIT_LIBRARIES}")

			




	
	
	
		
 
else()

			




	
	
	
		
 

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
# FIND SQLITE3

			




	
	
	
		
 
if (NOT CMAKE_COMPILER_IS_GNUCXX)

			




	
	
	
		
 
ADD_SUBDIRECTORY(msvc-deps)

			




	
	
	
		
 
else()

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
ADD_SUBDIRECTORY(msvc-deps/sqlite3)

			




	
	
		
 
@@ -110,49 +119,54 @@ if(NOT SWIFTEN_FOUND)

			




	
	
	
		
 
	set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Winscard")

			




	
	
	
		
 
	message(STATUS "Using swiften: ${SWIFTEN_INCLUDE_DIR} ${SWIFTEN_LIBRARY}")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
	add_definitions(-DSWIFTEN_STATIC=1)

			




	
	
	
		
 
	ADD_DEFINITIONS(-D_UNICODE)

			




	
	
	
		
 
	ADD_DEFINITIONS(-DUNICODE)

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
if (CMAKE_COMPILER_IS_GNUCXX)

			




	
	
	
		
 
set(openssl_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(openssl)

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
# FIND BOOST

			




	
	
	
		
 
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)

			




	
	
	
		
 

			




	
	
	
		
 
# FIND PROTOBUF

			




	
	
	
		
 
if (NOT PROTOBUF_FOUND AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY)

			




	
	
	
		
 
	set(PROTOBUF_FOUND 1)

			




	
	
	
		
 
	set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR})

			




	
	
	
		
 
	if (PROTOBUF_PROTOC_EXECUTABLE)

			




	
	
	
		
 
	else()

			




	
	
	
		
 
		set(PROTOBUF_PROTOC_EXECUTABLE protoc)

			




	
	
	
		
 
	endif()

			




	
	
	
		
 
	message(STATUS "Using protobuf: ${PROTOBUF_INCLUDE_DIRS} ${PROTOBUF_LIBRARY}")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
set(Communi_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(Communi)

			




	
	
	
		
 

			




	
	
	
		
 
if(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARY)

			




	
	
	
		
 
	set(LOG4CXX_LIBRARIES ${LOG4CXX_LIBRARY})

			




        

    


    
    

    

        

                

                    backends/libpurple/main.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -540,48 +540,49 @@ class SpectrumNetworkPlugin : public NetworkPlugin {

			




	
	
	
		
 
					}

			




	
	
	
		
 
					purple_blist_add_buddy_wrapped(buddy, NULL, group ,NULL);

			




	
	
	
		
 
					purple_account_add_buddy_wrapped(account, buddy);

			




	
	
	
		
 
				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleBuddyBlockToggled(const std::string &user, const std::string &buddyName, bool blocked) {

			




	
	
	
		
 
			if (CONFIG_BOOL(config, "service.enable_privacy_lists")) {

			




	
	
	
		
 
				PurpleAccount *account = m_sessions[user];

			




	
	
	
		
 
				if (account) {

			




	
	
	
		
 
					if (blocked) {

			




	
	
	
		
 
						purple_privacy_deny_wrapped(account, buddyName.c_str(), FALSE, FALSE);

			




	
	
	
		
 
					}

			




	
	
	
		
 
					else {

			




	
	
	
		
 
						purple_privacy_allow_wrapped(account, buddyName.c_str(), FALSE, FALSE);

			




	
	
	
		
 
					}

			




	
	
	
		
 
				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		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];

			




	
	
	
		
 
			if (account) {

			




	
	
	
		
 
				serv_send_typing_wrapped(purple_account_get_connection_wrapped(account), buddyName.c_str(), PURPLE_TYPED);

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
			PurpleAccount *account = m_sessions[user];

			




	
	
	
		
 
			if (account) {

			




	
	
	
		
 
				serv_send_typing_wrapped(purple_account_get_connection_wrapped(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_wrapped(purple_account_get_connection_wrapped(account), buddyName.c_str(), 0);

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




        

    


    
    

    

        

                

                    spectrum/src/sample.cfg
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
[service]

			




	
	
	
		
 
jid = localhost

			




	
	
	
		
 
password = secret

			




	
	
	
		
 
server = 127.0.0.1

			




	
	
	
		
 
port = 5222

			




	
	
	
		
 
server_mode = 1

			




	
	
	
		
 
backend_host=localhost

			




	
	
	
		
 
pidfile=./test.pid

			




	
	
	
		
 
# < this option doesn't work yet

			




	
	
	
		
 
#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

			




	
	
	
		
 

			




	
	
	
		
 
[backend]

			




	
	
	
		
 
#default_avatar=catmelonhead.jpg

			




	
	
	
		
 
#no_vcard_fetch=true

			




	
	
	
		
 

			




	
	
	
		
 
[logging]

			




	
	
	
		
 
#config=logging.cfg # log4cxx/log4j logging configuration file

			




	
	
	
		
 
#backend_config=/home/hanzz/code/libtransport/spectrum/src/backend-logging.cfg # log4cxx/log4j logging configuration file for backends

			




	
	
	
		
 

			




	
	
	
		
 
[database]

			




	
	
	
		
 
type=sqlite3 # or "none" without database backend

			




	
	
	
		
 
database=users.sqlite

			




	
	
	
		
 
prefix=twitter

			




	
	
	
		
 
#type = mysql # or "none" without database backend.......................................................................................................................

			




	
	
	
		
 
#database = test

			




	
	
	
		
 
#prefix=

			




	
	
	
		
 
#user=root

			




	
	
	
		
 
#password=yourrootsqlpassword

			




	
	
	
		
 
#encryption_key=hanzzik

			




        

    


    
    

    

        

                

                    src/tests/conversationmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -4,78 +4,111 @@

			




	
	
	
		
 
#include "transport/user.h"

			




	
	
	
		
 
#include "transport/transport.h"

			




	
	
	
		
 
#include "transport/conversation.h"

			




	
	
	
		
 
#include "transport/usermanager.h"

			




	
	
	
		
 
#include "transport/conversationmanager.h"

			




	
	
	
		
 
#include "transport/localbuddy.h"

			




	
	
	
		
 
#include <cppunit/TestFixture.h>

			




	
	
	
		
 
#include <cppunit/extensions/HelperMacros.h>

			




	
	
	
		
 
#include <Swiften/Swiften.h>

			




	
	
	
		
 
#include <Swiften/EventLoop/DummyEventLoop.h>

			




	
	
	
		
 
#include <Swiften/Server/Server.h>

			




	
	
	
		
 
#include <Swiften/Network/DummyNetworkFactories.h>

			




	
	
	
		
 
#include <Swiften/Network/DummyConnectionServer.h>

			




	
	
	
		
 
#include "Swiften/Server/ServerStanzaChannel.h"

			




	
	
	
		
 
#include "Swiften/Server/ServerFromClientSession.h"

			




	
	
	
		
 
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"

			




	
	
	
		
 
#include "basictest.h"

			




	
	
	
		
 

			




	
	
	
		
 
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;

			




	
	
	
		
 
		boost::shared_ptr<Swift::Message> m_msg;

			




	
	
	
		
 

			




	
	
	
		
 
		void setUp (void) {

			




	
	
	
		
 
			m_conv = NULL;

			




	
	
	
		
 
			m_msg.reset();

			




	
	
	
		
 
			setMeUp();

			




	
	
	
		
 
			connectUser();

			




	
	
	
		
 
			add2Buddies();

			




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

			




	
	
	
		
 
			received.clear();

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void tearDown (void) {

			




	
	
	
		
 
			received.clear();

			




	
	
	
		
 
			disconnectUser();

			




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

			




	
	
	
		
 
			tearMeDown();

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
		// 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_EQUAL(std::string("hi there!"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getBody());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getTo().toString());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("buddy1@localhost/bot"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getFrom().toString());

			




	
	
	
		
 
		

			




	
	
	
		
 
		received.clear();

			




	
	
	
		
 

			




	
	
	
		
 
		// send response

			




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

			




        

    


    
    

    

        

                

                    src/tests/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -184,36 +184,38 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 

			




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

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void handleDisconnected() {

			




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

			




	
	
	
		
 
		user->handleDisconnected("Connection error", Swift::SpectrumErrorPayload::CONNECTION_ERROR_AUTHENTICATION_FAILED);

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT(streamEnded);

			




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

			




	
	
	
		
 
		CPPUNIT_ASSERT(!user);

			




	
	
	
		
 

			




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

			




	
	
	
		
 
		Swift::Message *m = dynamic_cast<Swift::Message *>(getStanza(received[0]));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), m->getBody());

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::StreamError *>(received[1].get()));

			




	
	
	
		
 
		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
                    
                

        

        

            



	
	
		
 
@@ -327,48 +327,49 @@ void User::onConnectingTimeout() {

			




	
	
	
		
 
		LOG4CXX_INFO(logger, m_jid.toString() << ": Changing legacy network presence to " << highest->getType());

			




	
	
	
		
 
		onPresenceChanged(highest);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void User::setIgnoreDisconnect(bool ignoreDisconnect) {

			




	
	
	
		
 
	m_ignoreDisconnect = ignoreDisconnect;

			




	
	
	
		
 
	LOG4CXX_INFO(logger, m_jid.toString() << ": Setting ignoreDisconnect=" << m_ignoreDisconnect);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void User::handleDisconnected(const std::string &error, Swift::SpectrumErrorPayload::Error e) {

			




	
	
	
		
 
	if (m_ignoreDisconnect) {

			




	
	
	
		
 
		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnecting from legacy network ignored (probably moving between backends)");

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (e == Swift::SpectrumErrorPayload::CONNECTION_ERROR_OTHER_ERROR || e == Swift::SpectrumErrorPayload::CONNECTION_ERROR_NETWORK_ERROR) {

			




	
	
	
		
 
		if (m_reconnectCounter < 3) {

			




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

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnected from legacy network with error " << error);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	onDisconnected();

			




	
	
	
		
 

			




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

			




	
	
	
		
 
	msg->setBody(error);

			




	
	
	
		
 
	msg->setTo(m_jid.toBare());

			




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

			




	
	
	
		
 
	msg->addPayload(boost::make_shared<Swift::SpectrumErrorPayload>(e));

			




	
	
	
		
 
	m_component->getStanzaChannel()->sendMessage(msg);

			




	
	
	
		
 

			




	
	
	
		
 
	// In server mode, server finishes the session and pass unavailable session to userManager if we're connected to legacy network,

			




	
	
	
		
 
	// so we can't removeUser() in server mode, because it would be removed twice.

			




	
	
	
		
 
	// Once in finishSession and once in m_userManager->removeUser.

			




	
	
	
		
 
	if (m_component->inServerMode()) {

			




	
	
	
		
 
		// Remove user later just to be sure there won't be double-free.

			




        

    


    
    

    

        

                

                    src/usermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -313,64 +313,64 @@ void UserManager::handleRemoveTimeout(const std::string jid, User *u, bool recon

			




	
	
	
		
 

			




	
	
	
		
 
	// Maybe this User instance has been deleted in mean time and we would remove new one,

			




	
	
	
		
 
	// so better check for it and ignore deletion if "u" does not exist anymore.

			




	
	
	
		
 
	User *user = getUser(jid);

			




	
	
	
		
 
	if (user != u) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	// Remove user

			




	
	
	
		
 
	if (user) {

			




	
	
	
		
 
		removeUser(user);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	// Connect the user again when we're reconnecting.

			




	
	
	
		
 
	if (reconnect) {

			




	
	
	
		
 
		connectUser(jid);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
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:

			




	
	
	
		
 
		case Swift::Presence::Unsubscribe:

			




	
	
	
		
 
		case Swift::Presence::Unsubscribed:

			




	
	
	
		
 
			handleSubscription(presence);

			




	
	
	
		
 
			break;

			




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

			




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

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    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