Commit 6e675f65 authored by aligungr's avatar aligungr

L3 RRC/NAS developments

parent 8a273192
......@@ -19,6 +19,7 @@
#define PAUSE_CONFIRM_TIMEOUT 3000
#define PAUSE_POLLING 10
// todo add coverage again to cli
static std::string SignalDescription(int dbm)
{
if (dbm > -90)
......@@ -104,10 +105,11 @@ void UeCmdHandler::handleCmdImpl(NwUeCliCommand &msg)
switch (msg.cmd->present)
{
case app::UeCliCommand::STATUS: {
std::vector<Json> pduSessions{};
for (auto &pduSession : m_base->appTask->m_pduSessions)
if (pduSession.has_value())
pduSessions.push_back(ToJson(*pduSession));
// TODO
//std::vector<Json> pduSessions{};
//for (auto &pduSession : m_base->appTask->m_pduSessions)
// if (pduSession.has_value())
// pduSessions.push_back(ToJson(*pduSession));
Json json = Json::Obj({
{"cm-state", ToJson(m_base->nasTask->mm->m_cmState)},
......@@ -118,7 +120,7 @@ void UeCmdHandler::handleCmdImpl(NwUeCliCommand &msg)
{"stored-suci", ToJson(m_base->nasTask->mm->m_storage->storedSuci->get())},
{"stored-guti", ToJson(m_base->nasTask->mm->m_storage->storedGuti->get())},
{"has-emergency", ::ToJson(m_base->nasTask->mm->hasEmergency())},
{"pdu-sessions", Json::Arr(std::move(pduSessions))},
//TODO {"pdu-sessions", Json::Arr(std::move(pduSessions))},
});
sendResult(msg.address, json.dumpYaml());
break;
......
......@@ -129,17 +129,6 @@ void UeAppTask::receiveStatusUpdate(NwUeStatusUpdate &msg)
if (msg.what == NwUeStatusUpdate::SESSION_ESTABLISHMENT)
{
auto *session = msg.pduSession;
UePduSessionInfo sessionInfo{};
sessionInfo.psi = session->psi;
sessionInfo.type = nas::utils::EnumToString(session->sessionType);
if (session->pduAddress.has_value())
sessionInfo.address = utils::OctetStringToIp(session->pduAddress->pduAddressInformation);
sessionInfo.isEmergency = session->isEmergency;
sessionInfo.uplinkPending = false;
m_pduSessions[session->psi] = std::move(sessionInfo);
setupTunInterface(session);
return;
}
......@@ -153,11 +142,6 @@ void UeAppTask::receiveStatusUpdate(NwUeStatusUpdate &msg)
m_tunTasks[msg.psi] = nullptr;
}
if (m_pduSessions[msg.psi].has_value())
{
m_logger->info("PDU session[%d] released", msg.psi);
m_pduSessions[msg.psi] = {};
}
return;
}
......
......@@ -27,7 +27,6 @@ class UeAppTask : public NtsTask
TaskBase *m_base;
std::unique_ptr<Logger> m_logger;
std::array<std::optional<UePduSessionInfo>, 16> m_pduSessions{};
std::array<TunTask *, 16> m_tunTasks{};
ECmState m_cmState{};
......
......@@ -150,7 +150,7 @@ void NasSm::receiveReleaseCommand(const nas::PduSessionReleaseCommand &msg)
}
/* Construct Release Complete message */
nas::PduSessionReleaseComplete resp{};
nas::PduSessionReleaseComplete resp;
resp.pduSessionId = psi;
resp.pti = pti;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment