libtransport.git Changeset - f4b6ded08443

Changeset - f4b6ded08443

Parent rev.

Child rev.

[Not reviewed]

Merge

0 25 2

Vitaly Takmazov - 14 years ago 2011-10-20 07:22:15
vitalyster@gmail.com

merging latest changes

24 files changed with 198 insertions and 76 deletions:

backends/frotz/CMakeLists.txt

backends/frotz/main.cpp

backends/libpurple/main.cpp

cmake_modules/SwiftenConfig.cmake

include/Swiften/Network/DummyNetworkFactories.cpp

include/Swiften/Network/DummyNetworkFactories.h

include/Swiften/Server/ServerFromClientSession.cpp

include/Swiften/Server/ServerFromClientSession.h

include/Swiften/Server/ServerStanzaChannel.cpp

include/transport/CMakeLists.txt

include/transport/userregistry.h

plugin/CMakeLists.txt

plugin/src/CMakeLists.txt

plugin/src/networkplugin.cpp

spectrum/src/CMakeLists.txt

src/CMakeLists.txt

src/buddy.cpp

src/mysqlbackend.cpp

src/networkpluginserver.cpp

src/tests/component.cpp

src/transport.cpp

src/user.cpp

src/userregistry.cpp

src/vcardresponder.cpp

0 comments (0 inline, 0 general)

backends/frotz/CMakeLists.txt

➞

Show inline comments

@@ @@ -3,10 +3,10 @@ cmake_minimum_required(VERSION 2.6) @@
 ADD_SUBDIRECTORY(dfrotz)
 FILE(GLOB SRC *.c *.cpp)
 ADD_EXECUTABLE(spectrum2_frotz_backend ${SRC})
 target_link_libraries(spectrum2_frotz_backend transport pthread transport-plugin)
+target_link_libraries(spectrum2_frotz_backend transport pthread transport-plugin ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
 INSTALL(TARGETS spectrum2_frotz_backend RUNTIME DESTINATION bin)

backends/frotz/main.cpp

➞

Show inline comments

 		close(CHILD_WRITE);
+	}
+}
 class FrotzNetworkPlugin : public NetworkPlugin {
 	public:
 		Swift::BoostNetworkFactories *m_factories;
 		Swift::BoostIOServiceThread m_boostIOServiceThread;
 		boost::shared_ptr<Swift::Connection> m_conn;
 		FrotzNetworkPlugin(Config *config, Swift::SimpleEventLoop *loop, const std::string &host, int port) : NetworkPlugin() {
 			this->config = config;
 			m_factories = new Swift::BoostNetworkFactories(loop);
 			m_conn = m_factories->getConnectionFactory()->createConnection();
 			m_conn->onDataRead.connect(boost::bind(&FrotzNetworkPlugin::_handleDataRead, this, _1));
 			m_conn->connect(Swift::HostAddressPort(Swift::HostAddress(host), port));
 // 			m_conn->onConnectFinished.connect(boost::bind(&FrotzNetworkPlugin::_handleConnected, this, _1));
 // 			m_conn->onDisconnected.connect(boost::bind(&FrotzNetworkPlugin::handleDisconnected, this));
+		}
 		void sendData(const std::string &string) {
 			m_conn->write(Swift::createSafeByteArray(string));
+		}
 		void _handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data) {
 			std::string d(data->begin(), data->end());
 			handleDataRead(d);
+		}
 		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
 			np->handleConnected(user);
 			np->handleBuddyChanged(user, "zcode", "ZCode", "ZCode", pbnetwork::STATUS_ONLINE);
 // 			sleep(1);
@@ @@ -217,13 +236,14 @@ class FrotzNetworkPlugin : public NetworkPlugin { @@
 					games.push_back(itr->path().leaf());
+				}
+			}
 			return games;
