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

Changed configuration name from gnb to peer 

And restored gtp_peer configuration
This commit is contained in:
Sukchan Lee 2022-08-05 16:56:36 +09:00
parent f772bf3a62
commit 700c71ef4c
22 changed files with 68 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/open5gs/amf.yaml.in
View File

@ -326,10 +326,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/ausf.yaml.in
View File

@ -161,10 +161,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/bsf.yaml.in
View File

@ -163,10 +163,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/hss.yaml.in
View File

@ -45,9 +45,9 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/mme.yaml.in
View File

@ -391,10 +391,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/nrf.yaml.in
View File

@ -111,10 +111,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/nssf.yaml.in
View File

@ -204,10 +204,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/pcf.yaml.in
View File

@ -165,10 +165,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/pcrf.yaml.in
View File

@ -42,9 +42,9 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/scp.yaml.in
View File

@ -184,10 +184,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/sgwc.yaml.in
View File

@ -142,10 +142,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
# o Maximum Number of GTP peer nodes per SGWC/SMF
# gtp_peer: 64
#

6
configs/open5gs/sgwu.yaml.in
View File

@ -131,10 +131,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/smf.yaml.in
View File

@ -536,10 +536,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
# o Maximum Number of GTP peer nodes per SGWC/SMF
# gtp_peer: 64
#

6
configs/open5gs/udm.yaml.in
View File

@ -163,10 +163,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/udr.yaml.in
View File

@ -163,10 +163,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

6
configs/open5gs/upf.yaml.in
View File

@ -205,10 +205,10 @@ parameter:
#
# max:
#
# o Maximum Number of UE per AMF/MME
# o Maximum Number of UE
# ue: 1024
# o Maximum Number of gNB/eNB per AMF/MME
# gnb: 64
# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI)
# peer: 64
#
max:

26
lib/app/ogs-context.c
View File

@ -72,10 +72,9 @@ static void recalculate_pool_size(void)
self.pool.tunnel = self.pool.bearer * MAX_NUM_OF_TUNNEL;
#define OGS_MAX_NUM_OF_NF_SUBSCRIPTION 4 /* Num of Subscription per NF */
self.pool.nf_service = self.max.gnb * OGS_MAX_NUM_OF_NF_SERVICE;
self.pool.nf_service = self.max.peer * OGS_MAX_NUM_OF_NF_SERVICE;
#define POOL_NUM_PER_UE 16
#define POOL_NUM_PER_GNB 8
self.pool.timer = self.max.ue * POOL_NUM_PER_UE;
self.pool.message = self.max.ue * POOL_NUM_PER_UE;
self.pool.event = self.max.ue * POOL_NUM_PER_UE;
@ -83,10 +82,10 @@ static void recalculate_pool_size(void)
self.pool.subscription = self.max.ue * POOL_NUM_PER_UE;
self.pool.xact = self.max.ue * POOL_NUM_PER_UE;
self.pool.nf = self.max.gnb;
#define MAX_CSMAP_POOL 128
self.pool.csmap = MAX_CSMAP_POOL; /* Num of TAI-LAI Mapping Table */
#define POOL_NUM_PER_PEER 8
self.pool.nf = self.max.peer * POOL_NUM_PER_PEER;
/* Num of TAI-LAI Mapping Table */
self.pool.csmap = self.max.peer * POOL_NUM_PER_PEER;
#define MAX_NUM_OF_IMPU 8
self.pool.impi = self.max.ue;
@ -179,11 +178,12 @@ static void app_context_prepare(void)
self.sockopt.no_delay = true;
#define MAX_NUM_OF_UE 1024 /* Num of UE per AMF/MME */
#define MAX_NUM_OF_GNB 64 /* Num of gNB per AMF/MME */
#define MAX_NUM_OF_UE 1024 /* Num of UEs */
#define MAX_NUM_OF_PEER 64 /* Num of Peer */
self.max.gnb = MAX_NUM_OF_GNB;
self.max.ue = MAX_NUM_OF_UE;
self.max.peer = MAX_NUM_OF_PEER;
self.max.gtp_peer = MAX_NUM_OF_PEER;
ogs_pkbuf_default_init(&self.pool.defconfig);
@ -427,10 +427,14 @@ int ogs_app_context_parse_config(void)
if (!strcmp(max_key, "ue")) {
const char *v = ogs_yaml_iter_value(&max_iter);
if (v) self.max.ue = atoi(v);
} else if (!strcmp(max_key, "gnb") ||
} else if (!strcmp(max_key, "peer") ||
!strcmp(max_key, "enb")) {
const char *v = ogs_yaml_iter_value(&max_iter);
if (v) self.max.gnb = atoi(v);
if (v) self.max.peer = atoi(v);
} else if (!strcmp(max_key, "gtp_peer") ||
!strcmp(max_key, "enb")) {
const char *v = ogs_yaml_iter_value(&max_iter);
if (v) self.max.gtp_peer = atoi(v);
} else
ogs_warn("unknown key `%s`", max_key);
}

2
lib/app/ogs-context.h
View File

@ -103,7 +103,7 @@ typedef struct ogs_app_context_s {
struct {
uint64_t ue;
uint64_t gnb;
uint64_t peer;
uint64_t gtp_peer;
} max;

2
src/amf/context.c
View File

@ -56,7 +56,7 @@ void amf_context_init(void)
ogs_list_init(&self.ngap_list6);
/* Allocate TWICE the pool to check if maximum number of gNBs is reached */
ogs_pool_init(&amf_gnb_pool, ogs_app()->max.gnb*2);
ogs_pool_init(&amf_gnb_pool, ogs_app()->max.peer*2);
ogs_pool_init(&amf_ue_pool, ogs_app()->max.ue);
ogs_pool_init(&ran_ue_pool, ogs_app()->max.ue);
ogs_pool_init(&amf_sess_pool, ogs_app()->pool.sess);

2
src/amf/ngap-handler.c
View File

@ -94,7 +94,7 @@ static bool maximum_number_of_gnbs_is_reached(void)
}
}
return number_of_gnbs_online >= ogs_app()->max.gnb;
return number_of_gnbs_online >= ogs_app()->max.peer;
}
void ngap_handle_ng_setup_request(amf_gnb_t *gnb, ogs_ngap_message_t *message)

2
src/mme/mme-context.c
View File

@ -97,7 +97,7 @@ void mme_context_init()
ogs_pool_init(&mme_csmap_pool, ogs_app()->pool.csmap);
/* Allocate TWICE the pool to check if maximum number of eNBs is reached */
ogs_pool_init(&mme_enb_pool, ogs_app()->max.gnb*2);
ogs_pool_init(&mme_enb_pool, ogs_app()->max.peer*2);
ogs_pool_init(&mme_ue_pool, ogs_app()->max.ue);
ogs_pool_init(&enb_ue_pool, ogs_app()->max.ue);

2
src/mme/s1ap-handler.c
View File

@ -61,7 +61,7 @@ static bool maximum_number_of_enbs_is_reached(void)
}
}
return number_of_enbs_online >= ogs_app()->max.gnb;
return number_of_enbs_online >= ogs_app()->max.peer;
}
void s1ap_handle_s1_setup_request(mme_enb_t *enb, ogs_s1ap_message_t *message)