Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

refract Server 0

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-02-06 14:47:20 +03:00
parent 8ab4238537
commit 4b98d00faf
17 changed files with 549 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
LibServer/clienthandler/clienthandler.cpp
View File

@@ -9,8 +9,8 @@ ClientHandler::ClientHandler( QObject *parent):
{
}
void ClientHandler::initialize(int descriptor,ServerLMSWidget *serverWidget,
UpdateController *updateController,DataParser *dataParser)
void ClientHandler::initialize(int descriptor,
UpdateController *updateController,DataParser *dataParser, QMutex *mutex)
{
this->socket = new QTcpSocket;
this->thread = new QThread;
@@ -30,7 +30,6 @@ void ClientHandler::initialize(int descriptor,ServerLMSWidget *serverWidget,
recognizeSystem->moveToThread(thread);
this->updateController = updateController;
this->server = serverWidget;
QString peerName = socket->peerName();
QString peerAddress = socket->peerAddress().toString();
@@ -38,6 +37,8 @@ void ClientHandler::initialize(int descriptor,ServerLMSWidget *serverWidget,
client = new Client(peerName,peerAddress,peerPort,socket);
connect(recognizeSystem,&RecognizeSystem::signal_updateDocsXML,this,&ClientHandler::signal_updateDocsXML);
connect(this,&ClientHandler::sigSendXmlAnswer,sendSystem,&SendSystem::sendXmlAnswer,Qt::AutoConnection);
connect(this,&ClientHandler::sigInitSender,sendSystem,&SendSystem::initialize,Qt::AutoConnection/*Qt::DirectConnection*/);
connect(this,&ClientHandler::sigFileBlock,sendSystem,&SendSystem::sendFileBlock,Qt::AutoConnection);
@@ -57,9 +58,9 @@ void ClientHandler::initialize(int descriptor,ServerLMSWidget *serverWidget,
connect(socket,&QTcpSocket::readyRead,this,&ClientHandler::initClientType,Qt::AutoConnection);
initClientType();
recognizeSystem->initialize(updateController,dataParser,serverWidget,sendSystem, this);
recognizeSystem->initialize(updateController,dataParser,sendSystem, this);
sendSystem->setClient(client,socket);
emit sigInitSender(dataParser,serverWidget->getMutex());
emit sigInitSender(dataParser, mutex);
Logger::instance().log("SERVER: Client connected");
}

9
LibServer/clienthandler/clienthandler.h
View File

@@ -67,14 +67,16 @@ signals:
bool sigSocketFlush();
void sigSendVersion();
void sigSendPacketType(PacketType packetType);
void sigSendStop();
void sigSendStop();
void signal_updateDocsXML();
public :
QThread *thread;
QTcpSocket *socket;
void initialize(int descriptor, ServerLMSWidget *serverWidget,
UpdateController *updateController, DataParser *dataParser);
void initialize(int descriptor,
UpdateController *updateController, DataParser *dataParser, QMutex *mutex);
void setClient(Client *value);
private:
UpdateController *updateController;
@@ -82,7 +84,6 @@ private:
Client *client;
SendSystem *sendSystem;
ServerLMSWidget *server;
void initClientType();
void packetTypeInit(PacketType packet, Client *client);