libtransport.git Changeset - 3201977efb6a

Changeset - 3201977efb6a

Parent rev.

Child rev.

[Not reviewed]

0 17 1

Jan Kaluza - 13 years ago 2012-10-18 09:04:20
hanzz.k@gmail.com

Get room list on IRC and show rooms in service discovery

18 files changed with 192 insertions and 51 deletions:

backends/libcommuni/session.cpp

backends/libcommuni/session.h

include/transport/discoitemsresponder.h

include/transport/transport.h

include/transport/user.h

include/transport/usermanager.h

spectrum/src/main.cpp

spectrum/src/sample.cfg

src/buddy.cpp

src/config.cpp

src/discoinforesponder.cpp

src/discoinforesponder.h

src/discoitemsresponder.cpp

src/networkpluginserver.cpp

src/tests/basictest.cpp

src/tests/discoitemsresponder.cpp

100

src/transport.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

backends/libcommuni/session.cpp

➞

Show inline comments

@@ @@ -20,12 +20,14 @@ @@
 #define TO_UTF8(WHAT) std::string((WHAT).toUtf8().data(), (WHAT).toUtf8().size())
 #include "transport/logging.h"
 DEFINE_LOGGER(logger, "IRCSession");
 static bool sentList;
 MyIrcSession::MyIrcSession(const std::string &user, IRCNetworkPlugin *np, const std::string &suffix, QObject* parent) : IrcSession(parent)
+{
 	this->np = np;
 	this->user = user;
 	this->suffix = suffix;
 	m_connected = false;
+}
 void MyIrcSession::on_connected() {
 	m_connected = true;
 	if (suffix.empty()) {
 		np->handleConnected(user);
 		if (!sentList) {
 			sendCommand(IrcCommand::createList(""));
 			sentList = true;
+		}
+	}
 	for(AutoJoinMap::iterator it = m_autoJoin.begin(); it != m_autoJoin.end(); it++) {
 		sendCommand(IrcCommand::createJoin(FROM_UTF8(it->second->getChannel()), FROM_UTF8(it->second->getPassword())));
+	}
 				np->handleParticipantChanged(user, nickname, TO_UTF8(channel) + suffix,(int) flags, pbnetwork::STATUS_ONLINE);
+			}
 			break;
 		case 432:
 			np->handleDisconnected(user, pbnetwork::CONNECTION_ERROR_INVALID_USERNAME, "Erroneous Nickname");
 			break;
 		case 321:
 			m_rooms.clear();
 			m_names.clear();
 			break;
 		case 322:
 			m_rooms.push_back(TO_UTF8(m->parameters().value(1)));
 			m_names.push_back(TO_UTF8(m->parameters().value(1)));
 			break;
 		case 323:
 			np->handleRoomList("", m_rooms, m_names);
 			break;
 		default:
 			break;
+	}
 	//qDebug() << "numeric message received:" << receiver() << origin << code << params;
+}

backends/libcommuni/session.h

➞

Show inline comments

@@ @@ -82,12 +82,14 @@ protected: @@
 	IRCNetworkPlugin *np;
 	std::string user;
 	std::string m_identify;
 	AutoJoinMap m_autoJoin;
 	std::string m_topicData;
 	bool m_connected;
 	std::list<std::string> m_rooms;
 	std::list<std::string> m_names;
 };
 //class MyIrcBuffer : public Irc::Buffer
 //{
 //    Q_OBJECT

include/transport/discoitemsresponder.h

➞

Show inline comments

@@ @@ -25,18 +25,21 @@ @@
 #include "Swiften/Queries/GetResponder.h"
 #include "Swiften/Elements/DiscoItems.h"
 namespace Transport {
 class Component;
 class DiscoInfoResponder;
 class DiscoItemsResponder : public Swift::GetResponder<Swift::DiscoItems> {
 	public:
 		DiscoItemsResponder(Component *component);
 		~DiscoItemsResponder();
 		Swift::CapsInfo &getBuddyCapsInfo();
 		void addAdHocCommand(const std::string &node, const std::string &name);
 // 		void removeAdHocCommand(const std::string &node);
 		void addRoom(const std::string &node, const std::string &name);
 		void clearRooms();
 		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoItems> payload);
 	private:
 		Component *m_component;
 		boost::shared_ptr<Swift::DiscoItems> m_commands;
 		boost::shared_ptr<Swift::DiscoItems> m_rooms;
 		DiscoInfoResponder *m_discoInfoResponder;
 };
