fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27994 )
Change subject: BTS_Tests: workaround addr='0.0.0.0' in f_rtpem_activate()
......................................................................
BTS_Tests: workaround addr='0.0.0.0' in f_rtpem_activate()
If a CRXC message contains optional remote IP and port IEs, the
CRCX ACK received from the BTS is expected to contain its listen
address and port. In some cases osmo-bts may indicate nonsense
addr='0.0.0.0', and indeed the RTP_Emulation component is not gonna
like this. This makes both BTS_Tests.TC_speech_rtp_tch[fh] test
cases fail whenever executed in Docker:
Connection refused (unexpected)
Let's work this around by sending the remote IP and port IEs in
additional MDCX message and omitting them in CRCX. This mimics
osmo-bsc's behavior and makes both test cases pass.
Change-Id: I03453e72f62819989dfe6aa12d8bd889fced1046
Related: OS#5242
---
M bts/BTS_Tests.ttcn
1 file changed, 19 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/27994/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 06fe43b..c2de538 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -2532,16 +2532,28 @@
var PortNumber rtpem_bind_port := mp_rtpem_bind_port;
f_rtpem_bind(RTPEM_CTRL, mp_rtpem_bind_ip, rtpem_bind_port);
- /* Step 3: send CRCX with the configured address/port to the IUT */
- var RSL_Message rsl_pdu := f_rsl_transceive_ret(
- ts_RSL_IPA_CRCX(g_chan_nr, f_inet_addr(mp_rtpem_bind_ip), rtpem_bind_port),
+ /* Step 3a: send CRCX to create an RTP connection at the IUT */
+ var RSL_Message crcx_ack := f_rsl_transceive_ret(
+ /* FIXME (OS#5242): do not include Remote IP/Port IEs because
+ * osmo-bts would respond with nonsense listen addr='0.0.0.0'. */
+ ts_RSL_IPA_CRCX(g_chan_nr, omit, omit),
tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?),
"IPA CRCX ACK");
+ var uint16_t conn_id := crcx_ack.ies[1].body.ipa_conn_id;
- /* Step 4: connect to the IUT's address/port parsed from CRCX ACK */
- var HostName local_addr := f_inet_ntoa(rsl_pdu.ies[2].body.ipa_local_ip);
- var PortNumber local_port := rsl_pdu.ies[3].body.ipa_local_port;
- f_rtpem_connect(RTPEM_CTRL, local_addr, local_port);
+ /* Step 3b: send MDCX with the configured address/port to the IUT */
+ var RSL_Message mdcx_ack := f_rsl_transceive_ret(
+ ts_RSL_IPA_MDCX(g_chan_nr, conn_id,
+ remote_ip := f_inet_addr(mp_rtpem_bind_ip),
+ remote_port := rtpem_bind_port,
+ rtp_pt2 := 0),
+ tr_RSL_IPA_MDCX_ACK(g_chan_nr, conn_id, ?, ?, ?),
+ "IPA MDCX ACK");
+
+ /* Step 4: connect to the IUT's address/port parsed from MDCX ACK */
+ var HostName bts_bind_ip := f_inet_ntoa(mdcx_ack.ies[2].body.ipa_local_ip);
+ var PortNumber bts_bind_port := mdcx_ack.ies[3].body.ipa_local_port;
+ f_rtpem_connect(RTPEM_CTRL, bts_bind_ip, bts_bind_port);
/* Step 5: set the given RTP emulation mode */
f_rtpem_mode(RTPEM_CTRL, mode);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27994
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: I03453e72f62819989dfe6aa12d8bd889fced1046
Gerrit-Change-Number: 27994
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23918 )
Change subject: pcu_sock: comment out {dl,ul}_tbf_ext related warnings
......................................................................
pcu_sock: comment out {dl,ul}_tbf_ext related warnings
The gitlog shows that these warnings were added in
744f745d7a508605254afa8f78412ad410d153b0 by jolly (in 2012!).
As nobody has bothered for the past ten years, degrade them to comments.
Change-Id: Iebf9961cffbd7aa20b263f7dc0016a44782dec60
Related: osmo-bsc.git I9ef7e18f56aa86b48f0ffeec58406260736170f3
---
M src/common/pcu_sock.c
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 9d0d87c..980ed13 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -314,9 +314,9 @@
info_ind->flags |= PCU_IF_FLAG_MCS8;
if (rlcc->cs_mask & (1 << GPRS_MCS9))
info_ind->flags |= PCU_IF_FLAG_MCS9;
-#warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs"
+ /* FIXME: isn't dl_tbf_ext wrong?: * 10 and no ntohs */
info_ind->dl_tbf_ext = rlcc->parameter[T_DL_TBF_EXT];
-#warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs"
+ /* FIXME: isn't ul_tbf_ext wrong?: * 10 and no ntohs */
info_ind->ul_tbf_ext = rlcc->parameter[T_UL_TBF_EXT];
info_ind->initial_cs = rlcc->initial_cs;
info_ind->initial_mcs = rlcc->initial_mcs;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23918
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iebf9961cffbd7aa20b263f7dc0016a44782dec60
Gerrit-Change-Number: 23918
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged