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

Merge branch 'master' of https://github.com/hanzz/libtransport

Browse source
This commit is contained in:
Vitaly Takmazov 2012-12-29 12:08:24 +04:00
commit 86af41d3fa
27 changed files with 209 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backends/frotz/main.cpp
View file

@ -245,7 +245,7 @@ class FrotzNetworkPlugin : public NetworkPlugin {
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 = "", const std::string &id = "") {
std::cout << "aaa\n";
if (message.find("start") == 0) {
std::string game = message.substr(6);

2
backends/libcommuni/ircnetworkplugin.cpp
View file

@ -144,7 +144,7 @@ std::string IRCNetworkPlugin::getTargetName(const std::string &legacyName) {
return r;
}
void IRCNetworkPlugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &/*xhtml*/) {
void IRCNetworkPlugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &/*xhtml*/, const std::string &/*id*/) {
std::string session = getSessionName(user, legacyName);
if (m_sessions[session] == NULL) {
LOG4CXX_WARN(logger, user << ": Session name: " << session << ", No session for user");

2
backends/libcommuni/ircnetworkplugin.h
View file

@ -20,7 +20,7 @@ class IRCNetworkPlugin : public QObject, public NetworkPlugin {
void handleLogoutRequest(const std::string &user, const std::string &legacyName);
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*/, const std::string &/*id*/);
void handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password);

2
backends/libpurple/main.cpp
View file

@ -427,7 +427,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
}
}
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, const std::string &id) {
PurpleAccount *account = m_sessions[user];
if (account) {
PurpleConversation *conv = purple_find_conversation_with_account_wrapped(PURPLE_CONV_TYPE_CHAT, legacyName.c_str(), account);

2
backends/libyahoo2/main.cpp
View file

@ -145,7 +145,7 @@ class YahooPlugin : public NetworkPlugin {
}
}
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 = "", const std::string &id = "") {
YahooLocalAccount *account = m_users[user];
if (account) {
LOG4CXX_INFO(logger, "Sending message from " << user << " to " << legacyName << ": " << message << ".");

2
backends/skype/main.cpp
View file

@ -207,7 +207,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
}
}
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 = "", const std::string &id = "") {
Skype *skype = m_sessions[user];
if (skype) {
skype->send_command("MESSAGE " + legacyName + " " + message);

2
backends/smstools3/main.cpp
View file

@ -193,7 +193,7 @@ class SMSNetworkPlugin : public NetworkPlugin {
void handleLogoutRequest(const std::string &user, const std::string &legacyName) {
}
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 = "", const std::string &id = "") {
// Remove trailing +, because smstools doesn't use it in "From: " field for received messages.
std::string n = legacyName;
if (n.find("+") == 0) {

2
backends/swiften/main.cpp
View file

@ -202,7 +202,7 @@ class SwiftenPlugin : public NetworkPlugin {
}
}
void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &msg, const std::string &xhtml = "") {
void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &msg, const std::string &xhtml = "", const std::string &id = "") {
LOG4CXX_INFO(logger, "Sending message from " << user << " to " << legacyName << ".");
boost::shared_ptr<Swift::Client> client = m_users[user];
if (client) {

2
backends/template/plugin.cpp
View file

@ -45,7 +45,7 @@ void Plugin::handleLoginRequest(const std::string &user, const std::string &lega
void Plugin::handleLogoutRequest(const std::string &user, const std::string &legacyName) {
}
void Plugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml) {
void Plugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml, const std::string &id) {
LOG4CXX_INFO(logger, "Sending message from " << user << " to " << legacyName << ".");
if (legacyName == "echo") {
handleMessage(user, legacyName, message);

2
backends/template/plugin.h
View file

@ -16,7 +16,7 @@ class Plugin : public Transport::NetworkPlugin {
void handleLogoutRequest(const std::string &user, const std::string &legacyName);
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 = "", const std::string &id = "");
void handleBuddyUpdatedRequest(const std::string &user, const std::string &buddyName, const std::string &alias, const std::vector<std::string> &groups);

2
backends/twitter/TwitterPlugin.cpp
View file

@ -194,7 +194,7 @@ void TwitterPlugin::handleLeaveRoomRequest(const std::string &user, const std::s
}
// Messages to be sent to Twitter
void TwitterPlugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml)
void TwitterPlugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml, const std::string &/*id*/)
{
LOG4CXX_INFO(logger, "Received " << user << " --> " << legacyName << " - " << message)

2
backends/twitter/TwitterPlugin.h
View file

@ -74,7 +74,7 @@ class TwitterPlugin : public NetworkPlugin {
void handleLeaveRoomRequest(const std::string &/*user*/, const std::string &/*room*/);
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 = "", const std::string &id = "");
void handleBuddyUpdatedRequest(const std::string &user, const std::string &buddyName, const std::string &alias, const std::vector<std::string> &groups);

1
include/transport/config.h
View file

@ -126,6 +126,7 @@ class Config {
boost::signal<void ()> onConfigReloaded;
void updateBackendConfig(const std::string &backendConfig);
boost::signal<void ()> onBackendConfigUpdated;
static Config *createFromArgs(int argc, char **argv, std::string &error, std::string &host, int &port);

4
include/transport/networkplugin.h
View file

@ -113,6 +113,8 @@ class NetworkPlugin {
/// \param xhtml XHTML message.
void handleMessage(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &nickname = "", const std::string &xhtml = "", const std::string &timestamp = "", bool headline = false);
void handleMessageAck(const std::string &user, const std::string &legacyName, const std::string &id);
/// Call this function when subject in room changed.
/// \param user XMPP JID of user for which this event occurs. You can get it from NetworkPlugin::handleLoginRequest(). (eg. "user%gmail.com@xmpp.domain.tld")
/// \param legacyName Name of room. (eg. "#spectrum")
@ -199,7 +201,7 @@ class NetworkPlugin {
/// \param legacyName Legacy network name of buddy or room.
/// \param message Plain text message.
/// \param xhtml XHTML message.
virtual void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml = "") = 0;
virtual void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml = "", const std::string &id = "") = 0;
/// Called when XMPP user requests VCard of buddy.
/// \param user XMPP JID of user for which this event occurs.

7
include/transport/networkpluginserver.h
View file

@ -100,6 +100,7 @@ class NetworkPluginServer {
void handleBuddyChangedPayload(const std::string &payload);
void handleBuddyRemovedPayload(const std::string &payload);
void handleConvMessagePayload(const std::string &payload, bool subject = false);
void handleConvMessageAckPayload(const std::string &payload);
void handleParticipantChangedPayload(const std::string &payload);
void handleRoomChangedPayload(const std::string &payload);
void handleVCardPayload(const std::string &payload);
@ -140,7 +141,9 @@ class NetworkPluginServer {
void pingTimeout();
void sendPing(Backend *c);
Backend *getFreeClient(bool acceptUsers = true, bool longRun = false);
Backend *getFreeClient(bool acceptUsers = true, bool longRun = false, bool check = false);
void connectWaitingUsers();
void loginDelayFinished();
UserManager *m_userManager;
VCardResponder *m_vcardResponder;
@ -151,6 +154,7 @@ class NetworkPluginServer {
std::list<Backend *> m_clients;
Swift::Timer::ref m_pingTimer;
Swift::Timer::ref m_collectTimer;
Swift::Timer::ref m_loginTimer;
Component *m_component;
std::list<User *> m_waitingUsers;
bool m_isNextLongRun;
@ -160,6 +164,7 @@ class NetworkPluginServer {
AdminInterface *m_adminInterface;
bool m_startingBackend;
DiscoItemsResponder *m_discoItemsResponder;
time_t m_lastLogin;
};
}

2
include/transport/protocol.proto
View file

@ -71,6 +71,7 @@ message ConversationMessage {
optional string xhtml = 5;
optional string timestamp = 6;
optional bool headline = 7;
optional string id = 8;
}
message Room {
@ -167,6 +168,7 @@ message WrapperMessage {
TYPE_BACKEND_CONFIG = 30;
TYPE_QUERY = 31;
TYPE_ROOM_LIST = 32;
TYPE_CONV_MESSAGE_ACK = 33;
}
required Type type = 1;
optional bytes payload = 2;

2
include/transport/user.h
View file

@ -57,7 +57,7 @@ class User : public Swift::EntityCapsProvider {
/// Returns full JID which supports particular feature or invalid JID.
/// \param feature disco#info feature.
/// \return full JID which supports particular feature or invalid JID.
Swift::JID getJIDWithFeature(const std::string &feature);
std::vector<Swift::JID> getJIDWithFeature(const std::string &feature);
Swift::DiscoInfo::ref getCaps(const Swift::JID &jid) const;

17
plugin/cpp/networkplugin.cpp
View file

@ -100,6 +100,21 @@ void NetworkPlugin::handleMessage(const std::string &user, const std::string &le
send(message);
}
void NetworkPlugin::handleMessageAck(const std::string &user, const std::string &legacyName, const std::string &id) {
pbnetwork::ConversationMessage m;
m.set_username(user);
m.set_buddyname(legacyName);
m.set_message("");
m.set_id(id);
std::string message;
m.SerializeToString(&message);
WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE_ACK);
send(message);
}
void NetworkPlugin::handleAttention(const std::string &user, const std::string &buddyName, const std::string &msg) {
pbnetwork::ConversationMessage m;
m.set_username(user);
@ -391,7 +406,7 @@ void NetworkPlugin::handleConvMessagePayload(const std::string &data) {
return;
}
handleMessageSendRequest(payload.username(), payload.buddyname(), payload.message(), payload.xhtml());
handleMessageSendRequest(payload.username(), payload.buddyname(), payload.message(), payload.xhtml(), payload.id());
}
void NetworkPlugin::handleRoomSubjectChangedPayload(const std::string &data) {

10
src/adhocmanager.cpp
View file

@ -69,15 +69,13 @@ void AdHocManager::stop() {
}
void AdHocManager::handleUserCreated(User *user) {
if (!m_storageBackend) {
return;
}
for (std::map<std::string, AdHocCommandFactory *>::const_iterator it = m_factories.begin(); it != m_factories.end(); it++) {
for (std::map<std::string, std::string>::const_iterator it2 = it->second->getUserSettings().begin(); it2 != it->second->getUserSettings().end(); it2++) {
std::string value = CONFIG_STRING_DEFAULTED(m_component->getConfig(), it->second->getNode() + "." + it2->first, it2->second);
int type = (int) TYPE_BOOLEAN;
m_storageBackend->getUserSetting(user->getUserInfo().id, it2->first, type, value);
if (m_storageBackend) {
int type = (int) TYPE_BOOLEAN;
m_storageBackend->getUserSetting(user->getUserInfo().id, it2->first, type, value);
}
user->addUserSetting(it2->first, value);
}
}

4
src/config.cpp
View file

@ -98,6 +98,7 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
("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), "")
("service.login_delay", value<int>()->default_value(0), "")
("service.jid_escaping", value<bool>()->default_value(true), "")
("service.vip_only", value<bool>()->default_value(false), "")
("service.vip_message", value<std::string>()->default_value(""), "")
@ -312,6 +313,7 @@ void Config::updateBackendConfig(const std::string &backendConfig) {
("registration.needPassword", value<bool>()->default_value(true), "")
("registration.needRegistration", value<bool>()->default_value(false), "")
("registration.extraField", value<std::vector<std::string> >()->multitoken(), "")
("features.receipts", value<bool>()->default_value(false), "")
;
std::stringstream ifs(backendConfig);
@ -319,6 +321,8 @@ void Config::updateBackendConfig(const std::string &backendConfig) {
store(parsed, m_backendConfig);
notify(m_backendConfig);
onBackendConfigUpdated();
}
Config *Config::createFromArgs(int argc, char **argv, std::string &error, std::string &host, int &port) {

32
src/discoinforesponder.cpp
View file

@ -39,11 +39,12 @@ namespace Transport {
DiscoInfoResponder::DiscoInfoResponder(Swift::IQRouter *router, Config *config) : Swift::GetResponder<DiscoInfo>(router) {
m_config = config;
m_config->onBackendConfigUpdated.connect(boost::bind(&DiscoInfoResponder::updateBuddyFeatures, this));
m_buddyInfo = NULL;
m_transportInfo.addIdentity(DiscoInfo::Identity(CONFIG_STRING(m_config, "identity.name"),
CONFIG_STRING(m_config, "identity.category"),
CONFIG_STRING(m_config, "identity.type")));
m_buddyInfo.addIdentity(DiscoInfo::Identity(CONFIG_STRING(m_config, "identity.name"), "client", "pc"));
std::list<std::string> features;
features.push_back("jabber:iq:register");
features.push_back("jabber:iq:gateway");
@ -52,18 +53,25 @@ DiscoInfoResponder::DiscoInfoResponder(Swift::IQRouter *router, Config *config)
features.push_back("http://jabber.org/protocol/commands");
setTransportFeatures(features);
features.clear();
updateBuddyFeatures();
}
DiscoInfoResponder::~DiscoInfoResponder() {
delete m_buddyInfo;
}
void DiscoInfoResponder::updateBuddyFeatures() {
std::list<std::string> features;
features.push_back("http://jabber.org/protocol/disco#items");
features.push_back("http://jabber.org/protocol/disco#info");
features.push_back("http://jabber.org/protocol/chatstates");
features.push_back("http://jabber.org/protocol/xhtml-im");
if (CONFIG_BOOL_DEFAULTED(m_config, "features.receipts", false)) {
features.push_back("urn:xmpp:receipts");
}
setBuddyFeatures(features);
}
DiscoInfoResponder::~DiscoInfoResponder() {
}
void DiscoInfoResponder::setTransportFeatures(std::list<std::string> &features) {
for (std::list<std::string>::iterator it = features.begin(); it != features.end(); it++) {
if (!m_transportInfo.hasFeature(*it)) {
@ -73,14 +81,18 @@ void DiscoInfoResponder::setTransportFeatures(std::list<std::string> &features)
}
void DiscoInfoResponder::setBuddyFeatures(std::list<std::string> &f) {
delete m_buddyInfo;
m_buddyInfo = new Swift::DiscoInfo;
m_buddyInfo->addIdentity(DiscoInfo::Identity(CONFIG_STRING(m_config, "identity.name"), "client", "pc"));
for (std::list<std::string>::iterator it = f.begin(); it != f.end(); it++) {
if (!m_buddyInfo.hasFeature(*it)) {
m_buddyInfo.addFeature(*it);
if (!m_buddyInfo->hasFeature(*it)) {
m_buddyInfo->addFeature(*it);
}
}
CapsInfoGenerator caps("spectrum");
m_capsInfo = caps.generateCapsInfo(m_buddyInfo);
m_capsInfo = caps.generateCapsInfo(*m_buddyInfo);
onBuddyCapsInfoChanged(m_capsInfo);
}
@ -136,7 +148,7 @@ bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::J
}
// disco#info for buddy
else {
boost::shared_ptr<DiscoInfo> res(new DiscoInfo(m_buddyInfo));
boost::shared_ptr<DiscoInfo> res(new DiscoInfo(*m_buddyInfo));
res->setNode(info->getNode());
sendResponse(from, to, id, res);
}

3
src/discoinforesponder.h
View file

@ -51,9 +51,10 @@ class DiscoInfoResponder : public Swift::GetResponder<Swift::DiscoInfo> {
private:
virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoInfo> payload);
void updateBuddyFeatures();
Swift::DiscoInfo m_transportInfo;
Swift::DiscoInfo m_buddyInfo;
Swift::DiscoInfo *m_buddyInfo;
Config *m_config;
Swift::CapsInfo m_capsInfo;
std::map<std::string, std::string> m_rooms;

101
src/networkpluginserver.cpp
View file

@ -258,6 +258,7 @@ NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, U
m_isNextLongRun = false;
m_adminInterface = NULL;
m_startingBackend = false;
m_lastLogin = 0;
m_discoItemsResponder = discoItemsResponder;
m_component->m_factory = new NetworkFactory(this);
m_userManager->onUserCreated.connect(boost::bind(&NetworkPluginServer::handleUserCreated, this, _1));
@ -267,6 +268,10 @@ NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, U
m_pingTimer->onTick.connect(boost::bind(&NetworkPluginServer::pingTimeout, this));
m_pingTimer->start();
m_loginTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(CONFIG_INT(config, "service.login_delay") * 1000);
m_loginTimer->onTick.connect(boost::bind(&NetworkPluginServer::loginDelayFinished, this));
m_loginTimer->start();
if (CONFIG_INT(m_config, "service.memory_collector_time") != 0) {
m_collectTimer = component->getNetworkFactories()->getTimerFactory()->createTimer(CONFIG_INT(m_config, "service.memory_collector_time"));
m_collectTimer->onTick.connect(boost::bind(&NetworkPluginServer::collectBackend, this));
@ -355,6 +360,11 @@ void NetworkPluginServer::start() {
}
}
void NetworkPluginServer::loginDelayFinished() {
m_loginTimer->stop();
connectWaitingUsers();
}
void NetworkPluginServer::handleNewClientConnection(boost::shared_ptr<Swift::Connection> c) {
// Create new Backend instance
Backend *client = new Backend;
@ -686,6 +696,33 @@ void NetworkPluginServer::handleConvMessagePayload(const std::string &data, bool
m_userManager->messageToXMPPSent();
}
void NetworkPluginServer::handleConvMessageAckPayload(const std::string &data) {
pbnetwork::ConversationMessage payload;
if (payload.ParseFromString(data) == false) {
// TODO: ERROR
return;
}
User *user = m_userManager->getUser(payload.username());
if (!user)
return;
boost::shared_ptr<Swift::Message> msg(new Swift::Message());
msg->addPayload(boost::make_shared<Swift::DeliveryReceipt>(payload.id()));
NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(payload.buddyname());
// Receipts don't create conversation
if (!conv) {
return;
}
// Forward it
conv->handleMessage(msg);
}
void NetworkPluginServer::handleAttentionPayload(const std::string &data) {
pbnetwork::ConversationMessage payload;
if (payload.ParseFromString(data) == false) {
@ -830,6 +867,29 @@ void NetworkPluginServer::handleFTDataNeeded(Backend *b, unsigned long ftid) {
send(b->connection, message);
}
void NetworkPluginServer::connectWaitingUsers() {
// some users are in queue waiting for this backend
while(!m_waitingUsers.empty()) {
// There's no new backend, so stop associating users and wait for new backend,
// which has been already spawned in getFreeClient() call.
if (getFreeClient(true, false, true) == NULL)
break;
User *u = m_waitingUsers.front();
m_waitingUsers.pop_front();
LOG4CXX_INFO(logger, "Associating " << u->getJID().toString() << " with this backend");
// associate backend with user
handleUserCreated(u);
// connect user if it's ready
if (u->isReadyToConnect()) {
handleUserReadyToConnect(u);
}
}
}
void NetworkPluginServer::handlePongReceived(Backend *c) {
// This could be first PONG from the backend
if (c->pongReceived == -1) {
@ -841,26 +901,7 @@ void NetworkPluginServer::handlePongReceived(Backend *c) {
m_component->start();
}
// some users are in queue waiting for this backend
while(!m_waitingUsers.empty()) {
// There's no new backend, so stop associating users and wait for new backend,
// which has been already spawned in getFreeClient() call.
if (getFreeClient() == NULL)
break;
User *u = m_waitingUsers.front();
m_waitingUsers.pop_front();
LOG4CXX_INFO(logger, "Associating " << u->getJID().toString() << " with this backend");
// associate backend with user
handleUserCreated(u);
// connect user if it's ready
if (u->isReadyToConnect()) {
handleUserReadyToConnect(u);
}
}
connectWaitingUsers();
}
c->pongReceived = true;
@ -1023,6 +1064,9 @@ void NetworkPluginServer::handleDataRead(Backend *c, boost::shared_ptr<Swift::Sa
case pbnetwork::WrapperMessage_Type_TYPE_ROOM_LIST:
handleRoomListPayload(wrapper.payload());
break;
case pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE_ACK:
handleConvMessageAckPayload(wrapper.payload());
break;
default:
return;
}
@ -1406,6 +1450,10 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost
m.set_buddyname(conv->getLegacyName());
m.set_message(msg->getBody());
m.set_xhtml(xhtml);
boost::shared_ptr<Swift::DeliveryReceiptRequest> receiptPayload = msg->getPayload<Swift::DeliveryReceiptRequest>();
if (receiptPayload && !msg->getID().empty()) {
m.set_id(msg->getID());
}
std::string message;
m.SerializeToString(&message);
@ -1608,9 +1656,20 @@ void NetworkPluginServer::sendPing(Backend *c) {
// LOG4CXX_INFO(logger, "PING to " << c);
}
NetworkPluginServer::Backend *NetworkPluginServer::getFreeClient(bool acceptUsers, bool longRun) {
NetworkPluginServer::Backend *NetworkPluginServer::getFreeClient(bool acceptUsers, bool longRun, bool check) {
NetworkPluginServer::Backend *c = NULL;
unsigned long diff = CONFIG_INT(m_config, "service.login_delay");
time_t now = time(NULL);
if (diff && (now - m_lastLogin < diff)) {
m_loginTimer->start();
return NULL;
}
if (!check) {
m_lastLogin = time(NULL);
}
// Check all backends and find free one
for (std::list<Backend *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
if ((*it)->willDie == false && (*it)->acceptUsers == acceptUsers && (*it)->users.size() < CONFIG_INT(m_config, "service.users_per_backend") && (*it)->connection && (*it)->longRun == longRun) {

26
src/rostermanager.cpp
View file

@ -204,7 +204,9 @@ void RosterManager::sendBuddySubscribePresence(Buddy *buddy) {
response->setTo(m_user->getJID());
response->setFrom(buddy->getJID());
response->setType(Swift::Presence::Subscribe);
// TODO: NICKNAME
if (!buddy->getAlias().empty()) {
response->addPayload(boost::make_shared<Swift::Nickname>(buddy->getAlias()));
}
m_component->getStanzaChannel()->sendPresence(response);
}
@ -231,14 +233,7 @@ void RosterManager::setBuddyCallback(Buddy *buddy) {
sendBuddyRosterPush(buddy);
}
else {
// Send RIE only if there's resource which supports it.
Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
if (jidWithRIE.isValid()) {
m_RIETimer->start();
}
else {
sendBuddySubscribePresence(buddy);
}
m_RIETimer->start();
}
}
@ -317,10 +312,10 @@ void RosterManager::sendRIE() {
m_RIETimer->stop();
// Check the feature, because proper resource could logout during RIETimer.
Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
std::vector<Swift::JID> jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
// fallback to normal subscribe
if (!jidWithRIE.isValid()) {
if (jidWithRIE.empty()) {
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) {
@ -331,8 +326,6 @@ void RosterManager::sendRIE() {
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 *, 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;
@ -348,8 +341,11 @@ void RosterManager::sendRIE() {
payload->addItem(item);
}
boost::shared_ptr<Swift::GenericRequest<Swift::RosterItemExchangePayload> > request(new Swift::GenericRequest<Swift::RosterItemExchangePayload>(Swift::IQ::Set, jidWithRIE, payload, m_component->getIQRouter()));
request->send();
BOOST_FOREACH(Swift::JID &jid, jidWithRIE) {
LOG4CXX_INFO(logger, "Sending RIE stanza to " << jid.toString());
boost::shared_ptr<Swift::GenericRequest<Swift::RosterItemExchangePayload> > request(new Swift::GenericRequest<Swift::RosterItemExchangePayload>(Swift::IQ::Set, jid, payload, m_component->getIQRouter()));
request->send();
}
}
void RosterManager::handleSubscription(Swift::Presence::ref presence) {

27
src/tests/discoitemsresponder.cpp
View file

@ -28,6 +28,7 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe
CPPUNIT_TEST(roomList);
CPPUNIT_TEST(roomInfo);
CPPUNIT_TEST(clearRooms);
CPPUNIT_TEST(receipts);
CPPUNIT_TEST_SUITE_END();
public:
@ -94,6 +95,32 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe
CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoItems>()->getItems().empty());
}
void receipts() {
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("buddy@localhost");
injectIQ(iq);
loop->processEvents();
CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoInfo>());
CPPUNIT_ASSERT(!getStanza(received[0])->getPayload<Swift::DiscoInfo>()->hasFeature("urn:xmpp:receipts"));
received.clear();
cfg->updateBackendConfig("[features]\nreceipts=1\n");
injectIQ(iq);
loop->processEvents();
CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoInfo>());
CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoInfo>()->hasFeature("urn:xmpp:receipts"));
received.clear();
}
};
CPPUNIT_TEST_SUITE_REGISTRATION (DiscoItemsResponderTest);

12
src/tests/rostermanager.cpp
View file

@ -25,6 +25,7 @@ class RosterManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
CPPUNIT_TEST(setBuddy);
CPPUNIT_TEST(sendCurrentPresences);
CPPUNIT_TEST(sendCurrentPresence);
CPPUNIT_TEST(sendBuddySubscribePresence);
CPPUNIT_TEST(removeBuddy);
CPPUNIT_TEST(subscribeExistingBuddy);
CPPUNIT_TEST(subscribeNewBuddy);
@ -59,6 +60,17 @@ class RosterManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
m_buddy = buddy->getName();
}
void sendBuddySubscribePresence() {
add2Buddies();
received.clear();
User *user = userManager->getUser("user@localhost");
user->getRosterManager()->sendBuddySubscribePresence(user->getRosterManager()->getBuddy("buddy1"));
CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Nickname>());
CPPUNIT_ASSERT_EQUAL(std::string("Buddy 1"), getStanza(received[0])->getPayload<Swift::Nickname>()->getNickname());
}
void setBuddy() {
add2Buddies();
CPPUNIT_ASSERT_EQUAL(2, (int) received.size());

10
src/user.cpp
View file

@ -83,8 +83,8 @@ const Swift::JID &User::getJID() {
return m_jid;
}
Swift::JID User::getJIDWithFeature(const std::string &feature) {
Swift::JID jid;
std::vector<Swift::JID> User::getJIDWithFeature(const std::string &feature) {
std::vector<Swift::JID> jid;
std::vector<Swift::Presence::ref> presences = m_presenceOracle->getAllPresence(m_jid);
foreach(Swift::Presence::ref presence, presences) {
@ -111,11 +111,13 @@ Swift::JID User::getJIDWithFeature(const std::string &feature) {
if (discoInfo->hasFeature(feature)) {
LOG4CXX_INFO(logger, m_jid.toString() << ": Found JID with " << feature << " feature: " << presence->getFrom().toString());
return presence->getFrom();
jid.push_back(presence->getFrom());
}
}
LOG4CXX_INFO(logger, m_jid.toString() << ": No JID with " << feature << " feature " << m_legacyCaps.size());
if (jid.empty()) {
LOG4CXX_INFO(logger, m_jid.toString() << ": No JID with " << feature << " feature " << m_legacyCaps.size());
}
return jid;
}