Merge pull request #309 from aligungr/dev

Release v3.1.8

README.md

@@ -2,7 +2,7 @@
   <a href="https://github.com/aligungr/UERANSIM"><img src="/.github/logo.png" width="75" title="UERANSIM"></a>
 </p>
 <p align="center">
-<img src="https://img.shields.io/badge/UERANSIM-v3.1.7-blue" />
+<img src="https://img.shields.io/badge/UERANSIM-v3.1.8-blue" />
 <img src="https://img.shields.io/badge/3GPP-R15-orange" />
 <img src="https://img.shields.io/badge/License-GPL--3.0-green"/>
 </p>

src/lib/crypt/milenage.cpp

@@ -27,10 +27,10 @@ Milenage Calculate(const OctetString &opc, const OctetString &key, const OctetSt
     r.ak_r = OctetString::FromSpare(6);
 
     if (milenage_f1(opc.data(), key.data(), rand.data(), sqn.data(), amf.data(), r.mac_a.data(), r.mac_s.data()))
-        throw std::runtime_error("OPC calculation failed");
+        throw std::runtime_error("Milenage calculation failed");
     if (milenage_f2345(opc.data(), key.data(), rand.data(), r.res.data(), r.ck.data(), r.ik.data(), r.ak.data(),
                        r.ak_r.data()))
-        throw std::runtime_error("OPC calculation failed");
+        throw std::runtime_error("Milenage calculation failed");
 
     return r;
 }

src/lib/nas/msg.hpp

@@ -556,6 +556,7 @@ struct SecurityModeCommand : PlainMmMessage
     std::optional<IES1UeNetworkCapability> replayedS1UeNetworkCapability{};
 
     octet4 _macForNewSC{};
+    OctetString _originalPlainNasPdu{};
 
     SecurityModeCommand();
     void onBuild(NasMessageBuilder &b);

src/ue/nas/keys.cpp

@@ -81,7 +81,6 @@ std::pair<OctetString, OctetString> CalculateCkPrimeIkPrime(const OctetString &c
     s[1] = sqnXorAk.copy();
 
     auto res = crypto::CalculateKdfKey(key, 0x20, s, 2);
-    ;
 
     std::pair<OctetString, OctetString> ckIk;
     ckIk.first = res.subCopy(0, ck.length());
@@ -139,4 +138,20 @@ OctetString CalculateResStar(const OctetString &key, const std::string &snn, con
     return output.subCopy(output.length() - 16);
 }
 
+OctetString DeriveAmfPrimeInMobility(bool isUplink, const NasCount &count, const OctetString &kAmf)
+{
+    OctetString params[2];
+    params[0] = OctetString::FromOctet(isUplink ? 0x00 : 0x01);
+    params[1] = OctetString::FromOctet4(count.toOctet4());
+
+    return crypto::CalculateKdfKey(kAmf, 0x72, params, 2);
+}
+
+OctetString CalculateAuts(const OctetString &sqn, const OctetString &ak, const OctetString &macS)
+{
+    OctetString auts = OctetString::Xor(sqn, ak);
+    auts.append(macS);
+    return auts;
+}
+
 } // namespace nr::ue::keys
\ No newline at end of file

src/ue/nas/keys.hpp

@@ -28,6 +28,11 @@ void DeriveNasKeys(NasSecurityContext &securityContext);
  */
 std::string ConstructServingNetworkName(const Plmn &plmn);
 
+/**
+ * Derives kAMF to kAMF' in mobility 33.501/A.13
+ */
+OctetString DeriveAmfPrimeInMobility(bool isUplink, const NasCount &count, const OctetString &kAmf);
+
 /**
  * Calculates K_AUSF for 5G-AKA according to given parameters as specified in 3GPP TS 33.501 Annex A.2
  */
@@ -66,4 +71,9 @@ OctetString CalculateKAusfForEapAkaPrime(const OctetString &mk);
 OctetString CalculateResStar(const OctetString &key, const std::string &snn, const OctetString &rand,
                              const OctetString &res);
 
-} // namespace nr::ue::keys
\ No newline at end of file
+/*
+ * Calculates AUTS according to the given parameters
+ */
+OctetString CalculateAuts(const OctetString &sqn, const OctetString &ak, const OctetString &macS);
+
+} // namespace nr::ue::keys

src/ue/nas/mm/base.cpp

@@ -11,7 +11,7 @@
 #include <lib/nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/nas/task.hpp>
