sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

do the finishing touches (#1108)

This commit is contained in:
Sukchan Lee 2021-07-27 20:33:46 +09:00
parent 0db09f5c25
commit c6b13be92a
10 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/ogs-3gpp-types.h
View File

@ -30,8 +30,6 @@ extern "C" {
#define OGS_MAX_NUM_OF_SESS 4 /* Num of APN(Session) per UE */ #define OGS_MAX_NUM_OF_SESS 4 /* Num of APN(Session) per UE */
#define OGS_MAX_NUM_OF_BEARER 4 /* Num of Bearer per Session */ #define OGS_MAX_NUM_OF_BEARER 4 /* Num of Bearer per Session */
#define OGS_MAX_NUM_OF_RULE 4 /* Num of Rule per Session */
#define OGS_MAX_NUM_OF_PF 16 /* Num of PacketFilter per Bearer */
#define OGS_MAX_NUM_OF_PACKET_BUFFER 64 /* Num of PacketBuffer per UE */ #define OGS_MAX_NUM_OF_PACKET_BUFFER 64 /* Num of PacketBuffer per UE */
/* Num of PacketFilter per Bearer(GTP) or QoS(NAS-5GS) */ /* Num of PacketFilter per Bearer(GTP) or QoS(NAS-5GS) */

8
lib/pfcp/build.c
View File

@ -238,7 +238,7 @@ ogs_pkbuf_t *ogs_pfcp_up_build_association_setup_response(uint8_t type,
static struct { static struct {
ogs_pfcp_f_teid_t f_teid; ogs_pfcp_f_teid_t f_teid;
char dnn[OGS_MAX_DNN_LEN]; char dnn[OGS_MAX_DNN_LEN];
char *sdf_filter[OGS_MAX_NUM_OF_PF]; char *sdf_filter[OGS_PFCP_MAX_NUM_OF_RULE];
} pdrbuf[OGS_MAX_NUM_OF_PDR]; } pdrbuf[OGS_MAX_NUM_OF_PDR];
void ogs_pfcp_pdrbuf_init(void) void ogs_pfcp_pdrbuf_init(void)
@ -250,7 +250,7 @@ void ogs_pfcp_pdrbuf_clear(void)
{ {
int i, j; int i, j;
for (i = 0; i < OGS_MAX_NUM_OF_PDR; i++) { for (i = 0; i < OGS_MAX_NUM_OF_PDR; i++) {
for (j = 0; j < OGS_MAX_NUM_OF_PF; j++) { for (j = 0; j < OGS_PFCP_MAX_NUM_OF_RULE; j++) {
if (pdrbuf[i].sdf_filter[j]) if (pdrbuf[i].sdf_filter[j])
ogs_free(pdrbuf[i].sdf_filter[j]); ogs_free(pdrbuf[i].sdf_filter[j]);
} }
@ -261,7 +261,7 @@ void ogs_pfcp_build_create_pdr(
ogs_pfcp_tlv_create_pdr_t *message, int i, ogs_pfcp_pdr_t *pdr) ogs_pfcp_tlv_create_pdr_t *message, int i, ogs_pfcp_pdr_t *pdr)
{ {
ogs_pfcp_far_t *far = NULL; ogs_pfcp_far_t *far = NULL;
ogs_pfcp_sdf_filter_t pfcp_sdf_filter[OGS_MAX_NUM_OF_PF]; ogs_pfcp_sdf_filter_t pfcp_sdf_filter[OGS_PFCP_MAX_NUM_OF_RULE];
int j = 0; int j = 0;
int len = 0; int len = 0;
@ -376,7 +376,7 @@ void ogs_pfcp_build_created_pdr(
void ogs_pfcp_build_update_pdr( void ogs_pfcp_build_update_pdr(
ogs_pfcp_tlv_update_pdr_t *message, int i, ogs_pfcp_pdr_t *pdr) ogs_pfcp_tlv_update_pdr_t *message, int i, ogs_pfcp_pdr_t *pdr)
{ {
ogs_pfcp_sdf_filter_t pfcp_sdf_filter[OGS_MAX_NUM_OF_PF]; ogs_pfcp_sdf_filter_t pfcp_sdf_filter[OGS_PFCP_MAX_NUM_OF_RULE];
int j = 0; int j = 0;
int len = 0; int len = 0;

2
lib/pfcp/context.c
View File

@ -79,7 +79,7 @@ void ogs_pfcp_context_init(void)
ogs_app()->pool.sess * OGS_MAX_NUM_OF_BAR); ogs_app()->pool.sess * OGS_MAX_NUM_OF_BAR);
ogs_pool_init(&ogs_pfcp_rule_pool, ogs_pool_init(&ogs_pfcp_rule_pool,
ogs_app()->pool.sess * OGS_MAX_NUM_OF_PF); ogs_app()->pool.sess * OGS_PFCP_MAX_NUM_OF_RULE);
ogs_pool_init(&ogs_pfcp_dev_pool, OGS_MAX_NUM_OF_DEV); ogs_pool_init(&ogs_pfcp_dev_pool, OGS_MAX_NUM_OF_DEV);
ogs_pool_init(&ogs_pfcp_subnet_pool, OGS_MAX_NUM_OF_SUBNET); ogs_pool_init(&ogs_pfcp_subnet_pool, OGS_MAX_NUM_OF_SUBNET);

3
lib/pfcp/context.h
View File

@ -173,7 +173,8 @@ typedef struct ogs_pfcp_pdr_s {
ogs_pfcp_qer_t *qer; ogs_pfcp_qer_t *qer;
int num_of_flow; int num_of_flow;
char *flow_description[OGS_MAX_NUM_OF_PF]; #define OGS_PFCP_MAX_NUM_OF_RULE 8 /* Num of Rule per Session */
char *flow_description[OGS_PFCP_MAX_NUM_OF_RULE];
ogs_list_t rule_list; /* Rule List */ ogs_list_t rule_list; /* Rule List */

4
lib/pfcp/handler.c
View File

@ -313,7 +313,7 @@ ogs_pfcp_pdr_t *ogs_pfcp_handle_create_pdr(ogs_pfcp_sess_t *sess,
ogs_pfcp_rule_remove_all(pdr); ogs_pfcp_rule_remove_all(pdr);
for (i = 0; i < OGS_MAX_NUM_OF_PF; i++) { for (i = 0; i < OGS_PFCP_MAX_NUM_OF_RULE; i++) {
ogs_pfcp_sdf_filter_t sdf_filter; ogs_pfcp_sdf_filter_t sdf_filter;
ogs_pfcp_rule_t *rule = NULL; ogs_pfcp_rule_t *rule = NULL;
ogs_pfcp_rule_t *oppsite_direction_rule = NULL; ogs_pfcp_rule_t *oppsite_direction_rule = NULL;
@ -558,7 +558,7 @@ ogs_pfcp_pdr_t *ogs_pfcp_handle_update_pdr(ogs_pfcp_sess_t *sess,
ogs_pfcp_rule_remove_all(pdr); ogs_pfcp_rule_remove_all(pdr);
for (i = 0; i < OGS_MAX_NUM_OF_PF; i++) { for (i = 0; i < OGS_PFCP_MAX_NUM_OF_RULE; i++) {
ogs_pfcp_sdf_filter_t sdf_filter; ogs_pfcp_sdf_filter_t sdf_filter;
ogs_pfcp_rule_t *rule = NULL; ogs_pfcp_rule_t *rule = NULL;
ogs_pfcp_rule_t *oppsite_direction_rule = NULL; ogs_pfcp_rule_t *oppsite_direction_rule = NULL;

2
lib/pfcp/message.c
View File

@ -20,7 +20,7 @@
/******************************************************************************* /*******************************************************************************
* This file had been created by pfcp-tlv.py script v0.1.0 * This file had been created by pfcp-tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script. * Please do not modify this file but regenerate it via script.
* Created on: 2021-06-15 10:58:38.385939 by acetcom * Created on: 2021-07-27 20:23:21.045510 by acetcom
* from 29244-g10.docx * from 29244-g10.docx
******************************************************************************/ ******************************************************************************/

6
lib/pfcp/message.h
View File

@ -20,7 +20,7 @@
/******************************************************************************* /*******************************************************************************
* This file had been created by pfcp-tlv.py script v0.1.0 * This file had been created by pfcp-tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script. * Please do not modify this file but regenerate it via script.
* Created on: 2021-06-15 10:58:38.379862 by acetcom * Created on: 2021-07-27 20:23:21.038999 by acetcom
* from 29244-g10.docx * from 29244-g10.docx
******************************************************************************/ ******************************************************************************/
@ -626,7 +626,7 @@ typedef struct ogs_pfcp_tlv_ethernet_packet_filter_s {
ogs_pfcp_tlv_ethertype_t ethertype; ogs_pfcp_tlv_ethertype_t ethertype;
ogs_pfcp_tlv_c_tag_t c_tag; ogs_pfcp_tlv_c_tag_t c_tag;
ogs_pfcp_tlv_s_tag_t s_tag; ogs_pfcp_tlv_s_tag_t s_tag;
ogs_pfcp_tlv_sdf_filter_t sdf_filter[OGS_MAX_NUM_OF_PF]; ogs_pfcp_tlv_sdf_filter_t sdf_filter[8];
} ogs_pfcp_tlv_ethernet_packet_filter_t; } ogs_pfcp_tlv_ethernet_packet_filter_t;
typedef struct ogs_pfcp_tlv_pdi_s { typedef struct ogs_pfcp_tlv_pdi_s {
@ -636,7 +636,7 @@ typedef struct ogs_pfcp_tlv_pdi_s {
ogs_pfcp_tlv_network_instance_t network_instance; ogs_pfcp_tlv_network_instance_t network_instance;
ogs_pfcp_tlv_ue_ip_address_t ue_ip_address; ogs_pfcp_tlv_ue_ip_address_t ue_ip_address;
ogs_pfcp_tlv_traffic_endpoint_id_t traffic_endpoint_id; ogs_pfcp_tlv_traffic_endpoint_id_t traffic_endpoint_id;
ogs_pfcp_tlv_sdf_filter_t sdf_filter[OGS_MAX_NUM_OF_PF]; ogs_pfcp_tlv_sdf_filter_t sdf_filter[8];
ogs_pfcp_tlv_application_id_t application_id; ogs_pfcp_tlv_application_id_t application_id;
ogs_pfcp_tlv_ethernet_pdu_session_information_t ethernet_pdu_session_information; ogs_pfcp_tlv_ethernet_pdu_session_information_t ethernet_pdu_session_information;
ogs_pfcp_tlv_ethernet_packet_filter_t ethernet_packet_filter; ogs_pfcp_tlv_ethernet_packet_filter_t ethernet_packet_filter;

14
src/smf/context.c
View File

@ -59,7 +59,7 @@ void smf_context_init(void)
ogs_pool_init(&smf_sess_pool, ogs_app()->pool.sess); ogs_pool_init(&smf_sess_pool, ogs_app()->pool.sess);
ogs_pool_init(&smf_bearer_pool, ogs_app()->pool.bearer); ogs_pool_init(&smf_bearer_pool, ogs_app()->pool.bearer);
ogs_pool_init(&smf_pf_pool, ogs_app()->pool.bearer * OGS_MAX_NUM_OF_PF); ogs_pool_init(&smf_pf_pool, ogs_app()->pool.bearer * MAX_NUM_OF_PF);
self.supi_hash = ogs_hash_make(); self.supi_hash = ogs_hash_make();
ogs_assert(self.supi_hash); ogs_assert(self.supi_hash);
@ -2143,14 +2143,14 @@ smf_pf_t *smf_pf_add(smf_bearer_t *bearer)
ogs_assert(pf->identifier_node); ogs_assert(pf->identifier_node);
pf->identifier = *(pf->identifier_node); pf->identifier = *(pf->identifier_node);
ogs_assert(pf->identifier > 0 && pf->identifier <= OGS_MAX_NUM_OF_PF); ogs_assert(pf->identifier > 0 && pf->identifier <= MAX_NUM_OF_PF);
ogs_pool_alloc(&sess->pf_precedence_pool, &pf->precedence_node); ogs_pool_alloc(&sess->pf_precedence_pool, &pf->precedence_node);
ogs_assert(pf->precedence_node); ogs_assert(pf->precedence_node);
pf->precedence = *(pf->precedence_node); pf->precedence = *(pf->precedence_node);
ogs_assert(pf->precedence > 0 && pf->precedence <= ogs_assert(pf->precedence > 0 && pf->precedence <=
(OGS_MAX_NUM_OF_BEARER * OGS_MAX_NUM_OF_PF)); (OGS_MAX_NUM_OF_BEARER * MAX_NUM_OF_PF));
pf->bearer = bearer; pf->bearer = bearer;
@ -2427,9 +2427,9 @@ void smf_pf_identifier_pool_init(smf_bearer_t *bearer)
ogs_assert(bearer); ogs_assert(bearer);
ogs_index_init(&bearer->pf_identifier_pool, OGS_MAX_NUM_OF_PF); ogs_index_init(&bearer->pf_identifier_pool, MAX_NUM_OF_PF);
for (i = 1; i <= OGS_MAX_NUM_OF_PF; i++) { for (i = 1; i <= MAX_NUM_OF_PF; i++) {
bearer->pf_identifier_pool.array[i-1] = i; bearer->pf_identifier_pool.array[i-1] = i;
} }
} }
@ -2448,9 +2448,9 @@ void smf_pf_precedence_pool_init(smf_sess_t *sess)
ogs_assert(sess); ogs_assert(sess);
ogs_index_init(&sess->pf_precedence_pool, ogs_index_init(&sess->pf_precedence_pool,
OGS_MAX_NUM_OF_BEARER * OGS_MAX_NUM_OF_PF); OGS_MAX_NUM_OF_BEARER * MAX_NUM_OF_PF);
for (i = 1; i <= OGS_MAX_NUM_OF_BEARER * OGS_MAX_NUM_OF_PF; i++) { for (i = 1; i <= OGS_MAX_NUM_OF_BEARER * MAX_NUM_OF_PF; i++) {
sess->pf_precedence_pool.array[i-1] = i; sess->pf_precedence_pool.array[i-1] = i;
} }
} }

2
src/smf/context.h
View File

@ -177,6 +177,8 @@ typedef struct smf_bearer_s {
OGS_POOL(pf_identifier_pool, uint8_t); OGS_POOL(pf_identifier_pool, uint8_t);
#define MAX_NUM_OF_PF 16 /* Num of PacketFilter per Bearer */
/* Packet Filter List */ /* Packet Filter List */
ogs_list_t pf_list; ogs_list_t pf_list;
ogs_list_t pf_to_add_list; ogs_list_t pf_to_add_list;

8
src/smf/gx-path.c
View File

@ -893,8 +893,8 @@ static void smf_gx_cca_cb(void *data, struct msg **msg)
bearer = smf_bearer_find_by_pcc_rule_name( bearer = smf_bearer_find_by_pcc_rule_name(
sess_data->sess, pcc_rule->name); sess_data->sess, pcc_rule->name);
if (bearer && if (bearer &&
(ogs_list_count(&bearer->pf_list) + pcc_rule->num_of_flow > ((ogs_list_count(&bearer->pf_list) +
OGS_MAX_NUM_OF_PF)) { pcc_rule->num_of_flow) > MAX_NUM_OF_PF)) {
error++; error++;
} }
break; break;
@ -1094,8 +1094,8 @@ static int smf_gx_rar_cb( struct msg **msg, struct avp *avp,
bearer = smf_bearer_find_by_pcc_rule_name( bearer = smf_bearer_find_by_pcc_rule_name(
sess_data->sess, pcc_rule->name); sess_data->sess, pcc_rule->name);
if (bearer && if (bearer &&
(ogs_list_count(&bearer->pf_list) + pcc_rule->num_of_flow > ((ogs_list_count(&bearer->pf_list) +
OGS_MAX_NUM_OF_PF)) { pcc_rule->num_of_flow) > MAX_NUM_OF_PF)) {
result_code = ER_DIAMETER_UNABLE_TO_COMPLY; result_code = ER_DIAMETER_UNABLE_TO_COMPLY;
goto out; goto out;
} }