X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fprotocol.h;h=4bff50ae983b7be1b513d9de252da96869b5d95a;hb=e30092afc1803d753914a7ab9fa88bba818de559;hp=d7c1b1d590ec8cd9a29a4c2767ac88bec5865d78;hpb=d1bf207d30fe62a15d0e8669d186374c68e6eae8;p=quassel.git diff --git a/src/common/protocol.h b/src/common/protocol.h index d7c1b1d5..4bff50ae 100644 --- a/src/common/protocol.h +++ b/src/common/protocol.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -30,7 +30,9 @@ namespace Protocol { const quint32 magic = 0x42b33f00; enum Type { - LegacyProtocol = 1 + InternalProtocol = 0x00, + LegacyProtocol = 0x01, + DataStreamProtocol = 0x02 }; @@ -55,11 +57,13 @@ struct HandshakeMessage { struct RegisterClient : public HandshakeMessage { - inline RegisterClient(const QString &clientVersion, bool sslSupported = false) + inline RegisterClient(const QString &clientVersion, const QString &buildDate, bool sslSupported = false) : clientVersion(clientVersion) + , buildDate(buildDate) , sslSupported(sslSupported) {} QString clientVersion; + QString buildDate; // this is only used by the LegacyProtocol in compat mode bool sslSupported; @@ -77,12 +81,11 @@ struct ClientDenied : public HandshakeMessage struct ClientRegistered : public HandshakeMessage { - inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported, const QDateTime &coreStartTime) + inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported) : coreFeatures(coreFeatures) , coreConfigured(coreConfigured) , backendInfo(backendInfo) , sslSupported(sslSupported) - , coreStartTime(coreStartTime) {} quint32 coreFeatures; @@ -91,7 +94,6 @@ struct ClientRegistered : public HandshakeMessage // this is only used by the LegacyProtocol in compat mode bool sslSupported; - QDateTime coreStartTime; };