L3 RRC/NAS developments

src/ue.cpp

@@ -118,7 +118,7 @@ static nr::ue::UeConfig *ReadConfigYaml()
             s.sst = yaml::GetInt32(sNssai, "sst", 0, 0xFF);
             if (yaml::HasField(sNssai, "sd"))
                 s.sd = octet3{yaml::GetInt32(sNssai, "sd", 0, 0xFFFFFF)};
-            result->initials.defaultConfiguredNssai.slices.push_back(s);
+            result->defaultConfiguredNssai.slices.push_back(s);
         }
     }
 
@@ -130,7 +130,7 @@ static nr::ue::UeConfig *ReadConfigYaml()
             s.sst = yaml::GetInt32(sNssai, "sst", 0, 0xFF);
             if (yaml::HasField(sNssai, "sd"))
                 s.sd = octet3{yaml::GetInt32(sNssai, "sd", 0, 0xFFFFFF)};
-            result->initials.configuredNssai.slices.push_back(s);
+            result->configuredNssai.slices.push_back(s);
         }
     }
 
@@ -314,7 +314,8 @@ static nr::ue::UeConfig *GetConfigByUe(int ueIndex)
     c->imeiSv = g_refConfig->imeiSv;
     c->supi = g_refConfig->supi;
     c->hplmn = g_refConfig->hplmn;
-    c->initials = g_refConfig->initials;
+    c->configuredNssai = g_refConfig->configuredNssai;
+    c->defaultConfiguredNssai = g_refConfig->defaultConfiguredNssai;
     c->supportedAlgs = g_refConfig->supportedAlgs;
     c->gnbSearchList = g_refConfig->gnbSearchList;
     c->defaultSessions = g_refConfig->defaultSessions;

src/ue/nas/storage.cpp

@@ -72,8 +72,8 @@ MmStorage::MmStorage(TaskBase *base) : m_base{base}
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    defConfiguredNssai->set(m_base->config->initials.defaultConfiguredNssai);
-    configuredNssai->set(m_base->config->initials.configuredNssai);
+    defConfiguredNssai->set(m_base->config->defaultConfiguredNssai);
+    configuredNssai->set(m_base->config->configuredNssai);
 }
 
 } // namespace nr::ue
\ No newline at end of file

src/ue/types.hpp

@@ -102,14 +102,8 @@ struct UeConfig
     std::vector<std::string> gnbSearchList{};
     std::vector<SessionConfig> defaultSessions{};
     IntegrityMaxDataRateConfig integrityMaxRate{};
-
-    /* Read from config file as well, but should be stored in non-volatile
-     * mobile storage and subject to change in runtime */
-    struct Initials
-    {
     NetworkSlice defaultConfiguredNssai{};
     NetworkSlice configuredNssai{};
-    } initials{};
 
     /* Assigned by program */
     bool configureRouting{};