+		}
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &/*xhtml*/) {
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml = "") {
 			std::cout << "aaa\n";
 			if (message.find("start") == 0) {
 				std::string game = message.substr(6);
 				std::vector<std::string> lst = getGames();
 				if (std::find(lst.begin(), lst.end(), game) == lst.end()) {
 					np->handleMessage(user, "zcode", "Unknown game");
 					return;

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -497,53 +497,54 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 			if (ret) {
 				purple_buddy_icons_set_account_icon(account, (guchar *) contents, length);
+			}
+		}
 		void setDefaultAccountOptions(PurpleAccount *account) {
 // 			for (std::map<std::string,std::string>::const_iterator it = config->getUnregistered().begin();
 // 				it != config->getUnregistered().end(); it++) {
 // 				if ((*it).first.find("purple.") == 0) {
 // 					std::string key = (*it).first.substr((*it).first.find(".") + 1);
 //
 // 					PurplePlugin *plugin = purple_find_prpl(purple_account_get_protocol_id(account));
 // 					PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 // 					bool found = false;
 // 					for (GList *l = prpl_info->protocol_options; l != NULL; l = l->next) {
 // 						PurpleAccountOption *option = (PurpleAccountOption *) l->data;
 // 						PurplePrefType type = purple_account_option_get_type(option);
 // 						std::string key2(purple_account_option_get_setting(option));
 // 						std::cout << key << " " << key2 << " " << (*it).second << "\n";
 // 						if (key != key2)
 // 							continue;
 //
 // 						found = true;
 // 						switch (type) {
 // 							case PURPLE_PREF_BOOLEAN:
 // 								purple_account_set_bool(account, key.c_str(), fromString<bool>((*it).second));
 // 								break;
 //
 // 							case PURPLE_PREF_INT:
 // 								purple_account_set_int(account, key.c_str(), fromString<int>((*it).second));
 // 								break;
 //
 // 							case PURPLE_PREF_STRING:
 // 							case PURPLE_PREF_STRING_LIST:
 // 								purple_account_set_string(account, key.c_str(), (*it).second.c_str());
 // 								break;
 // 							default:
 // 								continue;
 // 						}
 // 						break;
 // 					}
 //
 // 					if (!found) {
 // 						purple_account_set_string(account, key.c_str(), (*it).second.c_str());
 // 					}
 // 				}
 // 			}
 			int i = 0;
 			gchar **keys = g_key_file_get_keys (keyfile, "purple", NULL, NULL);
 			while (keys && keys[i] != NULL) {
 				std::string key = keys[i];
 				PurplePlugin *plugin = purple_find_prpl(purple_account_get_protocol_id(account));
 				PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 				bool found = false;
 				for (GList *l = prpl_info->protocol_options; l != NULL; l = l->next) {
 					PurpleAccountOption *option = (PurpleAccountOption *) l->data;
 					PurplePrefType type = purple_account_option_get_type(option);
 					std::string key2(purple_account_option_get_setting(option));
 					if (key != key2) {
 						continue;
+					}
 					found = true;
 					switch (type) {
 						case PURPLE_PREF_BOOLEAN:
 							purple_account_set_bool(account, key.c_str(), fromString<bool>(KEYFILE_STRING("purple", key)));
 							break;
 						case PURPLE_PREF_INT:
 							purple_account_set_int(account, key.c_str(), fromString<int>(KEYFILE_STRING("purple", key)));
 							break;
 						case PURPLE_PREF_STRING:
 						case PURPLE_PREF_STRING_LIST:
 							purple_account_set_string(account, key.c_str(), KEYFILE_STRING("purple", key).c_str());
 							break;
 						default:
 							continue;
+					}
 					break;
+				}
 				if (!found) {
 					purple_account_set_string(account, key.c_str(), KEYFILE_STRING("purple", key).c_str());
+				}
 				i++;
+			}
 			g_strfreev (keys);
+		}
 		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
 			PurpleAccount *account = NULL;
 			std::string name;
@@ @@ -731,13 +732,12 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 				std::string name = legacyName;
 				if (KEYFILE_STRING("service", "protocol") == "any" && legacyName.find("prpl-") == 0) {
 					name = name.substr(name.find(".") + 1);
+				}
 				m_vcards[user + name] = id;
 				std::cout << name << " " << purple_account_get_username(account) << "\n";
 				if (KEYFILE_BOOL("backend", "no_vcard_fetch") && name != purple_account_get_username(account)) {
 					PurpleNotifyUserInfo *user_info = purple_notify_user_info_new();
 					notify_user_info(purple_account_get_connection(account), name.c_str(), user_info);
 					purple_notify_user_info_destroy(user_info);
+				}
 				else {
@@ @@ -1013,13 +1013,13 @@ static void buddyListNewNode(PurpleBlistNode *node) { @@
 	if (!PURPLE_BLIST_NODE_IS_BUDDY(node))
 		return;
 	PurpleBuddy *buddy = (PurpleBuddy *) node;
 	PurpleAccount *account = purple_buddy_get_account(buddy);
 	// Status
 	pbnetwork::StatusType status;
+	pbnetwork::StatusType status = pbnetwork::STATUS_NONE;
 	std::string message;
 	getStatus(buddy, status, message);
 	// Tooltip
 	PurplePlugin *prpl = purple_find_prpl(purple_account_get_protocol_id(account));
 	PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
 	if (!PURPLE_BLIST_NODE_IS_BUDDY(node))
 		return;
 	buddyListNewNode(node);
+}
 static void buddyPrivacyChanged(PurpleBlistNode *node, void *data) {
 	std::cout << "PRIVACY CHANGED\n";
 	if (!PURPLE_BLIST_NODE_IS_BUDDY(node))
 		return;
 	buddyListUpdate(NULL, node);
+}
 static void NodeRemoved(PurpleBlistNode *node, void *data) {
 	if (nickname.empty() && !fullName.empty()) {
 		nickname = fullName;
+	}
 	bool ownInfo = name == purple_account_get_username(account);
 	std::cout << "RECEIVED " << name << " " << purple_account_get_username(account) << "\n";
 	if (ownInfo) {
 		const gchar *displayname = purple_connection_get_display_name(gc);
 		if (!displayname) {
 			displayname = purple_account_get_name_for_display(account);
+		}
@@ @@ -1697,22 +1695,27 @@ static void spectrum_sigchld_handler(int sig) @@
 		snprintf(errmsg, BUFSIZ, "Warning: waitpid() returned %d", pid);
 		perror(errmsg);
+	}
+}
 static void transportDataReceived(gpointer data, gint source, PurpleInputCondition cond) {
 	if (cond & PURPLE_INPUT_READ) {
 		char buffer[65535];
 		char *ptr = buffer;
 		ssize_t n = read(source, ptr, sizeof(buffer));
 		if (n <= 0) {
 			LOG4CXX_INFO(logger, "Diconnecting from spectrum2 server");
 			exit(errno);
+		}
 		std::string d = std::string(buffer, n);
 		np->handleDataRead(d);
+	}
 	else {
 		np->readyForData();
+	}
+}
 int main(int argc, char **argv) {
 	GError *error = NULL;
 	GOptionContext *context;
 	context = g_option_context_new("config_file_name or profile name");
 	g_option_context_add_main_entries(context, options_entries, "");
@@ @@ -1818,12 +1821,13 @@ int main(int argc, char **argv) { @@
 		int flags = fcntl(m_sock, F_GETFL);
 		flags |= O_NONBLOCK;
 		fcntl(m_sock, F_SETFL, flags);
 		purple_input_add(m_sock, PURPLE_INPUT_READ, &transportDataReceived, NULL);
 // 		purple_input_add(m_sock, PURPLE_INPUT_WRITE, &transportDataReceived, NULL);
 		np = new SpectrumNetworkPlugin(host, port);
 		bool libev = KEYFILE_STRING("service", "eventloop") == "libev";
 		GMainLoop *m_loop;
 #ifdef WITH_LIBEVENT

cmake_modules/SwiftenConfig.cmake

➞

Show inline comments

 if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
 	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable")
 	set( SWIFTEN_CFLAGS "" )
 	if (SWIFTEN_CONFIG_EXECUTABLE)
 		execute_process(
-			COMMAND swiften-config --libs
+			COMMAND SWIFTEN_CONFIG_EXECUTABLE --libs
 			OUTPUT_VARIABLE SWIFTEN_LIBRARY)
 		string(REGEX REPLACE "[\r\n]"                  " " SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
 		string(REGEX REPLACE " +$"                     ""  SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
 	else()
 		message( FATAL_ERROR "Could NOT find swiften-config" )
 	endif()

include/Swiften/Network/DummyNetworkFactories.cpp

➞

Show inline comments

@@ @@ -14,16 +14,18 @@ namespace Swift { @@
 DummyNetworkFactories::DummyNetworkFactories(EventLoop* eventLoop) {
 	timerFactory = new DummyTimerFactory();
 	connectionFactory = new DummyConnectionFactory(eventLoop);
 	domainNameResolver = new PlatformDomainNameResolver(eventLoop);
 	connectionServerFactory = new DummyConnectionServerFactory(eventLoop);
 	m_platformXMLParserFactory =  new PlatformXMLParserFactory();
+}
 DummyNetworkFactories::~DummyNetworkFactories() {
 	delete connectionServerFactory;
 	delete domainNameResolver;
 	delete connectionFactory;
 	delete timerFactory;
 	delete m_platformXMLParserFactory;
+}
+}

include/Swiften/Network/DummyNetworkFactories.h

➞

Show inline comments

@@ @@ -4,12 +4,13 @@ @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 #pragma once
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 namespace Swift {
 	class EventLoop;
 	class DummyNetworkFactories : public NetworkFactories {
 		public:
@@ @@ -34,16 +35,25 @@ namespace Swift { @@
 			virtual Swift::NATTraverser* getNATTraverser() const {
 				return 0;
+			}
 			Swift::XMLParserFactory* getXMLParserFactory() const {
 				return m_platformXMLParserFactory;
+			}
             Swift::TLSContextFactory* getTLSContextFactory() const {
                 return 0;
+            }
             Swift::ProxyProvider* getProxyProvider() const {
                 return 0;
+            }
 		private:
 			PlatformXMLParserFactory *m_platformXMLParserFactory;
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;
 	};
+}

include/Swiften/Server/ServerFromClientSession.cpp

➞

Show inline comments

@@ @@ -6,12 +6,14 @@ @@
 #include <Swiften/Server/ServerFromClientSession.h>
 #include <boost/bind.hpp>
 #include <Swiften/Elements/ProtocolHeader.h>
 #include <Swiften/Elements/StreamError.h>
 #include <Swiften/Elements/Message.h>
 #include <Swiften/Server/UserRegistry.h>
 #include <Swiften/Network/Connection.h>
 #include <Swiften/StreamStack/XMPPLayer.h>
 #include <Swiften/Elements/StreamFeatures.h>
 #include <Swiften/Elements/ResourceBind.h>
 #include <Swiften/Elements/StartSession.h>
@@ @@ -31,21 +33,23 @@ namespace Swift { @@
 ServerFromClientSession::ServerFromClientSession(
 		const std::string& id,
 		boost::shared_ptr<Connection> connection,
 		PayloadParserFactoryCollection* payloadParserFactories,
 		PayloadSerializerCollection* payloadSerializers,
 		UserRegistry* userRegistry,
 		XMLParserFactory* factory) :
 		XMLParserFactory* factory,
 		Swift::JID remoteJID) :
 			Session(connection, payloadParserFactories, payloadSerializers, factory),
 			id_(id),
 			userRegistry_(userRegistry),
 			authenticated_(false),
 			initialized(false),
 			allowSASLEXTERNAL(false),
 			tlsLayer(0),
 			tlsConnected(false) {
 				setRemoteJID(remoteJID);
+}
 ServerFromClientSession::~ServerFromClientSession() {
 	if (tlsLayer) {
 		delete tlsLayer;
+	}
@@ @@ -56,15 +60,20 @@ void ServerFromClientSession::handlePasswordValid() { @@
 		getXMPPLayer()->writeElement(boost::shared_ptr<AuthSuccess>(new AuthSuccess()));
 		authenticated_ = true;
 		getXMPPLayer()->resetParser();
+	}
+}
 void ServerFromClientSession::handlePasswordInvalid() {
+void ServerFromClientSession::handlePasswordInvalid(const std::string &error) {
 	if (!isInitialized()) {
 		getXMPPLayer()->writeElement(boost::shared_ptr<AuthFailure>(new AuthFailure));
 		if (!error.empty()) {
 			boost::shared_ptr<StreamError> msg(new StreamError(StreamError::UndefinedCondition, error));
 			getXMPPLayer()->writeElement(msg);
+		}
 		finishSession(AuthenticationFailedError);
+	}
+}
 void ServerFromClientSession::handleElement(boost::shared_ptr<Element> element) {
 	if (isInitialized()) {

include/Swiften/Server/ServerFromClientSession.h

➞

Show inline comments

@@ @@ -36,13 +36,14 @@ namespace Swift { @@
 			ServerFromClientSession(
 					const std::string& id,
 					boost::shared_ptr<Connection> connection,
 					PayloadParserFactoryCollection* payloadParserFactories,
 					PayloadSerializerCollection* payloadSerializers,
 					UserRegistry* userRegistry,
 					XMLParserFactory* factory);
 					XMLParserFactory* factory,
 					Swift::JID remoteJID = Swift::JID());
 			~ServerFromClientSession();
 			boost::signal<void ()> onSessionStarted;
 			void setAllowSASLEXTERNAL();
 			const std::string &getUser() {
 				return user_;
@@ @@ -52,13 +53,13 @@ namespace Swift { @@
 			Swift::JID getBareJID() {
 				return Swift::JID(user_, getLocalJID().getDomain());
+			}
 			void handlePasswordValid();
 			void handlePasswordInvalid();
+			void handlePasswordInvalid(const std::string &error = "");
 		private:
 			void handleElement(boost::shared_ptr<Element>);
 			void handleStreamStart(const ProtocolHeader& header);
 			void handleSessionFinished(const boost::optional<SessionError>&);

include/Swiften/Server/ServerStanzaChannel.cpp

➞

Show inline comments

@@ @@ -26,13 +26,12 @@ namespace { @@
+		}
 		JID jid;
 	};
+}
 void ServerStanzaChannel::addSession(boost::shared_ptr<ServerFromClientSession> session) {
 	std::cout << "ADDING SESSION\n";
 	sessions[session->getRemoteJID().toBare().toString()].push_back(session);
 	session->onSessionFinished.connect(boost::bind(&ServerStanzaChannel::handleSessionFinished, this, _1, session));
 	session->onElementReceived.connect(boost::bind(&ServerStanzaChannel::handleElement, this, _1, session));
+}
 void ServerStanzaChannel::removeSession(boost::shared_ptr<ServerFromClientSession> session) {

include/transport/CMakeLists.txt

➞

Show inline comments

 if (PROTOBUF_FOUND)
 	add_custom_target(pb
 		${PROTOBUF_PROTOC_EXECUTABLE}
 		--cpp_out  ${CMAKE_CURRENT_BINARY_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/protocol.proto
     ADD_CUSTOM_COMMAND(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/protocol.pb.cc ${CMAKE_CURRENT_BINARY_DIR}/protocol.pb.h
         COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --cpp_out  ${CMAKE_CURRENT_BINARY_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/protocol.proto
         COMMENT "Running C++ protocol buffer compiler on protocol.proto"
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/protocol.proto
 		VERBATIM )
+    )
     ADD_CUSTOM_TARGET(pb DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/protocol.pb.cc)
 endif()
 FILE(GLOB HEADERS *.h protocol.h)
 INSTALL(FILES ${HEADERS} DESTINATION include/transport COMPONENT headers)
@@ \ No newline at end of file @@

include/transport/userregistry.h

➞

Show inline comments

@@ @@ -79,13 +79,13 @@ class UserRegistry : public Swift::UserRegistry { @@
 		/// Informs user that the password is valid and finishes login process.
 		/// \param user JID.
 		void onPasswordValid(const Swift::JID &user);
 		/// Informs user that the password is invalid and disconnects him.
 		/// \param user JID.
 		void onPasswordInvalid(const Swift::JID &user);
+		void onPasswordInvalid(const Swift::JID &user, const std::string &error = "");
 		/// Removes session later.
 		/// \param user JID.
 		void removeLater(const Swift::JID &user);
 		/// Returns current password for particular user

plugin/CMakeLists.txt

➞

Show inline comments

		new file 100644
		ADD_SUBDIRECTORY(src)

plugin/src/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB HEADERS ../include/transport/*.h)
 ADD_LIBRARY(transport-plugin SHARED ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS} ../../src/memoryusage.cpp ${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.pb.cc)
 ADD_DEPENDENCIES(transport-plugin pb)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
 ADD_DEFINITIONS(-fPIC)
 TARGET_LINK_LIBRARIES(transport-plugin ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES})
 SET_TARGET_PROPERTIES(transport-plugin PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
+)
 INSTALL(TARGETS transport-plugin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
 #CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")
 #INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)

plugin/src/networkplugin.cpp

➞

Show inline comments

@@ @@ -484,13 +484,12 @@ void NetworkPlugin::handleDataRead(std::string &data) { @@
 				handleLoginPayload(wrapper.payload());
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_LOGOUT:
 				handleLogoutPayload(wrapper.payload());
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_PING:
 				LOG4CXX_INFO(logger, "PING RECEIVED");
 				sendPong();
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE:
 				handleConvMessagePayload(wrapper.payload());
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_JOIN_ROOM:
@@ @@ -555,13 +554,12 @@ void NetworkPlugin::sendPong() { @@
 	std::string message;
 	pbnetwork::WrapperMessage wrap;
 	wrap.set_type(pbnetwork::WrapperMessage_Type_TYPE_PONG);
 	wrap.SerializeToString(&message);
 	send(message);
 	LOG4CXX_INFO(logger, "PONG");
 	sendMemoryUsage();
+}
 void NetworkPlugin::sendMemoryUsage() {
 	pbnetwork::Stats stats;

spectrum/src/CMakeLists.txt

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ FILE(GLOB SRC *.cpp) @@
 ADD_EXECUTABLE(spectrum2 ${SRC})
 ADD_DEPENDENCIES(spectrum2 spectrum2_libpurple_backend)
 ADD_DEPENDENCIES(spectrum2 spectrum2_libircclient-qt_backend)
 target_link_libraries(spectrum2 transport)
+target_link_libraries(spectrum2 transport ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
 INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)
 INSTALL(FILES
 	sample2.cfg
 	RENAME spectrum.cfg.example

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -17,15 +17,17 @@ endif() @@
 # SOURCE_GROUP(headers FILES ${HEADERS})
 if (PROTOBUF_FOUND)
 if (CMAKE_COMPILER_IS_GNUCXX)
-	ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ../include/transport/protocol.pb.cc)
+    ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc)
 else()
 	ADD_LIBRARY(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC} ../include/transport/protocol.pb.cc)
     ADD_LIBRARY(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc)
 endif()
 	SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
 endif()
     ADD_DEPENDENCIES(transport pb)
 else()
     ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
 endif()

src/buddy.cpp

➞

Show inline comments

@@ @@ -127,13 +127,12 @@ std::string Buddy::getSafeName() { @@
 		return m_jid.getNode();
+	}
 	std::string name = getName();
 // 	Transport::instance()->protocol()->prepareUsername(name, purple_buddy_get_account(m_buddy));
 	if (getFlags() & BUDDY_JID_ESCAPING) {
 		name = Swift::JID::getEscapedNode(name);
 		std::cout << "OUT '" << getName() << "' '" << name << "'\n";
+	}
 	else {
 		if (name.find_last_of("@") != std::string::npos) {
 			name.replace(name.find_last_of("@"), 1, "%"); // OK
+		}
+	}

src/mysqlbackend.cpp

➞

Show inline comments

 	return *this;
+}
 MySQLBackend::MySQLBackend(Config *config) {
 	m_config = config;
 	mysql_init(&m_conn);
 	my_bool my_true = 1;
 	mysql_options(&m_conn, MYSQL_OPT_RECONNECT, &my_true);
 	m_prefix = CONFIG_STRING(m_config, "database.prefix");
+}
 MySQLBackend::~MySQLBackend(){
 	delete m_setUser;
 	delete m_getUser;
 	if (!m_getBuddiesSettings->execute())
 		return false;
 	BOOST_FOREACH(BuddyInfo &b, roster) {
 		if (buddy_id == b.id) {
 			std::cout << "Adding buddy info setting " << key << "\n";
+// 			std::cout << "Adding buddy info setting " << key << "\n";
 			b.settings[key] = var;
 			buddy_id = -1;
+		}
 		while(buddy_id == -1 && m_getBuddiesSettings->fetch() == 0) {
 			std::string val;
 						buddy_id = -1;
+					}
 					continue;
 					break;
+			}
 			if (buddy_id == b.id) {
 				std::cout << "Adding buddy info setting " << key << "=" << val << "\n";
+// 				std::cout << "Adding buddy info setting " << key << "=" << val << "\n";
 				b.settings[key] = var;
 				buddy_id = -1;
+			}
+		}
+	}

src/networkpluginserver.cpp

➞

Show inline comments

 	pbnetwork::Disconnected payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	m_component->m_userRegistry->onPasswordInvalid(payload.user());
+	m_component->m_userRegistry->onPasswordInvalid(payload.user(), payload.message());
 	User *user = m_userManager->getUser(payload.user());
 	if (!user) {
 		return;
+	}
 	user->handleDisconnected(payload.message());

src/tests/component.cpp

➞

Show inline comments

@@ @@ -2,16 +2,20 @@ @@
 #include "transport/config.h"
 #include "transport/transport.h"
 #include "transport/conversation.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"
 using namespace Transport;
 class TestingConversation : public Conversation {
 	public:
 		TestingConversation(ConversationManager *conversationManager, const std::string &legacyName, bool muc = false) : Conversation(conversationManager, legacyName, muc) {
@@ @@ -45,15 +49,15 @@ class TestingFactory : public Factory { @@
 			if (buddyInfo.settings.find("icon_hash") != buddyInfo.settings.end())
 				buddy->setIconHash(buddyInfo.settings.find("icon_hash")->second.s);
 			return buddy;
+		}
 };
 class ComponentTest : public CPPUNIT_NS :: TestFixture {
+class ComponentTest : public CPPUNIT_NS :: TestFixture, public Swift::XMPPParserClient {
 	CPPUNIT_TEST_SUITE(ComponentTest);
-	CPPUNIT_TEST(presence);
+	CPPUNIT_TEST(handlePresenceWithNode);
 	CPPUNIT_TEST_SUITE_END();
 	public:
 		void setUp (void) {
 			std::istringstream ifs("service.server_mode = 1\n");
 			cfg = new Config();
@@ @@ -66,35 +70,75 @@ class ComponentTest : public CPPUNIT_NS :: TestFixture { @@
 			userRegistry = new UserRegistry(cfg, factories);
 			component = new Component(loop, factories, cfg, factory, userRegistry);
 			component->start();
 			payloadSerializers = new Swift::FullPayloadSerializerCollection();
 			payloadParserFactories = new Swift::FullPayloadParserFactoryCollection();
 			parser = new Swift::XMPPParser(this, payloadParserFactories, factories->getXMLParserFactory());
 			serverFromClientSession = boost::shared_ptr<Swift::ServerFromClientSession>(new Swift::ServerFromClientSession("id", factories->getConnectionFactory()->createConnection(),
 					payloadParserFactories, payloadSerializers, userRegistry, factories->getXMLParserFactory(), Swift::JID("user@localhost/resource")));
 			serverFromClientSession->startSession();
 			serverFromClientSession->onDataWritten.connect(boost::bind(&ComponentTest::handleDataReceived, this, _1));
 			dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->addSession(serverFromClientSession);
 			parser->parse("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' to='localhost' version='1.0'>");
 			received.clear();
 			loop->processEvents();
+		}
 		void tearDown (void) {
 			dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->removeSession(serverFromClientSession);
 			delete component;
 			delete userRegistry;
 			delete factories;
 			delete factory;
 			delete loop;
 			delete cfg;
 			delete parser;
 			received.clear();
+		}
 	void presence() {
 	void handleDataReceived(const Swift::SafeByteArray &data) {
 		parser->parse(safeByteArrayToString(data));
+	}
 	void handleStreamStart(const Swift::ProtocolHeader&) {
+	}
 	void handleElement(boost::shared_ptr<Swift::Element> element) {
 		received.push_back(element);
+	}
 	void handleStreamEnd() {
+	}
 	void handlePresenceWithNode() {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo("localhost");
 		response->setFrom("user@localhost/resource");
 		dynamic_cast<Swift::ServerStanzaChannel *>(component->getStanzaChannel())->onPresenceReceived(response);
 		loop->processEvents();
+	}
 	private:
 		boost::shared_ptr<Swift::ServerFromClientSession> serverFromClientSession;
 		Swift::FullPayloadSerializerCollection* payloadSerializers;
 		Swift::FullPayloadParserFactoryCollection* payloadParserFactories;
 		Swift::XMPPParser *parser;
 		UserRegistry *userRegistry;
 		Config *cfg;
 		Swift::Server *server;
 		Swift::DummyNetworkFactories *factories;
 		Swift::DummyEventLoop *loop;
 		TestingFactory *factory;
 		Component *component;
-		std::vector<std::string> received;
+		std::vector<boost::shared_ptr<Swift::Element> > received;
 };
 CPPUNIT_TEST_SUITE_REGISTRATION (ComponentTest);

src/transport.cpp

➞

Show inline comments

 		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(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_component->addPayloadParserFactory(new GenericPayloadParserFactory<StorageParser>("private", "jabber:iq:private"));
 		m_component->addPayloadParserFactory(new GenericPayloadParserFactory<Swift::AttentionParser>("attention", "urn:xmpp:attention:0"));
 		m_component->addPayloadParserFactory(new GenericPayloadParserFactory<Swift::XHTMLIMParser>("html", "http://jabber.org/protocol/xhtml-im"));
 		m_component->addPayloadParserFactory(new GenericPayloadParserFactory<Transport::BlockParser>("block", "urn:xmpp:block:0"));
 		m_component->addPayloadParserFactory(new GenericPayloadParserFactory<Swift::InvisibleParser>("invisible", "urn:xmpp:invisible:0"));
 		m_component->addPayloadSerializer(new Swift::AttentionSerializer());
 		m_component->addPayloadSerializer(new Swift::XHTMLIMSerializer());
 		m_component->addPayloadSerializer(new Transport::BlockSerializer());
 		m_component->addPayloadSerializer(new Swift::InvisibleSerializer());
 		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

@@ @@ -161,13 +161,12 @@ void User::setConnected(bool connected) { @@
 	updateLastActivity();
 	sendCurrentPresence();
+}
 void User::handlePresence(Swift::Presence::ref presence) {
 	std::cout << "PRESENCE " << presence->getFrom().toString() << "\n";
 	if (!m_connected) {
 		// we are not connected to legacy network, so we should do it when disco#info arrive :)
 		if (m_readyForConnect == false) {
 			// Forward status message to legacy network, but only if it's sent from active resource
 // 					if (m_activeResource == presence->getFrom().getResource().getUTF8String()) {
@@ @@ -296,13 +295,13 @@ void User::handleDisconnected(const std::string &error) { @@
 	// 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.
 		// We can't be sure finishSession sends unavailable presence everytime, so check if user gets removed
 		// in finishSession(...) call and if not, remove it here.
 		std::string jid = m_jid.toBare().toString();
 		dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
+		dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError(Swift::StreamError::UndefinedCondition, "test")));
 		if (m_userManager->getUser(jid) != NULL) {
 			m_userManager->removeUser(this);
+		}
+	}
 	else {
 		m_userManager->removeUser(this);

src/userregistry.cpp

➞

Show inline comments

+	}
 	else {
 		LOG4CXX_INFO(logger, key << ": onPasswordValid called for invalid user");
+	}
+}
 void UserRegistry::onPasswordInvalid(const Swift::JID &user) {
+void UserRegistry::onPasswordInvalid(const Swift::JID &user, const std::string &error) {
 	std::string key = user.toBare().toString();
 	if (users.find(key) != users.end()) {
 		LOG4CXX_INFO(logger, key << ": Password is invalid");
 		users[key].session->handlePasswordInvalid();
+		users[key].session->handlePasswordInvalid(error);
 		users.erase(key);
+	}
 	else {
 		LOG4CXX_INFO(logger, key << ": onPasswordInvalid called for invalid user");
+	}
+}

src/vcardresponder.cpp

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ namespace Transport { @@
 static LoggerPtr logger = Logger::getLogger("VCardResponder");
 VCardResponder::VCardResponder(Swift::IQRouter *router, Swift::NetworkFactories *factories, UserManager *userManager) : Swift::Responder<VCard>(router) {
 	m_id = 0;
 	m_userManager = userManager;
-	m_collectTimer = factories->getTimerFactory()->createTimer(20);
+	m_collectTimer = factories->getTimerFactory()->createTimer(20000);
 	m_collectTimer->onTick.connect(boost::bind(&VCardResponder::collectTimeouted, this));
 	m_collectTimer->start();
+}
 VCardResponder::~VCardResponder() {
+}

0 comments (0 inline, 0 general)