S-TMSI handling in RRC connection setup

src/utils/common_types.cpp

@@ -31,8 +31,8 @@ Supi Supi::Parse(const std::string &supi)
 
 int64_t GutiMobileIdentity::toTmsiValue() const
 {
-    return (static_cast<int64_t>(this->tmsi)) | (static_cast<int64_t>(this->amfPointer) << 38LL) |
-           (static_cast<int64_t>(this->amfSetId) << 48LL);
+    return (static_cast<int64_t>(this->tmsi)) | (static_cast<int64_t>(this->amfPointer) << 32LL) |
+           (static_cast<int64_t>(this->amfSetId) << 38LL);
 }
 
 GutiMobileIdentity GutiMobileIdentity::FromSTmsi(int64_t sTmsi)