+}
@@ \ No newline at end of file @@

include/transport/transport.h

➞

Show inline comments

@@ @@ -44,13 +44,12 @@ namespace Transport { @@
 	// 				CLIENT_FEATURE_XHTML_IM = 4,
 	// 				CLIENT_FEATURE_FILETRANSFER = 8,
 	// 				CLIENT_FEATURE_CHATSTATES = 16
 	// 				} SpectrumImportantFeatures;
 	//
 	class StorageBackend;
 	class DiscoInfoResponder;
 	class Factory;
 	class UserRegistry;
 	/// Represents one transport instance.
 	/// It's used to connect the Jabber server and provides transaction layer
@@ @@ -78,14 +77,12 @@ namespace Transport { @@
 			/// Returns Swift::StanzaChannel associated with this Transport::Component.
 			/// It can be used to send presences and other stanzas.
 			/// \return Swift::StanzaChannel associated with this Transport::Component.
 			Swift::StanzaChannel *getStanzaChannel();
 			Swift::CapsInfo &getBuddyCapsInfo();
 			/// Returns Swift::IQRouter associated with this Component.
 			/// \return Swift::IQRouter associated with this Component.
 			Swift::IQRouter *getIQRouter() { return m_iqRouter; }
 			/// Returns Swift::PresenceOracle associated with this Transport::Component.
@@ @@ -101,24 +98,12 @@ namespace Transport { @@
 			/// Connects the Jabber server.
 			void start();
 			void stop();
 			/// Sets disco#info features which are sent as answer to disco#info IQ-get.
 			/// This sets features of transport contact (For example "j2j.domain.tld").
 			/// \param features list of features as sent in disco#info response
 			void setTransportFeatures(std::list<std::string> &features);
 			/// Sets disco#info features which are sent as answer to disco#info IQ-get.
 			/// This sets features of legacy network buddies (For example "me\40gmail.com@j2j.domain.tld").
 			/// \param features list of features as sent in disco#info response
 			void setBuddyFeatures(std::list<std::string> &features);
 			/// Returns Jabber ID of this transport.
 			/// \return Jabber ID of this transport
 			Swift::JID &getJID() { return m_jid; }
 			/// Returns Swift::NetworkFactories which can be used to create new connections.
@@ @@ -183,13 +168,12 @@ namespace Transport { @@
 			PresenceOracle *m_presenceOracle;
 			Swift::StanzaChannel *m_stanzaChannel;
 			Swift::IQRouter *m_iqRouter;
 			Transport::UserRegistry *m_userRegistry;
 			StorageBackend *m_storageBackend;
  			DiscoInfoResponder *m_discoInfoResponder;
 			int m_reconnectCount;
 			Config* m_config;
 			std::string m_protocol;
 			Swift::JID m_jid;
 			Factory *m_factory;
 			Swift::EventLoop *m_loop;

include/transport/user.h

➞

Show inline comments

@@ @@ -68,12 +68,14 @@ class User : public Swift::EntityCapsProvider { @@
 		RosterManager *getRosterManager() { return m_rosterManager; }
 		ConversationManager *getConversationManager() { return m_conversationManager; }
 		Component *getComponent() { return m_component; }
 		UserManager *getUserManager() { return m_userManager; }
 		void setData(void *data) { m_data = data; }
 		void *getData() { return m_data; }
 		/// Handles presence from XMPP JID associated with this user.
 		/// \param presence Swift::Presence.
 		void handlePresence(Swift::Presence::ref presence);

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -29,12 +29,13 @@ namespace Transport { @@
 class User;
 class Component;
 class StorageBackend;
 class StorageResponder;
 class RosterResponder;
 class DiscoItemsResponder;
 /// Manages online XMPP Users.
 /// This class handles presences and creates User classes when new user connects.
 /// It also removes the User class once the last user's resource disconnected.
@@ @@ -52,13 +53,13 @@ class RosterResponder; @@
 */
 class UserManager : public Swift::EntityCapsProvider {
 	public:
 		/// Creates new UserManager.
 		/// \param component Component which's presence will be handled
 		/// \param storageBackend Storage backend used to fetch UserInfos
 		UserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend = NULL);
+		UserManager(Component *component, UserRegistry *userRegistry, DiscoItemsResponder *discoItemsResponder, StorageBackend *storageBackend = NULL);
 		/// Destroys UserManager.
 		~UserManager();
 		/// Returns user according to his bare JID.
 		/// \param barejid bare JID of user
@@ @@ -81,12 +82,14 @@ class UserManager : public Swift::EntityCapsProvider { @@
 		void removeUser(User *user, bool onUserBehalf = true);
 		void removeAllUsers(bool onUserBehalf = true);
 		Swift::DiscoInfo::ref getCaps(const Swift::JID&) const;
 		DiscoItemsResponder *getDiscoResponder() { return m_discoItemsResponder; }
 		/// Called when new User class is created.
 		/// \param user newly created User class
 		boost::signal<void (User *user)> onUserCreated;
 		/// Called when User class is going to be removed
 		/// \param user removed User class
@@ @@ -140,10 +143,11 @@ class UserManager : public Swift::EntityCapsProvider { @@
 		StorageBackend *m_storageBackend;
 		StorageResponder *m_storageResponder;
 		UserRegistry *m_userRegistry;
 		Swift::Timer::ref m_removeTimer;
 		unsigned long m_sentToXMPP;
 		unsigned long m_sentToBackend;
 		DiscoItemsResponder *m_discoItemsResponder;
 		friend class RosterResponder;
 };
+}

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -381,13 +381,16 @@ int main(int argc, char **argv) @@
 		std::cerr << "Can't connect to database. Check the log to find out the reason.\n";
 		return -1;
+	}
 	Logging::redirect_stderr();
 	UserManager userManager(&transport, &userRegistry, storageBackend);
 	DiscoItemsResponder discoItemsResponder(&transport);
 	discoItemsResponder.start();
 	UserManager userManager(&transport, &userRegistry, &discoItemsResponder, storageBackend);
 	userManager_ = &userManager;
 	UserRegistration *userRegistration = NULL;
 	UsersReconnecter *usersReconnecter = NULL;
 	if (storageBackend) {
 		userRegistration = new UserRegistration(&transport, &userManager, storageBackend);
@@ @@ -395,15 +398,12 @@ int main(int argc, char **argv) @@
 		usersReconnecter = new UsersReconnecter(&transport, storageBackend);
+	}
 	FileTransferManager ftManager(&transport, &userManager);
 	DiscoItemsResponder discoItemsResponder(&transport);
 	discoItemsResponder.start();
 	NetworkPluginServer plugin(&transport, &config, &userManager, &ftManager, &discoItemsResponder);
 	AdminInterface adminInterface(&transport, &userManager, &plugin, storageBackend, userRegistration);
 	plugin.setAdminInterface(&adminInterface);
 	StatsResponder statsResponder(&transport, &userManager, &plugin, storageBackend);

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -10,21 +10,22 @@ pidfile=./test.pid @@
 #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/libpurple/spectrum2_libpurple_backend
+#backend=../..//backends/libpurple/spectrum2_libpurple_backend
 #backend=../../backends/twitter/spectrum2_twitter_backend
-#backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum2_communi_backend
+backend=/home/hanzz/code/libtransport/backends/libcommuni/spectrum2_libcommuni_backend
 protocol=prpl-icq
 #protocol=prpl-msn
 #protocol=any
 #protocol=prpl-icq
 working_dir=./
 portfile=$jid.port
 irc_server=irc.freenode.org
 [backend]
 #default_avatar=catmelonhead.jpg
 #no_vcard_fetch=true
 [logging]

src/buddy.cpp

➞

Show inline comments

@@ @@ -20,12 +20,14 @@ @@
 #include "transport/buddy.h"
 #include "transport/rostermanager.h"
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/BlockPayload.h"
 #include "transport/usermanager.h"
 #include "transport/discoitemsresponder.h"
 namespace Transport {
 Buddy::Buddy(RosterManager *rosterManager, long id, BuddyFlag flags) : m_id(id), m_flags(flags), m_rosterManager(rosterManager),
 	m_subscription(Ask) {
 // 	m_rosterManager->setBuddy(this);
 		presence->setType(Swift::Presence::Unavailable);
 	presence->setShow(s.getType());
 	if (presence->getType() != Swift::Presence::Unavailable) {
 		// caps
-		presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::CapsInfo(m_rosterManager->getUser()->getComponent()->getBuddyCapsInfo())));
+		presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::CapsInfo(m_rosterManager->getUser()->getUserManager()->getDiscoResponder()->getBuddyCapsInfo())));
 // 		if (features & 0/*TRANSPORT_FEATURE_AVATARS*/) {
 			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::VCardUpdate (getIconHash())));
 // 		}
 		if (isBlocked()) {
 			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Transport::BlockPayload ()));

src/config.cpp

➞

Show inline comments

 		("service.reuse_old_backends", value<bool>()->default_value(true), "True if Spectrum should use old backends which were full in the past.")
 		("service.idle_reconnect_time", value<int>()->default_value(0), "Time in seconds after which idle users are reconnected to let their backend die.")
 		("service.memory_collector_time", value<int>()->default_value(0), "Time in seconds after which backend with most memory is set to die.")
 		("service.more_resources", value<bool>()->default_value(false), "Allow more resources to be connected in server mode at the same time.")
 		("service.enable_privacy_lists", value<bool>()->default_value(true), "")
 		("service.enable_xhtml", value<bool>()->default_value(true), "")
 		("service.max_room_list_size", value<int>()->default_value(100), "")
 		("vhosts.vhost", value<std::vector<std::string> >()->multitoken(), "")
 		("identity.name", value<std::string>()->default_value("Spectrum 2 Transport"), "Name showed in service discovery.")
 		("identity.category", value<std::string>()->default_value("gateway"), "Disco#info identity category. 'gateway' by default.")
 		("identity.type", value<std::string>()->default_value(""), "Type of transport ('icq','msn','gg','irc', ...)")
 		("registration.enable_public_registration", value<bool>()->default_value(true), "True if users should be able to register.")
 		("registration.language", value<std::string>()->default_value("en"), "Default language for registration form")

src/discoinforesponder.cpp

➞

Show inline comments

@@ @@ -19,21 +19,25 @@ @@
  */
 #include "discoinforesponder.h"
 #include <iostream>
 #include <boost/bind.hpp>
 #include <boost/algorithm/string.hpp>
 #include "Swiften/Disco/DiscoInfoResponder.h"
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Swiften.h"
 #include "transport/config.h"
 #include "transport/logging.h"
 using namespace Swift;
 using namespace boost;
 DEFINE_LOGGER(logger, "DiscoInfoResponder");
 namespace Transport {
 DiscoInfoResponder::DiscoInfoResponder(Swift::IQRouter *router, Config *config) : Swift::GetResponder<DiscoInfo>(router) {
 	m_config = config;
 	m_transportInfo.addIdentity(DiscoInfo::Identity(CONFIG_STRING(m_config, "identity.name"),
 													CONFIG_STRING(m_config, "identity.category"),
 	CapsInfoGenerator caps("spectrum");
 	m_capsInfo = caps.generateCapsInfo(m_buddyInfo);
 	onBuddyCapsInfoChanged(m_capsInfo);
+}
 void DiscoInfoResponder::addRoom(const std::string &jid, const std::string &name) {
 	std::string j = jid;
 	boost::algorithm::to_lower(j);
 	m_rooms[j] = name;
+}
 void DiscoInfoResponder::clearRooms() {
 	m_rooms.clear();
+}
 bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoInfo> info) {
 	if (!info->getNode().empty()) {
 		sendError(from, id, ErrorPayload::ItemNotFound, ErrorPayload::Cancel);
 		return true;
+	}
 	// presence for transport
 	// disco#info for transport
 	if (to.getNode().empty()) {
 		boost::shared_ptr<DiscoInfo> res(new DiscoInfo(m_transportInfo));
 		res->setNode(info->getNode());
 		sendResponse(from, id, res);
+	}
 	// presence for buddy
 	// disco#info for room
 	else if (m_rooms.find(to.toBare().toString()) != m_rooms.end()) {
 		boost::shared_ptr<DiscoInfo> res(new DiscoInfo());
 		res->addIdentity(DiscoInfo::Identity(m_rooms[to.toBare().toString()], "conference", "text"));
 		res->setNode(info->getNode());
 		sendResponse(from, to, id, res);
+	}
 	// disco#info for buddy
 	else {
 		boost::shared_ptr<DiscoInfo> res(new DiscoInfo(m_buddyInfo));
 		res->setNode(info->getNode());
 		sendResponse(from, to, id, res);
+	}
 	return true;

src/discoinforesponder.h

➞

Show inline comments

 		DiscoInfoResponder(Swift::IQRouter *router, Config *config);
 		~DiscoInfoResponder();
 		void setTransportFeatures(std::list<std::string> &features);
 		void setBuddyFeatures(std::list<std::string> &features);
 		void addRoom(const std::string &jid, const std::string &name);
 		void clearRooms();
 		boost::signal<void (const Swift::CapsInfo &capsInfo)> onBuddyCapsInfoChanged;
 		Swift::CapsInfo &getBuddyCapsInfo() {
 				return m_capsInfo;
+		}
 		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoInfo> payload);
 		Swift::DiscoInfo m_transportInfo;
 		Swift::DiscoInfo m_buddyInfo;
 		Config *m_config;
 		Swift::CapsInfo m_capsInfo;
 		std::map<std::string, std::string> m_rooms;
 };
+}
@@ \ No newline at end of file @@

src/discoitemsresponder.cpp

➞

Show inline comments

@@ @@ -23,12 +23,13 @@ @@
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Swiften.h"
 #include "transport/transport.h"
 #include "transport/logging.h"
 #include "discoinforesponder.h"
 using namespace Swift;
 using namespace boost;
 namespace Transport {
@@ @@ -37,28 +38,39 @@ DEFINE_LOGGER(logger, "DiscoItemsResponder"); @@
 DiscoItemsResponder::DiscoItemsResponder(Component *component) : Swift::GetResponder<DiscoItems>(component->getIQRouter()) {
 	m_component = component;
 	m_commands = boost::shared_ptr<DiscoItems>(new DiscoItems());
 	m_commands->setNode("http://jabber.org/protocol/commands");
 	m_rooms = boost::shared_ptr<DiscoItems>(new DiscoItems());
 	m_discoInfoResponder = new DiscoInfoResponder(component->getIQRouter(), component->getConfig());
 	m_discoInfoResponder->start();
+}
 DiscoItemsResponder::~DiscoItemsResponder() {
+	>
+	delete m_discoInfoResponder;
+}
 void DiscoItemsResponder::addAdHocCommand(const std::string &node, const std::string &name) {
 	m_commands->addItem(DiscoItems::Item(name, m_component->getJID(), node));
+}
 void DiscoItemsResponder::addRoom(const std::string &node, const std::string &name) {
 	m_rooms->addItem(DiscoItems::Item(name, m_component->getJID(), node));
 	if (m_rooms->getItems().size() > CONFIG_INT(m_component->getConfig(), "service.max_room_list_size")) {
 		return;
+	}
 	m_rooms->addItem(DiscoItems::Item(name, node));
 	m_discoInfoResponder->addRoom(node, name);
+}
 void DiscoItemsResponder::clearRooms() {
 	m_rooms = boost::shared_ptr<DiscoItems>(new DiscoItems());
 	m_discoInfoResponder->clearRooms();
+}
 Swift::CapsInfo &DiscoItemsResponder::getBuddyCapsInfo() {
 	return m_discoInfoResponder->getBuddyCapsInfo();
+}
 bool DiscoItemsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoItems> info) {
 	LOG4CXX_INFO(logger, "get request received with node " << info->getNode());
 	if (info->getNode() == "http://jabber.org/protocol/commands") {

src/networkpluginserver.cpp

➞

Show inline comments

 		// TODO: ERROR
 		return;
+	}
 	m_discoItemsResponder->clearRooms();
 	for (int i = 0; i < payload.room_size() && i < payload.name_size(); i++) {
 		m_discoItemsResponder->addRoom(payload.room(i), payload.name(i));
+		m_discoItemsResponder->addRoom(Swift::JID::getEscapedNode(payload.room(i)) + "@" + m_component->getJID().toString(), payload.name(i));
+	}
+}
 void NetworkPluginServer::handleDataRead(Backend *c, boost::shared_ptr<Swift::SafeByteArray> data) {
 	// Append data to buffer
 	c->data.insert(c->data.end(), data->begin(), data->end());

src/tests/basictest.cpp

➞

Show inline comments

@@ @@ -54,20 +54,20 @@ void BasicTest::setMeUp (void) { @@
 	userRegistry = new UserRegistry(cfg, factories);
 	component = new Component(loop, factories, cfg, factory, userRegistry);
 	component->start();
 	userManager = new UserManager(component, userRegistry, storage);
 	itemsResponder = new DiscoItemsResponder(component);
 	itemsResponder->start();
 	userManager = new UserManager(component, userRegistry, itemsResponder, storage);
 	userRegistration = new UserRegistration(component, userManager, storage);
 	userRegistration->start();
 	itemsResponder = new DiscoItemsResponder(component);
 	itemsResponder->start();
 	payloadSerializers = new Swift::FullPayloadSerializerCollection();
 	payloadParserFactories = new Swift::FullPayloadParserFactoryCollection();
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<StorageParser>("private", "jabber:iq:private"));
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<Swift::AttentionParser>("attention", "urn:xmpp:attention:0"));
 	payloadParserFactories->addFactory(new Swift::GenericPayloadParserFactory<Swift::XHTMLIMParser>("html", "http://jabber.org/protocol/xhtml-im"));

src/tests/discoitemsresponder.cpp

➞

Show inline comments

@@ new file 100644 @@
 #include "transport/userregistry.h"
 #include "transport/userregistration.h"
 #include "transport/config.h"
 #include "transport/storagebackend.h"
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/conversation.h"
 #include "transport/usermanager.h"
 #include "transport/localbuddy.h"
 #include "transport/settingsadhoccommand.h"
 #include "transport/adhocmanager.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 DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(DiscoItemsResponderTest);
 	CPPUNIT_TEST(roomList);
 	CPPUNIT_TEST(roomInfo);
 	CPPUNIT_TEST(clearRooms);
 	CPPUNIT_TEST_SUITE_END();
 	public:
 		void setUp (void) {
 			setMeUp();
+		}
 		void tearDown (void) {
 			received.clear();
 			tearMeDown();
+		}
 	void roomList() {
 		itemsResponder->addRoom("#room@localhost", "#room");
 		boost::shared_ptr<Swift::DiscoItems> payload(new Swift::DiscoItems());
 		boost::shared_ptr<Swift::IQ> iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload);
 		iq->setFrom("user@localhost");
 		injectIQ(iq);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoItems>());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room@localhost"), getStanza(received[0])->getPayload<Swift::DiscoItems>()->getItems()[0].getJID().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room"), getStanza(received[0])->getPayload<Swift::DiscoItems>()->getItems()[0].getName());
