maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly fill GUTI in NAS if available

Browse Source
This commit is contained in:
Robert Schmidt
2023-03-28 14:12:05 +02:00
parent 6e01a62838
commit 4642a7c0f5
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/NAS/NR_UE/nr_nas_msg_sim.c
+5 -16
View File
@@ -117,21 +117,10 @@ static int fill_suci(FGSMobileIdentity *mi, const uicc_t *uicc)
return sizeof(Suci5GSMobileIdentity_t); return sizeof(Suci5GSMobileIdentity_t);
} }
static int fill_guti(FGSMobileIdentity *mi, const nr_ue_nas_t *nas) static int fill_guti(FGSMobileIdentity *mi, const Guti5GSMobileIdentity_t *guti)
{ {
uicc_t *uicc = nas->uicc; AssertFatal(guti != NULL, "UE has no GUTI\n");
AssertFatal(false, "Need to add AMF data in function\n"); mi->guti = *guti;
mi->guti.typeofidentity = FGS_MOBILE_IDENTITY_5G_GUTI;
mi->guti.amfregionid = 0xca;
mi->guti.amfpointer = 0;
mi->guti.amfsetid = 1016;
mi->guti.tmsi = 10;
mi->guti.mncdigit1 = uicc->nmc_size == 2 ? uicc->imsiStr[3] - '0' : uicc->imsiStr[4] - '0';
mi->guti.mncdigit2 = uicc->nmc_size == 2 ? uicc->imsiStr[4] - '0' : uicc->imsiStr[5] - '0';
mi->guti.mncdigit3 = uicc->nmc_size == 2 ? 0xf : uicc->imsiStr[3] - '0';
mi->guti.mccdigit1 = uicc->imsiStr[0]-'0';
mi->guti.mccdigit2 = uicc->imsiStr[1]-'0';
mi->guti.mccdigit3 = uicc->imsiStr[2]-'0';
return 13; return 13;
} }
@@ -447,8 +436,8 @@ void generateRegistrationRequest(as_nas_info_t *initialNasMsg, nr_ue_nas_t *nas)
mm_msg->registration_request.fgsregistrationtype = INITIAL_REGISTRATION; mm_msg->registration_request.fgsregistrationtype = INITIAL_REGISTRATION;
mm_msg->registration_request.naskeysetidentifier.naskeysetidentifier = 1; mm_msg->registration_request.naskeysetidentifier.naskeysetidentifier = 1;
size += 1; size += 1;
if(0){ if(nas->guti){
size += fill_guti(&mm_msg->registration_request.fgsmobileidentity, nas); size += fill_guti(&mm_msg->registration_request.fgsmobileidentity, nas->guti);
} else { } else {
size += fill_suci(&mm_msg->registration_request.fgsmobileidentity, nas->uicc); size += fill_suci(&mm_msg->registration_request.fgsmobileidentity, nas->uicc);
} }