-#include <ue/nas/usim.hpp>
+#include <ue/nas/usim/usim.hpp>
 #include <ue/rrc/task.hpp>
 #include <utils/common.hpp>
 
@@ -232,6 +232,15 @@ void NasMm::onSwitchMmState(EMmState oldState, EMmState newState, EMmSubState ol
             m_usim->m_nonCurrentNsCtx = {};
         }
     }
+
+    // If the UE enters the 5GMM state 5GMM-DEREGISTERED or 5GMM-NULL,
+    // The RAND and RES* values stored in the ME shall be deleted and timer T3516, if running, shall be stopped
+    if (newState == EMmState::MM_DEREGISTERED || newState == EMmState::MM_NULL)
+    {
+        m_usim->m_rand = {};
+        m_usim->m_resStar = {};
+        m_timers->t3516.stop();
+    }
 }
 
 void NasMm::onSwitchRmState(ERmState oldState, ERmState newState)
@@ -278,6 +287,12 @@ void NasMm::onSwitchCmState(ECmState oldState, ECmState newState)
                      nas::ESwitchOff::NORMAL_DE_REGISTRATION)
                 switchMmState(EMmState::MM_DEREGISTERED, EMmSubState::MM_DEREGISTERED_NA);
         }
+
+        // If the UE enters the 5GMM-IDLE, the RAND and RES* values stored
+        //  in the ME shall be deleted and timer T3516, if running, shall be stopped
+        m_usim->m_rand = {};
+        m_usim->m_resStar = {};
+        m_timers->t3516.stop();
     }
 }
 

src/ue/nas/mm/config.cpp

@@ -9,12 +9,25 @@
 #include "mm.hpp"
 
 #include <lib/nas/utils.hpp>
