November 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: logging: ensure ANSI color escape is sent in same line/before newline
by manawyrm 07 Nov '23

07 Nov '23

manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34975?usp=email ) Change subject: logging: ensure ANSI color escape is sent in same line/before newline ...................................................................... logging: ensure ANSI color escape is sent in same line/before newline This fixes multi-line color clobbering in logging daemons like systemd-journald, which work with single-lines only. Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433 --- M src/core/logging.c 1 file changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/34975/1 diff --git a/src/core/logging.c b/src/core/logging.c index c6774f5..87654ac 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -616,7 +616,15 @@ } if (target->use_color && c_subsys) { - ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END); + /* Ensure the last color escape is sent before the newline + * (to not clobber journald, which works on single-lines only) */ + if (offset > 0 && buf[offset - 1] == '\n') { + offset--; rem++; + ret = snprintf(buf + offset, rem, "%s\n", OSMO_LOGCOLOR_END); + } else { + ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END); + } + if (ret < 0) goto err; OSMO_SNPRINTF_RET(ret, rem, offset, len); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34975?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433 Gerrit-Change-Number: 34975 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-hnbgw[master]: allow (second) CS RAB Assignment Request without RTP info
by neels 07 Nov '23

07 Nov '23

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email ) Change subject: allow (second) CS RAB Assignment Request without RTP info ...................................................................... Patch Set 4: (1 comment) File src/osmo-hnbgw/mgw_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974/comment/6f2e7d39_73a803b2 PS3, Line 768: if (map->mgw_fi && is_rab_ass_without_tli(map, message)) { > hmm i guess we don't need the 'map->mgw_fi' condition -- when a RAB Assignment has no RTP address, t […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Nov 2023 03:38:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-hnbgw[master]: allow (second) CS RAB Assignment Request without RTP info
by neels 07 Nov '23

07 Nov '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: allow (second) CS RAB Assignment Request without RTP info ...................................................................... allow (second) CS RAB Assignment Request without RTP info In the field, we've encountered a so far unsupported scenario: after a RAB Assignment Request and Response have successfully set up an RTP stream, the CN sends *another* RAB Assignment Request to modify some SDU parameters, omitting the transportLayerInformation IE (not modifying the RTP address). Directly forward all RAB Assignment Requests that have no RTP information. This covers above use case, and also generally applies: no RTP info means nothing to tell the MGW about. Do not (yet?) support modifying the RTP address/port. Related: osmo-ttcn3-hacks Iadaba0e5e82ad6d163ad509904ede213e2462d5c Related: SYS#6624 Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/74/34974/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
by neels 07 Nov '23

07 Nov '23

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email ) Change subject: allow second CS RAB Assignment Request ...................................................................... Patch Set 3: (1 comment) File src/osmo-hnbgw/mgw_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974/comment/51bfab18_35e55f31 PS3, Line 768: if (map->mgw_fi && is_rab_ass_without_tli(map, message)) { hmm i guess we don't need the 'map->mgw_fi' condition -- when a RAB Assignment has no RTP address, then there is by definition nothing to do with it in osmo-hnbgw, so we can just forward those without requiring that a working RAB is already set up. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Nov 2023 03:31:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
by neels 07 Nov '23

07 Nov '23

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: allow second CS RAB Assignment Request ...................................................................... allow second CS RAB Assignment Request In the field, we've encountered a so far unsupported scenario: after a RAB Assignment Request and Response have successfully set up an RTP stream, the CN sends *another* RAB Assignment Request to modify some SDU parameters, omitting the transportLayerInformation IE (not modifying the RTP address). Detect a secondary RAB Assignment Request, and just forward it as-is: the hNodeB is interested in the RAB configuration, osmo-hnbgw just needs the RTP info, which is not even present in this use case. Do not (yet?) support modifying the RTP address/port. Related: osmo-ttcn3-hacks Iadaba0e5e82ad6d163ad509904ede213e2462d5c Related: SYS#6624 Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/74/34974/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ttcn3-hacks[master]: add HNBGW_Tests.TC_second_rab_assignment
by neels 07 Nov '23

07 Nov '23

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34973?usp=email ) Change subject: add HNBGW_Tests.TC_second_rab_assignment ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34973?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iadaba0e5e82ad6d163ad509904ede213e2462d5c Gerrit-Change-Number: 34973 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Nov 2023 03:23:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
by Jenkins Builder 07 Nov '23

07 Nov '23

Attention is currently required from: neels. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email ) Change subject: allow second CS RAB Assignment Request ...................................................................... Patch Set 2: (1 comment) File src/osmo-hnbgw/mgw_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12307): https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974/comment/1bcedfcb_86f42812 PS2, Line 765: /* After a normal RAB Assignment, another RAB Assigment may follow, modifying some RAB parameters. This second 'Assigment' may be misspelled - perhaps 'Assignment'? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Nov 2023 03:14:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
by Jenkins Builder 07 Nov '23

07 Nov '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email ) Change subject: allow second CS RAB Assignment Request ...................................................................... Patch Set 1: (1 comment) File src/osmo-hnbgw/mgw_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12305): https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974/comment/8d4016f4_cf67729d PS1, Line 765: /* After a normal RAB Assignment, another RAB Assigment may follow, modifying some RAB parameters. This second 'Assigment' may be misspelled - perhaps 'Assignment'? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Nov 2023 03:03:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
by neels 07 Nov '23

07 Nov '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email ) Change subject: allow second CS RAB Assignment Request ...................................................................... allow second CS RAB Assignment Request In the field, we've encountered a so far unsupported scenario: after a RAB Assignment Request and Response have successfully set up an RTP stream, the CN sends *another* RAB Assignment Request to modify some SDU parameters, omitting the transportLayerInformation IE (not modifying the RTP address). Detect a secondary RAB Assignment Request, and just forward it as-is: the hNodeB is interested in the RAB configuration, osmo-hnbgw just needs the RTP info, which is not even present in this use case. Do not (yet?) support modifying the RTP address/port. Related: osmo-ttcn3-hacks Iadaba0e5e82ad6d163ad509904ede213e2462d5c Related: SYS#6624 Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/74/34974/1 diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index ddab0b5..3bbd8c6 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -683,6 +683,47 @@ return 0; } +static bool is_rab_ass_without_tli(struct hnbgw_context_map *map, ranap_message *message) +{ + RANAP_RAB_AssignmentRequestIEs_t *ies; + RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; + RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; + RANAP_RAB_SetupOrModifyItemFirst_t _rab_setup_or_modify_item_first = { 0 }; + RANAP_RAB_SetupOrModifyItemFirst_t *rab_setup_or_modify_item_first = &_rab_setup_or_modify_item_first; + int rc; + bool ret; + + ies = &message->msg.raB_AssignmentRequestIEs; + + if (!(ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT)) + return false; + + /* Detect the end of the list */ + if (ies->raB_SetupOrModifyList.list.count < 1) + return false; + + protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[0]; + protocol_ie_field_pair = protocol_ie_container_pair->list.array[0]; + + if (!protocol_ie_field_pair) + return false; + + if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) { + RANAP_DEBUG + ("Decoding failed, the protocol IE field-pair is not of type RANAP RAB setup-or-modify-item!\n"); + return false; + } + + rc = ranap_decode_rab_setupormodifyitemfirst(rab_setup_or_modify_item_first, + &protocol_ie_field_pair->firstValue); + if (rc < 0) + return false; + + ret = rab_setup_or_modify_item_first->transportLayerInformation == NULL; + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, rab_setup_or_modify_item_first); + return ret; +} + /* Check if the message contains a RAB-ReleaseItem that matches the RAB-ID that is managed by the given context map */ static bool is_our_rab_release(struct hnbgw_context_map *map, ranap_message *message) { @@ -721,6 +762,14 @@ initialized = true; } + /* After a normal RAB Assignment, another RAB Assigment may follow, modifying some RAB parameters. This second + * RAB Assignment may omit transportLayerInformation (remains unchanged). Simply forward this to RUA, without + * the need to adjust anything here. Allow this only when there already is an mgw_fsm with proper address. */ + if (map->mgw_fi && is_rab_ass_without_tli(map, message)) { + LOG_MAP(map, DCN, LOGL_INFO, "Rx secondary RAB Assignment Request, forwarding as-is\n"); + return map_rua_dispatch(map, MAP_RUA_EV_TX_DIRECT_TRANSFER, ranap_msg); + } + /* The RTP stream negotiation usually begins with a RAB-AssignmentRequest and ends with an IU-Release, however * it may also be that the MSC decides to release the RAB with a dedicated RAB-AssignmentRequest that contains * a ReleaseList. In this case an FSM will already be present. */ @@ -791,6 +840,13 @@ return -1; } + if (map->mgw_fi->state == MGW_ST_ESTABLISHED) { + /* This is a response to a second RAB Assignment Request, which only modified some RAB config on top of + * an earlier RAB Assignment. Just forward the response as-is, we already have our MGW set up and need + * no info from it. (i.e. we don't support modifying the RTP address.) */ + return map_sccp_dispatch(map, MAP_SCCP_EV_TX_DATA_REQUEST, ranap_msg); + } + mgw_fsm_priv = map->mgw_fi->priv; talloc_steal(mgw_fsm_priv, ranap_msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: HNBGW_Tests.TC_second_rab_assignment
by neels 07 Nov '23

07 Nov '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34973?usp=email ) Change subject: HNBGW_Tests.TC_second_rab_assignment ...................................................................... HNBGW_Tests.TC_second_rab_assignment Related: SYS#6624 Change-Id: Iadaba0e5e82ad6d163ad509904ede213e2462d5c --- M hnbgw/HNBGW_Tests.ttcn M library/ranap/RANAP_Templates.ttcn 2 files changed, 172 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/34973/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 505beab..c80ef89 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -2596,6 +2596,130 @@ f_shutdown_helper(); } +/* When a HNB that is connected does another HNB Register, make sure the SCCP links for all its UEs are disconnected in + * reasonable time. */ +friend function f_tc_hnb_reregister_cleanup_sccp(charstring id, TestHdlrParams pars) runs on ConnHdlr { + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + + f_init_handler(pars, t_guard := 30.0); + + /* TODO: HNBAP UE REGISTER */ + //HNBAP.send(ts_HNBAP_UERegister()) + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + f_create_rab(pars.mgcp_pars); + + f_verify_talloc_count(HNBGWVTY, { + "sccp_connection", "hnbgw_context_map" //, "ue_context" + /* TODO: "ue_context" should also be 1, but these tests fail to do HNBAP UE REGISTER */ + }, expect_count := 1, attempts := 5); + f_sleep(1.0); + + /* Trigger cleanup of HNB, by sending another HNBAP HNB Register Request */ + var integer cell_id := g_pars.hnb_idx; + HNBAP.send(ts_HNBAP_HNBRegisterRequest(char2oct("TTCN3 HNodeB"), + '00F110'O, + int2bit(1 + cell_id, 28), + int2oct(2, 2), + int2oct(3, 1), + int2oct(4, 2))); + + /* At this point I would like to confirm that SCCP was released by osmo-hnbgw: + * SCCP.receive(RLSD) + * But this seems completely impossible. SCCP_Emulation handles RLSD internally without letting any other layers + * know about it, and it seems impossible to check whether an SCCP connection exists, either. + * + * Since that doesn't work, I am only checking whether the talloc report has any sccp_connection instances left. */ + + timer T := 10.0; + T.start; + alt { + [] as_mgcp_dlcx(pars) {} + [] T.timeout { + setverdict(fail, "Timeout waiting for DLCX"); + mtc.stop; + } + } + f_sleep(3.0); + f_verify_talloc_count(HNBGWVTY, { + "sccp_connection", "hnbgw_context_map" //, "ue_context" + }, expect_count := 0); +} + +testcase TC_hnb_reregister_cleanup_sccp() runs on test_CT { + var ConnHdlr vc_conn; + g_num_hnbs := 1; + f_init(); + + vc_conn := f_start_handler_with_pars(refers(f_tc_hnb_reregister_cleanup_sccp), t_pars(8)); + vc_conn.done; + + f_shutdown_helper(); +} + +/* In the field, we encountered a "normal" RAB Assignment that concludes successfully, followed by another RAB + * Assignment that has different SDU subflow parameters, and does not contain RTP information. At the time of writing, + * it seems that the second RAB Assignment causes a crash. Play through this scenario. */ +friend function f_tc_second_rab_assignment(charstring id, TestHdlrParams pars) runs on ConnHdlr { + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + timer T := 5.0; + + f_init_handler(pars); + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + f_create_rab(pars.mgcp_pars); + + /* Now send a second RAB Assignment with different subflows and omitting transportLayerAddress. (Assuming the + * first RAB Assignment's transportLayerAddress remains in use unchanged.) */ + var template RAB_SetupOrModifyList rab_sml; + rab_sml := ts_RAB_SML2(t_RAB_id(23), + ts_RabParams, + user_plane_info := omit, + transport_layer_info := omit); + tx := valueof(ts_RANAP_RabAssReq(rab_sml)); + BSSAP.send(tx); + T.start; + + // TODO: expect response + + f_sleep(5.0); + + /* Send Iu Release */ + tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); + f_iu2iuh(tx); + + T.start; + alt { + [] as_mgcp_dlcx(pars) {} + [] T.timeout { + setverdict(fail, "Timeout waiting for DLCX"); + } + } + + tx := valueof(ts_RANAP_IuReleaseComplete()); + f_iuh2iu(tx); +} + +testcase TC_second_rab_assignment() runs on test_CT { + var ConnHdlr vc_conn; + g_num_hnbs := 1; + f_init(); + + vc_conn := f_start_handler_with_pars(refers(f_tc_second_rab_assignment), t_pars(3)); + vc_conn.done; + + f_shutdown_helper(); +} + control { execute(TC_hnb_register()); execute(TC_hnb_register_duplicate()); @@ -2643,6 +2767,8 @@ execute( TC_sgsnpool_sccp_n_pcstate_detaches_cnlink() ); execute( TC_sgsnpool_sccp_n_pcstate_attaches_cnlink() ); + execute(TC_second_rab_assignment()); + /* Run at the end since it makes osmo-hnbgw <= 1.3.0 crash: OS#5676 */ execute(TC_hnb_reregister_reuse_sctp_assoc()); diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 051195f..a713e2d 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -1331,6 +1331,42 @@ } } } +/* Like ts_RAB_SML(), but more control on presence/absence of individual IEs */ +template (value) RAB_SetupOrModifyList ts_RAB_SML2( + template (value) RAB_ID rab_id, + template (omit) RAB_Parameters rab_params, + template (omit) UserPlaneInformation user_plane_info, + template (omit) TransportLayerInformation transport_layer_info + ) := { { + { + id := id_RAB_SetupOrModifyItem, + firstCriticality := reject, + firstValue := { + rAB_SetupOrModifyItemFirst := { + rAB_ID := rab_id, + nAS_SynchronisationIndicator := omit, + rAB_Parameters := rab_params, + userPlaneInformation := user_plane_info, + transportLayerInformation := transport_layer_info, + service_Handover := omit, + iE_Extensions := omit + } + }, + secondCriticality := ignore, + secondValue := { + rAB_SetupOrModifyItemSecond := { + pDP_TypeInformation := omit, + dataVolumeReportingIndication := omit, + dl_GTP_PDU_SequenceNumber := omit, + ul_GTP_PDU_SequenceNumber := omit, + dl_N_PDU_SequenceNumber := omit, + ul_N_PDU_SequenceNumber := omit, + iE_Extensions := omit + } + } + } +} } + template (value) TransportLayerInformation ts_TLI_ps(template (value) TransportLayerAddress tla, template (value) GTP_TEI gtp_tei) := { transportLayerAddress := tla, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34973?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iadaba0e5e82ad6d163ad509904ede213e2462d5c Gerrit-Change-Number: 34973 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0