L3 RRC/NAS developments

src/ue.cpp

@@ -201,7 +201,7 @@ static nr::ue::UeConfig *ReadConfigYaml()
 
             s.isEmergency = yaml::GetBool(sess, "emergency");
 
-            result->initSessions.push_back(s);
+            result->defaultSessions.push_back(s);
         }
     }
 
@@ -317,7 +317,7 @@ static nr::ue::UeConfig *GetConfigByUe(int ueIndex)
     c->initials = g_refConfig->initials;
     c->supportedAlgs = g_refConfig->supportedAlgs;
     c->gnbSearchList = g_refConfig->gnbSearchList;
-    c->initSessions = g_refConfig->initSessions;
+    c->defaultSessions = g_refConfig->defaultSessions;
     c->configureRouting = g_refConfig->configureRouting;
     c->prefixLogger = g_refConfig->prefixLogger;
     c->integrityMaxRate = g_refConfig->integrityMaxRate;

src/ue/nas/sm/resource.cpp

@@ -108,16 +108,49 @@ std::bitset<16> NasSm::getPduSessionStatus()
 
 void NasSm::establishRequiredSessions()
 {
-    if (m_base->config->initSessions.empty())
+    if (m_mm->hasEmergency())
     {
-        m_logger->warn("No initial PDU sessions are configured");
+        if (!anyEmergencySession())
+        {
+            SessionConfig config;
+            config.type = nas::EPduSessionType::IPV4;
+            config.apn = std::nullopt;
+            config.sNssai = std::nullopt;
+            config.isEmergency = true;
+            sendEstablishmentRequest(config);
+        }
+
         return;
     }
 
-    //m_logger->debug("Initial PDU sessions are establishing [%d#]", m_base->config->initSessions.size());
+    for (auto &config : m_base->config->defaultSessions)
+    {
+        if (!anySessionMatches(config))
+            sendEstablishmentRequest(config);
+    }
+}
+
+bool NasSm::anySessionMatches(const SessionConfig &config)
+{
+    // ACTIVE_PENDING etc. are also included
+    return std::any_of(m_pduSessions.begin(), m_pduSessions.end(), [&config](auto &ps) {
+        if (ps->psState == EPsState::INACTIVE)
+            return false;
+
+        if (config.isEmergency)
+            return ps->isEmergency;
+
+        if (config.isEmergency != ps->isEmergency)
+            return false;
+        if (config.type != ps->sessionType)
+            return false;
+        if (config.apn != ps->apn)
+            return false;
+        if (config.sNssai != ps->sNssai)
+            return false;
 
-    for (auto &sess : m_base->config->initSessions)
-        sendEstablishmentRequest(sess);
+        return true;
+    });
 }
 
 } // namespace nr::ue
\ No newline at end of file

src/ue/nas/sm/sm.hpp

@@ -52,6 +52,7 @@ class NasSm
     std::bitset<16> getUplinkDataStatus();
     std::bitset<16> getPduSessionStatus();
     void establishRequiredSessions();
+    bool anySessionMatches(const SessionConfig &config);
 
   private: /* Transport */
     void receiveSmMessage(const nas::SmMessage &msg);

src/ue/types.hpp

@@ -100,7 +100,7 @@ struct UeConfig
     std::optional<std::string> imeiSv{};
     SupportedAlgs supportedAlgs{};
     std::vector<std::string> gnbSearchList{};
-    std::vector<SessionConfig> initSessions{};
+    std::vector<SessionConfig> defaultSessions{};
     IntegrityMaxDataRateConfig integrityMaxRate{};
 
     /* Read from config file as well, but should be stored in non-volatile