Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+15
-15
@@ -61,10 +61,10 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
if (handleVersion(version))
|
||||
{
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_SUP_SECURITY_TYPES);
|
||||
DEBUG_LOG() << "RfbVersion handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbVersion handled Successfully!";
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "RfbVersion handshake Error!";
|
||||
ERROR_LOG(m_logger) << "RfbVersion handshake Error!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -78,10 +78,10 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
if (handleSupportedSecurityTypes(supTypes))
|
||||
{
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_VNC_AUTHENTICATION);
|
||||
DEBUG_LOG() << "RfbSecurityType handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbSecurityType handled Successfully!";
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "RfbSecurityType handshake Error!";
|
||||
ERROR_LOG(m_logger) << "RfbSecurityType handshake Error!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -95,10 +95,10 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
if (handleVncAuthentication(auth))
|
||||
{
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_SECURITY_RESULT);
|
||||
DEBUG_LOG() << "RfbVncAuthentication handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbVncAuthentication handled Successfully!";
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "RfbVncAuthentication Error!";
|
||||
ERROR_LOG(m_logger) << "RfbVncAuthentication Error!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -112,10 +112,10 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
if (handleSecurityResult(result))
|
||||
{
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_SERVER_INIT);
|
||||
DEBUG_LOG() << "RfbSecurityResult handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbSecurityResult handled Successfully!";
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "RfbSecurityResult Error!";
|
||||
ERROR_LOG(m_logger) << "RfbSecurityResult Error!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
emit connected();
|
||||
m_socket->write(RfbProtocol::CTS::RfbFrameBufferUpdateRequest(false, 0, 0, 1920, 1200));
|
||||
setNextExpectedMessageType(RfbProtocol::STC::RFB_FRAMEBUFFER_UPDATE);
|
||||
DEBUG_LOG() << "RfbServerInit handled Successfully!";
|
||||
DEBUG_LOG(m_logger) << "RfbServerInit handled Successfully!";
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -155,7 +155,7 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
stream.startTransaction();
|
||||
quint8 msgType;
|
||||
stream >> msgType;
|
||||
DEBUG_LOG() << "got message from server: " << QString::number(msgType, 16);
|
||||
DEBUG_LOG(m_logger) << "got message from server: " << QString::number(msgType, 16);
|
||||
switch (msgType)
|
||||
{
|
||||
case RfbProtocol::STC::RFB_FRAMEBUFFER_UPDATE:
|
||||
@@ -167,7 +167,7 @@ bool VncHandler::handleData(QDataStream &stream)
|
||||
case RfbProtocol::STC::RFB_SERVER_CUTTEXT:
|
||||
return handleServerCuttext(stream);
|
||||
default:
|
||||
WARNING_LOG() << "Unknown message type from server (" << QString::number(msgType, 16) << ") - reconnecting";
|
||||
WARNING_LOG(m_logger) << "Unknown message type from server (" << QString::number(msgType, 16) << ") - reconnecting";
|
||||
stream.abortTransaction();
|
||||
slotOnDisconnected();
|
||||
return false;
|
||||
@@ -241,7 +241,7 @@ void VncHandler::writeData(const QByteArray &data)
|
||||
|
||||
void VncHandler::error()
|
||||
{
|
||||
ERROR_LOG() << "SocketError " << m_socket->errorString();
|
||||
ERROR_LOG(m_logger) << "SocketError " << m_socket->errorString();
|
||||
}
|
||||
|
||||
void VncHandler::resetHandler()
|
||||
@@ -261,7 +261,7 @@ bool VncHandler::handleVersion(const RfbProtocol::STC::RfbVersion &version)
|
||||
version.minorVersion()));
|
||||
return true;
|
||||
}
|
||||
ERROR_LOG() << "Unsupported Version: " << version.majorVersion() << "." << version.minorVersion();
|
||||
ERROR_LOG(m_logger) << "Unsupported Version: " << version.majorVersion() << "." << version.minorVersion();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -276,7 +276,7 @@ bool VncHandler::handleSupportedSecurityTypes(const RfbProtocol::STC::RfbSupport
|
||||
for (quint8 type : supportedTypes.types())
|
||||
typesString.append(QString::number(type)).append(QLatin1Char(' '));
|
||||
if (typesString.isEmpty()) typesString = QStringLiteral("EMPTY");
|
||||
ERROR_LOG() << "Unsupported Security Types: " << typesString;
|
||||
ERROR_LOG(m_logger) << "Unsupported Security Types: " << typesString;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -327,7 +327,7 @@ bool VncHandler::handleSecurityResult(const RfbProtocol::STC::RfbSecurityResult
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG() << result.reason();
|
||||
ERROR_LOG(m_logger) << result.reason();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
+2
@@ -39,6 +39,8 @@ private slots:
|
||||
void error();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool handleData(QDataStream &stream);
|
||||
bool handleFrameBufferUpdate(QDataStream &stream);
|
||||
bool handleSetColormap(QDataStream &stream);
|
||||
|
||||
Reference in new issue
Block a user