Skip to content

Commit

Permalink
Update 1
Browse files Browse the repository at this point in the history 
Change-Id: Ie68aba5e6ab3995b8195056c6a1cc20e69edac2e
  • Loading branch information
@tarun018
tarun018 committed Sep 2, 2017
1 parent bedefc2 commit ce70d34
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 41 deletions.
90 changes: 51 additions & 39 deletions Limber/MIXMockServer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,20 @@
#include <boost/bind.hpp>

#include <Swiften/Base/IDGenerator.h>
#include <Swiften/Elements/IQ.h>
#include <Swiften/Elements/Message.h>
#include <Swiften/Base/Log.h>
#include <Swiften/Elements/DiscoInfo.h>
#include <Swiften/Elements/DiscoItems.h>
#include <Swiften/Elements/IQ.h>
#include <Swiften/Elements/MIXJoin.h>
#include <Swiften/Elements/MIXLeave.h>
#include <Swiften/Elements/MIXParticipant.h>
#include <Swiften/Elements/MIXPayload.h>
#include <Swiften/Elements/Message.h>
#include <Swiften/Elements/PubSub.h>
#include <Swiften/Elements/PubSubItem.h>
#include <Swiften/Elements/PubSubItems.h>
#include <Swiften/Elements/RosterPayload.h>
#include <Swiften/Elements/RosterItemPayload.h>
#include <Swiften/Elements/RosterPayload.h>
#include <Swiften/Elements/Stanza.h>
#include <Swiften/EventLoop/EventLoop.h>
#include <Swiften/EventLoop/EventOwner.h>
Expand All @@ -40,16 +41,14 @@
#include <Swiften/Network/BoostConnectionServer.h>
#include <Swiften/Network/BoostIOServiceThread.h>
#include <Swiften/Network/ConnectionServer.h>
#include <Swiften/Roster/XMPPRosterImpl.h>
#include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
#include <Swiften/Parser/PlatformXMLParserFactory.h>
#include <Swiften/Roster/XMPPRosterImpl.h>
#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>

#include <Limber/Server/ServerFromClientSession.h>
#include <Limber/Server/SimpleUserRegistry.h>

#include <Swiften/Base/Log.h>

using namespace Swift;

class SimpleMIXChannelRegistry {
Expand Down Expand Up @@ -138,37 +137,32 @@ class Server {
participantInformationMap_.insert(std::make_pair(session->getRemoteJID().toBare(), information_));
}

auto message = std::dynamic_pointer_cast<Message>(stanza);
if (message) {
handleMessageReceived(message, session);
return;
}

auto iq = std::dynamic_pointer_cast<IQ>(stanza);
if (!iq) {
return;
}

if (mixChannelRegistry_->hasMIXChannel(stanza->getTo())) {
//If request comes to particular channel supported by service.
handleElementReceivedForMIXChannel(iq, session);
handleElementReceivedForMIXChannel(stanza, session);
} else if (stanza->getTo() == session->getLocalJID()) {
//If request comes to domain service.
handleElementReceivedForMIXService(iq, session);
handleElementReceivedForMIXService(stanza, session);
} else if (stanza->getTo() == session->getRemoteJID().toBare() || stanza->getTo() == JID()) {
//If request comes to own account.
handleElementReceivedForAccount(iq, session);
handleElementReceivedForAccount(stanza, session);
}
}

void handleMessageReceived(Message::ref message, std::shared_ptr<ServerFromClientSession> session) {
/**
* If message is received by MIX channel, it sends it to all clients with JID as proxy JID of sender.
* It sends a replicated message with same submission ID as received message to the sender for verification.
*/
void handleMessageReceivedForMIXChannel(Message::ref message, std::shared_ptr<ServerFromClientSession> session) {
SWIFT_LOG(debug) << "Message Received" << std::endl;
auto channelJID = message->getTo();
auto sender = message->getFrom();
SWIFT_LOG(debug) << "Channel " << channelJID << std::endl;
SWIFT_LOG(debug) << "Sender " << sender << std::endl;

SWIFT_LOG_ASSERT(mixChannelRegistry_->hasMIXChannel(channelJID), warning);

// Send message to all clients.
auto i = participantMap_.find(channelJID);
if (i != participantMap_.end()) {
auto participants = i->second;
Expand Down Expand Up @@ -199,42 +193,55 @@ class Server {
}
}

// Sending replicated message to sender with same submission ID as received message.
mixPayload->setSubmissionID(message->getID());
forwardMessage->setTo(sender);
session->sendElement(forwardMessage);
}
}

