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

[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email ) Change subject: ecu: force alignment of member data in struct osmo_ecu_state ...................................................................... ecu: force alignment of member data in struct osmo_ecu_state The member data[0] in struct osmo_ecu_state is used as an anchor to attach private structs for a concrete ECU implementation. This works by allocating more memory then struct osmo_ecu_state actually needs and then using the excess memory to store the private struct of the concrete ECU implementation. However, thsi poses a problem since data[0] is at the end of the struct it may land in an unaligned position. This also means that the struct we store there is also unaligned. We should fix this by ensuring that data[0] lands at an aligned memory location. Related: OS#6286 Change-Id: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 --- M include/osmocom/codec/ecu.h 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/35212/1 diff --git a/include/osmocom/codec/ecu.h b/include/osmocom/codec/ecu.h index 6492860..7750540 100644 --- a/include/osmocom/codec/ecu.h +++ b/include/osmocom/codec/ecu.h @@ -46,6 +46,7 @@ /* Codec independent ECU state */ struct osmo_ecu_state { enum osmo_ecu_codec codec; + struct {} __attribute__ ((aligned)); uint8_t data[0]; }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in osmo-hnbgw[master]: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side

by osmith

Attention is currently required from: dexter, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email ) Change subject: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?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: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe Gerrit-Change-Number: 35153 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Dec 2023 11:26:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Allow announcing a different mgw-local IuUP address after MDCX

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: Allow announcing a different mgw-local IuUP address after MDCX ...................................................................... hnbgw: Allow announcing a different mgw-local IuUP address after MDCX This will allow emulating an MGW deciding to change its local IuUP IP address due to received remote address in MGCP MDCX, and announce the changed address back in MGCP MDCX. A test validating this scenario against osmo-hnbgw will be added in a follow-up patch. Related: SYS#6657 Change-Id: Ia724e0363a8bab56f5d31e7f7f7a127af584f935 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 27 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 7f2d6c0..d4073d1 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -222,6 +222,8 @@ type record MgwResponse { integer resp, HostName mgw_rtp_ip, + /* if set, used after first received MDCX: */ + HostName mgw_rtp_ip_mdcx optional, PortNumber mgw_rtp_port, MgcpConnectionId mgcp_connection_id } @@ -250,12 +252,14 @@ mgw_conn_ran := { resp := 1, mgw_rtp_ip := "127.1.2.1", + mgw_rtp_ip_mdcx := omit, mgw_rtp_port := 10000, mgcp_connection_id := '11111'H }, mgw_conn_cn := { resp := 1, mgw_rtp_ip := "127.1.2.2", + mgw_rtp_ip_mdcx := omit, mgw_rtp_port := 20000, mgcp_connection_id := '22222'H }, @@ -1271,9 +1275,16 @@ interleave { /* Expect MDCX with IP/port from RAB Assignment Response */ [] MGCP.receive(tr_MDCX(tr_SDP(pars.hnb_rtp_ip, pars.hnb_rtp_port))) -> value mgcp_cmd { + var HostName mgw_rtp_ip; log("MDCX1", mgcp_cmd); + if (ispresent(pars.mgw_conn_ran.mgw_rtp_ip_mdcx)) { + mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip_mdcx; + } else { + mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip; + } + /* Verify SDP of MDCX */ - var SDP_Message sdp := valueof(ts_SDP(pars.mgw_conn_ran.mgw_rtp_ip, pars.mgw_conn_ran.mgw_rtp_ip, hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_ran.mgw_rtp_port, + var SDP_Message sdp := valueof(ts_SDP(mgw_rtp_ip, mgw_rtp_ip, hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_ran.mgw_rtp_port, { int2str(pars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(pars.rtp_payload_type, pars.rtp_sdp_format)), valueof(ts_SDP_ptime(20)) } )); var template MgcpResponse mgcp_rsp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_ran.mgcp_connection_id, sdp); MGCP.send(valueof(mgcp_rsp)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?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: Ia724e0363a8bab56f5d31e7f7f7a127af584f935 Gerrit-Change-Number: 35166 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35167?usp=email ) Change subject: hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg ...................................................................... hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg Change-Id: Ibfc37118ed3a67e4ca3f417273bedba127be7639 Related: SYS#6657 Related: OS#6127 --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/expected-results.xml 2 files changed, 50 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index d4073d1..15fc85f 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -606,7 +606,6 @@ /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ pars.hnb := g_hnb_cfg[pars.hnb_idx]; - pars.mgcp_pars := valueof(t_MgcpParams); vc_conn.start(derefers(fn)(id, pars)); } @@ -993,6 +992,7 @@ cn_idx := f_cn_idx(ps_domain, cn_nr), imsi := f_gen_imsi(imsi_suffix), ps_domain := ps_domain, + mgcp_pars := t_MgcpParams, hnb := omit, /* filled in later */ expect_separate_sccp_cr := expect_separate_sccp_cr, tx_sccp_cr_data_len := tx_sccp_cr_data_len, @@ -1276,9 +1276,13 @@ /* Expect MDCX with IP/port from RAB Assignment Response */ [] MGCP.receive(tr_MDCX(tr_SDP(pars.hnb_rtp_ip, pars.hnb_rtp_port))) -> value mgcp_cmd { var HostName mgw_rtp_ip; + var boolean exp_rua_rab_reass := false; log("MDCX1", mgcp_cmd); if (ispresent(pars.mgw_conn_ran.mgw_rtp_ip_mdcx)) { mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip_mdcx; + if (pars.mgw_conn_ran.mgw_rtp_ip != pars.mgw_conn_ran.mgw_rtp_ip_mdcx) { + exp_rua_rab_reass := true; + } } else { mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip; } @@ -1288,6 +1292,21 @@ { int2str(pars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(pars.rtp_payload_type, pars.rtp_sdp_format)), valueof(ts_SDP_ptime(20)) } )); var template MgcpResponse mgcp_rsp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_ran.mgcp_connection_id, sdp); MGCP.send(valueof(mgcp_rsp)); + + /* If IP address changed, we expect HNBGW to Modify the RAB through RAB-Ass-Req: */ + if (exp_rua_rab_reass) { + var template RAB_SetupOrModifyList rab_sml; + /* Expect RAB Assignment Request with IP/port from MDCX ACK via Iuh */ + rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_ran.mgw_rtp_ip_mdcx), t_RAB_binding_port(pars.mgw_conn_ran.mgw_rtp_port)); + tx := valueof(ts_RANAP_RabAssReq(rab_sml)); + + f_rua_expect(tx); + /* Send back RAB Assignment Response via Iuh */ + rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.hnb_rtp_ip), t_RAB_binding_port(pars.hnb_rtp_port)); + tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); + RUA.send(tx); + /* This shouldn't trigger any MGCP, since nothing changed on the HNB IP side. Continue below. */ + } } /* Handle CRCX for second leg of endpoint, answer with IP/port */ [] MGCP.receive(tr_CRCX(pars.mgcp_ep, tr_SDP(pars.cn_rtp_ip, pars.cn_rtp_port))) -> value mgcp_cmd { @@ -1487,6 +1506,23 @@ f_shutdown_helper(); } +/* Test case where IuUP IP address announced by HNB and updated through MDCX + * makes MGW select a new local IuUP address. HNBGW is expected to update the HNB + * through RAB-Modify-Req. */ +testcase TC_rab_assign_mgw_iuup_addr_chg() runs on test_CT { + var ConnHdlr vc_conn; + g_num_hnbs := 1; + f_init(); + var template (value) TestHdlrParams pars := t_pars(3); + /* Emulate change of local IuUP IP address after rx MDCX: */ + pars.mgcp_pars.mgw_conn_ran.mgw_rtp_ip_mdcx := "127.3.2.1"; + + vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assignment), pars); + vc_conn.done; + + f_shutdown_helper(); +} + /* Create an Iuh connection; send InitialUE; transceive data both directions */ friend function f_tc_ranap_bidir(charstring id, TestHdlrParams pars) runs on ConnHdlr { f_init_handler(pars); @@ -2688,6 +2724,7 @@ execute(TC_rab_release()); execute(TC_rab_assign_fail()); execute(TC_rab_assign_mgcp_to()); + execute(TC_rab_assign_mgw_iuup_addr_chg()); execute(TC_ranap_cs_mo_disconnect()); execute(TC_ranap_ps_mo_disconnect()); diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml index 3b338bf..fb86108 100644 --- a/hnbgw/expected-results.xml +++ b/hnbgw/expected-results.xml @@ -13,6 +13,7 @@ <testcase classname='HNBGW_Tests' name='TC_rab_release' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_rab_assign_fail' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_rab_assign_mgcp_to' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_rab_assign_mgw_iuup_addr_chg' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ranap_cs_mo_disconnect' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ranap_ps_mo_disconnect' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment_without_pfcp' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35167?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: Ibfc37118ed3a67e4ca3f417273bedba127be7639 Gerrit-Change-Number: 35167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35167?usp=email ) Change subject: hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35167?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: Ibfc37118ed3a67e4ca3f417273bedba127be7639 Gerrit-Change-Number: 35167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Dec 2023 11:19:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp-client: Transmit remote IP addr in CRCX if known and port=0

