stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Libtransport: Support for bouncer mode in case of rawxml. Support for more resources in Buddy class.

Browse source
This commit is contained in:
HanzZ 2013-02-22 09:45:31 +01:00
parent 5521c40944
commit e5aab1415d
15 changed files with 240 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
backends/skype/skypedb.cpp
View file

@ -40,6 +40,10 @@
#include "malloc.h"
#endif
#include "skypeplugin.h"
#include "skypeplugin.h"
// Prepare the SQL statement
#define PREP_STMT(sql, str) \
if(sqlite3_prepare_v2(db, std::string(str).c_str(), -1, &sql, NULL)) { \
@ -104,7 +108,7 @@ bool getAvatar(const std::string &db_path, const std::string &name, std::string
FINALIZE_STMT(stmt);
}
else {
LOG4CXX_ERROR(logger, "Can't created prepared statement");
LOG4CXX_ERROR(logger, "Can't create prepared statement");
LOG4CXX_ERROR(logger, (sqlite3_errmsg(db) == NULL ? "" : sqlite3_errmsg(db)));
}
sqlite3_close(db);
@ -112,4 +116,42 @@ bool getAvatar(const std::string &db_path, const std::string &name, std::string
return ret;
}
bool loadBuddies(Transport::NetworkPlugin *np, const std::string &db_path) {
bool ret = false;
// sqlite3 *db;
// LOG4CXX_INFO(logger, "Opening database " << db_path);
// if (sqlite3_open(db_path.c_str(), &db)) {
// sqlite3_close(db);
// LOG4CXX_ERROR(logger, "Can't open database");
// }
// else {
// sqlite3_stmt *stmt;
// PREP_STMT(stmt, "SELECT avatar_image FROM Contacts WHERE skypename=?");
// if (stmt) {
// BEGIN(stmt);
// BIND_STR(stmt, name);
// if(sqlite3_step(stmt) == SQLITE_ROW) {
// int size = sqlite3_column_bytes(stmt, 0);
// const void *data = sqlite3_column_blob(stmt, 0);
// photo = std::string((const char *)data + 1, size - 1);
// ret = true;
// }
// else {
// LOG4CXX_ERROR(logger, (sqlite3_errmsg(db) == NULL ? "" : sqlite3_errmsg(db)));
// }
//
// int ret;
// while((ret = sqlite3_step(stmt)) == SQLITE_ROW) {
// }
// FINALIZE_STMT(stmt);
// }
// else {
// LOG4CXX_ERROR(logger, "Can't create prepared statement");
// LOG4CXX_ERROR(logger, (sqlite3_errmsg(db) == NULL ? "" : sqlite3_errmsg(db)));
// }
// sqlite3_close(db);
// }
return ret;
}
}

4
backends/skype/skypedb.h
View file

@ -26,8 +26,10 @@
#include <iostream>
#include <map>
class SkypePlugin;
namespace SkypeDB {
bool getAvatar(const std::string &db, const std::string &name, std::string &avatar);
bool loadBuddies(SkypePlugin *np, const std::string &db);
}

8
include/transport/buddy.h
View file

