Index: tools/AgentSim/AgentSimController.cpp =================================================================== diff -u -ra5781739bcbe58c754aff8861561495624bc5b67 -rcaca75be9a284ac5f98c078ec47c2e826ac5e980 --- tools/AgentSim/AgentSimController.cpp (.../AgentSimController.cpp) (revision a5781739bcbe58c754aff8861561495624bc5b67) +++ tools/AgentSim/AgentSimController.cpp (.../AgentSimController.cpp) (revision caca75be9a284ac5f98c078ec47c2e826ac5e980) @@ -39,7 +39,7 @@ */ bool AgentSimController::listen() { - const QString socketPath = _settings.value("Socket/LocalSocketName", "/tmp/leahi_rt.sock").toString(); + const QString socketPath = _settings.value("Socket/AgentSocketName", "/tmp/cloudconnect_agent.sock").toString(); QLocalServer::removeServer(socketPath); if (!_server.listen(socketPath)) { qCritical().noquote() << "AgentSim: failed to listen on" << socketPath << "—" << _server.errorString(); @@ -85,39 +85,39 @@ /*! * \brief AgentSimController::onReadyRead * \details Appends incoming bytes to the receive buffer and drains it through - * the RtMessage parser. Logs each complete frame and sends an Ack. + * the CloudConnectFrame parser. Logs each complete frame and sends an Ack. */ void AgentSimController::onReadyRead() { _rxBuf.append(_client->readAll()); - RtMessage::FeedResult result; + CloudConnectFrame::FeedResult result; do { result = _rxMsg.feed(_rxBuf); switch (result) { - case RtMessage::FeedResult::Complete: + case CloudConnectFrame::FeedResult::Complete: handleMessage(_rxMsg); _rxMsg.reset(); break; - case RtMessage::FeedResult::HeaderError: + case CloudConnectFrame::FeedResult::HeaderError: qWarning().noquote() << "AgentSim: header CRC error — frame dropped"; break; - case RtMessage::FeedResult::PayloadError: + case CloudConnectFrame::FeedResult::PayloadError: qWarning().noquote() << "AgentSim: payload CRC error — frame dropped"; break; - case RtMessage::FeedResult::Incomplete: + case CloudConnectFrame::FeedResult::Incomplete: break; } - } while (result == RtMessage::FeedResult::Complete && !_rxBuf.isEmpty()); + } while (result == CloudConnectFrame::FeedResult::Complete && !_rxBuf.isEmpty()); } /*! * \brief AgentSimController::handleMessage * \details Decodes a received frame and prints its typed body as JSON, generically * via the protobuf descriptor pool (msgId -> message name -> dynamic parse). - * \param msg The complete RtMessage frame. + * \param msg The complete CloudConnectFrame frame. */ -void AgentSimController::handleMessage(const RtMessage &msg) +void AgentSimController::handleMessage(const CloudConnectFrame &msg) { const QByteArray payload = msg.payload(); logMessage(msg.msgId(), msg.sequence(), payload); @@ -173,7 +173,7 @@ * \param sequence Sequence number from the parsed frame. * \param payload Payload bytes of the parsed frame. */ -void AgentSimController::logMessage(RtMessage::MsgId msgId, quint16 sequence, const QByteArray &payload) +void AgentSimController::logMessage(CloudConnectFrame::MsgId msgId, quint16 sequence, const QByteArray &payload) { qInfo().noquote() << QString("AgentSim: rx MsgId=0x%1 seq=%2 payloadLen=%3") .arg(static_cast(msgId), 4, 16, QChar('0'))