Changes of Revision 298
commit_a3a683e5a623b0553add0a65e3686c8e5d550fd3.txt
Added
commit_aa746794e7505229cbcf93eb2b5b8fdbd7c06373.txt
Deleted
open5gs_2.6.4.97.aa746.dsc -> open5gs_2.6.4.98.a3a68.dsc
Changed
x
1
2
Source: open5gs3
Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg4
Architecture: any5
-Version: 2.6.4.97.aa7466
+Version: 2.6.4.98.a3a687
Maintainer: Harald Welte <laforge@gnumonks.org>8
Uploaders: Sukchan Lee <acetcom@gmail.com>9
Homepage: https://open5gs.org10
11
open5gs-udr deb net optional arch=any12
open5gs-upf deb net optional arch=any13
Checksums-Sha1:14
- efb5a16b122e2001f865ad8680382740c52314eb 14390676 open5gs_2.6.4.97.aa746.tar.xz15
+ 0e8b9a0039ddb2a3e96c4308a3d381815ad1d948 14392444 open5gs_2.6.4.98.a3a68.tar.xz16
Checksums-Sha256:17
- 3ab13252d4422f10b386dd09403d3d8dedbae9099fd5342342b81039bf771f37 14390676 open5gs_2.6.4.97.aa746.tar.xz18
+ f2d9b7a645753f31202a4c2aeec3ae5abc39187434ce00e3a3ce07ec5c113dd3 14392444 open5gs_2.6.4.98.a3a68.tar.xz19
Files:20
- 6d940453f49f47a05b0ba8c0914f5e51 14390676 open5gs_2.6.4.97.aa746.tar.xz21
+ e8d380bd448704a85acc6992ad9e8193 14392444 open5gs_2.6.4.98.a3a68.tar.xz22
open5gs_2.6.4.97.aa746.tar.xz/.tarball-version -> open5gs_2.6.4.98.a3a68.tar.xz/.tarball-version
Changed
4
1
2
-2.6.4.97-aa7463
+2.6.4.98-a3a684
open5gs_2.6.4.97.aa746.tar.xz/debian/changelog -> open5gs_2.6.4.98.a3a68.tar.xz/debian/changelog
Changed
12
1
2
-open5gs (2.6.4.97.aa746) unstable; urgency=medium3
+open5gs (2.6.4.98.a3a68) unstable; urgency=medium4
5
* Automatically generated changelog entry for building the Osmocom master feed6
7
- -- Osmocom OBS scripts <info@osmocom.org> Thu, 14 Sep 2023 22:42:46 +00008
+ -- Osmocom OBS scripts <info@osmocom.org> Sat, 16 Sep 2023 12:03:56 +00009
10
open5gs (2.6.4) unstable; urgency=medium11
12
open5gs_2.6.4.97.aa746.tar.xz/src/mme/emm-handler.c -> open5gs_2.6.4.98.a3a68.tar.xz/src/mme/emm-handler.c
Changed
17
1
2
3
switch (eps_mobile_identity->imsi.type) {4
case OGS_NAS_EPS_MOBILE_IDENTITY_IMSI:5
- ogs_assert(sizeof(ogs_nas_mobile_identity_imsi_t) ==6
- eps_mobile_identity->length);7
+ if (sizeof(ogs_nas_mobile_identity_imsi_t) !=8
+ eps_mobile_identity->length) {9
+ ogs_error("mobile_identity length (%d != %d)",10
+ (int)sizeof(ogs_nas_mobile_identity_imsi_t),11
+ eps_mobile_identity->length);12
+ return OGS_ERROR;13
+ }14
memcpy(&mme_ue->nas_mobile_identity_imsi, 15
&eps_mobile_identity->imsi, eps_mobile_identity->length);16
ogs_nas_eps_imsi_to_bcd(17
open5gs_2.6.4.97.aa746.tar.xz/src/mme/s1ap-build.c -> open5gs_2.6.4.98.a3a68.tar.xz/src/mme/s1ap-build.c
Changed
90
1
2
return ogs_s1ap_encode(&pdu);3
}4
5
+ogs_pkbuf_t *s1ap_build_enb_configuration_update_ack(void)6
+{7
+ S1AP_S1AP_PDU_t pdu;8
+ S1AP_SuccessfulOutcome_t *successfulOutcome = NULL;9
+10
+ ogs_debug("ENBConfigurationUpdateAcknowledge");11
+12
+ memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));13
+ pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome;14
+ pdu.choice.successfulOutcome = CALLOC(1, sizeof(S1AP_SuccessfulOutcome_t));15
+16
+ successfulOutcome = pdu.choice.successfulOutcome;17
+ successfulOutcome->procedureCode =18
+ S1AP_ProcedureCode_id_ENBConfigurationUpdate;19
+ successfulOutcome->criticality = S1AP_Criticality_reject;20
+ successfulOutcome->value.present =21
+ S1AP_SuccessfulOutcome__value_PR_ENBConfigurationUpdateAcknowledge;22
+23
+ return ogs_s1ap_encode(&pdu);24
+}25
+26
+ogs_pkbuf_t *s1ap_build_enb_configuration_update_failure(27
+ S1AP_Cause_PR group, long cause, long time_to_wait)28
+{29
+ S1AP_S1AP_PDU_t pdu;30
+ S1AP_UnsuccessfulOutcome_t *unsuccessfulOutcome = NULL;31
+ S1AP_ENBConfigurationUpdateFailure_t *ENBConfigurationUpdateFailure = NULL;32
+33
+ S1AP_ENBConfigurationUpdateFailureIEs_t *ie = NULL;34
+ S1AP_Cause_t *Cause = NULL;35
+ S1AP_TimeToWait_t *TimeToWait = NULL;36
+37
+ ogs_debug("ENBConfigurationUpdateFailure");38
+39
+ ogs_debug(" Group%d Cause%d TimeToWait%ld",40
+ group, (int)cause, time_to_wait);41
+42
+ memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));43
+ pdu.present = S1AP_S1AP_PDU_PR_unsuccessfulOutcome;44
+ pdu.choice.unsuccessfulOutcome =45
+ CALLOC(1, sizeof(S1AP_UnsuccessfulOutcome_t));46
+47
+ unsuccessfulOutcome = pdu.choice.unsuccessfulOutcome;48
+ unsuccessfulOutcome->procedureCode =49
+ S1AP_ProcedureCode_id_ENBConfigurationUpdate;50
+ unsuccessfulOutcome->criticality = S1AP_Criticality_reject;51
+ unsuccessfulOutcome->value.present =52
+ S1AP_UnsuccessfulOutcome__value_PR_ENBConfigurationUpdateFailure;53
+54
+ ENBConfigurationUpdateFailure =55
+ &unsuccessfulOutcome->value.choice.ENBConfigurationUpdateFailure;56
+57
+ ie = CALLOC(1, sizeof(S1AP_ENBConfigurationUpdateFailureIEs_t));58
+ ASN_SEQUENCE_ADD(&ENBConfigurationUpdateFailure->protocolIEs, ie);59
+60
+ ie->id = S1AP_ProtocolIE_ID_id_Cause;61
+ ie->criticality = S1AP_Criticality_ignore;62
+ ie->value.present = S1AP_ENBConfigurationUpdateFailureIEs__value_PR_Cause;63
+64
+ Cause = &ie->value.choice.Cause;65
+66
+ if (time_to_wait > -1) {67
+ ie = CALLOC(1, sizeof(S1AP_ENBConfigurationUpdateFailureIEs_t));68
+ ASN_SEQUENCE_ADD(&ENBConfigurationUpdateFailure->protocolIEs, ie);69
+70
+ ie->id = S1AP_ProtocolIE_ID_id_TimeToWait;71
+ ie->criticality = S1AP_Criticality_ignore;72
+ ie->value.present =73
+ S1AP_ENBConfigurationUpdateFailureIEs__value_PR_TimeToWait;74
+75
+ TimeToWait = &ie->value.choice.TimeToWait;76
+ }77
+78
+ Cause->present = group;79
+ Cause->choice.radioNetwork = cause;80
+81
+ if (TimeToWait)82
+ *TimeToWait = time_to_wait;83
+84
+ return ogs_s1ap_encode(&pdu);85
+}86
+87
ogs_pkbuf_t *s1ap_build_downlink_nas_transport(88
enb_ue_t *enb_ue, ogs_pkbuf_t *emmbuf)89
{90
open5gs_2.6.4.97.aa746.tar.xz/src/mme/s1ap-build.h -> open5gs_2.6.4.98.a3a68.tar.xz/src/mme/s1ap-build.h
Changed
12
1
2
ogs_pkbuf_t *s1ap_build_setup_failure(3
S1AP_Cause_PR group, long cause, long time_to_wait);4
5
+ogs_pkbuf_t *s1ap_build_enb_configuration_update_ack(void);6
+ogs_pkbuf_t *s1ap_build_enb_configuration_update_failure(7
+ S1AP_Cause_PR group, long cause, long time_to_wait);8
+9
ogs_pkbuf_t *s1ap_build_downlink_nas_transport(10
enb_ue_t *enb_ue, ogs_pkbuf_t *emmbuf);11
12
open5gs_2.6.4.97.aa746.tar.xz/src/mme/s1ap-handler.c -> open5gs_2.6.4.98.a3a68.tar.xz/src/mme/s1ap-handler.c
Changed
131
1
2
ogs_assert(r != OGS_ERROR);3
}4
5
+void s1ap_handle_enb_configuration_update(6
+ mme_enb_t *enb, ogs_s1ap_message_t *message)7
+{8
+ int i, j, r;9
+10
+ S1AP_InitiatingMessage_t *initiatingMessage = NULL;11
+ S1AP_ENBConfigurationUpdate_t *ENBConfigurationUpdate = NULL;12
+13
+ S1AP_ENBConfigurationUpdateIEs_t *ie = NULL;14
+ S1AP_SupportedTAs_t *SupportedTAs = NULL;15
+ S1AP_PagingDRX_t *PagingDRX = NULL;16
+17
+ ogs_assert(enb);18
+ ogs_assert(enb->sctp.sock);19
+20
+ ogs_assert(message);21
+ initiatingMessage = message->choice.initiatingMessage;22
+ ogs_assert(initiatingMessage);23
+ ENBConfigurationUpdate =24
+ &initiatingMessage->value.choice.ENBConfigurationUpdate;25
+ ogs_assert(ENBConfigurationUpdate);26
+27
+ ogs_debug("ENBConfigurationUpdate");28
+29
+ for (i = 0; i < ENBConfigurationUpdate->protocolIEs.list.count; i++) {30
+ ie = ENBConfigurationUpdate->protocolIEs.list.arrayi;31
+ switch (ie->id) {32
+ case S1AP_ProtocolIE_ID_id_SupportedTAs:33
+ SupportedTAs = &ie->value.choice.SupportedTAs;34
+ break;35
+ case S1AP_ProtocolIE_ID_id_DefaultPagingDRX:36
+ PagingDRX = &ie->value.choice.PagingDRX;37
+ break;38
+ default:39
+ break;40
+ }41
+ }42
+43
+ /* Parse Supported TA */44
+ if (SupportedTAs) {45
+ S1AP_Cause_PR group = S1AP_Cause_PR_NOTHING;46
+ long cause = 0;47
+48
+ enb->num_of_supported_ta_list = 0;49
+ for (i = 0; i < SupportedTAs->list.count; i++) {50
+ S1AP_SupportedTAs_Item_t *SupportedTAs_Item = NULL;51
+ S1AP_TAC_t *tAC = NULL;52
+53
+ SupportedTAs_Item =54
+ (S1AP_SupportedTAs_Item_t *)SupportedTAs->list.arrayi;55
+ ogs_assert(SupportedTAs_Item);56
+ tAC = &SupportedTAs_Item->tAC;57
+ ogs_assert(tAC);58
+59
+ for (j = 0; j < SupportedTAs_Item->broadcastPLMNs.list.count; j++) {60
+ S1AP_PLMNidentity_t *pLMNidentity = NULL;61
+ pLMNidentity = (S1AP_PLMNidentity_t *)62
+ SupportedTAs_Item->broadcastPLMNs.list.arrayj;63
+ ogs_assert(pLMNidentity);64
+65
+ memcpy(&enb->supported_ta_list66
+ enb->num_of_supported_ta_list.tac,67
+ tAC->buf, sizeof(uint16_t));68
+ enb->supported_ta_listenb->num_of_supported_ta_list.tac =69
+ be16toh(enb->supported_ta_list70
+ enb->num_of_supported_ta_list.tac);71
+ memcpy(&enb->supported_ta_list72
+ enb->num_of_supported_ta_list.plmn_id,73
+ pLMNidentity->buf, sizeof(ogs_plmn_id_t));74
+ ogs_debug(" PLMN_IDMCC:%d MNC:%d TAC%d",75
+ ogs_plmn_id_mcc(&enb->supported_ta_list76
+ enb->num_of_supported_ta_list.plmn_id),77
+ ogs_plmn_id_mnc(&enb->supported_ta_list78
+ enb->num_of_supported_ta_list.plmn_id),79
+ enb->supported_ta_listenb->num_of_supported_ta_list.tac);80
+ enb->num_of_supported_ta_list++;81
+ }82
+ }83
+84
+ /*85
+ * TS36.41386
+ * Section 8.7.3.4 Abnormal Conditions87
+ *88
+ * If the eNB initiates the procedure by sending a S1 SETUP REQUEST89
+ * message including the PLMN Identity IEs and none of the PLMNs90
+ * provided by the eNB is identified by the MME, then the MME shall91
+ * reject the eNB S1 Setup Request procedure with the appropriate cause92
+ * value, e.g., “Unknown PLMN”.93
+ */94
+ if (enb_plmn_id_is_foreign(enb)) {95
+ ogs_warn("S1-Setup failure:");96
+ ogs_warn(" Global-ENB-ID PLMN-ID is foreign");97
+ group = S1AP_Cause_PR_misc;98
+ cause = S1AP_CauseMisc_unknown_PLMN;99
+100
+ r = s1ap_send_enb_configuration_update_failure(enb, group, cause);101
+ ogs_expect(r == OGS_OK);102
+ ogs_assert(r != OGS_ERROR);103
+ return;104
+ }105
+106
+ if (!served_tai_is_found(enb)) {107
+ ogs_warn("S1-Setup failure:");108
+ ogs_warn(" Cannot find Served TAI. "109
+ "Check 'mme.tai' configuration");110
+ group = S1AP_Cause_PR_misc;111
+ cause = S1AP_CauseMisc_unknown_PLMN;112
+113
+ r = s1ap_send_enb_configuration_update_failure(enb, group, cause);114
+ ogs_expect(r == OGS_OK);115
+ ogs_assert(r != OGS_ERROR);116
+ return;117
+ }118
+ }119
+120
+ if (PagingDRX)121
+ ogs_debug(" PagingDRX%ld", *PagingDRX);122
+123
+ r = s1ap_send_enb_configuration_update_ack(enb);124
+ ogs_expect(r == OGS_OK);125
+ ogs_assert(r != OGS_ERROR);126
+}127
+128
void s1ap_handle_initial_ue_message(mme_enb_t *enb, ogs_s1ap_message_t *message)129
{130
int i, r;131
open5gs_2.6.4.97.aa746.tar.xz/src/mme/s1ap-handler.h -> open5gs_2.6.4.98.a3a68.tar.xz/src/mme/s1ap-handler.h
Changed
10
1
2
3
void s1ap_handle_s1_setup_request(4
mme_enb_t *enb, ogs_s1ap_message_t *message);5
+void s1ap_handle_enb_configuration_update(6
+ mme_enb_t *enb, ogs_s1ap_message_t *message);7
void s1ap_handle_initial_ue_message(8
mme_enb_t *enb, ogs_s1ap_message_t *message);9
void s1ap_handle_uplink_nas_transport(10
open5gs_2.6.4.97.aa746.tar.xz/src/mme/s1ap-path.c -> open5gs_2.6.4.98.a3a68.tar.xz/src/mme/s1ap-path.c
Changed
58
1
2
return rv;3
}4
5
+int s1ap_send_enb_configuration_update_ack(mme_enb_t *enb)6
+{7
+ int rv;8
+ ogs_pkbuf_t *s1ap_buffer;9
+10
+ ogs_debug("ENBConfigurationUpdateAcknowledge");11
+12
+ if (!mme_enb_cycle(enb)) {13
+ ogs_error("eNB has already been removed");14
+ return OGS_NOTFOUND;15
+ }16
+17
+ s1ap_buffer = s1ap_build_enb_configuration_update_ack();18
+ if (!s1ap_buffer) {19
+ ogs_error("s1ap_build_setup_rsp() failed");20
+ return OGS_ERROR;21
+ }22
+23
+ rv = s1ap_send_to_enb(enb, s1ap_buffer, S1AP_NON_UE_SIGNALLING);24
+ ogs_expect(rv == OGS_OK);25
+26
+ return rv;27
+}28
+29
+int s1ap_send_enb_configuration_update_failure(30
+ mme_enb_t *enb, S1AP_Cause_PR group, long cause)31
+{32
+ int rv;33
+ ogs_pkbuf_t *s1ap_buffer;34
+35
+ ogs_debug("ENBConfigurationUpdateFailure");36
+37
+ if (!mme_enb_cycle(enb)) {38
+ ogs_error("eNB has already been removed");39
+ return OGS_NOTFOUND;40
+ }41
+42
+ s1ap_buffer = s1ap_build_enb_configuration_update_failure(43
+ group, cause, S1AP_TimeToWait_v10s);44
+ if (!s1ap_buffer) {45
+ ogs_error("s1ap_build_setup_failure() failed");46
+ return OGS_ERROR;47
+ }48
+49
+ rv = s1ap_send_to_enb(enb, s1ap_buffer, S1AP_NON_UE_SIGNALLING);50
+ ogs_expect(rv == OGS_OK);51
+52
+ return rv;53
+}54
+55
int s1ap_send_initial_context_setup_request(mme_ue_t *mme_ue)56
{57
int rv;58
open5gs_2.6.4.97.aa746.tar.xz/src/mme/s1ap-path.h -> open5gs_2.6.4.98.a3a68.tar.xz/src/mme/s1ap-path.h
Changed
12
1
2
int s1ap_send_s1_setup_failure(3
mme_enb_t *enb, S1AP_Cause_PR group, long cause);4
5
+int s1ap_send_enb_configuration_update_ack(mme_enb_t *enb);6
+int s1ap_send_enb_configuration_update_failure(7
+ mme_enb_t *enb, S1AP_Cause_PR group, long cause);8
+9
int s1ap_send_initial_context_setup_request(mme_ue_t *mme_ue);10
int s1ap_send_ue_context_modification_request(mme_ue_t *mme_ue);11
int s1ap_send_ue_context_release_command(12
open5gs_2.6.4.97.aa746.tar.xz/src/mme/s1ap-sm.c -> open5gs_2.6.4.98.a3a68.tar.xz/src/mme/s1ap-sm.c
Changed
11
1
2
case S1AP_ProcedureCode_id_S1Setup :3
s1ap_handle_s1_setup_request(enb, pdu);4
break;5
+ case S1AP_ProcedureCode_id_ENBConfigurationUpdate:6
+ s1ap_handle_enb_configuration_update(enb, pdu);7
+ break;8
case S1AP_ProcedureCode_id_initialUEMessage :9
s1ap_handle_initial_ue_message(enb, pdu);10
break;11
open5gs_2.6.4.97.aa746.tar.xz/tests/attach/s1setup-test.c -> open5gs_2.6.4.98.a3a68.tar.xz/tests/attach/s1setup-test.c
Changed
62
1
2
}3
}4
5
+static void s1setup_test3(abts_case *tc, void *data)6
+{7
+ int rv;8
+ ogs_socknode_t *nodeNUM_OF_TEST_ENB;9
+ ogs_pkbuf_t *sendbuf;10
+ ogs_pkbuf_t *recvbuf;11
+ ogs_s1ap_message_t message;12
+ int i;13
+14
+ i = 0;15
+ nodei = tests1ap_client(AF_INET);16
+ ABTS_PTR_NOTNULL(tc, nodei);17
+18
+ sendbuf = test_s1ap_build_s1_setup_request(19
+ S1AP_ENB_ID_PR_macroENB_ID, 0x54f64+i);20
+ ABTS_PTR_NOTNULL(tc, sendbuf);21
+22
+ rv = testenb_s1ap_send(nodei, sendbuf);23
+ ABTS_INT_EQUAL(tc, OGS_OK, rv);24
+25
+ recvbuf = testenb_s1ap_read(nodei);26
+ ABTS_PTR_NOTNULL(tc, recvbuf);27
+28
+ rv = ogs_s1ap_decode(&message, recvbuf);29
+ ABTS_INT_EQUAL(tc, OGS_OK, rv);30
+31
+ ogs_s1ap_free(&message);32
+ ogs_pkbuf_free(recvbuf);33
+34
+ sendbuf = test_s1ap_build_enb_configuration_update(0);35
+ ABTS_PTR_NOTNULL(tc, sendbuf);36
+37
+ rv = testenb_s1ap_send(nodei, sendbuf);38
+ ABTS_INT_EQUAL(tc, OGS_OK, rv);39
+40
+ recvbuf = testenb_s1ap_read(nodei);41
+ ABTS_PTR_NOTNULL(tc, recvbuf);42
+43
+ rv = ogs_s1ap_decode(&message, recvbuf);44
+ ABTS_INT_EQUAL(tc, OGS_OK, rv);45
+46
+ ogs_s1ap_free(&message);47
+ ogs_pkbuf_free(recvbuf);48
+49
+ testenb_s1ap_close(nodei);50
+}51
+52
abts_suite *test_s1setup(abts_suite *suite)53
{54
suite = ADD_SUITE(suite)55
56
abts_run_test(suite, s1setup_test1, NULL);57
abts_run_test(suite, s1setup_test2, NULL);58
+ abts_run_test(suite, s1setup_test3, NULL);59
60
return suite;61
}62
open5gs_2.6.4.97.aa746.tar.xz/tests/common/s1ap-build.c -> open5gs_2.6.4.98.a3a68.tar.xz/tests/common/s1ap-build.c
Changed
50
1
2
return pkbuf;3
}4
5
+ogs_pkbuf_t *test_s1ap_build_enb_configuration_update(int i)6
+{7
+ ogs_pkbuf_t *pkbuf = NULL;8
+ const char *payloadTEST_S1AP_MAX_MESSAGE = {9
+ "001d002a0000"10
+ "04003c4003000031 0040000700000040 34f2990089400140 0124400c00004ced"11
+ "a80000004034f299",12
+ "",13
+ "",14
+15
+ "",16
+ "",17
+ "",18
+19
+ "",20
+ "",21
+ "",22
+23
+ };24
+ uint16_t lenTEST_S1AP_MAX_MESSAGE = {25
+ 46,26
+ 0,27
+ 0,28
+29
+ 0,30
+ 0,31
+ 0,32
+33
+ 0,34
+ 0,35
+ 0,36
+ };37
+ char hexbufOGS_HUGE_LEN;38
+39
+ pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);40
+ ogs_assert(pkbuf);41
+ ogs_pkbuf_put_data(pkbuf,42
+ ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);43
+44
+ return pkbuf;45
+}46
+47
ogs_pkbuf_t *test_s1ap_build_malformed_s1_setup_request(int i)48
{49
ogs_pkbuf_t *pkbuf = NULL;50
open5gs_2.6.4.97.aa746.tar.xz/tests/common/s1ap-build.h -> open5gs_2.6.4.98.a3a68.tar.xz/tests/common/s1ap-build.h
Changed
9
1
2
S1AP_Cause_PR group, long cause);3
4
ogs_pkbuf_t *test_s1ap_build_enb_configuration_transfer(int i);5
+ogs_pkbuf_t *test_s1ap_build_enb_configuration_update(int i);6
7
ogs_pkbuf_t *test_s1ap_build_malformed_s1_setup_request(int i);8
ogs_pkbuf_t *test_s1ap_build_malformed_enb_status_transfer(int i);9