+	}
 	void roomInfo() {
 		itemsResponder->addRoom("#room@localhost", "#room");
 		boost::shared_ptr<Swift::DiscoInfo> payload(new Swift::DiscoInfo());
 		boost::shared_ptr<Swift::IQ> iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload);
 		iq->setFrom("user@localhost");
 		iq->setTo("#room@localhost");
 		injectIQ(iq);
 		loop->processEvents();
 		dumpReceived();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoInfo>());
 		CPPUNIT_ASSERT_EQUAL(std::string("#room"), getStanza(received[0])->getPayload<Swift::DiscoInfo>()->getIdentities()[0].getName());
 		CPPUNIT_ASSERT_EQUAL(std::string("conference"), getStanza(received[0])->getPayload<Swift::DiscoInfo>()->getIdentities()[0].getCategory());
 		CPPUNIT_ASSERT_EQUAL(std::string("text"), getStanza(received[0])->getPayload<Swift::DiscoInfo>()->getIdentities()[0].getType());
+	}
 	void clearRooms() {
 		itemsResponder->addRoom("#room@localhost", "#room");
 		itemsResponder->clearRooms();
 		boost::shared_ptr<Swift::DiscoItems> payload(new Swift::DiscoItems());
 		boost::shared_ptr<Swift::IQ> iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload);
 		iq->setFrom("user@localhost");
 		injectIQ(iq);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoItems>());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoItems>()->getItems().empty());
