Revert "Add keepAlive message before send file/clipboard data #4768"

This reverts commit 5287c62540b277474603ea8a38c53b50cb8f4d52.
This commit is contained in:
Jerry (Xinyu Hou) 2015-12-08 12:27:55 -08:00 committed by Xinyu Hou
parent b5b2cdfade
commit 7cbd3fdcb4
7 changed files with 20 additions and 22 deletions

View File

@ -198,3 +198,4 @@ REGISTER_EVENT(Clipboard, clipboardSending)
REGISTER_EVENT(File, fileChunkSending)
REGISTER_EVENT(File, fileRecieveCompleted)
REGISTER_EVENT(File, keepAlive)

View File

@ -712,7 +712,8 @@ class FileEvents : public EventTypes {
public:
FileEvents() :
m_fileChunkSending(Event::kUnknown),
m_fileRecieveCompleted(Event::kUnknown) { }
m_fileRecieveCompleted(Event::kUnknown),
m_keepAlive(Event::kUnknown) { }
//! @name accessors
//@{
@ -723,9 +724,13 @@ public:
//! Completed receiving a file
Event::Type fileRecieveCompleted();
//! Send a keep alive
Event::Type keepAlive();
//@}
private:
Event::Type m_fileChunkSending;
Event::Type m_fileRecieveCompleted;
Event::Type m_keepAlive;
};

View File

@ -252,7 +252,9 @@ ServerProxy::parseMessage(const UInt8* code)
}
else if (memcmp(code, kMsgCKeepAlive, 4) == 0) {
keepAlive();
// echo keep alives and reset alarm
ProtocolUtil::writef(m_stream, kMsgCKeepAlive);
resetKeepAliveAlarm();
}
else if (memcmp(code, kMsgCNoop, 4) == 0) {
@ -890,21 +892,12 @@ ServerProxy::dragInfoReceived()
void
ServerProxy::handleClipboardSendingEvent(const Event& event, void*)
{
keepAlive();
ClipboardChunk::send(m_stream, event.getData());
}
void ServerProxy::keepAlive()
{
// echo keep alives and reset alarm
ProtocolUtil::writef(m_stream, kMsgCKeepAlive);
resetKeepAliveAlarm();
}
void
ServerProxy::fileChunkSending(UInt8 mark, char* data, size_t dataSize)
{
keepAlive();
FileChunk::send(m_stream, mark, data, dataSize);
}

View File

@ -107,7 +107,6 @@ private:
void fileChunkReceived();
void dragInfoReceived();
void handleClipboardSendingEvent(const Event&, void*);
void keepAlive();
private:
typedef EResult (ServerProxy::*MessageParser)(const UInt8*);

View File

@ -35,10 +35,16 @@ ClientProxy1_5::ClientProxy1_5(const String& name, synergy::IStream* stream, Ser
ClientProxy1_4(name, stream, server, events),
m_events(events)
{
m_events->adoptHandler(m_events->forFile().keepAlive(),
this,
new TMethodEventJob<ClientProxy1_3>(this,
&ClientProxy1_3::handleKeepAlive, NULL));
}
ClientProxy1_5::~ClientProxy1_5()
{
m_events->removeHandler(m_events->forFile().keepAlive(), this);
}
void
@ -52,7 +58,6 @@ ClientProxy1_5::sendDragInfo(UInt32 fileCount, const char* info, size_t size)
void
ClientProxy1_5::fileChunkSending(UInt8 mark, char* data, size_t dataSize)
{
keepAlive();
FileChunk::send(getStream(), mark, data, dataSize);
}

View File

@ -50,12 +50,6 @@ ClientProxy1_6::setClipboard(ClipboardID id, const IClipboard* clipboard)
if (m_clipboard[id].m_dirty) {
// this clipboard is now clean
m_clipboard[id].m_dirty = false;
// add keep alive message before we do clipboard copy
// in case there is a big data inside and time that would
// comsume will cause connecton being dropped
keepAlive();
Clipboard::copy(&m_clipboard[id].m_clipboard, clipboard);
String data = m_clipboard[id].m_clipboard.marshall();
@ -72,9 +66,6 @@ ClientProxy1_6::setClipboard(ClipboardID id, const IClipboard* clipboard)
void
ClientProxy1_6::handleClipboardSendingEvent(const Event& event, void*)
{
// add keep alive message before we send each clipboard data
keepAlive();
ClipboardChunk::send(getStream(), event.getData());
}

View File

@ -84,6 +84,8 @@ StreamChunker::sendFile(
}
if (sendStopwatch.getTime() > SEND_THRESHOLD) {
events->addEvent(Event(events->forFile().keepAlive(), eventTarget));
// make sure we don't read too much from the mock data.
if (sentLength + chunkSize > size) {
chunkSize = size - sentLength;
@ -149,6 +151,8 @@ StreamChunker::sendClipboard(
}
if (sendStopwatch.getTime() > SEND_THRESHOLD) {
events->addEvent(Event(events->forFile().keepAlive(), eventTarget));
// make sure we don't read too much from the mock data.
if (sentLength + chunkSize > size) {
chunkSize = size - sentLength;