diff --git a/ClientCore/ClientCore.cpp b/ClientCore/ClientCore.cpp index a049421..9a1fd16 100644 --- a/ClientCore/ClientCore.cpp +++ b/ClientCore/ClientCore.cpp @@ -122,7 +122,12 @@ bool ClientCore::Send(const char* data, qint64 len) qCritical() << QString("client %1 not connected...").arg(remoteID_); return false; } - qint64 bytesWritten = socket_->write(data, len); + + qint64 bytesWritten = -1; + { + QMutexLocker locker(&sockMut_); + bytesWritten = socket_->write(data, len); + } if (bytesWritten == -1 || !socket_->waitForBytesWritten(5000)) { qCritical() << QString("Send data to server failed. %1").arg(socket_->errorString()); return false; diff --git a/ClientCore/ClientCore.h b/ClientCore/ClientCore.h index a6b068e..0689e85 100644 --- a/ClientCore/ClientCore.h +++ b/ClientCore/ClientCore.h @@ -56,6 +56,8 @@ public: QMutex conMutex_; QString ownID_; QString remoteID_; + + QMutex sockMut_; QTcpSocket* socket_; QByteArray recvBuffer_; diff --git a/ClientCore/FileTrans.cpp b/ClientCore/FileTrans.cpp index 45c7d4b..6b84142 100644 --- a/ClientCore/FileTrans.cpp +++ b/ClientCore/FileTrans.cpp @@ -2,18 +2,180 @@ FileTrans::FileTrans(ClientCore* clientCore) : clientCore_(clientCore) { + RegisterFrameCall(); } void FileTrans::SetTasks(const QVector& tasks) { - tasks_ = tasks; + localTasks_ = tasks; } void FileTrans::RegisterFrameCall() { clientCore_->SetFrameCall(FBT_CLI_REQ_SEND, [this](QSharedPointer frame) { fbtReqSend(frame); }); + clientCore_->SetFrameCall(FBT_CLI_REQ_RECV, [this](QSharedPointer frame) { fbtReqRecv(frame); }); + clientCore_->SetFrameCall(FBT_CLI_TRANS_DONE, [this](QSharedPointer frame) { fbtTransDone(frame); }); + clientCore_->SetFrameCall(FBT_CLI_ANSSEND_SUCCESS, [this](QSharedPointer frame) { fbtAnsSendSuccess(frame); }); + clientCore_->SetFrameCall(FBT_CLI_ANSSEND_FAILED, [this](QSharedPointer frame) { fbtAnsSendFailed(frame); }); + clientCore_->SetFrameCall(FBT_CLI_ANSRECV_FAILED, [this](QSharedPointer frame) { fbtAnsRecvFailed(frame); }); + clientCore_->SetFrameCall(FBT_CLI_ANSRECV_SUCCESS, [this](QSharedPointer frame) { fbtAnsRecvSuccess(frame); }); + clientCore_->SetFrameCall(FBT_CLI_FILETRANS, [this](QSharedPointer frame) { fbtFileTrans(frame); }); + clientCore_->SetFrameCall(FBT_CLI_FILETRANS_FAILED, [this](QSharedPointer frame) { fbtFileTransFailed(frame); }); } void FileTrans::fbtReqSend(QSharedPointer frame) { + // judget is same client's same file. + + // send + InfoMsg info = infoUnpack(frame->data); + auto doTask = QSharedPointer::create(); + doTask->file.setFileName(info.path); + if (!doTask->file.open(QIODevice::ReadOnly)) { + qCritical() << QString(tr("open file failed: %1")).arg(info.path); + return; + } + doTask->task.isUpload = true; + doTask->task.localPath = info.path; + doTask->task.remoteId = frame->fid; + SendFile(doTask); } + +void FileTrans::fbtReqRecv(QSharedPointer frame) +{ + // recv is single thread recv. + + // judge idle + + // reply msg + + // recv + InfoMsg info = infoUnpack(frame->data); + downTask_.file.setFileName(info.path); + if (!downTask_.file.open(QIODevice::WriteOnly)) { + info.msg = QString(tr("open file failed: %1")).arg(info.path); + qCritical() << info.msg; + if (!clientCore_->Send(info, FBT_CLI_ANSRECV_FAILED, frame->fid)) { + qCritical() << QString(tr("open recv file:%2 failed, and reply %2 failed.")).arg(info.msg).arg(frame->fid); + downTask_.file.close(); + return; + } + return; + } + info.msg = QString(tr("open recv file success: %1")).arg(info.path); + if (!clientCore_->Send(info, FBT_CLI_ANSRECV_SUCCESS, frame->fid)) { + qCritical() << QString(tr("open recv file:%2 success, but reply %2 failed.")).arg(info.msg).arg(frame->fid); + downTask_.file.close(); + return; + } + downTask_.state = TaskState::STATE_RUNNING; +} + +void FileTrans::fbtTransDone(QSharedPointer frame) +{ + auto info = infoUnpack(frame->data); + if (downTask_.file.isOpen()) { + downTask_.file.close(); + downTask_.state = TaskState::STATE_FINISH; + qInfo() << QString(tr("recv file:%1 success.")).arg(downTask_.file.fileName()); + clientCore_->Send(info, FBT_CLI_ANSRECV_SUCCESS, frame->fid); + return; + } + qCritical() << QString(tr("recv file:%1 done sigal, but file not opened.")).arg(info.msg); +} + +void FileTrans::fbtAnsRecvSuccess(QSharedPointer frame) +{ + // ready to send + InfoMsg info = infoUnpack(frame->data); + auto doTask = QSharedPointer::create(); + doTask->file.setFileName(info.path); + if (!doTask->file.open(QIODevice::ReadOnly)) { + qCritical() << QString(tr("open file failed: %1")).arg(info.path); + return; + } + doTask->task.isUpload = true; + doTask->task.localPath = info.path; + doTask->task.remoteId = frame->fid; + SendFile(doTask); +} + +void FileTrans::fbtAnsRecvFailed(QSharedPointer frame) +{ + InfoMsg info = infoUnpack(frame->data); + qCritical() << QString(tr("request send file:%1 failed. reason:%2")).arg(info.path).arg(info.msg); +} + +void FileTrans::fbtFileTrans(QSharedPointer frame) +{ + if (downTask_.state != TaskState::STATE_RUNNING) { + return; + } + // For the sake of efficiency, not verify the legality of the file + auto ws = downTask_.file.write(frame->data.constData(), frame->data.size()); + if (ws != frame->data.size()) { + downTask_.state = TaskState::STATE_FAILED; + InfoMsg info; + info.msg = downTask_.file.errorString(); + clientCore_->Send(info, FBT_CLI_FILETRANS_FAILED, frame->fid); + } +} + +void FileTrans::fbtAnsSendFailed(QSharedPointer frame) +{ +} + +void FileTrans::fbtAnsSendSuccess(QSharedPointer frame) +{ +} + +void FileTrans::fbtFileTransFailed(QSharedPointer frame) +{ +} + +void FileTrans::SendFile(const QSharedPointer& task) +{ + auto* sendThread = new SendThread(clientCore_); + sendThread->setTask(task); + QMutexLocker locker(&sthMut_); + sendThreads_.push_back(sendThread); + sendThread->run(); +} + +SendThread::SendThread(ClientCore* clientCore) : cliCore_(clientCore) +{ +} + +void SendThread::run() +{ + // task's file shoule be already opened. + auto frame = QSharedPointer::create(); + frame->tid = task_->task.remoteId; + frame->type = FBT_CLI_FILETRANS; + + bool suc = true; + while (!task_->file.atEnd()) { + frame->data.resize(CHUNK_BUF_SIZE); + auto br = task_->file.read(frame->data.data(), CHUNK_BUF_SIZE); + if (br == -1) { + qCritical() << QString(tr("read file failed: %1")).arg(task_->file.errorString()); + suc = false; + break; + } + frame->data.resize(br); + if (!cliCore_->Send(frame)) { + qCritical() << QString(tr("send to %1 file failed.")).arg(task_->task.remoteId); + suc = false; + break; + } + } + + if (!suc) { + task_->file.close(); + } +} + +void SendThread::setTask(const QSharedPointer& task) +{ + task_ = task; +} \ No newline at end of file diff --git a/ClientCore/FileTrans.h b/ClientCore/FileTrans.h index cd424b5..1b15620 100644 --- a/ClientCore/FileTrans.h +++ b/ClientCore/FileTrans.h @@ -3,6 +3,7 @@ #include #include +#include #include #include "ClientCore.h" @@ -18,7 +19,7 @@ struct TransTask { }; enum class TaskState { - STATE_READY = 0, + STATE_NONE = 0, STATE_RUNNING, STATE_FAILED, STATE_FINISH, @@ -26,10 +27,25 @@ enum class TaskState { struct DoTransTask { QFile file; - TaskState state; + TaskState state = TaskState::STATE_NONE; TransTask task; }; +class SendThread : public QThread +{ + Q_OBJECT +public: + SendThread(ClientCore* clientCore); + +public: + void run() override; + void setTask(const QSharedPointer& task); + +private: + ClientCore* cliCore_; + QSharedPointer task_; +}; + class FileTrans : public QObject { Q_OBJECT @@ -42,12 +58,30 @@ public: private: void fbtReqSend(QSharedPointer frame); + void fbtReqRecv(QSharedPointer frame); + void fbtTransDone(QSharedPointer frame); + void fbtAnsRecvSuccess(QSharedPointer frame); + void fbtAnsRecvFailed(QSharedPointer frame); + void fbtFileTrans(QSharedPointer frame); + void fbtAnsSendFailed(QSharedPointer frame); + void fbtAnsSendSuccess(QSharedPointer frame); + void fbtFileTransFailed(QSharedPointer frame); + +private: + void SendFile(const QSharedPointer& task); private: DoTransTask downTask_; - QVector tasks_; + + QMutex lMut_; + QMutex rMut_; + QVector localTasks_; + QVector remoteTasks_; + ClientCore* clientCore_; - QMap upTasks_; + QMutex sthMut_; + QVector sendThreads_; + QMap upTasks_; }; #endif \ No newline at end of file diff --git a/Gui/CMakeLists.txt b/Gui/CMakeLists.txt index bb35770..39b9fe9 100644 --- a/Gui/CMakeLists.txt +++ b/Gui/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.16) project(frelayGUI VERSION ${PROJECT_VERSION} LANGUAGES CXX) @@ -22,6 +22,7 @@ Control/ConnectControl.h Control/ConnectControl.cpp Control/ConnectControl.ui Control/CompareControl.h Control/CompareControl.cpp Control/CompareControl.ui GuiUtil/Public.h GuiUtil/Public.cpp Control/Transform.h Control/Transform.cpp Control/Transform.ui +../Res/frelay.qrc ../Res/ico.rc ) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) diff --git a/Gui/main.cpp b/Gui/main.cpp index 2931e4f..22fcbd5 100644 --- a/Gui/main.cpp +++ b/Gui/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "frelayGUI.h" @@ -12,6 +12,7 @@ int main(int argc, char* argv[]) #ifdef _WIN32 QFont font("Microsoft YaHei", 9); a.setFont(font); + a.setWindowIcon(QIcon(":/ico/main.ico")); a.setStyle("Windows"); #endif diff --git a/Protocol/Protocol.h b/Protocol/Protocol.h index cb5ea4c..abcf276 100644 --- a/Protocol/Protocol.h +++ b/Protocol/Protocol.h @@ -1,10 +1,12 @@ -#ifndef PROTOCOL_H +#ifndef PROTOCOL_H #define PROTOCOL_H #include #include #include +constexpr quint32 CHUNK_BUF_SIZE = 1 * 1024 * 1024; + // It is specified here that the first 30 contents (inclusive) are // used for communication with the server. // Contents beyond 30 are only forwarded. @@ -20,13 +22,14 @@ enum FrameBufferType : uint16_t { FBT_CLI_ASK_HOME, FBT_CLI_ANS_HOME, FBT_CLI_REQ_SEND, - FBT_CLI_ANSREQ_SUCCESS, - FBT_CLI_ANSREQ_FAILED, + FBT_CLI_ANSSEND_SUCCESS, + FBT_CLI_ANSSEND_FAILED, FBT_CLI_REQ_RECV, FBT_CLI_ANSRECV_SUCCESS, FBT_CLI_ANSRECV_FAILED, FBT_CLI_FILETRANS, - FBT_CLI_TRANS_DONE + FBT_CLI_TRANS_DONE, + FBT_CLI_FILETRANS_FAILED }; struct FrameBuffer { diff --git a/Res/frelay.qrc b/Res/frelay.qrc new file mode 100644 index 0000000..727aff0 --- /dev/null +++ b/Res/frelay.qrc @@ -0,0 +1,6 @@ + + + main.ico + server.ico + + diff --git a/Res/ico.rc b/Res/ico.rc new file mode 100644 index 0000000..e42514b --- /dev/null +++ b/Res/ico.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "main.ico" diff --git a/Res/main.ico b/Res/main.ico new file mode 100644 index 0000000..f470d9a Binary files /dev/null and b/Res/main.ico differ diff --git a/Res/original/a.svg b/Res/original/a.svg new file mode 100644 index 0000000..49f4e61 --- /dev/null +++ b/Res/original/a.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Res/original/b.svg b/Res/original/b.svg new file mode 100644 index 0000000..74ea3ad --- /dev/null +++ b/Res/original/b.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Res/server.ico b/Res/server.ico new file mode 100644 index 0000000..ea2020c Binary files /dev/null and b/Res/server.ico differ diff --git a/Res/server.rc b/Res/server.rc new file mode 100644 index 0000000..f72ade4 --- /dev/null +++ b/Res/server.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "server.ico" diff --git a/Server/CMakeLists.txt b/Server/CMakeLists.txt index 7c04dd4..6b24f3d 100644 --- a/Server/CMakeLists.txt +++ b/Server/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.16) project(frelayServer LANGUAGES CXX) @@ -12,6 +12,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Network) -add_executable(frelayServer Server.h Server.cpp main.cpp) +add_executable(frelayServer Server.h Server.cpp main.cpp ../Res/server.rc) target_link_libraries(frelayServer PRIVATE Protocol Util) target_link_libraries(frelayServer PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network) \ No newline at end of file diff --git a/Struct/InfoMsg.h b/Struct/InfoMsg.h index 97fc119..0a8cbbc 100644 --- a/Struct/InfoMsg.h +++ b/Struct/InfoMsg.h @@ -1,4 +1,4 @@ -#ifndef INFO_MSG_H +#ifndef INFO_MSG_H #define INFO_MSG_H #include @@ -10,15 +10,16 @@ struct InfoMsg { qint32 mark{}; QString msg; + QString path; void serialize(QDataStream& data) const { - data << mark << msg; + data << mark << msg << path; } void deserialize(QDataStream& data) { - data >> mark >> msg; + data >> mark >> msg >> path; } };