Merge remote-tracking branch 'origin/issue-985' into integration_2025_w37 (!3633)

Fix PLMN print in select_amf and elsewhere

Closes #985
This commit is contained in:
Robert Schmidt
2025-09-10 16:59:05 +02:00
4 changed files with 69 additions and 55 deletions
+5 -9
View File
@@ -82,6 +82,8 @@
#define QOSFLOW_MAX_VALUE 64
#define NGAP_MAX_NO_TAI_PAGING 16 // 9.2.4.1 3GPP TS 38.413
/* Security key length used within gNB
* Even if only 16 bytes will be effectively used,
* the key length is 32 bytes (256 bits)
@@ -206,12 +208,6 @@ typedef struct fiveg_s_tmsi_s {
uint32_t m_tmsi;
} fiveg_s_tmsi_t;
typedef struct ngap_tai_plmn_identity_s {
uint16_t mcc;
uint16_t mnc;
uint8_t mnc_digit_length;
} ngap_plmn_identity_t;
typedef struct ngap_ue_paging_identity_s {
fiveg_s_tmsi_t s_tmsi;
} ngap_ue_paging_identity_t;
@@ -228,7 +224,7 @@ typedef struct ngap_ue_identity_s {
} ngap_ue_identity_t;
typedef struct ngap_mobility_restriction_s{
ngap_plmn_identity_t serving_plmn;
plmn_id_t serving_plmn;
}ngap_mobility_restriction_t;
typedef enum pdusession_qosflow_mapping_ind_e{
@@ -600,10 +596,10 @@ typedef struct ngap_paging_ind_s {
ngap_cn_domain_t cn_domain;
/* PLMN_identity in TAI of Paging*/
ngap_plmn_identity_t plmn_identity[256];
plmn_id_t plmn_identity[NGAP_MAX_NO_TAI_PAGING];
/* TAC in TAIList of Paging*/
int16_t tac[256];
int16_t tac[NGAP_MAX_NO_TAI_PAGING];
/* size of TAIList*/
int16_t tai_size;