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

rollback [#565]

This commit is contained in:
Sukchan Lee 2020-09-12 12:16:08 -04:00
parent ef3b84f3f6
commit ce8d10e4fc
15 changed files with 126 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configs/310014.yaml.in
View File

@ -35,9 +35,9 @@ mme:
addr: 127.0.0.8
s1ap:
addr: 127.0.0.2
- addr: 127.0.0.2
gtpc:
addr: 127.0.0.2
- addr: 127.0.0.2
gummei:
plmn_id:
mcc: 310
@ -50,7 +50,7 @@ mme:
mnc: 014
tac: 1
security:
integrity_order : [ EIA1, EIA2, EIA0 ]
integrity_order : [ EIA2, EIA1, EIA0 ]
ciphering_order : [ EEA0, EEA1, EEA2 ]
network_name:
@ -58,9 +58,9 @@ mme:
sgwc:
gtpc:
addr: 127.0.0.3
- addr: 127.0.0.3
pfcp:
addr: 127.0.0.3
- addr: 127.0.0.3
smf:
sbi:
@ -114,14 +114,14 @@ amf:
mcc: 310
mnc: 014
tac: 1
plmn:
plmn_support:
- plmn_id:
mcc: 310
mnc: 014
s_nssai:
- sst: 1
security:
integrity_order : [ NIA1, NIA2, NIA0 ]
integrity_order : [ NIA2, NIA1, NIA0 ]
ciphering_order : [ NEA0, NEA1, NEA2 ]
network_name:
full: Open5GS
@ -129,17 +129,15 @@ amf:
sgwu:
gtpu:
addr: 127.0.0.6
- addr: 127.0.0.6
pfcp:
addr: 127.0.0.6
- addr: 127.0.0.6
upf:
pfcp:
- addr: 127.0.0.7
gtpu:
- addr:
- 127.0.0.7
- ::1
- addr: 127.0.0.7
pdn:
- addr: 10.45.0.1/16
- addr: cafe::1/64
@ -181,10 +179,10 @@ pcrf:
nrf:
sbi:
addr:
- addr:
- 127.0.0.10
- ::1
port: 7777
port: 7777
ausf:
sbi:

26
configs/csfb.yaml.in
View File

@ -35,9 +35,9 @@ mme:
addr: 127.0.0.8
s1ap:
addr: 127.0.0.2
- addr: 127.0.0.2
gtpc:
addr: 127.0.0.2
- addr: 127.0.0.2
sgsap:
- addr: 127.0.0.2
map:
@ -84,7 +84,7 @@ mme:
mnc: 21
tac: 12345
security:
integrity_order : [ EIA1, EIA2, EIA0 ]
integrity_order : [ EIA2, EIA1, EIA0 ]
ciphering_order : [ EEA0, EEA1, EEA2 ]
network_name:
@ -92,9 +92,9 @@ mme:
sgwc:
gtpc:
addr: 127.0.0.3
- addr: 127.0.0.3
pfcp:
addr: 127.0.0.3
- addr: 127.0.0.3
smf:
sbi:
@ -148,14 +148,14 @@ amf:
mcc: 901
mnc: 70
tac: 1
plmn:
plmn_support:
- plmn_id:
mcc: 901
mnc: 70
s_nssai:
- sst: 1
security:
integrity_order : [ NIA1, NIA2, NIA0 ]
integrity_order : [ NIA2, NIA1, NIA0 ]
ciphering_order : [ NEA0, NEA1, NEA2 ]
network_name:
full: Open5GS
@ -163,17 +163,15 @@ amf:
sgwu:
gtpu:
addr: 127.0.0.6
- addr: 127.0.0.6
pfcp:
addr: 127.0.0.6
- addr: 127.0.0.6
upf:
pfcp:
- addr: 127.0.0.7
gtpu:
- addr:
- 127.0.0.7
- ::1
- addr: 127.0.0.7
pdn:
- addr: 10.45.0.1/16
- addr: cafe::1/64
@ -215,10 +213,10 @@ pcrf:
nrf:
sbi:
addr:
- addr:
- 127.0.0.10
- ::1
port: 7777
port: 7777
ausf:
sbi:

24
configs/minimal.yaml.in
View File

@ -35,9 +35,9 @@ mme:
addr: 127.0.0.8
s1ap:
addr: 127.0.0.2
- addr: 127.0.0.2
gtpc:
addr: 127.0.0.2
- addr: 127.0.0.2
gummei:
plmn_id:
mcc: 901
@ -50,7 +50,7 @@ mme:
mnc: 70
tac: 1
security:
integrity_order : [ EIA1, EIA2, EIA0 ]
integrity_order : [ EIA2, EIA1, EIA0 ]
ciphering_order : [ EEA0, EEA1, EEA2 ]
network_name:
@ -58,9 +58,9 @@ mme:
sgwc:
gtpc:
addr: 127.0.0.3
- addr: 127.0.0.3
pfcp:
addr: 127.0.0.3
- addr: 127.0.0.3
smf:
sbi:
@ -114,7 +114,7 @@ amf:
mcc: 208
mnc: 93
tac: 1
plmn:
plmn_support:
- plmn_id:
mcc: 208
mnc: 93
@ -132,17 +132,15 @@ amf:
sgwu:
gtpu:
addr: 127.0.0.6
- addr: 127.0.0.6
pfcp:
addr: 127.0.0.6
- addr: 127.0.0.6
upf:
pfcp:
- addr: 127.0.0.7
gtpu:
- addr:
- 127.0.0.7
- ::1
- addr: 127.0.0.7
pdn:
- addr: 10.45.0.1/16
- addr: cafe::1/64
@ -184,10 +182,10 @@ pcrf:
nrf:
sbi:
addr:
- addr:
- 127.0.0.10
- ::1
port: 7777
port: 7777
ausf:
sbi:

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

@ -137,7 +137,7 @@ logger:
# <PLMN Support>
#
# o Multiple PLMN Support
# plmn:
# plmn_support:
# - plmn_id:
# mcc: 901
# mnc: 70
@ -178,14 +178,14 @@ amf:
mcc: 901
mnc: 70
tac: 1
plmn:
plmn_support:
- plmn_id:
mcc: 901
mnc: 70
s_nssai:
- sst: 1
security:
integrity_order : [ NIA1, NIA2, NIA0 ]
integrity_order : [ NIA2, NIA1, NIA0 ]
ciphering_order : [ NEA0, NEA1, NEA2 ]
network_name:
full: Open5GS

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

@ -204,9 +204,9 @@ logger:
mme:
freeDiameter: @sysconfdir@/freeDiameter/mme.conf
s1ap:
addr: 127.0.0.2
- addr: 127.0.0.2
gtpc:
addr: 127.0.0.2
- addr: 127.0.0.2
gummei:
plmn_id:
mcc: 901
@ -219,7 +219,7 @@ mme:
mnc: 70
tac: 1
security:
integrity_order : [ EIA1, EIA2, EIA0 ]
integrity_order : [ EIA2, EIA1, EIA0 ]
ciphering_order : [ EEA0, EEA1, EEA2 ]
network_name:
full: Open5GS
@ -283,7 +283,7 @@ mme:
#
sgwc:
gtpc:
addr: 127.0.0.3
- addr: 127.0.0.3
#
# smf:
@ -324,7 +324,7 @@ sgwc:
# apn: volte
smf:
gtpc:
addr:
- addr:
- 127.0.0.4
- ::1

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

@ -47,9 +47,9 @@ logger:
#
sgwc:
gtpc:
addr: 127.0.0.3
- addr: 127.0.0.3
pfcp:
addr: 127.0.0.3
- addr: 127.0.0.3
#
# sgwu:
@ -105,7 +105,7 @@ sgwc:
#
sgwu:
pfcp:
addr: 127.0.0.6
- addr: 127.0.0.6
#
# parameter:

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

@ -51,9 +51,9 @@ logger:
#
sgwu:
gtpu:
addr: 127.0.0.6
- addr: 127.0.0.6
pfcp:
addr: 127.0.0.6
- addr: 127.0.0.6
#
# sgwc:

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

@ -137,9 +137,7 @@ upf:
pfcp:
- addr: 127.0.0.7
gtpu:
- addr:
- 127.0.0.7
- ::1
- addr: 127.0.0.7
pdn:
- addr: 10.45.0.1/16
- addr: cafe::1/64

26
configs/sample.yaml.in
View File

@ -35,9 +35,9 @@ mme:
addr: 127.0.0.8
s1ap:
addr: 127.0.0.2
- addr: 127.0.0.2
gtpc:
addr: 127.0.0.2
- addr: 127.0.0.2
gummei:
plmn_id:
mcc: 901
@ -50,7 +50,7 @@ mme:
mnc: 70
tac: 1
security:
integrity_order : [ EIA1, EIA2, EIA0 ]
integrity_order : [ EIA2, EIA1, EIA0 ]
ciphering_order : [ EEA0, EEA1, EEA2 ]
network_name:
@ -58,9 +58,9 @@ mme:
sgwc:
gtpc:
addr: 127.0.0.3
- addr: 127.0.0.3
pfcp:
addr: 127.0.0.3
- addr: 127.0.0.3
smf:
sbi:
@ -114,14 +114,14 @@ amf:
mcc: 901
mnc: 70
tac: 1
plmn:
plmn_support:
- plmn_id:
mcc: 901
mnc: 70
s_nssai:
- sst: 1
security:
integrity_order : [ NIA1, NIA2, NIA0 ]
integrity_order : [ NIA2, NIA1, NIA0 ]
ciphering_order : [ NEA0, NEA1, NEA2 ]
network_name:
full: Open5GS
@ -129,17 +129,15 @@ amf:
sgwu:
gtpu:
addr: 127.0.0.6
- addr: 127.0.0.6
pfcp:
addr: 127.0.0.6
- addr: 127.0.0.6
upf:
pfcp:
- addr: 127.0.0.7
gtpu:
- addr:
- 127.0.0.7
- ::1
- addr: 127.0.0.7
pdn:
- addr: 10.45.0.1/16
- addr: cafe::1/64
@ -181,10 +179,10 @@ pcrf:
nrf:
sbi:
addr:
- addr:
- 127.0.0.10
- ::1
port: 7777
port: 7777
ausf:
sbi:

26
configs/srslte.yaml.in
View File

@ -35,9 +35,9 @@ mme:
addr: 127.0.0.8
s1ap:
addr: 127.0.1.100
- addr: 127.0.1.100
gtpc:
addr: 127.0.0.2
- addr: 127.0.0.2
gummei:
plmn_id:
mcc: 901
@ -50,7 +50,7 @@ mme:
mnc: 70
tac: 7
security:
integrity_order : [ EIA1, EIA2, EIA0 ]
integrity_order : [ EIA2, EIA1, EIA0 ]
ciphering_order : [ EEA0, EEA1, EEA2 ]
network_name:
@ -58,9 +58,9 @@ mme:
sgwc:
gtpc:
addr: 127.0.0.3
- addr: 127.0.0.3
pfcp:
addr: 127.0.0.3
- addr: 127.0.0.3
smf:
sbi:
@ -114,14 +114,14 @@ amf:
mcc: 901
mnc: 70
tac: 1
plmn:
plmn_support:
- plmn_id:
mcc: 901
mnc: 70
s_nssai:
- sst: 1
security:
integrity_order : [ NIA1, NIA2, NIA0 ]
integrity_order : [ NIA2, NIA1, NIA0 ]
ciphering_order : [ NEA0, NEA1, NEA2 ]
network_name:
full: Open5GS
@ -129,17 +129,15 @@ amf:
sgwu:
gtpu:
addr: 127.0.0.6
- addr: 127.0.0.6
pfcp:
addr: 127.0.0.6
- addr: 127.0.0.6
upf:
pfcp:
- addr: 127.0.0.7
gtpu:
- addr:
- 127.0.0.7
- ::1
- addr: 127.0.0.7
pdn:
- addr: 10.45.0.1/16
- addr: cafe::1/64
@ -181,10 +179,10 @@ pcrf:
nrf:
sbi:
addr:
- addr:
- 127.0.0.10
- ::1
port: 7777
port: 7777
ausf:
sbi:

26
configs/volte.yaml.in
View File

@ -35,9 +35,9 @@ mme:
addr: 127.0.0.8
s1ap:
addr: 127.0.0.2
- addr: 127.0.0.2
gtpc:
addr: 127.0.0.2
- addr: 127.0.0.2
gummei:
plmn_id:
mcc: 001
@ -50,7 +50,7 @@ mme:
mnc: 01
tac: 12345
security:
integrity_order : [ EIA1, EIA2, EIA0 ]
integrity_order : [ EIA2, EIA1, EIA0 ]
ciphering_order : [ EEA0, EEA1, EEA2 ]
network_name:
@ -58,9 +58,9 @@ mme:
sgwc:
gtpc:
addr: 127.0.0.3
- addr: 127.0.0.3
pfcp:
addr: 127.0.0.3
- addr: 127.0.0.3
smf:
sbi:
@ -117,14 +117,14 @@ amf:
mcc: 001
mnc: 01
tac: 1
plmn:
plmn_support:
- plmn_id:
mcc: 001
mnc: 01
s_nssai:
- sst: 1
security:
integrity_order : [ NIA1, NIA2, NIA0 ]
integrity_order : [ NIA2, NIA1, NIA0 ]
ciphering_order : [ NEA0, NEA1, NEA2 ]
network_name:
full: Open5GS
@ -132,17 +132,15 @@ amf:
sgwu:
gtpu:
addr: 127.0.0.6
- addr: 127.0.0.6
pfcp:
addr: 127.0.0.6
- addr: 127.0.0.6
upf:
pfcp:
- addr: 127.0.0.7
gtpu:
- addr:
- 127.0.0.7
- ::1
- addr: 127.0.0.7
pdn:
- addr: 10.45.0.1/16
- addr: cafe::1/64
@ -186,10 +184,10 @@ pcrf:
nrf:
sbi:
addr:
- addr:
- 127.0.0.10
- ::1
port: 7777
port: 7777
ausf:
sbi:

40
src/amf/context.c
View File

@ -525,38 +525,38 @@ int amf_context_parse_config(void)
if (list2->num || num_of_list0) {
self.num_of_served_tai++;
}
} else if (!strcmp(amf_key, "plmn")) {
ogs_yaml_iter_t plmn_array, plmn_iter;
ogs_yaml_iter_recurse(&amf_iter, &plmn_array);
} else if (!strcmp(amf_key, "plmn_support")) {
ogs_yaml_iter_t plmn_support_array, plmn_support_iter;
ogs_yaml_iter_recurse(&amf_iter, &plmn_support_array);
do {
const char *mnc = NULL, *mcc = NULL;
ogs_assert(self.num_of_plmn_support <=
OGS_MAX_NUM_OF_PLMN);
if (ogs_yaml_iter_type(&plmn_array) ==
if (ogs_yaml_iter_type(&plmn_support_array) ==
YAML_MAPPING_NODE) {
memcpy(&plmn_iter, &plmn_array,
memcpy(&plmn_support_iter, &plmn_support_array,
sizeof(ogs_yaml_iter_t));
} else if (ogs_yaml_iter_type(&plmn_array) ==
} else if (ogs_yaml_iter_type(&plmn_support_array) ==
YAML_SEQUENCE_NODE) {
if (!ogs_yaml_iter_next(&plmn_array))
if (!ogs_yaml_iter_next(&plmn_support_array))
break;
ogs_yaml_iter_recurse(&plmn_array,
&plmn_iter);
} else if (ogs_yaml_iter_type(&plmn_array) ==
ogs_yaml_iter_recurse(&plmn_support_array,
&plmn_support_iter);
} else if (ogs_yaml_iter_type(&plmn_support_array) ==
YAML_SCALAR_NODE) {
break;
} else
ogs_assert_if_reached();
while (ogs_yaml_iter_next(&plmn_iter)) {
const char *plmn_key =
ogs_yaml_iter_key(&plmn_iter);
ogs_assert(plmn_key);
if (!strcmp(plmn_key, "plmn_id")) {
while (ogs_yaml_iter_next(&plmn_support_iter)) {
const char *plmn_support_key =
ogs_yaml_iter_key(&plmn_support_iter);
ogs_assert(plmn_support_key);
if (!strcmp(plmn_support_key, "plmn_id")) {
ogs_yaml_iter_t plmn_id_iter;
ogs_yaml_iter_recurse(&plmn_iter,
ogs_yaml_iter_recurse(&plmn_support_iter,
&plmn_id_iter);
while (ogs_yaml_iter_next(&plmn_id_iter)) {
const char *plmn_id_key =
@ -578,9 +578,9 @@ int amf_context_parse_config(void)
plmn_id,
atoi(mcc), atoi(mnc), strlen(mnc));
}
} else if (!strcmp(plmn_key, "s_nssai")) {
} else if (!strcmp(plmn_support_key, "s_nssai")) {
ogs_yaml_iter_t s_nssai_array, s_nssai_iter;
ogs_yaml_iter_recurse(&plmn_iter,
ogs_yaml_iter_recurse(&plmn_support_iter,
&s_nssai_array);
do {
ogs_s_nssai_t *s_nssai = NULL;
@ -651,7 +651,7 @@ int amf_context_parse_config(void)
} while (ogs_yaml_iter_type(&s_nssai_array) ==
YAML_SEQUENCE_NODE);
} else
ogs_warn("unknown key `%s`", plmn_key);
ogs_warn("unknown key `%s`", plmn_support_key);
}
if (self.plmn_support[
@ -667,7 +667,7 @@ int amf_context_parse_config(void)
self.plmn_support[
self.num_of_plmn_support].num_of_s_nssai = 0;
}
} while (ogs_yaml_iter_type(&plmn_array) ==
} while (ogs_yaml_iter_type(&plmn_support_array) ==
YAML_SEQUENCE_NODE);
} else if (!strcmp(amf_key, "security")) {
ogs_yaml_iter_t security_iter;

23
src/amf/ngap-build.c
View File

@ -823,8 +823,6 @@ ogs_pkbuf_t *ngap_build_pdu_session_resource_setup_request(
NGAP_SST_t *sST = NULL;
OCTET_STRING_t *transfer = NULL;
NGAP_UEAggregateMaximumBitRate_t *UEAggregateMaximumBitRate = NULL;
ogs_assert(gmmbuf);
ogs_assert(n2smbuf);
ogs_assert(sess);
@ -910,27 +908,6 @@ ogs_pkbuf_t *ngap_build_pdu_session_resource_setup_request(
memcpy(transfer->buf, n2smbuf->data, transfer->size);
ogs_pkbuf_free(n2smbuf);
if (amf_ue->subscribed_ue_ambr.downlink ||
amf_ue->subscribed_ue_ambr.uplink) {
ie = CALLOC(1, sizeof(NGAP_PDUSessionResourceSetupRequestIEs_t));
ASN_SEQUENCE_ADD(&PDUSessionResourceSetupRequest->protocolIEs, ie);
ie->id = NGAP_ProtocolIE_ID_id_UEAggregateMaximumBitRate;
ie->criticality = NGAP_Criticality_ignore;
ie->value.present =
NGAP_PDUSessionResourceSetupRequestIEs__value_PR_UEAggregateMaximumBitRate;
UEAggregateMaximumBitRate = &ie->value.choice.UEAggregateMaximumBitRate;
asn_uint642INTEGER(
&UEAggregateMaximumBitRate->uEAggregateMaximumBitRateUL,
amf_ue->subscribed_ue_ambr.uplink);
asn_uint642INTEGER(
&UEAggregateMaximumBitRate->uEAggregateMaximumBitRateDL,
amf_ue->subscribed_ue_ambr.downlink);
}
return ogs_ngap_encode(&pdu);
}

40
tests/common/context.c
View File

@ -383,38 +383,38 @@ int test_context_parse_config(void)
if (list2->num || num_of_list0) {
self.num_of_nr_served_tai++;
}
} else if (!strcmp(amf_key, "plmn")) {
ogs_yaml_iter_t plmn_array, plmn_iter;
ogs_yaml_iter_recurse(&amf_iter, &plmn_array);
} else if (!strcmp(amf_key, "plmn_support")) {
ogs_yaml_iter_t plmn_support_array, plmn_support_iter;
ogs_yaml_iter_recurse(&amf_iter, &plmn_support_array);
do {
const char *mnc = NULL, *mcc = NULL;
ogs_assert(self.num_of_plmn_support <=
OGS_MAX_NUM_OF_PLMN);
if (ogs_yaml_iter_type(&plmn_array) ==
if (ogs_yaml_iter_type(&plmn_support_array) ==
YAML_MAPPING_NODE) {
memcpy(&plmn_iter, &plmn_array,
memcpy(&plmn_support_iter, &plmn_support_array,
sizeof(ogs_yaml_iter_t));
} else if (ogs_yaml_iter_type(&plmn_array) ==
} else if (ogs_yaml_iter_type(&plmn_support_array) ==
YAML_SEQUENCE_NODE) {
if (!ogs_yaml_iter_next(&plmn_array))
if (!ogs_yaml_iter_next(&plmn_support_array))
break;
ogs_yaml_iter_recurse(&plmn_array,
&plmn_iter);
} else if (ogs_yaml_iter_type(&plmn_array) ==
ogs_yaml_iter_recurse(&plmn_support_array,
&plmn_support_iter);
} else if (ogs_yaml_iter_type(&plmn_support_array) ==
YAML_SCALAR_NODE) {
break;
} else
ogs_assert_if_reached();
while (ogs_yaml_iter_next(&plmn_iter)) {
const char *plmn_key =
ogs_yaml_iter_key(&plmn_iter);
ogs_assert(plmn_key);
if (!strcmp(plmn_key, "plmn_id")) {
while (ogs_yaml_iter_next(&plmn_support_iter)) {
const char *plmn_support_key =
ogs_yaml_iter_key(&plmn_support_iter);
ogs_assert(plmn_support_key);
if (!strcmp(plmn_support_key, "plmn_id")) {
ogs_yaml_iter_t plmn_id_iter;
ogs_yaml_iter_recurse(&plmn_iter,
ogs_yaml_iter_recurse(&plmn_support_iter,
&plmn_id_iter);
while (ogs_yaml_iter_next(&plmn_id_iter)) {
const char *plmn_id_key =
@ -436,9 +436,9 @@ int test_context_parse_config(void)
plmn_id,
atoi(mcc), atoi(mnc), strlen(mnc));
}
} else if (!strcmp(plmn_key, "s_nssai")) {
} else if (!strcmp(plmn_support_key, "s_nssai")) {
ogs_yaml_iter_t s_nssai_array, s_nssai_iter;
ogs_yaml_iter_recurse(&plmn_iter,
ogs_yaml_iter_recurse(&plmn_support_iter,
&s_nssai_array);
do {
ogs_s_nssai_t *s_nssai = NULL;
@ -509,7 +509,7 @@ int test_context_parse_config(void)
} while (ogs_yaml_iter_type(&s_nssai_array) ==
YAML_SEQUENCE_NODE);
} else
ogs_warn("unknown key `%s`", plmn_key);
ogs_warn("unknown key `%s`", plmn_support_key);
}
if (self.plmn_support[
@ -525,7 +525,7 @@ int test_context_parse_config(void)
self.plmn_support[
self.num_of_plmn_support].num_of_s_nssai = 0;
}
} while (ogs_yaml_iter_type(&plmn_array) ==
} while (ogs_yaml_iter_type(&plmn_support_array) ==
YAML_SEQUENCE_NODE);
} else if (!strcmp(amf_key, "sbi")) {
/* handle config in sbi library */

2
tests/common/gmm-build.c
View File

@ -142,7 +142,7 @@ ogs_pkbuf_t *testgmm_build_registration_request(
s1_ue_network_capability->eea = 0xf0;
s1_ue_network_capability->eia = 0xf0;
s1_ue_network_capability->uea = 0xc0;
s1_ue_network_capability->uia = 0x40;
s1_ue_network_capability->uia = 0xc0;
s1_ue_network_capability->notification_procedure = 1;
s1_ue_network_capability->extended_protocol_configuration_options = 1;
s1_ue_network_capability->n1_mode = 1;