void handleElementReceivedForAccount(IQ::ref iq, std::shared_ptr<ServerFromClientSession> session) {
if(iq->getPayload<RosterPayload>()) {
handleRosterRequest(iq, session);
} else if (auto incomingJoinPayload = iq->getPayload<MIXJoin>()) {
handleJoin(iq, session, incomingJoinPayload);
} else if (auto incomingLeavePayload = iq->getPayload<MIXLeave>()) {
handleLeave(iq, session, incomingLeavePayload);
void handleElementReceivedForAccount(Stanza::ref stanza, std::shared_ptr<ServerFromClientSession> session) {
if (auto iq = std::dynamic_pointer_cast<IQ>(stanza)) {
if(iq->getPayload<RosterPayload>()) {
handleRosterRequest(iq, session);
} else if (auto incomingJoinPayload = iq->getPayload<MIXJoin>()) {
handleJoin(iq, session, incomingJoinPayload);
} else if (auto incomingLeavePayload = iq->getPayload<MIXLeave>()) {
handleLeave(iq, session, incomingLeavePayload);
}
}
}

void handleElementReceivedForMIXService(IQ::ref iq, std::shared_ptr<ServerFromClientSession> session) {
if (iq->getPayload<DiscoItems>()) {
SWIFT_LOG(debug) << "Query: Channel List" << std::endl;
auto responsePayload = std::make_shared<DiscoItems>();
for (auto channel : mixChannelRegistry_->getChannels()) {
responsePayload->addItem(DiscoItems::Item(JID(channel).getNode(), JID(channel)));
void handleElementReceivedForMIXService(Stanza::ref stanza, std::shared_ptr<ServerFromClientSession> session) {
if (auto iq = std::dynamic_pointer_cast<IQ>(stanza)) {
if (iq->getPayload<DiscoItems>()) {
SWIFT_LOG(debug) << "Query: Channel List" << std::endl;
auto responsePayload = std::make_shared<DiscoItems>();
for (auto channel : mixChannelRegistry_->getChannels()) {
responsePayload->addItem(DiscoItems::Item(JID(channel).getNode(), JID(channel)));
}
session->sendElement(IQ::createResult(iq->getFrom(), iq->getTo(), iq->getID(), responsePayload));
}
session->sendElement(IQ::createResult(iq->getFrom(), iq->getTo(), iq->getID(), responsePayload));
}
}

void handleElementReceivedForMIXChannel(IQ::ref iq, std::shared_ptr<ServerFromClientSession> session) {
void handleElementReceivedForMIXChannel(Stanza::ref stanza, std::shared_ptr<ServerFromClientSession> session) {
if (auto message = std::dynamic_pointer_cast<Message>(stanza)) {
handleMessageReceivedForMIXChannel(message, session);
} else if (auto iq = std::dynamic_pointer_cast<IQ>(stanza)) {
handleIQReceivedForMIXChannel(iq, session);
}
}

void handleIQReceivedForMIXChannel(IQ::ref iq, std::shared_ptr<ServerFromClientSession> session) {
if (auto pubSubPayload = iq->getPayload<PubSub>()) {
SWIFT_LOG(debug) << "Query: PubSub" << std::endl;
auto channelJID = iq->getTo();
SWIFT_LOG_ASSERT(mixChannelRegistry_->hasMIXChannel(channelJID), warning);
auto itemsPayload = std::dynamic_pointer_cast<PubSubItems>(pubSubPayload->getPayload());
if (itemsPayload->getNode() == MIX::ParticipantsNode) {
SWIFT_LOG(debug) << "Query: Participant List for " << channelJID << std::endl;
session->sendElement(IQ::createResult(iq->getFrom(), iq->getTo(), iq->getID(), getParticipantsOfChannel(channelJID)));
session->sendElement(IQ::createResult(iq->getFrom(), iq->getTo(), iq->getID(), retrieveParticipantsOfChannel(channelJID)));
} else if (itemsPayload->getNode() == MIX::JIDMapNode) {
SWIFT_LOG(debug) << "Query: Lookup Participants from " << channelJID << std::endl;
session->sendElement(IQ::createResult(iq->getFrom(), iq->getTo(), iq->getID(), getRealJIDResponse(pubSubPayload)));
Expand Down Expand Up @@ -326,6 +333,11 @@ class Server {
if (j != sessionMap_.end()) {
sessionMap_.erase(iq->getFrom());
}

auto k = participantInformationMap_.find(iq->getFrom());
if (k != participantInformationMap_.end()) {
participantInformationMap_.erase(iq->getFrom());
}
} else {
SWIFT_LOG(debug) << "Initial roster not requested by client." <<std::endl;
}
Expand Down Expand Up @@ -386,7 +398,7 @@ class Server {
return rosterPayload;
}

std::shared_ptr<PubSub> getParticipantsOfChannel(const JID& channelJID) {
std::shared_ptr<PubSub> retrieveParticipantsOfChannel(const JID& channelJID) {
auto pubSubPayload = std::make_shared<PubSub>();
auto pubSubItems = std::make_shared<PubSubItems>();
pubSubItems->setNode(MIX::ParticipantsNode);
Expand Down Expand Up @@ -419,7 +431,7 @@ class Server {
auto itemsPayload = std::dynamic_pointer_cast<PubSubItems>(payload->getPayload());
for (auto item : itemsPayload->getItems()) {
for( auto iter = participantInformationMap_.begin(), iend = participantInformationMap_.end(); iter != iend; ++iter ) {
if (*((iter->second)->getProxyJID()) == item->getID()) {
if ((iter->second)->getProxyJID() && *((iter->second)->getProxyJID()) == item->getID()) {
auto mixParticipant = std::make_shared<MIXParticipant>();
mixParticipant->setJID(iter->first);
item->addData(mixParticipant);
Expand Down
1 change: 0 additions & 1 deletion Swiften/Examples/MIXListAndJoin/MIXListAndJoin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ static void handleMessageReceived(Message::ref message) {
if (auto mixPayload = message->getPayload<MIXPayload>()) {
if (mixPayload->getSubmissionID()) {
SWIFT_LOG(debug) << "Ignoring the replicated message" << std::endl;
return;
} else if (message->getFrom().toBare() == mixChannelJID) {
std::cout << "[ " << mixChannelJID << " ] " << message->getFrom().getResource() << ": " << message->getBody().get_value_or("") << std::endl;
}
Expand Down
2 changes: 1 addition & 1 deletion Swiften/MIX/MIX.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ namespace Swift {
boost::signals2::signal<void (Form::ref /* preferencesForm */, ErrorPayload::ref /* failedConfiguration */)> onPreferencesFormResponse;
boost::signals2::signal<void (MIXUserPreference::ref /* userPreferenceResponse */, ErrorPayload::ref /* failedUpdate */)> onPreferencesUpdateResponse;
boost::signals2::signal<void (std::shared_ptr<PubSub> /* responsePubSub */, ErrorPayload::ref /* lookupError */)> onLookupResponse;
boost::signals2::signal<void (std::shared_ptr<PubSub> /* responsePubSub */, ErrorPayload::ref /* lookupError */)> onParticipantResponse;
boost::signals2::signal<void (std::shared_ptr<PubSub> /* responsePubSub */, ErrorPayload::ref /* errorResponse */)> onParticipantResponse;
};
}

0 comments on commit ce70d34

Please sign in to comment.