Changeset - f9d40b961a35
Parent rev.
Child rev.
[Not reviewed]
0 3 0
Jan Kaluza - 14 years ago 2011-06-20 15:46:31
hanzz.k@gmail.com
First test of logging using log4cxx
3 files changed with 21 insertions and 9 deletions:
CMakeLists.txt
4
4
include/transport/transport.h
1
src/transport.cpp
16
5
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -61,31 +61,31 @@ if (PROTOBUF_FOUND)
 
		include_directories(${PURPLE_INCLUDE_DIR})
 
		include_directories(${GLIB2_INCLUDE_DIR})
 
	else()
 
		message("Libpurple plugin  : no (install libpurple)")
 
	endif()
 

			




	
	
	
		
 
	if(IRC_FOUND)

			




	
	
	
		
 
		ADD_DEFINITIONS(-DIRC_SHARED)

			




	
	
	
		
 
		message("IRC plugin        : yes")

			




	
	
	
		
 
		include_directories(${IRC_INCLUDE_DIR})

			




	
	
	
		
 
		include(${QT_USE_FILE})

			




	
	
	
		
 
	else()

			




	
	
	
		
 
		message("IRC plugin        : no (install libircclient-qt and Google Protocol Buffers)")

			




	
	
	
		
 
		message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")

			




	
	
	
		
 
	endif()

			




	
	
	
		
 

			




	
	
	
		
 
else()

			




	
	
	
		
 
	message("Network plugins   : no (install Google Protocol Buffers)")

			




	
	
	
		
 
	message("Libpurple plugin  : no (install libpurple and Google Protocol Buffers)")

			




	
	
	
		
 
	message("IRC plugin        : no (install libircclient-qt and Google Protocol Buffers)")

			




	
	
	
		
 
	message("Network plugins   : no (install libprotobuf-dev)")

			




	
	
	
		
 
	message("Libpurple plugin  : no (install libpurple and libprotobuf-dev)")

			




	
	
	
		
 
	message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (LOG4CXX_FOUND)

			




	
	
	
		
 
	message("Logging           : yes")

			




	
	
	
		
 
	include_directories(${LOG4CXX_INCLUDE_DIR})

			




	
	
	
		
 
else()

			




	
	
	
		
 
	message(FATAL_ERROR "Logging           : no (install log4cxx-devel)")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if(CMAKE_BUILD_TYPE MATCHES Debug)

			




	
	
	
		
 
	ADD_DEFINITIONS(-O0)

			




	
	
	
		
 
	ADD_DEFINITIONS(-ggdb)

			




        

    


    
    

    

        

                

                    include/transport/transport.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,24 +23,25 @@

			




	
	
	
		
 
#include <vector>

			




	
	
	
		
 
#include "Swiften/Swiften.h"

			




	
	
	
		
 
#include "Swiften/Server/Server.h"

			




	
	
	
		
 
#include "Swiften/Disco/GetDiscoInfoRequest.h"

			




	
	
	
		
 
#include "Swiften/Disco/EntityCapsManager.h"

			




	
	
	
		
 
#include "Swiften/Disco/CapsManager.h"

			




	
	
	
		
 
#include "Swiften/Disco/CapsMemoryStorage.h"

			




	
	
	
		
 
#include "Swiften/Presence/PresenceOracle.h"

			




	
	
	
		
 
#include "Swiften/Network/BoostTimerFactory.h"

			




	
	
	
		
 
#include "Swiften/Network/BoostIOServiceThread.h"

			




	
	
	
		
 
#include "Swiften/Server/UserRegistry.h"

			




	
	
	
		
 
#include "Swiften/Base/SafeByteArray.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <boost/bind.hpp>

			




	
	
	
		
 
#include "transport/config.h"

			




	
	
	
		
 
#include "transport/factory.h"

			




	
	
	
		
 

			




	
	
	
		
 
#define tr(lang,STRING)    (STRING)

			




	
	
	
		
 
#define _(STRING)    (STRING)

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 
	// typedef enum { 	CLIENT_FEATURE_ROSTERX = 2,

			




	
	
	
		
 
	// 				CLIENT_FEATURE_XHTML_IM = 4,

			




	
	
	
		
 
	// 				CLIENT_FEATURE_FILETRANSFER = 8,

			




	
	
	
		
 
	// 				CLIENT_FEATURE_CHATSTATES = 16

			




        

    


    
    

    

        

                

                    src/transport.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,30 +19,34 @@

			




	
	
	
		
 
 */

			




	
	
	
		
 

			




	
	
	
		
 
