smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: restore client protocol downgrade message

Browse source
This commit is contained in:
Nick Bolton 2026-07-04 15:19:47 +01:00
parent bcd3a658fc
commit fc44b0bb18
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/lib/client/Client.cpp
View file

@ -15,6 +15,7 @@
#include "common/NetworkProtocol.h" #include "common/NetworkProtocol.h"
#include "common/Settings.h" #include "common/Settings.h"
#include "deskflow/Clipboard.h" #include "deskflow/Clipboard.h"
#include "deskflow/DeskflowException.h"
#include "deskflow/IPlatformScreen.h" #include "deskflow/IPlatformScreen.h"
#include "deskflow/PacketStreamFilter.h" #include "deskflow/PacketStreamFilter.h"
#include "deskflow/ProtocolTypes.h" #include "deskflow/ProtocolTypes.h"
@ -632,14 +633,29 @@ void Client::handleHello()
return; return;
} }
LOG_DEBUG( if (serverMajor != kProtocolMajorVersion) {
"saying hello back with version %s %d.%d", protocolName.c_str(), kProtocolMajorVersion, kProtocolMinorVersion LOG_WARN("server protocol version not compatible: %d.%d", serverMajor, serverMinor);
); sendConnectionFailedEvent(IncompatibleClientException(serverMajor, serverMinor).what());
cleanupTimer();
cleanupConnection();
return;
}
int16_t helloBackMinor = kProtocolMinorVersion;
if (serverMinor < kProtocolMinorVersion) {
helloBackMinor = serverMinor;
LOG_INFO(
"downgrading client protocol version from %d.%d to %d.%d", //
kProtocolMajorVersion, kProtocolMinorVersion, kProtocolMajorVersion, helloBackMinor
);
}
LOG_DEBUG("saying hello back with version %s %d.%d", protocolName.c_str(), kProtocolMajorVersion, helloBackMinor);
// dynamically build write format for hello back since `ProtocolUtil::writef` // dynamically build write format for hello back since `ProtocolUtil::writef`
// doesn't support formatting fixed length strings yet. // doesn't support formatting fixed length strings yet.
std::string helloBackMessage = protocolName + kMsgHelloBackArgs; std::string helloBackMessage = protocolName + kMsgHelloBackArgs;
ProtocolUtil::writef(m_stream, helloBackMessage.c_str(), kProtocolMajorVersion, kProtocolMinorVersion, &m_name); ProtocolUtil::writef(m_stream, helloBackMessage.c_str(), kProtocolMajorVersion, helloBackMinor, &m_name);
// now connected but waiting to complete handshake // now connected but waiting to complete handshake
setupScreen(); setupScreen();