@ -80,7 +80,7 @@ class Buddy {
/// \param only_new if True, this function returns Presence stanza only if it's different
/// than the previously generated one.
/// \return Presence stanza or NULL.
Swift::Presence::ref generatePresenceStanza(int features, bool only_new = false);
std::vector<Swift::Presence::ref> &generatePresenceStanzas(int features, bool only_new = false);
void setBlocked(bool block) {
if (block)
@ -124,6 +124,8 @@ class Buddy {
void sendPresence();
void handleRawPresence(Swift::Presence::ref);
/// Handles VCard from legacy network and forwards it to XMPP user.
/// \param id ID used in IQ-result.
@ -157,6 +159,8 @@ class Buddy {
/// \return avatar hash or empty string.
virtual std::string getIconHash() = 0;
virtual bool isAvailable() = 0;
/// Returns legacy name of buddy from JID.
/// \param jid Jabber ID.
@ -167,10 +171,10 @@ class Buddy {
protected:
void generateJID();
Swift::JID m_jid;
std::vector<Swift::Presence::ref> m_presences;
private:
long m_id;
// Swift::Presence::ref m_lastPresence;
BuddyFlag m_flags;
RosterManager *m_rosterManager;
Subscription m_subscription;

11
include/transport/conversation.h
View file

@ -72,6 +72,7 @@ class Conversation {
void handleMessage(boost::shared_ptr<Swift::Message> &message, const std::string &nickname = "");
void handleRawMessage(boost::shared_ptr<Swift::Message> &message);
void handleRawPresence(Swift::Presence::ref presence);
/// Handles participant change in MUC.
@ -163,10 +164,16 @@ class Conversation {
bool m_muc;
Swift::JID m_jid;
std::list<Swift::JID> m_jids;
std::map<std::string, Participant> m_participants;
boost::shared_ptr<Swift::Message> m_subject;
bool m_sentInitialPresence;
// TODO: Move this to some extra class to cache the most used
// rooms across different accounts. Just now if we have 10 users
// connected to single room, we store all those things 10 times.
// It would be also great to store last 100 messages per room
// every time, so we can get history messages for IRC for example.
boost::shared_ptr<Swift::Message> m_subject;
std::list<boost::shared_ptr<Swift::Message> > m_cachedMessages;
std::map<std::string, Swift::Presence::ref> m_participants;
};
}

8
include/transport/localbuddy.h
View file

@ -39,10 +39,10 @@ class LocalBuddy : public Buddy {
std::string getName() { return m_name; }
bool setName(const std::string &name);
bool getStatus(Swift::StatusShow &status, std::string &statusMessage) {
status = m_status;
statusMessage = m_statusMessage;
return true;
bool getStatus(Swift::StatusShow &status, std::string &statusMessage);
bool isAvailable() {
return m_status.getType() != Swift::StatusShow::None;
}
void setStatus(const Swift::StatusShow &status, const std::string &statusMessage);

4
include/transport/transport.h
View file

@ -155,6 +155,10 @@ namespace Transport {
boost::signal<void (boost::shared_ptr<Swift::IQ>)> onRawIQReceived;
bool isRawXMLEnabled() {
return m_rawXML;
}
private:
void handleConnected();
void handleConnectionError(const Swift::ComponentError &error);

47
src/buddy.cpp
View file

@ -40,8 +40,8 @@ Buddy::~Buddy() {
}
void Buddy::sendPresence() {
Swift::Presence::ref presence = generatePresenceStanza(255);
if (presence) {
std::vector<Swift::Presence::ref> &presences = generatePresenceStanzas(255);
BOOST_FOREACH(Swift::Presence::ref presence, presences) {
m_rosterManager->getUser()->getComponent()->getStanzaChannel()->sendPresence(presence);
}
}
@ -89,17 +89,33 @@ Buddy::Subscription Buddy::getSubscription() {
return m_subscription;
}
Swift::Presence::ref Buddy::generatePresenceStanza(int features, bool only_new) {
std::string alias = getAlias();
std::string name = getSafeName();
void Buddy::handleRawPresence(Swift::Presence::ref presence) {
for (std::vector<Swift::Presence::ref>::iterator it = m_presences.begin(); it != m_presences.end(); it++) {
if ((*it)->getFrom() == presence->getFrom()) {
m_presences.erase(it);
break;
}
}
m_presences.push_back(presence);
m_rosterManager->getUser()->getComponent()->getStanzaChannel()->sendPresence(presence);
}
std::vector<Swift::Presence::ref> &Buddy::generatePresenceStanzas(int features, bool only_new) {
if (m_jid.getNode().empty()) {
generateJID();
}
Swift::StatusShow s;
std::string statusMessage;
if (!getStatus(s, statusMessage))
return Swift::Presence::ref();
if (m_jid.getNode().empty()) {
generateJID();
if (!getStatus(s, statusMessage)) {
for (std::vector<Swift::Presence::ref>::iterator it = m_presences.begin(); it != m_presences.end(); it++) {
if ((*it)->getFrom() == m_jid) {
m_presences.erase(it);
break;
}
}
return m_presences;
}
Swift::Presence::ref presence = Swift::Presence::create();
@ -128,6 +144,15 @@ Swift::Presence::ref Buddy::generatePresenceStanza(int features, bool only_new)
}
}
BOOST_FOREACH(Swift::Presence::ref &p, m_presences) {
if (p->getFrom() == presence->getFrom()) {
p = presence;
return m_presences;
}
}
m_presences.push_back(presence);
// if (only_new) {
// if (m_lastPresence)
// m_lastPresence->setTo(Swift::JID(""));
@ -137,7 +162,7 @@ Swift::Presence::ref Buddy::generatePresenceStanza(int features, bool only_new)
// m_lastPresence = presence;
// }
return presence;
return m_presences;
}
std::string Buddy::getSafeName() {

19
src/conversation.cpp
View file

@ -198,10 +198,9 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
}
void Conversation::sendParticipants(const Swift::JID &to) {
for (std::map<std::string, Participant>::iterator it = m_participants.begin(); it != m_participants.end(); it++) {
Swift::Presence::ref presence = generatePresence(it->first, it->second.flag, it->second.status, it->second.statusMessage, "");
presence->setTo(to);
m_conversationManager->getComponent()->getStanzaChannel()->sendPresence(presence);
for (std::map<std::string, Swift::Presence::ref>::iterator it = m_participants.begin(); it != m_participants.end(); it++) {
(*it).second->setTo(to);
m_conversationManager->getComponent()->getStanzaChannel()->sendPresence((*it).second);
}
}
@ -296,6 +295,12 @@ Swift::Presence::ref Conversation::generatePresence(const std::string &nick, int
return presence;
}
void Conversation::handleRawPresence(Swift::Presence::ref presence) {
// TODO: Detect nickname change.
m_conversationManager->getComponent()->getStanzaChannel()->sendPresence(presence);
m_participants[presence->getFrom().getResource()] = presence;
}
void Conversation::handleParticipantChanged(const std::string &nick, Conversation::ParticipantFlag flag, int status, const std::string &statusMessage, const std::string &newname) {
Swift::Presence::ref presence = generatePresence(nick, flag, status, statusMessage, newname);
@ -303,11 +308,7 @@ void Conversation::handleParticipantChanged(const std::string &nick, Conversatio
m_participants.erase(nick);
}
else {
Participant p;
p.flag = flag;
p.status = status;
p.statusMessage = statusMessage;
m_participants[nick] = p;
m_participants[nick] = presence;
}

9
src/localbuddy.cpp
View file

@ -102,4 +102,13 @@ void LocalBuddy::setGroups(const std::vector<std::string> &groups) {
}
}
bool LocalBuddy::getStatus(Swift::StatusShow &status, std::string &statusMessage) {
if (getRosterManager()->getUser()->getComponent()->isRawXMLEnabled()) {
return false;
}
status = m_status;
statusMessage = m_statusMessage;
return true;
}
}

13
src/networkpluginserver.cpp
View file

@ -1053,10 +1053,17 @@ void NetworkPluginServer::handleElement(boost::shared_ptr<Swift::Element> elemen
boost::shared_ptr<Swift::Presence> presence = boost::dynamic_pointer_cast<Swift::Presence>(stanza);
if (presence) {
m_component->getStanzaChannel()->sendPresence(presence);
if (buddy) {
buddy->m_statusMessage = presence->getStatus();
buddy->m_status = Swift::StatusShow(presence->getShow());
if (!buddy->isAvailable() && presence->getType() != Swift::Presence::Unavailable) {
buddy->m_status.setType(Swift::StatusShow::Online);
}
buddy->handleRawPresence(presence);
}
else if (conv) {
conv->handleRawPresence(presence);
}
else {
m_component->getStanzaChannel()->sendPresence(presence);
}
return;

34
src/rostermanager.cpp
View file

@ -255,9 +255,11 @@ void RosterManager::storeBuddy(Buddy *buddy) {
void RosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, Swift::SetRosterRequest::ref request, const std::string &key) {
LOG4CXX_INFO(logger, "handleBuddyRosterPushResponse called for buddy " << key);
if (m_buddies[key] != NULL) {
Swift::Presence::ref presence = m_buddies[key]->generatePresenceStanza(255);
if (presence && presence->getType() == Swift::Presence::Available) {
m_component->getStanzaChannel()->sendPresence(presence);
if (m_buddies[key]->isAvailable()) {
std::vector<Swift::Presence::ref> &presences = m_buddies[key]->generatePresenceStanzas(255);
BOOST_FOREACH(Swift::Presence::ref &presence, presences) {
m_component->getStanzaChannel()->sendPresence(presence);
}
}
}
else {
@ -440,13 +442,13 @@ void RosterManager::handleSubscription(Swift::Presence::ref presence) {
Buddy *buddy = getBuddy(Buddy::JIDToLegacyName(presence->getTo()));
if (buddy) {
std::vector<Swift::Presence::ref> &presences = buddy->generatePresenceStanzas(255);
switch (presence->getType()) {
// buddy is already there, so nothing to do, just answer
case Swift::Presence::Subscribe:
onBuddyAdded(buddy);
response->setType(Swift::Presence::Subscribed);
currentPresence = buddy->generatePresenceStanza(255);
if (currentPresence) {
BOOST_FOREACH(Swift::Presence::ref &currentPresence, presences) {
currentPresence->setTo(presence->getFrom());
m_component->getStanzaChannel()->sendPresence(currentPresence);
}
@ -587,8 +589,11 @@ void RosterManager::sendCurrentPresences(const Swift::JID &to) {
if (!buddy) {
continue;
}
Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
if (presence && presence->getType() == Swift::Presence::Available) {
if (!buddy->isAvailable()) {
continue;
}
std::vector<Swift::Presence::ref> &presences = buddy->generatePresenceStanzas(255);
BOOST_FOREACH(Swift::Presence::ref &presence, presences) {
presence->setTo(to);
m_component->getStanzaChannel()->sendPresence(presence);
}
@ -598,8 +603,8 @@ void RosterManager::sendCurrentPresences(const Swift::JID &to) {
void RosterManager::sendCurrentPresence(const Swift::JID &from, const Swift::JID &to) {
Buddy *buddy = getBuddy(Buddy::JIDToLegacyName(from));
if (buddy) {
Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
if (presence) {
std::vector<Swift::Presence::ref> &presences = buddy->generatePresenceStanzas(255);
BOOST_FOREACH(Swift::Presence::ref &presence, presences) {
presence->setTo(to);
m_component->getStanzaChannel()->sendPresence(presence);
}
@ -619,11 +624,18 @@ void RosterManager::sendUnavailablePresences(const Swift::JID &to) {
if (!buddy) {
continue;
}
Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
if (presence && presence->getType() == Swift::Presence::Available) {
if (!buddy->isAvailable()) {
continue;
}
std::vector<Swift::Presence::ref> &presences = buddy->generatePresenceStanzas(255);
BOOST_FOREACH(Swift::Presence::ref &presence, presences) {
Swift::Presence::Type type = presence->getType();
presence->setTo(to);
presence->setType(Swift::Presence::Unavailable);
m_component->getStanzaChannel()->sendPresence(presence);
presence->setType(type);
}
}

3
src/tests/basictest.cpp
View file

@ -241,6 +241,9 @@ void BasicTest::disconnectUser() {
if (user) {
user->addUserSetting("stay_connected", "0");
}
else {
return;
}
received.clear();
userManager->disconnectUser("user@localhost");
dynamic_cast<Swift::DummyTimerFactory *>(factories->getTimerFactory())->setTime(100);

5
src/tests/conversationmanager.cpp
View file

@ -23,6 +23,7 @@ using namespace Transport;
class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
CPPUNIT_TEST_SUITE(ConversationManagerTest);
CPPUNIT_TEST(conversationSize);
CPPUNIT_TEST(handleNormalMessages);
CPPUNIT_TEST(handleNormalMessagesHeadline);
CPPUNIT_TEST(handleGroupchatMessages);
@ -60,6 +61,10 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe
tearMeDown();
}
void conversationSize() {
std::cout << " = " << sizeof(Conversation) << " B";
}
void handleMessageReceived(TestingConversation *_conv, boost::shared_ptr<Swift::Message> &_msg) {
m_conv = _conv;
m_msg = _msg;

5
src/tests/localbuddy.cpp
View file

@ -22,6 +22,7 @@ using namespace Transport;
class LocalBuddyTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
CPPUNIT_TEST_SUITE(LocalBuddyTest);
CPPUNIT_TEST(localBuddySize);
CPPUNIT_TEST(createWithInvalidName);
CPPUNIT_TEST(buddyFlagsFromJID);
CPPUNIT_TEST(JIDToLegacyName);
@ -43,6 +44,10 @@ class LocalBuddyTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
tearMeDown();
}
void localBuddySize() {
std::cout << " = " << sizeof(LocalBuddy) << " B";
}
void createWithInvalidName() {
User *user = userManager->getUser("user@localhost");
CPPUNIT_ASSERT(user);

74
src/tests/networkpluginserver.cpp
View file

@ -56,6 +56,7 @@ class NetworkPluginServerTest : public CPPUNIT_NS :: TestFixture, public BasicTe
CPPUNIT_TEST(handleRawXML);
CPPUNIT_TEST(benchmarkHandleBuddyChangedPayload);
CPPUNIT_TEST(benchmarkSendUnavailablePresence);
CPPUNIT_TEST_SUITE_END();
public:
@ -140,6 +141,49 @@ class NetworkPluginServerTest : public CPPUNIT_NS :: TestFixture, public BasicTe
std::cerr << " " << clk.elapsedTime() << " s";
}
void benchmarkSendUnavailablePresence() {
Clock clk;
std::vector<std::string> lst;
for (int i = 0; i < 1000; i++) {
pbnetwork::Buddy buddy;
buddy.set_username("user@localhost");
buddy.set_buddyname("buddy" + boost::lexical_cast<std::string>(i) + "@test");
buddy.set_status((pbnetwork::StatusType) 5);
std::string message;
buddy.SerializeToString(&message);
lst.push_back(message);
}
std::vector<std::string> lst2;
for (int i = 0; i < 1000; i++) {
pbnetwork::Buddy buddy;
buddy.set_username("user@localhost");
buddy.set_buddyname("buddy" + boost::lexical_cast<std::string>(1000+i) + "@test");
buddy.set_status((pbnetwork::StatusType) 2);
std::string message;
buddy.SerializeToString(&message);
lst2.push_back(message);
}
for (int i = 0; i < 1000; i++) {
serv->handleBuddyChangedPayload(lst[i]);
received.clear();
}
for (int i = 0; i < 1000; i++) {
serv->handleBuddyChangedPayload(lst2[i]);
received.clear();
}
User *user = userManager->getUser("user@localhost");
clk.start();
user->getRosterManager()->sendUnavailablePresences("user@localhost");
clk.end();
std::cerr << " " << clk.elapsedTime() << " s";
}
void handleBuddyChangedPayload() {
User *user = userManager->getUser("user@localhost");
@ -198,14 +242,36 @@ class NetworkPluginServerTest : public CPPUNIT_NS :: TestFixture, public BasicTe
}
void handleRawXML() {
cfg->updateBackendConfig("[features]\nrawxml=1\n");
User *user = userManager->getUser("user@localhost");
std::vector<std::string> grp;
grp.push_back("group1");
LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy1@domain.tld", "Buddy 1", grp, BUDDY_JID_ESCAPING);
user->getRosterManager()->setBuddy(buddy);
received.clear();
std::string xml = "<presence from='buddy1@domain.tld' to='user@localhost'/>";
std::string xml = "<presence from='buddy1@domain.tld/res' to='user@localhost'/>";
serv->handleRawXML(xml);
CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
std::string xml2 = "<presence from='buddy1@domain.tld/res2' to='user@localhost'/>";
serv->handleRawXML(xml2);
CPPUNIT_ASSERT_EQUAL(2, (int) received.size());
CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));
CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40domain.tld@localhost"), dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getFrom().toString());
CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40domain.tld@localhost/res"), dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getFrom().toString());
CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[1])));
CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40domain.tld@localhost/res2"), dynamic_cast<Swift::Presence *>(getStanza(received[1]))->getFrom().toString());
received.clear();
user->getRosterManager()->sendUnavailablePresences("user@localhost");
CPPUNIT_ASSERT_EQUAL(3, (int) received.size());
CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));
CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40domain.tld@localhost/res"), dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getFrom().toString());
CPPUNIT_ASSERT_EQUAL(Swift::Presence::Unavailable, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getType());
CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[1])));
CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40domain.tld@localhost/res2"), dynamic_cast<Swift::Presence *>(getStanza(received[1]))->getFrom().toString());
CPPUNIT_ASSERT_EQUAL(Swift::Presence::Unavailable, dynamic_cast<Swift::Presence *>(getStanza(received[1]))->getType());
}
void handleMessageHeadline() {