#include "transport/transport.h"

			




	
	
	
		
 
#include <boost/bind.hpp>

			




	
	
	
		
 
#include "transport/storagebackend.h"

			




	
	
	
		
 
#include "transport/factory.h"

			




	
	
	
		
 
#include "discoinforesponder.h"

			




	
	
	
		
 
#include "discoitemsresponder.h"

			




	
	
	
		
 
#include "storageparser.h"

			




	
	
	
		
 
#include "Swiften/TLS/OpenSSL/OpenSSLServerContext.h"

			




	
	
	
		
 
#include "Swiften/TLS/PKCS12Certificate.h"

			




	
	
	
		
 
#include "Swiften/TLS/OpenSSL/OpenSSLServerContextFactory.h"

			




	
	
	
		
 
#include <log4cxx/logger.h>

			




	
	
	
		
 
#include "log4cxx/basicconfigurator.h"

			




	
	
	
		
 

			




	
	
	
		
 
using namespace Swift;

			




	
	
	
		
 
using namespace boost;

			




	
	
	
		
 
using namespace log4cxx;

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 
	

			




	
	
	
		
 
static LoggerPtr logger = Logger::getLogger("Component");

			




	
	
	
		
 

			




	
	
	
		
 
class MyUserRegistry : public Swift::UserRegistry {

			




	
	
	
		
 
	public:

			




	
	
	
		
 
		MyUserRegistry(Component *c) {component = c;}

			




	
	
	
		
 
		~MyUserRegistry() {}

			




	
	
	
		
 
		bool isValidUserPassword(const JID& user, const Swift::SafeByteArray& password) const {

			




	
	
	
		
 
			users[user.toBare().toString()] = Swift::safeByteArrayToString(password);

			




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

			




	
	
	
		
 
			response->setTo(component->getJID());

			




	
	
	
		
 
			response->setFrom(user);

			




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

			




	
	
	
		
 
			component->onUserPresenceReceived(response);

			




	
	
		
 
@@ -53,38 +57,45 @@ class MyUserRegistry : public Swift::UserRegistry {

			




	
	
	
		
 
		mutable Component *component;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
Component::Component(Swift::EventLoop *loop, Config *config, Factory *factory) {

			




	
	
	
		
 
	m_component = NULL;

			




	
	
	
		
 
	m_userRegistry = NULL;

			




	
	
	
		
 
	m_server = NULL;

			




	
	
	
		
 
	m_reconnectCount = 0;

			




	
	
	
		
 
	m_config = config;

			




	
	
	
		
 
	m_factory = factory;

			




	
	
	
		
 
	m_loop = loop;

			




	
	
	
		
 

			




	
	
	
		
 
	BasicConfigurator::configure();

			




	
	
	
		
 

			




	
	
	
		
 
	m_jid = Swift::JID(CONFIG_STRING(m_config, "service.jid"));

			




	
	
	
		
 

			




	
	
	
		
 
	m_factories = new BoostNetworkFactories(loop);

			




	
	
	
		
 

			




	
	
	
		
 
	m_reconnectTimer = m_factories->getTimerFactory()->createTimer(1000);

			




	
	
	
		
 
	m_reconnectTimer->onTick.connect(bind(&Component::start, this)); 

			




	
	
	
		
 

			




	
	
	
		
 
	if (CONFIG_BOOL(m_config, "service.server_mode")) {

			




	
	
	
		
 
		LOG4CXX_INFO(logger, "Creating component in server mode on port " << CONFIG_INT(m_config, "service.port"));

			




	
	
	
		
 
		m_userRegistry = new MyUserRegistry(this);

			




	
	
	
		
 
		m_server = new Swift::Server(loop, m_factories, m_userRegistry, m_jid, CONFIG_INT(m_config, "service.port"));

			




	
	
	
		
 
		if (!CONFIG_STRING(m_config, "service.cert").empty()) {

			




	
	
	
		
 
			LOG4CXX_INFO(logger, "Using PKCS#12 certificate " << CONFIG_STRING(m_config, "service.cert"));

			




	
	
	
		
 
			TLSServerContextFactory *f = new OpenSSLServerContextFactory();

			




	
	
	
		
 
			m_server->addTLSEncryption(f, PKCS12Certificate(CONFIG_STRING(m_config, "service.cert"), createSafeByteArray(CONFIG_STRING(m_config, "service.cert_password"))));

			




	
	
	
		
 
		}

			




	
	
	
		
 
		else {

			




	
	
	
		
 
			LOG4CXX_WARN(logger, "No PKCS#12 certificate used. TLS is disabled.");

			




	
	
	
		
 
		}

			




	
	
	
		
 
// 		m_server->start();

			




	
	
	
		
 
		m_stanzaChannel = m_server->getStanzaChannel();

			




	
	
	
		
 
		m_iqRouter = m_server->getIQRouter();

			




	
	
	
		
 

			




	
	
	
		
 
		m_server->addPayloadParserFactory(new GenericPayloadParserFactory<StorageParser>("private", "jabber:iq:private"));

			




	
	
	
		
 

			




	
	
	
		
 
		m_server->onDataRead.connect(bind(&Component::handleDataRead, this, _1));

			




	
	
	
		
 
		m_server->onDataWritten.connect(bind(&Component::handleDataWritten, this, _1));

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		m_component = new Swift::Component(loop, m_factories, m_jid, CONFIG_STRING(m_config, "service.password"));

			




	
	
	
		
 
		m_component->setSoftwareVersion("", "");

			




	
	
		
 
@@ -150,35 +161,37 @@ void Component::setTransportFeatures(std::list<std::string> &features) {

			




	
	
	
		
 
void Component::setBuddyFeatures(std::list<std::string> &features) {

			




	
	
	
		
 
	// TODO: handle caps change

			




	
	
	
		
 
	m_discoInfoResponder->setBuddyFeatures(features);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Component::start() {

			




	
	
	
		
 
	if (m_component) {

			




	
	
	
		
 
		m_reconnectCount++;

			




	
	
	
		
 
		m_component->connect(CONFIG_STRING(m_config, "service.server"), CONFIG_INT(m_config, "service.port"));

			




	
	
	
		
 
		m_reconnectTimer->stop();

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else if (m_server) {

			




	
	
	
		
 
		LOG4CXX_INFO(logger, "Starting component in server mode on port " << CONFIG_INT(m_config, "service.port"));

			




	
	
	
		
 
		m_server->start();

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Component::stop() {

			




	
	
	
		
 
	if (m_component) {

			




	
	
	
		
 
		m_reconnectCount = 0;

			




	
	
	
		
 
		m_component->disconnect();

			




	
	
	
		
 
		m_reconnectTimer->stop();

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else if (m_server) {

			




	
	
	
		
 
		LOG4CXX_INFO(logger, "Stopping component in server mode on port " << CONFIG_INT(m_config, "service.port"));

			




	
	
	
		
 
		m_server->stop();

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Component::handleConnected() {

			




	
	
	
		
 
	onConnected();

			




	
	
	
		
 
	m_reconnectCount = 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Component::handleConnectionError(const ComponentError &error) {

			




	
	
	
		
 
	onConnectionError(error);

			




	
	
	
		
 
// 	if (m_reconnectCount == 2)

			




	
	
		
 
@@ -198,35 +211,33 @@ void Component::handleDataWritten(const Swift::SafeByteArray &data) {

			




	
	
	
		
 
void Component::handlePresence(Swift::Presence::ref presence) {

			




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

			




	
	
	
		
 
	// filter out login/logout presence spam

			




	
	
	
		
 
	if (!presence->getTo().getNode().empty() && isMUC == false)

			




	
	
	
		
 
		return;

			




	
	
	
		
 

			




	
	
	
		
 
	// filter out bad presences

			




	
	
	
		
 
	if (!presence->getFrom().isValid()) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	// check if we have this client's capabilities and ask for them

			




	
	
	
		
 
	bool haveFeatures = false;

			




	
	
	
		
 
// 	bool haveFeatures = false;

			




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

			




	
	
	
		
 
		boost::shared_ptr<CapsInfo> capsInfo = presence->getPayload<CapsInfo>();

			




	
	
	
		
 
		if (capsInfo && capsInfo->getHash() == "sha-1") {

			




	
	
	
		
 
			haveFeatures = m_entityCapsManager->getCaps(presence->getFrom()) != DiscoInfo::ref();

			




	
	
	
		
 
			std::cout << "has capsInfo " << haveFeatures << "\n";

			




	
	
	
		
 
			/*haveFeatures = */m_entityCapsManager->getCaps(presence->getFrom()) != DiscoInfo::ref();

			




	
	
	
		
 
		}

			




	
	
	
		
 
// 		else {

			




	
	
	
		
 
// 			GetDiscoInfoRequest::ref discoInfoRequest = GetDiscoInfoRequest::create(presence->getFrom(), m_iqRouter);

			




	
	
	
		
 
// 			discoInfoRequest->onResponse.connect(boost::bind(&Component::handleDiscoInfoResponse, this, _1, _2, presence->getFrom()));

			




	
	
	
		
 
// 			discoInfoRequest->send();

			




	
	
	
		
 
// 		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	onUserPresenceReceived(presence);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Component::handleCapsChanged(const Swift::JID& jid) {

			




	
	
	
		
 
	bool haveFeatures = m_entityCapsManager->getCaps(jid) != DiscoInfo::ref();

			




	
	
	
		
 
	std::cout << "has capsInfo " << haveFeatures << "\n";

			




	
	
	
		
 
	m_entityCapsManager->getCaps(jid) != DiscoInfo::ref();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
}

			




        

    



    


    



    



      

      





    
    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