by pespin

Attention is currently required from: dexter, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email ) Change subject: mgcp-client: Transmit remote IP addr in CRCX if known and port=0 ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: we may need to recover some stuff from version 1 of this patch, in order to signal to the osmo-mgw already during CRCX that we want to use codec IuFP even if we don't know the port. This way MGW gains knownledge that it will be an IuUP conn and hence can act specifically (eg. alow rx of IuUP Init without knowing the remote IuUP address). -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I30165dbac5e484011d0acf46af36f105954a501d Gerrit-Change-Number: 35152 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Dec 2023 11:18:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Allow announcing a different mgw-local IuUP address after MDCX

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: hnbgw: Allow announcing a different mgw-local IuUP address after MDCX ...................................................................... hnbgw: Allow announcing a different mgw-local IuUP address after MDCX This will allow emulating an MGW deciding to change its local IuUP IP address due to received remote address in MGCP MDCX, and announce the changed address back in MGCP MDCX. A test validating this scenario against osmo-hnbgw will be added in a follow-up patch. Related: SYS#6657 Change-Id: Ia724e0363a8bab56f5d31e7f7f7a127af584f935 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/35166/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?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: Ia724e0363a8bab56f5d31e7f7f7a127af584f935 Gerrit-Change-Number: 35166 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Allow announcing a different mgw-local IuUP address after MDCX

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?usp=email ) Change subject: hnbgw: Allow announcing a different mgw-local IuUP address after MDCX ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?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: Ia724e0363a8bab56f5d31e7f7f7a127af584f935 Gerrit-Change-Number: 35166 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Dec 2023 11:16:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename record CrcxResponse->MgwResponse

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35165?usp=email ) Change subject: hnbgw: Rename record CrcxResponse->MgwResponse ...................................................................... hnbgw: Rename record CrcxResponse->MgwResponse The previous name is misleading, since they are also used during MDCX. Change-Id: I1ffcb1100b0f92f7175ff08f9d4df49c0cf596b5 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 15 insertions(+), 4 deletions(-) Approvals: osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 67411ff..7f2d6c0 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -219,7 +219,7 @@ sccp_addr_peer := omit } -type record CrcxResponse { +type record MgwResponse { integer resp, HostName mgw_rtp_ip, PortNumber mgw_rtp_port, @@ -230,8 +230,8 @@ integer got_dlcx_count, MgcpCallId mgcp_call_id optional, MgcpEndpoint mgcp_ep, - CrcxResponse mgw_conn_ran, - CrcxResponse mgw_conn_cn, + MgwResponse mgw_conn_ran, + MgwResponse mgw_conn_cn, uint7_t rtp_payload_type, charstring rtp_sdp_format, HostName hnb_rtp_ip, @@ -1131,7 +1131,7 @@ * Return true when an OK reply was sent, false otherwise. * Count occurrence of Osmux, include Osmux parameters in the reply if necessary. */ function f_handle_crcx(inout MgcpParameters pars, MgcpCommand mgcp_cmd) return template MgcpResponse { - var CrcxResponse conn := pars.mgw_conn_ran; + var MgwResponse conn := pars.mgw_conn_ran; if (pars.got_crcx_count > 0) { conn := pars.mgw_conn_cn; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35165?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: I1ffcb1100b0f92f7175ff08f9d4df49c0cf596b5 Gerrit-Change-Number: 35165 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename mgcp conns to reflect each side peer

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35164?usp=email ) Change subject: hnbgw: Rename mgcp conns to reflect each side peer ...................................................................... hnbgw: Rename mgcp conns to reflect each side peer Change-Id: Ie68d0397a56d48223fb4b1ffe1710f988518257f --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 19 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 5bcd40c..67411ff 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -230,8 +230,8 @@ integer got_dlcx_count, MgcpCallId mgcp_call_id optional, MgcpEndpoint mgcp_ep, - CrcxResponse mgw_conn_1, - CrcxResponse mgw_conn_2, + CrcxResponse mgw_conn_ran, + CrcxResponse mgw_conn_cn, uint7_t rtp_payload_type, charstring rtp_sdp_format, HostName hnb_rtp_ip, @@ -247,13 +247,13 @@ got_dlcx_count := 0, mgcp_call_id := omit, mgcp_ep := "rtpbridge/1@mgw", - mgw_conn_1 := { + mgw_conn_ran := { resp := 1, mgw_rtp_ip := "127.1.2.1", mgw_rtp_port := 10000, mgcp_connection_id := '11111'H }, - mgw_conn_2 := { + mgw_conn_cn := { resp := 1, mgw_rtp_ip := "127.1.2.2", mgw_rtp_port := 20000, @@ -1131,9 +1131,9 @@ * Return true when an OK reply was sent, false otherwise. * Count occurrence of Osmux, include Osmux parameters in the reply if necessary. */ function f_handle_crcx(inout MgcpParameters pars, MgcpCommand mgcp_cmd) return template MgcpResponse { - var CrcxResponse conn := pars.mgw_conn_1; + var CrcxResponse conn := pars.mgw_conn_ran; if (pars.got_crcx_count > 0) { - conn := pars.mgw_conn_2; + conn := pars.mgw_conn_cn; } pars.got_crcx_count := pars.got_crcx_count + 1; @@ -1252,7 +1252,7 @@ T.stop; /* Expect RAB Assignment Request with IP/port from CRCX ACK via Iuh */ - rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_1.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_1.mgw_rtp_port)); + rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_ran.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_ran.mgw_rtp_port)); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); f_rua_expect(tx); @@ -1273,9 +1273,9 @@ [] MGCP.receive(tr_MDCX(tr_SDP(pars.hnb_rtp_ip, pars.hnb_rtp_port))) -> value mgcp_cmd { log("MDCX1", mgcp_cmd); /* Verify SDP of MDCX */ - var SDP_Message sdp := valueof(ts_SDP(pars.mgw_conn_1.mgw_rtp_ip, pars.mgw_conn_1.mgw_rtp_ip, hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_1.mgw_rtp_port, + var SDP_Message sdp := valueof(ts_SDP(pars.mgw_conn_ran.mgw_rtp_ip, pars.mgw_conn_ran.mgw_rtp_ip, hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_ran.mgw_rtp_port, { int2str(pars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(pars.rtp_payload_type, pars.rtp_sdp_format)), valueof(ts_SDP_ptime(20)) } )); - var template MgcpResponse mgcp_rsp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_1.mgcp_connection_id, sdp); + var template MgcpResponse mgcp_rsp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_ran.mgcp_connection_id, sdp); MGCP.send(valueof(mgcp_rsp)); } /* Handle CRCX for second leg of endpoint, answer with IP/port */ @@ -1288,7 +1288,7 @@ } /* Expect RAB Assignment Response with IP/port from second CRCX ACK */ - rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_2.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_2.mgw_rtp_port)); + rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_cn.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_cn.mgw_rtp_port)); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); f_bssap_expect(tx); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35164?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: Ie68d0397a56d48223fb4b1ffe1710f988518257f Gerrit-Change-Number: 35164 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023