Reinserts original comments
This commit is contained in:
112 files changed
+7113
-5131
No files matched your search
@@ -1,17 +1,17 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// manual class headers
|
||||
#include "PrtCnvInjectionSocket.hpp"
|
||||
#include <CoPrtCnv/CoPrtCnvInjectionHeader.hpp>
|
||||
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
|
||||
@@ -33,9 +33,9 @@ PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
|
||||
delete m_Socket;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Disconnects a TCP-client
|
||||
// ---------------------------------------------------------------
|
||||
void PrtCnvInjectionSocket::disconnectClient()
|
||||
{
|
||||
INFO_LOG(m_logger) << "A client has disconnected from the injection-server";
|
||||
@@ -43,9 +43,9 @@ void PrtCnvInjectionSocket::disconnectClient()
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Reads in TCP-data and handles them
|
||||
// ---------------------------------------------------------------
|
||||
void PrtCnvInjectionSocket::processInputData()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Injection-server has data received";
|
||||
@@ -55,7 +55,7 @@ void PrtCnvInjectionSocket::processInputData()
|
||||
{
|
||||
if (injectionHeader.isIdCorrect())
|
||||
{
|
||||
|
||||
// check whether all bytes are available
|
||||
qint64 available = m_Socket->bytesAvailable();
|
||||
if (available < qint64(injectionHeader.m_Size + sizeof(injectionHeader)))
|
||||
{
|
||||
@@ -64,15 +64,15 @@ void PrtCnvInjectionSocket::processInputData()
|
||||
<< injectionHeader.m_Id1 << " id2=" << injectionHeader.m_Id2
|
||||
<< " kind=" << (int)injectionHeader.m_Kind << " size="
|
||||
<< injectionHeader.m_Size;
|
||||
return;
|
||||
return; // try it later, when (maybe) enough bytes are available...
|
||||
}
|
||||
|
||||
// enough bytes => read now all in
|
||||
m_Socket->read((char*)&injectionHeader, sizeof(injectionHeader));
|
||||
if (injectionHeader.isIdCorrect())
|
||||
{
|
||||
|
||||
//INFO_LOG(m_logger) << "kind=" << (int)injectionHeader.m_Kind << " size=" << injectionHeader.m_Size;
|
||||
|
||||
|
||||
// read the data
|
||||
QByteArray data(injectionHeader.m_Size, Qt::Uninitialized);
|
||||
m_Socket->read(data.data(), injectionHeader.m_Size);
|
||||
|
||||
@@ -111,7 +111,7 @@ void PrtCnvInjectionSocket::processInputData()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void PrtCnvInjectionSocket::setSocket(QTcpSocket* a_socket, PrtCnvInjectionThread* a_server)
|
||||
{
|
||||
m_Socket = a_socket;
|
||||
@@ -124,4 +124,4 @@ void PrtCnvInjectionSocket::setSocket(QTcpSocket* a_socket, PrtCnvInjectionThrea
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace PrtCnv
|
||||
Reference in new issue
Block a user