#include "corenetwork.h"
#include "corenetworkconfig.h"
#include "coresessioneventprocessor.h"
+#include "coretransfermanager.h"
#include "coreusersettings.h"
#include "ctcpparser.h"
#include "eventstringifier.h"
_ircListHelper(new CoreIrcListHelper(this)),
_networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
_coreInfo(this),
+ _transferManager(new CoreTransferManager(this)),
_eventManager(new CoreEventManager(this)),
_eventStringifier(new EventStringifier(this)),
_sessionEventProcessor(new CoreSessionEventProcessor(this)),
p->setHeartBeatInterval(30);
p->setMaxHeartBeatCount(60); // 30 mins until we throw a dead socket out
- connect(p, SIGNAL(peerRemoved(SignalProxy::AbstractPeer*)), SLOT(removeClient(SignalProxy::AbstractPeer*)));
+ connect(p, SIGNAL(peerRemoved(Peer*)), SLOT(removeClient(Peer*)));
connect(p, SIGNAL(connected()), SLOT(clientsConnected()));
connect(p, SIGNAL(disconnected()), SLOT(clientsDisconnected()));
p->synchronize(networkConfig());
p->synchronize(&_coreInfo);
p->synchronize(&_ignoreListManager);
+ p->synchronize(transferManager());
// Restore session state
if (restoreState)
restoreSessionState();
void CoreSession::addClient(RemotePeer *peer)
{
- QVariantMap reply;
- reply["MsgType"] = "SessionInit";
- reply["SessionState"] = sessionState();
- peer->writeSocketData(reply);
+ peer->dispatch(sessionState());
signalProxy()->addPeer(peer);
}
}
-void CoreSession::removeClient(SignalProxy::AbstractPeer *peer)
+void CoreSession::removeClient(Peer *peer)
{
RemotePeer *p = qobject_cast<RemotePeer *>(peer);
if (p)
// recheck if there exists a buffer to store a redirected message in
for (int i = 0; i < redirectedMessages.count(); i++) {
- const RawMessage &rawMsg = _messageQueue.at(i);
+ const RawMessage &rawMsg = redirectedMessages.at(i);
if (bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) {
bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
}
}
-QVariant CoreSession::sessionState()
+Protocol::SessionState CoreSession::sessionState() const
{
- QVariantMap v;
-
- v["CoreFeatures"] = (int)Quassel::features();
-
- QVariantList bufs;
- foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
- v["BufferInfos"] = bufs;
- QVariantList networkids;
- foreach(NetworkId id, _networks.keys()) networkids << qVariantFromValue(id);
- v["NetworkIds"] = networkids;
-
- quint32 ircusercount = 0;
- quint32 ircchannelcount = 0;
- foreach(Network *net, _networks.values()) {
- ircusercount += net->ircUserCount();
- ircchannelcount += net->ircChannelCount();
- }
- v["IrcUserCount"] = ircusercount;
- v["IrcChannelCount"] = ircchannelcount;
+ QVariantList bufferInfos;
+ QVariantList networkIds;
+ QVariantList identities;
- QList<QVariant> idlist;
- foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i);
- v["Identities"] = idlist;
+ foreach(const BufferInfo &id, buffers())
+ bufferInfos << QVariant::fromValue(id);
+ foreach(const NetworkId &id, _networks.keys())
+ networkIds << QVariant::fromValue(id);
+ foreach(const Identity *i, _identities.values())
+ identities << QVariant::fromValue(*i);
- //v["Payload"] = QByteArray(100000000, 'a'); // for testing purposes
- return v;
+ return Protocol::SessionState(identities, bufferInfos, networkIds);
}