+#include <ue/nas/sm/sm.hpp>
 
 namespace nr::ue
 {
 
 void NasMm::receiveConfigurationUpdate(const nas::ConfigurationUpdateCommand &msg)
 {
+    // Abnormal case: 5.4.4.5, c) Generic UE configuration update and de-registration procedure collision
+    if (m_mmState == EMmState::MM_DEREGISTERED_INITIATED)
+    {
+        // "If the UE receives CONFIGURATION UPDATE COMMAND message after sending a DEREGISTRATION REQUEST message and
+        //  the access type included in the DEREGISTRATION REQUEST message is same as the access in which the
+        //  CONFIGURATION UPDATE COMMAND message is received, then the UE shall ignore the CONFIGURATION UPDATE COMMAND
+        //  message and proceed with the de-registration procedure. Otherwise, the UE shall proceed with both the
+        //  procedures."
+        m_logger->warn("Configuration Update Command ignored because of the De-registration procedure collusion");
+        return;
+    }
+
     // Indicates there exists at least one configuration to be updated
     bool hasNewConfig = false;
 
@@ -127,6 +140,14 @@ void NasMm::receiveConfigurationUpdate(const nas::ConfigurationUpdateCommand &ms
         }
     }
 
+    // "If acknowledgement requested is indicated in the Configuration update indication IE in the CONFIGURATION UPDATE
+    //  COMMAND message, the UE shall send a CONFIGURATION UPDATE COMPLETE message."
+    if (msg.configurationUpdateIndication.has_value() &&
+        msg.configurationUpdateIndication->ack == nas::EAcknowledgement::REQUESTED)
+    {
+        sendNasMessage(nas::ConfigurationUpdateComplete{});
+    }
+
     // "If the CONFIGURATION UPDATE COMMAND message indicates "registration requested" in the Configuration update
     //  indication IE and:"
     if (msg.configurationUpdateIndication.has_value() &&
@@ -137,7 +158,7 @@ void NasMm::receiveConfigurationUpdate(const nas::ConfigurationUpdateCommand &ms
         if (!hasNewConfig || (msg.allowedNssai.has_value() || msg.configuredNssai.has_value() ||
                               msg.networkSlicingIndication.has_value()))
         {
-            if (hasEmergency()) // "an emergency PDU session exists,"
+            if (m_sm->anyEmergencySession()) // "an emergency PDU session exists,"
             {
                 // "the UE shall, after the completion of the generic UE configuration
                 //  update procedure and after the emergency PDU session is released, release the existing N1 NAS
@@ -163,14 +184,6 @@ void NasMm::receiveConfigurationUpdate(const nas::ConfigurationUpdateCommand &ms
             // TODO
         }
     }
-
-    // "If acknowledgement requested is indicated in the Configuration update indication IE in the CONFIGURATION UPDATE
-    //  COMMAND message, the UE shall send a CONFIGURATION UPDATE COMPLETE message."
-    if (msg.configurationUpdateIndication.has_value() &&
-        msg.configurationUpdateIndication->ack == nas::EAcknowledgement::REQUESTED)
-    {
-        sendNasMessage(nas::ConfigurationUpdateComplete{});
-    }
 }
 
 } // namespace nr::ue

src/ue/nas/mm/dereg.cpp

@@ -236,13 +236,13 @@ void NasMm::receiveDeregistrationRequest(const nas::DeRegistrationRequestUeTermi
 
         if (cause == nas::EMmCause::PLMN_NOT_ALLOWED)
         {
-            // todo: add to forbidden plmn
+            nas::utils::AddToPlmnList(m_usim->m_forbiddenPlmnList, nas::utils::PlmnFrom(*m_usim->m_currentPlmn));
         }
 
         if (cause == nas::EMmCause::TA_NOT_ALLOWED || cause == nas::EMmCause::ROAMING_NOT_ALLOWED_IN_TA ||
             cause == nas::EMmCause::NO_SUITIBLE_CELLS_IN_TA)
         {
-            // todo: add to forbidden tai
+            nas::utils::AddToTaiList(m_usim->m_forbiddenTaiListRoaming, *m_usim->m_currentTai);
         }
 
         if (cause == nas::EMmCause::ILLEGAL_UE || cause == nas::EMmCause::FIVEG_SERVICES_NOT_ALLOWED)

src/ue/nas/mm/mm.hpp

@@ -11,7 +11,7 @@
 #include <lib/crypt/milenage.hpp>
 #include <lib/nas/nas.hpp>
 #include <lib/nas/timer.hpp>
-#include <ue/nas/usim.hpp>
+#include <ue/nas/usim/usim.hpp>
 #include <ue/nts.hpp>
 #include <ue/types.hpp>
 #include <utils/nts.hpp>
@@ -38,10 +38,12 @@ class NasMm
 
     // Most recent registration request
     std::unique_ptr<nas::RegistrationRequest> m_lastRegistrationRequest{};
-    // Most recent de-registration request
-    std::unique_ptr<nas::DeRegistrationRequestUeOriginating> m_lastDeregistrationRequest{};
     // Most recent service request
     std::unique_ptr<nas::ServiceRequest> m_lastServiceRequest{};
+    // Most recent de-registration request
+    std::unique_ptr<nas::DeRegistrationRequestUeOriginating> m_lastDeregistrationRequest{};
+    // Indicates that last registration request was sent without a NAS security context
+    bool m_lastRegWithoutNsc{};
     // Indicates the last de-registration cause
     EDeregCause m_lastDeregCause{};
     // Indicates the last service request cause
@@ -58,6 +60,8 @@ class NasMm
     nas::IE5gsNetworkFeatureSupport m_nwFeatureSupport{};
     // Last time Service Request needed indication for Data
     long m_lastTimeServiceReqNeededIndForData{};
+    // Number of times the network failing the authentication check
+    int m_nwConsecutiveAuthFailure{};
 
     friend class UeCmdHandler;
 
@@ -112,9 +116,9 @@ class NasMm
     void receiveEapSuccessMessage(const eap::Eap &eap);
     void receiveEapFailureMessage(const eap::Eap &eap);
     void receiveEapResponseMessage(const eap::Eap &eap);
-    EAutnValidationRes validateAutn(const OctetString &ak, const OctetString &mac, const OctetString &autn);
-    bool checkSqn(const OctetString &sqn);
-    crypto::milenage::Milenage calculateMilenage(const OctetString &sqn, const OctetString &rand);
+    EAutnValidationRes validateAutn(const OctetString &rand, const OctetString &autn);
+    crypto::milenage::Milenage calculateMilenage(const OctetString &sqn, const OctetString &rand, bool dummyAmf);
+    bool networkFailingTheAuthCheck(bool hasChance);
 
   private: /* Security */
     void receiveSecurityModeCommand(const nas::SecurityModeCommand &msg);

src/ue/nas/mm/radio.cpp

@@ -18,11 +18,6 @@ namespace nr::ue
 
 void NasMm::handlePlmnSearchResponse(const std::vector<UeCellMeasurement> &measures)
 {
-    // TODO
-    // if (m_base->nodeListener)
-    //    m_base->nodeListener->onConnected(app::NodeType::UE, m_base->config->getNodeName(), app::NodeType::GNB,
-    //                                      gnbName);
-
     if (m_mmSubState != EMmSubState::MM_REGISTERED_PLMN_SEARCH &&
         m_mmSubState != EMmSubState::MM_REGISTERED_NO_CELL_AVAILABLE &&
         m_mmSubState != EMmSubState::MM_DEREGISTERED_PLMN_SEARCH &&

src/ue/nas/mm/register.cpp

@@ -97,6 +97,7 @@ void NasMm::sendInitialRegistration(EInitialRegCause regCause)
     // Send the message
     sendNasMessage(*request);
     m_lastRegistrationRequest = std::move(request);
+    m_lastRegWithoutNsc = m_usim->m_currentNsCtx == nullptr;
 
     // Process timers
     m_timers->t3510.start();
@@ -187,6 +188,7 @@ void NasMm::sendMobilityRegistration(ERegUpdateCause updateCause)
     // Send the message
     sendNasMessage(*request);
     m_lastRegistrationRequest = std::move(request);
+    m_lastRegWithoutNsc = m_usim->m_currentNsCtx == nullptr;
 
     // Process timers
     m_timers->t3510.start();
@@ -218,6 +220,11 @@ void NasMm::receiveRegistrationAccept(const nas::RegistrationAccept &msg)
         receiveInitialRegistrationAccept(msg);
     else
         receiveMobilityRegistrationAccept(msg);
+
+    // The RAND and RES* values stored in the ME shall be deleted and timer T3516, if running, shall be stopped
+    m_usim->m_rand = {};
+    m_usim->m_resStar = {};
+    m_timers->t3516.stop();
 }
 
 void NasMm::receiveInitialRegistrationAccept(const nas::RegistrationAccept &msg)
@@ -449,6 +456,11 @@ void NasMm::receiveRegistrationReject(const nas::RegistrationReject &msg)
         receiveInitialRegistrationReject(msg);
     else
         receiveMobilityRegistrationReject(msg);
+
+    // The RAND and RES* values stored in the ME shall be deleted and timer T3516, if running, shall be stopped
+    m_usim->m_rand = {};
+    m_usim->m_resStar = {};
+    m_timers->t3516.stop();
 }
 
 void NasMm::receiveInitialRegistrationReject(const nas::RegistrationReject &msg)

src/ue/nas/mm/service.cpp

@@ -7,6 +7,7 @@
 //
 
 #include "mm.hpp"
+
 #include <lib/nas/utils.hpp>
 #include <ue/nas/sm/sm.hpp>
 
@@ -211,6 +212,11 @@ void NasMm::receiveServiceReject(const nas::ServiceReject &msg)
     m_serCounter = 0;
     m_timers->t3517.stop();
 
+    // The RAND and RES* values stored in the ME shall be deleted and timer T3516, if running, shall be stopped
+    m_usim->m_rand = {};
+    m_usim->m_resStar = {};
+    m_timers->t3516.stop();
+
     auto cause = msg.mmCause.value;
     m_logger->err("Service Reject received with cause [%s]", nas::utils::EnumToString(cause));
 

src/ue/nas/mm/timer.cpp

@@ -85,6 +85,11 @@ void NasMm::onTimerExpire(nas::NasTimer &timer)
         }
         break;
     }
+    case 3516: {
+        m_usim->m_rand = {};
+        m_usim->m_resStar = {};
+        break;
+    }
     case 3517: {
         if (m_mmState == EMmState::MM_SERVICE_REQUEST_INITIATED)
         {
@@ -109,6 +114,11 @@ void NasMm::onTimerExpire(nas::NasTimer &timer)
         m_usim->m_storedSuci = {};
         break;
     }
+    case 3520: {
+        logExpired();
+        networkFailingTheAuthCheck(false);
+        break;
+    }
     case 3521: {
         if (timer.getExpiryCount() == 5)
         {

src/ue/nas/mm/transport.cpp

@@ -30,7 +30,7 @@ static bool IsAcceptedWithoutIntegrity(const nas::PlainMmMessage &msg)
     return msgType == nas::EMessageType::IDENTITY_REQUEST || msgType == nas::EMessageType::AUTHENTICATION_REQUEST ||
            msgType == nas::EMessageType::AUTHENTICATION_RESULT || msgType == nas::EMessageType::AUTHENTICATION_REJECT ||
            msgType == nas::EMessageType::REGISTRATION_REJECT ||
-           msgType == nas::EMessageType::DEREGISTRATION_ACCEPT_UE_TERMINATED ||
+           msgType == nas::EMessageType::DEREGISTRATION_ACCEPT_UE_ORIGINATING ||
            msgType == nas::EMessageType::SERVICE_REJECT;
 }
 
@@ -118,6 +118,9 @@ void NasMm::receiveNasMessage(const nas::NasMessage &msg)
             return;
         }
 
+        ((nas::SecurityModeCommand &)(*smcMsg))._macForNewSC = securedMm.messageAuthenticationCode;
+        ((nas::SecurityModeCommand &)(*smcMsg))._originalPlainNasPdu = securedMm.plainNasMessage.copy();
+
         receiveMmMessage((const nas::PlainMmMessage &)(*smcMsg));
         return;
     }
@@ -169,8 +172,6 @@ void NasMm::receiveNasMessage(const nas::NasMessage &msg)
 
 void NasMm::receiveMmMessage(const nas::PlainMmMessage &msg)
 {
-    // TODO: trigger on receive
-
     switch (msg.messageType)
     {
     case nas::EMessageType::REGISTRATION_ACCEPT:

src/ue/nas/sm/transport.cpp

@@ -40,8 +40,6 @@ void NasSm::sendSmMessage(int psi, const nas::SmMessage &msg)
 
 void NasSm::receiveSmMessage(const nas::SmMessage &msg)
 {
-    // TODO: trigger on receive
-
     switch (msg.messageType)
     {
     case nas::EMessageType::PDU_SESSION_ESTABLISHMENT_ACCEPT:

src/ue/nas/task.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "usim.hpp"
+#include <ue/nas/usim/usim.hpp>
 #include <lib/crypt/milenage.hpp>
 #include <lib/nas/nas.hpp>
 #include <lib/nas/timer.hpp>

src/ue/nas/usim/sqn_mng.cpp

+//
+// This file is a part of UERANSIM open source project.
+// Copyright (c) 2021 ALİ GÜNGÖR.
+//
+// The software and all associated files are licensed under GPL-3.0
+// and subject to the terms and conditions defined in LICENSE file.
+//
+
+#include "sqn_mng.hpp"
+
+#include <stdexcept>
+
+namespace nr::ue
+{
+
+SqnManager::SqnManager(uint64_t indBitLen, uint64_t wrappingDelta)
+    : m_indBitLen{indBitLen}, m_wrappingDelta{wrappingDelta}, m_sqnArr(1ull << m_indBitLen)
+{
+    if (m_indBitLen < 2 || m_indBitLen > 16)
+        throw std::runtime_error("bad indBitLen");
+}
+
+uint64_t SqnManager::getSeqFromSqn(uint64_t sqn) const
+{
+    sqn &= ~((1ull << m_indBitLen) - 1ull);
+    sqn >>= m_indBitLen;
+    sqn &= (1ull << 48ull) - 1ull;
+    return sqn;
+}
+
+uint64_t SqnManager::getIndFromSqn(uint64_t sqn) const
+{
+    return sqn & ((1ull << m_indBitLen) - 1ull);
+}
+
+uint64_t SqnManager::getSeqMs() const
+{
+    return getSeqFromSqn(getSqnMs());
+}
+
+uint64_t SqnManager::getSqnMs() const
+{
+    return *std::max_element(m_sqnArr.begin(), m_sqnArr.end());
+}
+
+bool SqnManager::checkSqn(uint64_t sqn)
+{
+    uint64_t seq = getSeqFromSqn(sqn);
+    uint64_t ind = getIndFromSqn(sqn);
+
+    if (seq - getSeqMs() > m_wrappingDelta)
+        return false;
+    if (seq <= getSeqFromSqn(m_sqnArr[ind]))
+        return false;
+
+    m_sqnArr[ind] = sqn;
+    return true;
+}
+
+bool SqnManager::checkSqn(const OctetString &sqn)
+{
+    OctetString str;
+    str.appendOctet2(0);
+    str.append(sqn);
+    return checkSqn(str.get8UL(0));
+}
+
+OctetString SqnManager::getSqn() const
+{
+    return OctetString::FromOctet8(getSqnMs()).subCopy(2);
+}
+
+} // namespace nr::ue

src/ue/nas/usim/sqn_mng.hpp

+//
+// This file is a part of UERANSIM open source project.
+// Copyright (c) 2021 ALİ GÜNGÖR.
+//
+// The software and all associated files are licensed under GPL-3.0
+// and subject to the terms and conditions defined in LICENSE file.
+//
+
+#pragma once
+
+#include <algorithm>
+#include <cstdint>
+#include <vector>
+
+#include <utils/octet_string.hpp>
+
+namespace nr::ue
+{
+
+class SqnManager
+{
+  private:
+    uint64_t m_indBitLen;
+    uint64_t m_wrappingDelta;
+
+    std::vector<uint64_t> m_sqnArr;
+
+  public:
+    SqnManager(uint64_t indBitLen, uint64_t wrappingDelta);
+
+  private:
+    [[nodiscard]] uint64_t getSeqFromSqn(uint64_t sqn) const;
+    [[nodiscard]] uint64_t getIndFromSqn(uint64_t sqn) const;
+    [[nodiscard]] uint64_t getSeqMs() const;
+    [[nodiscard]] uint64_t getSqnMs() const;
+    bool checkSqn(uint64_t sqn);
+
+  public:
+    [[nodiscard]] OctetString getSqn() const;
+    bool checkSqn(const OctetString &sqn);
+};
+
+} // namespace nr::ue

src/ue/nas/usim.cpp → src/ue/nas/usim/usim.cpp

@@ -19,6 +19,8 @@ void ue::Usim::initialize(bool hasSupi, const UeConfig::Initials &initials)
 
     m_defConfiguredNssai = initials.defaultConfiguredNssai;
     m_configuredNssai = initials.configuredNssai;
+
+    m_sqnMng = std::make_unique<SqnManager>(5ull, 1ull << 28ull);
 }
 
 bool Usim::isValid()

src/ue/nas/usim.hpp → src/ue/nas/usim/usim.hpp

@@ -8,9 +8,12 @@
 
 #pragma once
 
-#include <lib/nas/msg.hpp>
+#include "sqn_mng.hpp"
+
 #include <memory>
 #include <optional>
+
+#include <lib/nas/msg.hpp>
 #include <ue/types.hpp>
 #include <utils/common_types.hpp>
 #include <utils/octet_string.hpp>
@@ -46,7 +49,9 @@ class Usim
     // Security related
     std::unique_ptr<NasSecurityContext> m_currentNsCtx{};
     std::unique_ptr<NasSecurityContext> m_nonCurrentNsCtx{};
-    OctetString m_sqn{};
+    OctetString m_rand{};
+    OctetString m_resStar{};
+    std::unique_ptr<SqnManager> m_sqnMng{};
 
     // NSSAI related
     NetworkSlice m_defConfiguredNssai{};
@@ -67,6 +72,7 @@ class Usim
 
   public:
     void initialize(bool hasSupi, const UeConfig::Initials &initials);
+
     bool isValid();
     void invalidate();
 };

src/ue/types.hpp

@@ -303,10 +303,6 @@ struct UeKeys
 {
     OctetString abba{};
 
-    OctetString rand{};
-    OctetString res{};
-    OctetString resStar{}; // used in 5G-AKA
-
     OctetString kAusf{};
     OctetString kSeaf{};
     OctetString kAmf{};
@@ -316,9 +312,6 @@ struct UeKeys
     [[nodiscard]] UeKeys deepCopy() const
     {
         UeKeys keys;
-        keys.rand = rand.subCopy(0);
-        keys.res = res.subCopy(0);
-        keys.resStar = resStar.subCopy(0);
         keys.kAusf = kAusf.subCopy(0);
         keys.kSeaf = kSeaf.subCopy(0);
         keys.kAmf = kAmf.subCopy(0);

src/utils/constants.hpp

@@ -15,10 +15,10 @@ struct cons
     // Version information
     static constexpr const uint8_t Major = 3;
     static constexpr const uint8_t Minor = 1;
-    static constexpr const uint8_t Patch = 7;
+    static constexpr const uint8_t Patch = 8;
     static constexpr const char *Project = "UERANSIM";
-    static constexpr const char *Tag = "v3.1.7";
-    static constexpr const char *Name = "UERANSIM v3.1.7";
+    static constexpr const char *Tag = "v3.1.8";
+    static constexpr const char *Name = "UERANSIM v3.1.8";
     static constexpr const char *Owner = "ALİ GÜNGÖR";
 
     // Some port values

tools/rls-wireshark-dissector.lua

 --[[
 -- Dissector for Radio Link Simulation Protocol
 -- (used by UERANSIM <https://github.com/aligungr/UERANSIM>).
--- When this dissector was written, UERANSIM was in version 3.1.7.
 --
 -- CC0-1.0 2021 - Louis Royer (<https://github.com/louisroyer/RLS-wireshark-dissector>)
 --]]
@@ -30,14 +29,14 @@ local sim_pos_y = ProtoField.uint32("rls.sim_pos_y", "RLS Position Y", base.DEC)
 local sim_pos_z = ProtoField.uint32("rls.sim_pos_z", "RLS Position Z", base.DEC)
 
 -- For cell Info Response
-local mcc = ProtoField.uint16("rls.mmc", "RLS MMC", base.DEC)
-local mnc = ProtoField.uint16("rls.mnc", "RLS MNC", base.DEC)
-local long_mnc = ProtoField.bool("rls.long_mnc", "RLS MNC is long", base.BOOL)
-local nci = ProtoField.uint64("rls.nci", "RLS New Radio Cell Identity", base.HEX)
-local tac = ProtoField.uint32("rls.tac", "RLS Tracking Area Code", base.DEC)
+local mcc = ProtoField.uint16("rls.mcc", "MCC", base.DEC)
+local mnc = ProtoField.uint16("rls.mnc", "MNC", base.DEC)
+local long_mnc = ProtoField.bool("rls.long_mnc", "MNC is 3-digit", base.BOOL)
+local nci = ProtoField.uint64("rls.nci", "NR Cell Identity", base.HEX)
+local tac = ProtoField.uint32("rls.tac", "Tracking Area Code", base.DEC)
 local dbm = ProtoField.int32("rls.dbm", "RLS Signal Strength (dBm)", base.DEC)
-local gnb_name = ProtoField.string("rls.gnb_name", "RLS gNb name")
-local link_ip = ProtoField.string("rls.link_ip", "RLS gNb Link IP")
+local gnb_name = ProtoField.string("rls.gnb_name", "gNB Name")
+local link_ip = ProtoField.string("rls.link_ip", "gNB Link IP")
 
 -- For PDU Delivery
 local pdu_type_name = {
@@ -49,14 +48,14 @@ local pdu_type_name = {
 local pdu_type = ProtoField.uint8("rls.pdu_type", "RLS PDU Type", base.DEC, pdu_type_name)
 
 local rrc_channel_name = {
-	[0] = "BCCH_BCH",
-	[1] = "BCCH_DL_SCH",
-	[2] = "DL_CCCH",
-	[3] = "DL_DCCH",
+	[0] = "BCCH-BCH",
+	[1] = "BCCH-DL-SCH",
+	[2] = "DL-CCCH",
+	[3] = "DL-DCCH",
 	[4] = "PCCH",
-	[5] = "UL_CCCH",
-	[6] = "UL_CCCH1",
-	[7] = "UL_DCCH",
+	[5] = "UL-CCCH",
+	[6] = "UL-CCCH1",
+	[7] = "UL-DCCH",
 }
 
 local rrc_channel_dissector = {
@@ -71,7 +70,7 @@ local rrc_channel_dissector = {
 }
 
 local rrc_channel = ProtoField.uint32("rls.rrc_channel", "RRC Channel", base.DEC, rrc_channel_name)
-local session_id = ProtoField.uint32("rls.session_id", "RLS Session ID", base.DEC)
+local session_id = ProtoField.uint32("rls.session_id", "PDU Session ID", base.DEC)
 
 --[[
 -- Dissector definition
@@ -109,7 +108,7 @@ function rls_protocol.dissector(buffer, pinfo, tree)
 		subtree:add(sim_pos_z, buffer(21,4))
 	elseif msg_type == 2 then -- Cell Info Response
 		subtree:add(mcc, buffer(13,2))
-		local mnc_tree = subtree:add(rls_protocol, buffer(15,3), "RLS MNC: "..tostring(buffer(15,2):uint()))
+		local mnc_tree = subtree:add(rls_protocol, buffer(15,3), "MNC: "..tostring(buffer(15,2):uint()))
 		mnc_tree:add(mnc, buffer(15,2))
 		mnc_tree:add(long_mnc, buffer(17,1))
 		subtree:add(nci, buffer(18,8))