Refactor

2c1f2b6c · aligungr · 31196a88 · 2c1f2b6c
Commit 2c1f2b6c authored Feb 23, 2021 by aligungr
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 25 deletions

src/ue/mm/identity.cpp src/ue/mm/identity.cpp +23 -25

No files found.
--- a/src/ue/mm/identity.cpp
+++ b/src/ue/mm/identity.cpp
@@ -95,33 +95,31 @@ nas::IE5gsMobileIdentity NasMm::getOrGeneratePreferredId()
 {
    if (m_storage.m_storedGuti.type != nas::EIdentityType::NO_IDENTITY)
        return m_storage.m_storedGuti;
+    auto suci = getOrGenerateSuci();
+    if (suci.type != nas::EIdentityType::NO_IDENTITY)
+    {
+        return suci;
+    }
+    else if (m_base->config->imei.has_value())
+    {
+        nas::IE5gsMobileIdentity res{};
+        res.type = nas::EIdentityType::IMEI;
+        res.value = *m_base->config->imei;
+        return res;
+    }
+    else if (m_base->config->imeiSv.has_value())
+    {
+        nas::IE5gsMobileIdentity res{};
+        res.type = nas::EIdentityType::IMEISV;
+        res.value = *m_base->config->imeiSv;
+        return res;
+    }
    else
    {
-        auto suci = getOrGenerateSuci();
+        nas::IE5gsMobileIdentity res{};
-        if (suci.type != nas::EIdentityType::NO_IDENTITY)
+        res.type = nas::EIdentityType::NO_IDENTITY;
-        {
+        return res;
-            return suci;
-        }
-        else if (m_base->config->imei.has_value())
-        {
-            nas::IE5gsMobileIdentity res{};
-            res.type = nas::EIdentityType::IMEI;
-            res.value = *m_base->config->imei;
-            return res;
-        }
-        else if (m_base->config->imeiSv.has_value())
-        {
-            nas::IE5gsMobileIdentity res{};
-            res.type = nas::EIdentityType::IMEISV;
-            res.value = *m_base->config->imeiSv;
-            return res;
-        }
-        else
-        {
-            nas::IE5gsMobileIdentity res{};
-            res.type = nas::EIdentityType::NO_IDENTITY;
-            return res;
-        }
    }
 }