Page MenuHomeWildfire Games
Differential D492 Diff 1907 source/network/NetFileTransfer.cpp

Changeset View

Standalone View

View Options

source/network/NetFileTransfer.cpp

/* Copyright (C) 2016 Wildfire Games. /* Copyright (C) 2017 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or * the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* 0 A.D. is distributed in the hope that it will be useful, * 0 A.D. is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>. * along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "precompiled.h" #include "precompiled.h"
#include "NetFileTransfer.h" #include "NetFileTransfer.h"
#include "lib/timer.h" #include "lib/timer.h"
#include "network/NetMessage.h" #include "network/NetMessages.h"
#include "network/NetSession.h" #include "network/NetSession.h"
#include "ps/CLogger.h" #include "ps/CLogger.h"
Status CNetFileTransferer::HandleMessageReceive(const CNetMessage* message) Status CNetFileTransferer::HandleMessageReceive(const CNetMessageBuffer& message)
{ {
if (message->GetType() == NMT_FILE_TRANSFER_RESPONSE) if (message.GetType() == NMT_FILE_TRANSFER_RESPONSE)
leperUnsubmitted
Done
Inline Actions

switch

leper: `switch`
leperUnsubmitted
Done
Inline Actions

\n{

leper: `\n{`
{ {
CFileTransferResponseMessage* respMessage = (CFileTransferResponseMessage*)message; CFileTransferResponseMessage respMessage;
message.GetMessage(respMessage);
if (m_FileReceiveTasks.find(respMessage->m_RequestID) == m_FileReceiveTasks.end()) if (m_FileReceiveTasks.find(respMessage.m_RequestID) == m_FileReceiveTasks.end())
{ {
LOGERROR("Net transfer: Unsolicited file transfer response (id=%d)", (int)respMessage->m_RequestID); LOGERROR("Net transfer: Unsolicited file transfer response (id=%d)", (int)respMessage.m_RequestID);
return ERR::FAIL; return ERR::FAIL;
} }
if (respMessage->m_Length == 0 || respMessage->m_Length > MAX_FILE_TRANSFER_SIZE) if (respMessage.m_Length == 0 || respMessage.m_Length > MAX_FILE_TRANSFER_SIZE)
{ {
LOGERROR("Net transfer: Invalid size for file transfer response (length=%d)", (int)respMessage->m_Length); LOGERROR("Net transfer: Invalid size for file transfer response (length=%d)", (int)respMessage.m_Length);
return ERR::FAIL; return ERR::FAIL;
} }
shared_ptr<CNetFileReceiveTask> task = m_FileReceiveTasks[respMessage->m_RequestID]; shared_ptr<CNetFileReceiveTask> task = m_FileReceiveTasks[respMessage.m_RequestID];
task->m_Length = respMessage->m_Length; task->m_Length = respMessage.m_Length;
task->m_Buffer.reserve(respMessage->m_Length); task->m_Buffer.reserve(respMessage.m_Length);
LOGMESSAGERENDER("Downloading data over network (%d KB) - please wait...", (int)(task->m_Length/1024)); LOGMESSAGERENDER("Downloading data over network (%d KB) - please wait...", (int)(task->m_Length/1024));
m_LastProgressReportTime = timer_Time(); m_LastProgressReportTime = timer_Time();
return INFO::OK; return INFO::OK;
} }
else if (message->GetType() == NMT_FILE_TRANSFER_DATA) else if (message.GetType() == NMT_FILE_TRANSFER_DATA)
{ {
CFileTransferDataMessage* dataMessage = (CFileTransferDataMessage*)message; CFileTransferDataMessage dataMessage;
message.GetMessage(dataMessage);
if (m_FileReceiveTasks.find(dataMessage->m_RequestID) == m_FileReceiveTasks.end()) if (m_FileReceiveTasks.find(dataMessage.m_RequestID) == m_FileReceiveTasks.end())
{ {
LOGERROR("Net transfer: Unsolicited file transfer data (id=%d)", (int)dataMessage->m_RequestID); LOGERROR("Net transfer: Unsolicited file transfer data (id=%d)", (int)dataMessage.m_RequestID);
return ERR::FAIL; return ERR::FAIL;
} }
shared_ptr<CNetFileReceiveTask> task = m_FileReceiveTasks[dataMessage->m_RequestID]; shared_ptr<CNetFileReceiveTask> task = m_FileReceiveTasks[dataMessage.m_RequestID];
task->m_Buffer += dataMessage->m_Data; task->m_Buffer += dataMessage.m_Data;
if (task->m_Buffer.size() > task->m_Length) if (task->m_Buffer.size() > task->m_Length)
{ {
LOGERROR("Net transfer: Invalid size for file transfer data (length=%d actual=%d)", (int)task->m_Length, (int)task->m_Buffer.size()); LOGERROR("Net transfer: Invalid size for file transfer data (length=%d actual=%d)", (int)task->m_Length, (int)task->m_Buffer.size());
return ERR::FAIL; return ERR::FAIL;
} }
CFileTransferAckMessage ackMessage; CFileTransferAckMessage ackMessage;
ackMessage.m_RequestID = task->m_RequestID; ackMessage.m_RequestID = task->m_RequestID;
ackMessage.m_NumPackets = 1; // TODO: would be nice to send a single ack for multiple packets at once ackMessage.m_NumPackets = 1; // TODO: would be nice to send a single ack for multiple packets at once
m_Session->SendMessage(&ackMessage); m_Session->SendMessage(ackMessage);
if (task->m_Buffer.size() == task->m_Length) if (task->m_Buffer.size() == task->m_Length)
{ {
LOGMESSAGERENDER("Download completed"); LOGMESSAGERENDER("Download completed");
task->OnComplete(); task->OnComplete();
m_FileReceiveTasks.erase(dataMessage->m_RequestID); m_FileReceiveTasks.erase(dataMessage.m_RequestID);
return INFO::OK; return INFO::OK;
} }
// TODO: should report progress using proper GUI // TODO: should report progress using proper GUI
// Report the download status occassionally // Report the download status occassionally
double t = timer_Time(); double t = timer_Time();
if (t > m_LastProgressReportTime + 0.5) if (t > m_LastProgressReportTime + 0.5)
{ {
LOGMESSAGERENDER("Downloading data: %.1f%% of %d KB", 100.f*task->m_Buffer.size()/task->m_Length, (int)(task->m_Length/1024)); LOGMESSAGERENDER("Downloading data: %.1f%% of %d KB", 100.f*task->m_Buffer.size()/task->m_Length, (int)(task->m_Length/1024));
m_LastProgressReportTime = t; m_LastProgressReportTime = t;
} }
return INFO::OK; return INFO::OK;
} }
else if (message->GetType() == NMT_FILE_TRANSFER_ACK) else if (message.GetType() == NMT_FILE_TRANSFER_ACK)
{ {
CFileTransferAckMessage* ackMessage = (CFileTransferAckMessage*)message; CFileTransferAckMessage ackMessage;
message.GetMessage(ackMessage);
if (m_FileSendTasks.find(ackMessage->m_RequestID) == m_FileSendTasks.end()) if (m_FileSendTasks.find(ackMessage.m_RequestID) == m_FileSendTasks.end())
{ {
LOGERROR("Net transfer: Unsolicited file transfer ack (id=%d)", (int)ackMessage->m_RequestID); LOGERROR("Net transfer: Unsolicited file transfer ack (id=%d)", (int)ackMessage.m_RequestID);
return ERR::FAIL; return ERR::FAIL;
} }
CNetFileSendTask& task = m_FileSendTasks[ackMessage->m_RequestID]; CNetFileSendTask& task = m_FileSendTasks[ackMessage.m_RequestID];
if (ackMessage->m_NumPackets > task.packetsInFlight) if (ackMessage.m_NumPackets > task.packetsInFlight)
{ {
LOGERROR("Net transfer: Invalid num packets for file transfer ack (num=%d inflight=%d)", LOGERROR("Net transfer: Invalid num packets for file transfer ack (num=%d inflight=%d)",
(int)ackMessage->m_NumPackets, (int)task.packetsInFlight); (int)ackMessage.m_NumPackets, (int)task.packetsInFlight);
return ERR::FAIL; return ERR::FAIL;
} }
task.packetsInFlight -= ackMessage->m_NumPackets; task.packetsInFlight -= ackMessage.m_NumPackets;
return INFO::OK; return INFO::OK;
} }
return INFO::SKIPPED; return INFO::SKIPPED;
} }
void CNetFileTransferer::StartTask(const shared_ptr<CNetFileReceiveTask>& task) void CNetFileTransferer::StartTask(const shared_ptr<CNetFileReceiveTask>& task)
{ {
u32 requestID = m_NextRequestID++; u32 requestID = m_NextRequestID++;
task->m_RequestID = requestID; task->m_RequestID = requestID;
m_FileReceiveTasks[requestID] = task; m_FileReceiveTasks[requestID] = task;
CFileTransferRequestMessage request; CFileTransferRequestMessage request;
request.m_RequestID = requestID; request.m_RequestID = requestID;
m_Session->SendMessage(&request); m_Session->SendMessage(request);
} }
void CNetFileTransferer::StartResponse(u32 requestID, const std::string& data) void CNetFileTransferer::StartResponse(u32 requestID, const std::string& data)
{ {
CNetFileSendTask task; CNetFileSendTask task;
task.requestID = requestID; task.requestID = requestID;
task.buffer = data; task.buffer = data;
task.offset = 0; task.offset = 0;
task.packetsInFlight = 0; task.packetsInFlight = 0;
task.maxWindowSize = DEFAULT_FILE_TRANSFER_WINDOW_SIZE; task.maxWindowSize = DEFAULT_FILE_TRANSFER_WINDOW_SIZE;
m_FileSendTasks[task.requestID] = task; m_FileSendTasks[task.requestID] = task;
CFileTransferResponseMessage respMessage; CFileTransferResponseMessage respMessage;
respMessage.m_RequestID = requestID; respMessage.m_RequestID = requestID;
respMessage.m_Length = task.buffer.size(); respMessage.m_Length = task.buffer.size();
m_Session->SendMessage(&respMessage); m_Session->SendMessage(respMessage);
} }
void CNetFileTransferer::Poll() void CNetFileTransferer::Poll()
{ {
// Find tasks which have fewer packets in flight than their window size, // Find tasks which have fewer packets in flight than their window size,
// and send more packets // and send more packets
for (std::pair<const u32, CNetFileSendTask>& p : m_FileSendTasks) for (std::pair<const u32, CNetFileSendTask>& p : m_FileSendTasks)
{ {
CNetFileSendTask& task = p.second; CNetFileSendTask& task = p.second;
while (task.packetsInFlight < task.maxWindowSize && task.offset < task.buffer.size()) while (task.packetsInFlight < task.maxWindowSize && task.offset < task.buffer.size())
{ {
CFileTransferDataMessage dataMessage; CFileTransferDataMessage dataMessage;
dataMessage.m_RequestID = task.requestID; dataMessage.m_RequestID = task.requestID;
ssize_t packetSize = std::min(DEFAULT_FILE_TRANSFER_PACKET_SIZE, task.buffer.size() - task.offset); ssize_t packetSize = std::min(DEFAULT_FILE_TRANSFER_PACKET_SIZE, task.buffer.size() - task.offset);
dataMessage.m_Data = task.buffer.substr(task.offset, packetSize); dataMessage.m_Data = task.buffer.substr(task.offset, packetSize);
task.offset += packetSize; task.offset += packetSize;
++task.packetsInFlight; ++task.packetsInFlight;
m_Session->SendMessage(&dataMessage); m_Session->SendMessage(dataMessage);
} }
} }
// TODO: need to garbage-collect finished tasks // TODO: need to garbage-collect finished tasks
} }
Wildfire Games · Phabricator