QDataStream &operator<<(QDataStream &out, const Message &msg)
{
+ Q_ASSERT(SignalProxy::current());
+ Q_ASSERT(SignalProxy::current()->targetPeer());
+
// We do not serialize the sender prefixes until we have a new protocol or client-features implemented
- out << msg.msgId()
- << (quint32) msg.timestamp().toTime_t()
- << (quint32) msg.type()
+ out << msg.msgId();
+
+ if (SignalProxy::current()->targetPeer()->hasFeature(Quassel::Feature::LongMessageTime)) {
+ out << (quint64) msg.timestamp().toMSecsSinceEpoch();
+ } else {
+ out << (quint32) msg.timestamp().toTime_t();
+ }
+
+ out << (quint32) msg.type()
<< (quint8) msg.flags()
<< msg.bufferInfo()
<< msg.sender().toUtf8();
QDataStream &operator>>(QDataStream &in, Message &msg)
{
+ Q_ASSERT(SignalProxy::current());
+ Q_ASSERT(SignalProxy::current()->sourcePeer());
+
in >> msg._msgId;
- quint32 timeStamp;
- in >> timeStamp;
- msg._timestamp = QDateTime::fromTime_t(timeStamp);
+ if (SignalProxy::current()->sourcePeer()->hasFeature(Quassel::Feature::LongMessageTime)) {
+ quint64 timeStamp;
+ in >> timeStamp;
+ msg._timestamp = QDateTime::fromMSecsSinceEpoch(timeStamp);
+ } else {
+ quint32 timeStamp;
+ in >> timeStamp;
+ msg._timestamp = QDateTime::fromTime_t(timeStamp);
+ }
quint32 type;
in >> type;
SenderPrefixes, ///< Show prefixes for senders in backlog
RemoteDisconnect, ///< Allow this peer to be remotely disconnected
ExtendedFeatures, ///< Extended features
+ LongMessageTime, ///< Serialize message time as 64-bit
#if QT_VERSION >= 0x050500
EcdsaCertfpKeys, ///< ECDSA keys for CertFP in identities
#endif