libtransport.git Changeset - 7e8720849725

Changeset - 7e8720849725

Parent rev.

Child rev.

[Not reviewed]

0 13 0

Jan Kaluza - 14 years ago 2011-09-07 14:03:27
hanzz.k@gmail.com

Fixed spectrum2 compilation with MSVC. Thanks to Vitaly Takmazov

13 files changed with 61 insertions and 36 deletions:

include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp

include/transport/buddy.h

include/transport/sqlite3backend.h

spectrum/src/main.cpp

src/logger.cpp

src/memoryusage.cpp

src/networkplugin.cpp

src/networkpluginserver.cpp

src/rostermanager.cpp

src/sqlite3backend.cpp

src/transport.cpp

src/user.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp

➞

Show inline comments

@@ @@ -15,15 +15,15 @@ @@
 #include <openssl/pkcs12.h>
 #include "Swiften/TLS/OpenSSL/OpenSSLServerContext.h"
 #include "Swiften/TLS/OpenSSL/OpenSSLCertificate.h"
 #include "Swiften/TLS/PKCS12Certificate.h"
+#ifndef _MSC_VER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
 namespace Swift {
 static const int MAX_FINISHED_SIZE = 4096;
 static const int SSL_READ_BUFFERSIZE = 8192;
 static void freeX509Stack(STACK_OF(X509)* stack) {
 		PCCERT_CONTEXT certContext = NULL;
 		while (true) {
 			certContext = CertFindCertificateInStore(systemStore, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, certContext);
 			if (!certContext) {
 				break;
 			}
 			ByteArray certData(certContext->pbCertEncoded, certContext->cbCertEncoded);
+			ByteArray certData(createByteArray(certContext->pbCertEncoded, certContext->cbCertEncoded));
 			OpenSSLCertificate cert(certData);
 			if (store && cert.getInternalX509()) {
 				X509_STORE_add_cert(store, cert.getInternalX509().get());
 			}
 		}
 	}

include/transport/buddy.h

➞

Show inline comments

@@ @@ -84,13 +84,13 @@ class Buddy { @@
 				m_flags = (BuddyFlag) (m_flags | BUDDY_BLOCKED);
 			else
 				m_flags = (BuddyFlag) (m_flags & ~BUDDY_BLOCKED);
+		}
 		bool isBlocked() {
 			return m_flags & BUDDY_BLOCKED;
+			return (m_flags & BUDDY_BLOCKED)  != 0;
+		}
 		/// Sets current subscription.
 		/// \param subscription "to", "from", "both", "ask"
 		void setSubscription(const std::string &subscription);

include/transport/sqlite3backend.h

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ @@
 #include <string>
 #include <map>
 #include "Swiften/Swiften.h"
 #include "transport/storagebackend.h"
 #include "transport/config.h"
-#include <sqlite3.h>
+#include "sqlite3.h"
 namespace Transport {
 /// Used to store transport data into SQLite3 database.
 class SQLite3Backend : public StorageBackend
+{

spectrum/src/main.cpp

➞

Show inline comments

 #include "transport/config.h"
 #include "transport/transport.h"
 #include "transport/usermanager.h"
 #include "transport/logger.h"
 #include "transport/sqlite3backend.h"
 #include "transport/mysqlbackend.h"
+//#include "transport/mysqlbackend.h"
 #include "transport/userregistration.h"
 #include "transport/networkpluginserver.h"
 #include "transport/admininterface.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #ifndef WIN32
 #include "sys/signal.h"
 #else
 #include <Windows.h>
 #include <tchar.h>
 #endif
 #include "log4cxx/logger.h"
 #include "log4cxx/patternlayout.h"
 #include "log4cxx/propertyconfigurator.h"
 #include "log4cxx/consoleappender.h"
 using namespace log4cxx;
@@ @@ -28,23 +33,23 @@ static void spectrum_sigterm_handler(int sig) { @@
 	eventLoop_->stop();
+}
 int main(int argc, char **argv)
+{
 	Config config;
+#ifndef WIN32
 	if (signal(SIGINT, spectrum_sigint_handler) == SIG_ERR) {
 		std::cout << "SIGINT handler can't be set\n";
 		return -1;
+	}
 	if (signal(SIGTERM, spectrum_sigterm_handler) == SIG_ERR) {
 		std::cout << "SIGTERM handler can't be set\n";
 		return -1;
+	}
+#endif
 	boost::program_options::options_description desc("Usage: spectrum [OPTIONS] <config_file.cfg>\nAllowed options");
 	desc.add_options()
 		("help,h", "help")
 		("no-daemonize,n", "Do not run spectrum as daemon")
+		;
 	try
@@ @@ -79,13 +84,17 @@ int main(int argc, char **argv) @@
 		std::cerr << "Can't load configuration file.\n";
 		return 1;
+	}
 	if (CONFIG_STRING(&config, "logging.config").empty()) {
 		LoggerPtr root = log4cxx::Logger::getRootLogger();
 #ifdef WIN32
 		root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));
 #else
 		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
 #endif
+	}
 	else {
 		log4cxx::PropertyConfigurator::configure(CONFIG_STRING(&config, "logging.config"));
+	}
 	Swift::SimpleEventLoop eventLoop;
@@ @@ -102,20 +111,21 @@ int main(int argc, char **argv) @@
 		storageBackend = new SQLite3Backend(&config);
 		if (!storageBackend->connect()) {
 			std::cerr << "Can't connect to database.\n";
 			return -1;
+		}
+	}
 /*
 	else if (CONFIG_STRING(&config, "database.type") == "mysql") {
 		storageBackend = new MySQLBackend(&config);
 		if (!storageBackend->connect()) {
 			std::cerr << "Can't connect to database.\n";
 			return -1;
+		}
+	}
+*/
 	UserManager userManager(&transport, &userRegistry, storageBackend);
 	UserRegistration *userRegistration = NULL;
 	if (storageBackend) {
 		userRegistration = new UserRegistration(&transport, &userManager, storageBackend);
 		userRegistration->start();
 // 		logger.setUserRegistration(&userRegistration);

src/logger.cpp

➞

Show inline comments

@@ @@ -30,39 +30,39 @@ @@
 using namespace boost;
 namespace Transport {
 Logger::Logger(Component *component) {
 	component->onConnected.connect(bind(&Logger::handleConnected, this));
 	component->onConnectionError.connect(bind(&Logger::handleConnectionError, this, _1));
 	component->onXMLIn.connect(bind(&Logger::handleXMLIn, this, _1));
 	component->onXMLOut.connect(bind(&Logger::handleXMLOut, this, _1));
 	component->onConnected.connect(boost::bind(&Logger::handleConnected, this));
 	component->onConnectionError.connect(boost::bind(&Logger::handleConnectionError, this, _1));
 	component->onXMLIn.connect(boost::bind(&Logger::handleXMLIn, this, _1));
 	component->onXMLOut.connect(boost::bind(&Logger::handleXMLOut, this, _1));
+}
 Logger::~Logger(){
+}
 void Logger::setStorageBackend(StorageBackend *storage) {
 	storage->onStorageError.connect(bind(&Logger::handleStorageError, this, _1, _2));
+	storage->onStorageError.connect(boost::bind(&Logger::handleStorageError, this, _1, _2));
+}
 void Logger::setUserRegistration(UserRegistration *userRegistration) {
 	userRegistration->onUserRegistered.connect(bind(&Logger::handleUserRegistered, this, _1));
 	userRegistration->onUserUnregistered.connect(bind(&Logger::handleUserUnregistered, this, _1));
 	userRegistration->onUserUpdated.connect(bind(&Logger::handleUserUpdated, this, _1));
 	userRegistration->onUserRegistered.connect(boost::bind(&Logger::handleUserRegistered, this, _1));
 	userRegistration->onUserUnregistered.connect(boost::bind(&Logger::handleUserUnregistered, this, _1));
 	userRegistration->onUserUpdated.connect(boost::bind(&Logger::handleUserUpdated, this, _1));
+}
 void Logger::setUserManager(UserManager *userManager) {
 	userManager->onUserCreated.connect(bind(&Logger::handleUserCreated, this, _1));
 	userManager->onUserDestroyed.connect(bind(&Logger::handleUserDestroyed, this, _1));
 	userManager->onUserCreated.connect(boost::bind(&Logger::handleUserCreated, this, _1));
 	userManager->onUserDestroyed.connect(boost::bind(&Logger::handleUserDestroyed, this, _1));
+}
 void Logger::setRosterManager(RosterManager *rosterManager) {
 	rosterManager->onBuddySet.connect(bind(&Logger::handleBuddySet, this, _1));
 	rosterManager->onBuddyUnset.connect(bind(&Logger::handleBuddyUnset, this, _1));
 	rosterManager->onBuddySet.connect(boost::bind(&Logger::handleBuddySet, this, _1));
 	rosterManager->onBuddyUnset.connect(boost::bind(&Logger::handleBuddyUnset, this, _1));
+}
 void Logger::handleConnected() {
 	std::cout << "[COMPONENT] Connected to Jabber Server!\n";
+}

src/memoryusage.cpp

➞

Show inline comments

@@ @@ -22,13 +22,15 @@ @@
 #include <iostream>
 #include <cstring>
 #include <sstream>
 #include <fstream>
 #include <algorithm>
 #ifndef WIN32
 #include <sys/param.h>
 #endif
 #ifdef BSD
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>

src/networkplugin.cpp

➞

Show inline comments

 	m_pingTimer = m_factories->getTimerFactory()->createTimer(30000);
 	m_pingTimer->onTick.connect(boost::bind(&NetworkPlugin::pingTimeout, this));
 	connect();
 	double shared;
 #ifndef WIN32
 	process_mem_usage(shared, m_init_res);
 #endif
+}
 NetworkPlugin::~NetworkPlugin() {
 	delete m_factories;
+}
@@ @@ -506,13 +508,15 @@ void NetworkPlugin::sendPong() { @@
 void NetworkPlugin::sendMemoryUsage() {
 	pbnetwork::Stats stats;
 	stats.set_init_res(m_init_res);
 	double res;
 	double shared;
 #ifndef WIN32
 	process_mem_usage(shared, res);
 #endif
 	stats.set_res(res);
 	stats.set_shared(shared);
 	std::string message;
 	stats.SerializeToString(&message);

src/networkpluginserver.cpp

➞

Show inline comments

 	PROCESS_INFORMATION pi;
 	ZeroMemory (&si, sizeof(si));
 	si.cb=sizeof (si);
 	if (! CreateProcess(
 	original_path.c_str(),
 	path.c_str(),         // command line
 	NULL,
 	(LPSTR)path.c_str(),         // command line
 ,                    // process attributes
 ,                    // thread attributes
 ,                    // inherit handles
 ,                    // creation flags
 ,                    // environment
 ,                    // cwd
 	pbnetwork::Buddy buddy;
 	buddy.set_username(user->getJID().toBare());
 	buddy.set_buddyname(b->getName());
 	buddy.set_alias(b->getAlias());
 	buddy.set_groups(b->getGroups().size() == 0 ? "" : b->getGroups()[0]);
 	buddy.set_status(Swift::StatusShow::None);
-	buddy.set_blocked(not b->isBlocked());
+	buddy.set_blocked(!b->isBlocked());
 	std::string message;
 	buddy.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED);

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -29,12 +29,15 @@ @@
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Elements/RosterItemPayload.h"
 #include "Swiften/Elements/RosterItemExchangePayload.h"
 #include "log4cxx/logger.h"
 #include <boost/foreach.hpp>
 #include <map>
 #include <iterator>
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("RosterManager");
@@ @@ -53,13 +56,13 @@ RosterManager::~RosterManager() { @@
 	if (m_rosterStorage) {
 		m_rosterStorage->storeBuddies();
+	}
 	sendUnavailablePresences(m_user->getJID().toBare());
-	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
+	for (std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		delete buddy;
+	}
@@ @@ -181,26 +184,26 @@ void RosterManager::sendRIE() { @@
 	// Check the feature, because proper resource could logout during RIETimer.
 	Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
 	// fallback to normal subscribe
 	if (!jidWithRIE.isValid()) {
-		for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
+		for (std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 			Buddy *buddy = (*it).second;
 			if (!buddy) {
 				continue;
+			}
 			sendBuddySubscribePresence(buddy);
+		}
 		return;
+	}
 	LOG4CXX_INFO(logger, "Sending RIE stanza to " << jidWithRIE.toString());
 	Swift::RosterItemExchangePayload::ref payload = Swift::RosterItemExchangePayload::ref(new Swift::RosterItemExchangePayload());
-	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
+	for (std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		Swift::RosterItemExchangePayload::Item item;
 		item.setJID(buddy->getJID().toBare());
+	}
+}
 Swift::RosterPayload::ref RosterManager::generateRosterPayload() {
 	Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
-	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
+	for (std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		Swift::RosterItemPayload item;
 		item.setJID(buddy->getJID().toBare());
 		payload->addItem(item);
+	}
 	return payload;
+}
 void RosterManager::sendCurrentPresences(const Swift::JID &to) {
-	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
+	for (std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
 		if (presence) {
 		response->setType(Swift::Presence::Unavailable);
 		m_component->getStanzaChannel()->sendPresence(response);
+	}
+}
 void RosterManager::sendUnavailablePresences(const Swift::JID &to) {
-	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
+	for (std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
 		if (presence) {

src/sqlite3backend.cpp

➞

Show inline comments

 		user.id = sqlite3_column_int(m_getUser, 0);
 		user.jid = (const char *) sqlite3_column_text(m_getUser, 1);
 		user.uin = (const char *) sqlite3_column_text(m_getUser, 2);
 		user.password = (const char *) sqlite3_column_text(m_getUser, 3);
 		user.encoding = (const char *) sqlite3_column_text(m_getUser, 4);
 		user.language = (const char *) sqlite3_column_text(m_getUser, 5);
 		user.vip = sqlite3_column_int(m_getUser, 6);
+		user.vip = sqlite3_column_int(m_getUser, 6) != 0;
 		return true;
+	}
 	if (ret != SQLITE_DONE) {
 		LOG4CXX_ERROR(logger, "getUser query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
+	}

src/transport.cpp

➞

Show inline comments

 		m_server->addPayloadSerializer(new Swift::AttentionSerializer());
 		m_server->addPayloadSerializer(new Swift::XHTMLIMSerializer());
 		m_server->addPayloadSerializer(new Swift::BlockSerializer());
 		m_server->addPayloadSerializer(new Swift::InvisibleSerializer());
 		m_server->onDataRead.connect(bind(&Component::handleDataRead, this, _1));
 		m_server->onDataWritten.connect(bind(&Component::handleDataWritten, this, _1));
 		m_server->onDataRead.connect(boost::bind(&Component::handleDataRead, this, _1));
 		m_server->onDataWritten.connect(boost::bind(&Component::handleDataWritten, this, _1));
+	}
 	else {
 		LOG4CXX_INFO(logger, "Creating component in gateway mode");
 		m_component = new Swift::Component(loop, m_factories, m_jid, CONFIG_STRING(m_config, "service.password"));
 		m_component->setSoftwareVersion("", "");
 		m_component->onConnected.connect(bind(&Component::handleConnected, this));
 		m_component->onError.connect(bind(&Component::handleConnectionError, this, _1));
 		m_component->onDataRead.connect(bind(&Component::handleDataRead, this, _1));
 		m_component->onDataWritten.connect(bind(&Component::handleDataWritten, this, _1));
 		m_component->onError.connect(boost::bind(&Component::handleConnectionError, this, _1));
 		m_component->onDataRead.connect(boost::bind(&Component::handleDataRead, this, _1));
 		m_component->onDataWritten.connect(boost::bind(&Component::handleDataWritten, this, _1));
 		m_stanzaChannel = m_component->getStanzaChannel();
 		m_iqRouter = m_component->getIQRouter();
+	}
 	m_capsMemoryStorage = new CapsMemoryStorage();
 	m_capsManager = new CapsManager(m_capsMemoryStorage, m_stanzaChannel, m_iqRouter);

src/user.cpp

➞

Show inline comments

@@ @@ -27,13 +27,15 @@ @@
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Elements/MUCPayload.h"
 #include "log4cxx/logger.h"
 #include <boost/foreach.hpp>
 #ifndef WIN32
 #include <execinfo.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 using namespace log4cxx;
 using namespace boost;
 	return jid;
+}
 static void
 print_trace (void)
+{
 #ifndef WIN32
 void *array[80];
 size_t size;
 char **strings;
 size_t i;
 size = backtrace (array, 80);
@@ @@ -116,12 +119,13 @@ strings = backtrace_symbols (array, size); @@
 printf ("Obtained %zd stack frames.\n", size);
 for (i = 0; i < size; i++)
 	printf ("%s\n", strings[i]);
 free (strings);
 #endif
+}
 void User::handlePresence(Swift::Presence::ref presence) {
 	std::cout << "PRESENCE " << presence->getFrom().toString() << "\n";
 // 	print_trace();
 	if (!m_connected) {

src/usermanager.cpp

➞

Show inline comments

@@ @@ -96,13 +96,15 @@ void UserManager::removeUser(User *user) { @@
 	if (m_component->inServerMode()) {
 		disconnectUser(user->getJID());
+	}
 	onUserDestroyed(user);
 	delete user;
 #ifndef WIN32
 	malloc_trim(0);
 #endif
 // 	VALGRIND_DO_LEAK_CHECK;
+}
 int UserManager::getUserCount() {
 	return m_users.size();
+}

0 comments (0 inline, 0 general)