diff --git a/lib/pfcp/context.c b/lib/pfcp/context.c index 3b615bf99..7646385a6 100644 --- a/lib/pfcp/context.c +++ b/lib/pfcp/context.c @@ -447,13 +447,13 @@ int ogs_pfcp_context_parse_config(const char *local, const char *remote) const char *hostname[OGS_MAX_NUM_OF_HOSTNAME]; uint16_t port = self.pfcp_port; uint16_t tac[OGS_MAX_NUM_OF_TAI] = {0,}; - uint8_t num_of_tac = 0; + int num_of_tac = 0; const char *dnn[OGS_MAX_NUM_OF_DNN]; - uint8_t num_of_dnn = 0; + int num_of_dnn = 0; uint32_t e_cell_id[OGS_MAX_NUM_OF_CELL_ID] = {0,}; - uint8_t num_of_e_cell_id = 0; + int num_of_e_cell_id = 0; uint64_t nr_cell_id[OGS_MAX_NUM_OF_CELL_ID] = {0,}; - uint8_t num_of_nr_cell_id = 0; + int num_of_nr_cell_id = 0; /* full list RR enabled by default */ uint8_t rr_enable = 1; diff --git a/lib/proto/types.h b/lib/proto/types.h index c2d499a27..3a30c1d33 100644 --- a/lib/proto/types.h +++ b/lib/proto/types.h @@ -83,7 +83,7 @@ extern "C" { #define OGS_MAX_FQDN_LEN 256 #define OGS_MAX_NUM_OF_SERVED_GUAMI 8 -#define OGS_MAX_NUM_OF_SERVED_TAI 16 +#define OGS_MAX_NUM_OF_SERVED_TAI OGS_MAX_NUM_OF_TAI #define OGS_MAX_NUM_OF_ALGORITHM 8 #define OGS_MAX_NUM_OF_BPLMN 6 diff --git a/src/amf/context.h b/src/amf/context.h index 344ca693e..fceb928a6 100644 --- a/src/amf/context.h +++ b/src/amf/context.h @@ -47,18 +47,18 @@ typedef uint32_t amf_m_tmsi_t; typedef struct amf_context_s { /* Served GUAMI */ - uint8_t num_of_served_guami; + int num_of_served_guami; ogs_guami_t served_guami[OGS_MAX_NUM_OF_SERVED_GUAMI]; /* Served TAI */ - uint8_t num_of_served_tai; + int num_of_served_tai; struct { ogs_5gs_tai0_list_t list0; ogs_5gs_tai2_list_t list2; } served_tai[OGS_MAX_NUM_OF_SERVED_TAI]; /* PLMN Support */ - uint8_t num_of_plmn_support; + int num_of_plmn_support; struct { ogs_plmn_id_t plmn_id; int num_of_s_nssai; @@ -70,14 +70,14 @@ typedef struct amf_context_s { * #define NAS_SECURITY_ALGORITHMS_128_EEA1 1 * #define NAS_SECURITY_ALGORITHMS_128_EEA2 2 * #define NAS_SECURITY_ALGORITHMS_128_EEA3 3 */ - uint8_t num_of_ciphering_order; + int num_of_ciphering_order; uint8_t ciphering_order[OGS_MAX_NUM_OF_ALGORITHM]; /* defined in 'nas_ies.h' * #define NAS_SECURITY_ALGORITHMS_EIA0 0 * #define NAS_SECURITY_ALGORITHMS_128_EIA1 1 * #define NAS_SECURITY_ALGORITHMS_128_EIA1 2 * #define NAS_SECURITY_ALGORITHMS_128_EIA3 3 */ - uint8_t num_of_integrity_order; + int num_of_integrity_order; uint8_t integrity_order[OGS_MAX_NUM_OF_ALGORITHM]; /* Network Name */ @@ -129,16 +129,16 @@ typedef struct amf_gnb_s { bool ng_setup_success; /* gNB NGAP Setup complete successfuly */ } state; - uint16_t max_num_of_ostreams;/* SCTP Max num of outbound streams */ + int max_num_of_ostreams;/* SCTP Max num of outbound streams */ uint16_t ostream_id; /* gnb_ostream_id generator */ - uint8_t num_of_supported_ta_list; + int num_of_supported_ta_list; struct { ogs_uint24_t tac; - uint8_t num_of_bplmn_list; + int num_of_bplmn_list; struct { ogs_plmn_id_t plmn_id; - uint8_t num_of_s_nssai; + int num_of_s_nssai; ogs_s_nssai_t s_nssai[OGS_MAX_NUM_OF_SLICE]; } bplmn_list[OGS_MAX_NUM_OF_BPLMN]; } supported_ta_list[OGS_MAX_NUM_OF_TAI]; diff --git a/src/mme/mme-context.c b/src/mme/mme-context.c index 9ed1d27eb..0faf3425d 100644 --- a/src/mme/mme-context.c +++ b/src/mme/mme-context.c @@ -1316,9 +1316,9 @@ int mme_context_parse_config() const char *hostname[OGS_MAX_NUM_OF_HOSTNAME]; uint16_t port = ogs_gtp_self()->gtpc_port; uint16_t tac[OGS_MAX_NUM_OF_TAI] = {0,}; - uint8_t num_of_tac = 0; + int num_of_tac = 0; uint32_t e_cell_id[OGS_MAX_NUM_OF_CELL_ID] = {0,}; - uint8_t num_of_e_cell_id = 0; + int num_of_e_cell_id = 0; if (ogs_yaml_iter_type(>pc_array) == YAML_MAPPING_NODE) { diff --git a/src/mme/mme-context.h b/src/mme/mme-context.h index f2f214429..384f8d587 100644 --- a/src/mme/mme-context.h +++ b/src/mme/mme-context.h @@ -66,12 +66,12 @@ typedef uint32_t mme_m_tmsi_t; typedef uint32_t mme_p_tmsi_t; typedef struct served_gummei_s { - uint32_t num_of_plmn_id; + int num_of_plmn_id; ogs_plmn_id_t plmn_id[OGS_MAX_NUM_OF_PLMN]; - uint32_t num_of_mme_gid; + int num_of_mme_gid; uint16_t mme_gid[GRP_PER_MME]; - uint32_t num_of_mme_code; + int num_of_mme_code; uint8_t mme_code[CODE_PER_MME]; } served_gummei_t; @@ -98,11 +98,11 @@ typedef struct mme_context_s { ogs_list_t csmap_list; /* TAI-LAI Map List */ /* Served GUMME */ - uint8_t max_num_of_served_gummei; + int max_num_of_served_gummei; served_gummei_t served_gummei[MAX_NUM_OF_SERVED_GUMMEI]; /* Served TAI */ - uint8_t num_of_served_tai; + int num_of_served_tai; struct { ogs_eps_tai0_list_t list0; ogs_eps_tai2_list_t list2; @@ -113,14 +113,14 @@ typedef struct mme_context_s { * #define NAS_SECURITY_ALGORITHMS_128_EEA1 1 * #define NAS_SECURITY_ALGORITHMS_128_EEA2 2 * #define NAS_SECURITY_ALGORITHMS_128_EEA3 3 */ - uint8_t num_of_ciphering_order; + int num_of_ciphering_order; uint8_t ciphering_order[OGS_MAX_NUM_OF_ALGORITHM]; /* defined in 'nas_ies.h' * #define NAS_SECURITY_ALGORITHMS_EIA0 0 * #define NAS_SECURITY_ALGORITHMS_128_EIA1 1 * #define NAS_SECURITY_ALGORITHMS_128_EIA1 2 * #define NAS_SECURITY_ALGORITHMS_128_EIA3 3 */ - uint8_t num_of_integrity_order; + int num_of_integrity_order; uint8_t integrity_order[OGS_MAX_NUM_OF_ALGORITHM]; /* Network Name */ @@ -157,9 +157,9 @@ typedef struct mme_sgw_s { ogs_gtp_node_t gnode; uint16_t tac[OGS_MAX_NUM_OF_TAI]; - uint8_t num_of_tac; + int num_of_tac; uint32_t e_cell_id[OGS_MAX_NUM_OF_CELL_ID]; - uint8_t num_of_e_cell_id; + int num_of_e_cell_id; ogs_list_t sgw_ue_list; } mme_sgw_t; @@ -184,7 +184,7 @@ typedef struct mme_vlr_s { ogs_timer_t *t_conn; /* client timer to connect to server */ - uint16_t max_num_of_ostreams;/* SCTP Max num of outbound streams */ + int max_num_of_ostreams;/* SCTP Max num of outbound streams */ uint16_t ostream_id; /* vlr_ostream_id generator */ ogs_sockaddr_t *sa_list; /* VLR SGsAP Socket Address List */ @@ -216,10 +216,10 @@ typedef struct mme_enb_s { bool s1_setup_success; /* eNB S1AP Setup complete successfuly */ } state; - uint16_t max_num_of_ostreams;/* SCTP Max num of outbound streams */ + int max_num_of_ostreams;/* SCTP Max num of outbound streams */ uint16_t ostream_id; /* enb_ostream_id generator */ - uint8_t num_of_supported_ta_list; + int num_of_supported_ta_list; ogs_eps_tai_t supported_ta_list[OGS_MAX_NUM_OF_TAI*OGS_MAX_NUM_OF_BPLMN]; ogs_pkbuf_t *s1_reset_ack; /* Reset message */