+	}
 };
 CPPUNIT_TEST_SUITE_REGISTRATION (DiscoItemsResponderTest);

src/transport.cpp

➞

Show inline comments

@@ @@ -23,13 +23,12 @@ @@
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include "transport/storagebackend.h"
 #include "transport/factory.h"
 #include "transport/userregistry.h"
 #include "transport/logging.h"
 #include "discoinforesponder.h"
 #include "storageparser.h"
 #ifdef _WIN32
 #include <Swiften/TLS/CAPICertificate.h>
 #include "Swiften/TLS/Schannel/SchannelServerContext.h"
 #include "Swiften/TLS/Schannel/SchannelServerContextFactory.h"
 #else
 	m_entityCapsManager = new EntityCapsManager(m_capsManager, m_stanzaChannel);
  	m_entityCapsManager->onCapsChanged.connect(boost::bind(&Component::handleCapsChanged, this, _1));
 	m_presenceOracle = new Transport::PresenceOracle(m_stanzaChannel);
 	m_presenceOracle->onPresenceChange.connect(bind(&Component::handlePresence, this, _1));
 	m_discoInfoResponder = new DiscoInfoResponder(m_iqRouter, m_config);
 	m_discoInfoResponder->start();
 //
 // 	m_registerHandler = new SpectrumRegisterHandler(m_component);
 // 	m_registerHandler->start();
