libtransport.git Changeset - f9d40b961a35

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 22 insertions and 10 deletions:

CMakeLists.txt

include/transport/transport.h

src/transport.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -70,13 +70,13 @@ if (PROTOBUF_FOUND) @@
 		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)

include/transport/transport.h

➞

Show inline comments

@@ @@ -32,6 +32,7 @@ @@
 #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"

src/transport.cpp

➞

Show inline comments

@@ @@ -28,12 +28,16 @@ @@
 #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:
 	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->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();
@@ @@ -159,6 +170,7 @@ void Component::start() { @@
 		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();
+	}
+}
@@ @@ -170,6 +182,7 @@ void Component::stop() { @@
 		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();
+	}
+}
+	}
 	// 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);
+}
 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)