Merge branch 'master' of https://github.com/aligungr/UERANSIM into dev

src/ue/rrc/connection.cpp

@@ -66,7 +66,7 @@ void UeRrcLayer::startConnectionEstablishment(OctetString &&nasPdu)
     {
         m_initialId.present = ASN_RRC_InitialUE_Identity_PR_ng_5G_S_TMSI_Part1;
         asn::SetBitStringLong<39>(static_cast<int64_t>(gutiOrTmsi->tmsi) |
-                                      (static_cast<int64_t>((gutiOrTmsi->amfPointer & 0b1111111)) << 39ull),
+                                      (static_cast<int64_t>(gutiOrTmsi->amfPointer & 0b1111111) << 32ull),
                                   m_initialId.choice.ng_5G_S_TMSI_Part1);
     }
     else

src/utils/common_types.cpp

@@ -38,7 +38,7 @@ int64_t GutiMobileIdentity::toTmsiValue() const
 GutiMobileIdentity GutiMobileIdentity::FromSTmsi(int64_t sTmsi)
 {
     GutiMobileIdentity res;
-    res.tmsi = octet4{static_cast<uint32_t>(sTmsi & 0xFFFFFFLL)};
+    res.tmsi = octet4{static_cast<uint32_t>(sTmsi & 0xFFFFFFFFLL)};
     res.amfPointer = static_cast<int>(((sTmsi >> 32LL) & 0b111111LL));
     res.amfSetId = static_cast<int>(((sTmsi >> 38LL) & 0b1111111111LL));
     return res;