+}
 Component::~Component() {
 	delete m_presenceOracle;
 	delete m_entityCapsManager;
 	delete m_capsManager;
 	delete m_capsMemoryStorage;
 	delete m_discoInfoResponder;
 	if (m_component)
 		delete m_component;
 	if (m_server) {
 		m_server->stop();
 		delete m_server;
+	}
@@ @@ -185,25 +182,12 @@ Swift::StanzaChannel *Component::getStanzaChannel() { @@
+}
 Transport::PresenceOracle *Component::getPresenceOracle() {
 	return m_presenceOracle;
+}
 void Component::setTransportFeatures(std::list<std::string> &features) {
 	m_discoInfoResponder->setTransportFeatures(features);
+}
 Swift::CapsInfo &Component::getBuddyCapsInfo() {
 		return m_discoInfoResponder->getBuddyCapsInfo();
+}
 void Component::setBuddyFeatures(std::list<std::string> &features) {
 	// TODO: handle caps change
 	m_discoInfoResponder->setBuddyFeatures(features);
+}
 void Component::start() {
 	if (m_component && !m_component->isAvailable()) {
 		LOG4CXX_INFO(logger, "Connecting XMPP server " << CONFIG_STRING(m_config, "service.server") << " port " << CONFIG_INT(m_config, "service.port"));
 		if (CONFIG_INT(m_config, "service.port") == 5222) {
 			LOG4CXX_WARN(logger, "Port 5222 is usually used for client connections, not for component connections! Are you sure you are using right port?");
+		}

src/usermanager.cpp

➞

Show inline comments

@@ @@ -23,12 +23,13 @@ @@
 #include "transport/transport.h"
 #include "transport/storagebackend.h"
 #include "transport/conversationmanager.h"
 #include "transport/rostermanager.h"
 #include "transport/userregistry.h"
 #include "transport/logging.h"
 #include "transport/discoitemsresponder.h"
 #include "storageresponder.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #ifndef __FreeBSD__
@@ @@ -37,21 +38,22 @@ @@
 // #include "valgrind/memcheck.h"
 namespace Transport {
 DEFINE_LOGGER(logger, "UserManager");
 UserManager::UserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend) {
+UserManager::UserManager(Component *component, UserRegistry *userRegistry, DiscoItemsResponder *discoItemsResponder, StorageBackend *storageBackend) {
 	m_cachedUser = NULL;
 	m_onlineBuddies = 0;
 	m_sentToXMPP = 0;
 	m_sentToBackend = 0;
 	m_component = component;
 	m_storageBackend = storageBackend;
 	m_storageResponder = NULL;
 	m_userRegistry = userRegistry;
 	m_discoItemsResponder = discoItemsResponder;
 	if (m_storageBackend) {
 		m_storageResponder = new StorageResponder(component->getIQRouter(), m_storageBackend, this);
 		m_storageResponder->start();
+	}

0 comments (0 inline, 0 general)