diff --git a/Core/recognizesystem.cpp b/Core/recognizesystem.cpp index 72e7095..33901ce 100644 --- a/Core/recognizesystem.cpp +++ b/Core/recognizesystem.cpp @@ -34,46 +34,29 @@ void RecognizeSystem::recognize(QTcpSocket *socket) int cntBytesAvl = 0; while((cntBytesAvl = socket->bytesAvailable()) > 0) { - - /* - if(cntBytesAvl < 4) - { - //if(!socket->waitForReadyRead(TCP_READ_TIMEOUT)) - //return; - socket->waitForReadyRead(TCP_READ_TIMEOUT); - continue; - } - */ - if (socket->state() != QTcpSocket::ConnectedState) { qDebug() << "RecognizeSystem::recognize socket->state() != QTcpSocket::ConnectedState"; return; } - /* - if(!socket->waitForReadyRead(TCP_READ_TIMEOUT)) - { - continue; - } - */ if(packetType == PacketType::TYPE_NONE) //определение первичного пакета - { - stream.startTransaction(); - stream >> packetType; + { + stream.startTransaction(); + stream >> packetType; - if(!stream.commitTransaction()) - { - socket->waitForReadyRead(TCP_READ_TIMEOUT); - continue; - } - //qDebug() << Tools::GetTime() << "CLIENT: type: " << packetType; - if(packetType == PacketType::TYPE_FILE) - socket->waitForReadyRead(10); - else - socket->waitForReadyRead(100); + if(!stream.commitTransaction()) + { + socket->waitForReadyRead(TCP_READ_TIMEOUT); + continue; } - //continue; + //qDebug() << Tools::GetTime() << "CLIENT: type: " << packetType; + if(packetType == PacketType::TYPE_FILE) + socket->waitForReadyRead(10); + else + socket->waitForReadyRead(100); + } + switch ((int)packetType) { @@ -164,9 +147,6 @@ void RecognizeSystem::recognize(QTcpSocket *socket) continue; } - //if(!socket->waitForReadyRead(TCP_READ_TIMEOUT)) - //continue; - if(fileSize - sizeReceiveData >= BLOCK_SIZE) tmpBlock = socket->read(BLOCK_SIZE); else