- gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: abis_nm: run gsm_bts_check_cfg during oml bring up
by osmith 03 May '22

03 May '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28023 ) Change subject: abis_nm: run gsm_bts_check_cfg during oml bring up ...................................................................... abis_nm: run gsm_bts_check_cfg during oml bring up Don't wait until RSL link goes up to check the reported features against the config. Do it in the OML bring up right after the features are reported. Related: SYS#5922, OS#5538 Change-Id: I6b1b4ef3e163528ed186050d848ec089a4315a7c --- M src/osmo-bsc/abis_nm.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/28023/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index bb44c70..f467d16 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -730,6 +730,12 @@ else rc = parse_attr_resp_info_attr(bts, trx, foh, &tp); + if (gsm_bts_check_cfg(bts) != 0) { + LOGP(DLINP, LOGL_ERROR, "(bts=%u) BTS config invalid, dropping BTS!\n", bts->nr); + ipaccess_drop_oml_deferred(bts); + return -EINVAL; + } + osmo_signal_dispatch(SS_NM, S_NM_GET_ATTR_REP, mb); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6b1b4ef3e163528ed186050d848ec089a4315a7c Gerrit-Change-Number: 28023 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-remsim[master]: cosmetic: various typo/spelling fixes
by laforge 03 May '22

03 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28022 ) Change subject: cosmetic: various typo/spelling fixes ...................................................................... cosmetic: various typo/spelling fixes Change-Id: Idc4db138d83be0c7c0b0ff6dfbb9f094b21d6fa9 --- M src/bankd/bankd_main.c M src/client/main_fsm.c M src/client/user_ifdhandler.c M src/rspro_client_fsm.c 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/22/28022/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 012b48c..a96869f 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -82,7 +82,7 @@ asn_debug = 0; - /* intialize members of 'bankd' */ + /* initialize members of 'bankd' */ bankd->slotmaps = slotmap_init(bankd); INIT_LLIST_HEAD(&bankd->workers); pthread_mutex_init(&bankd->workers_mutex, NULL); diff --git a/src/client/main_fsm.c b/src/client/main_fsm.c index f8b1406..0aa7429 100644 --- a/src/client/main_fsm.c +++ b/src/client/main_fsm.c @@ -70,7 +70,7 @@ env[i++] = talloc_asprintf(env, "REMSIM_CAUSE=%s", cause); - /* ask frontend to append any frontend-speccific additional environment vars */ + /* ask frontend to append any frontend-specific additional environment vars */ rc = frontend_append_script_env(bc, env, i, 256-i-1); if (rc > 0) i = rc; diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c index f3e5489..60adfdb 100644 --- a/src/client/user_ifdhandler.c +++ b/src/client/user_ifdhandler.c @@ -111,7 +111,7 @@ void __thread *talloc_asn1_ctx; struct client_thread { - /* bankd client runningi inside this thread */ + /* bankd client running inside this thread */ struct bankd_client *bc; /* inter-thread osmo-fd; communication with IFD/PCSC thread */ @@ -132,7 +132,7 @@ int it_sock_fd; }; -/* enqueue a msgb (containg 'struct itmsg') towards the IFD-handler thread */ +/* enqueue a msgb (containing 'struct itmsg') towards the IFD-handler thread */ static void enqueue_to_ifd(struct client_thread *ct, struct msgb *msg) { if (!msg) diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index c0336b7..bd07330 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -94,11 +94,11 @@ } enum server_conn_fsm_state { - /* waiting for initial connectiong to remsim-server */ + /* waiting for initial connection to remsim-server */ SRVC_ST_INIT, /* server connection established, waiting for ClientConnectRes */ SRVC_ST_ESTABLISHED, - /* server connection etsablished, ClientConnect succeeded */ + /* server connection established, ClientConnect succeeded */ SRVC_ST_CONNECTED, /* connection lost, we're waiting for a re-establish */ SRVC_ST_REESTABLISH, -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idc4db138d83be0c7c0b0ff6dfbb9f094b21d6fa9 Gerrit-Change-Number: 28022 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: debian-bullseye-build: add libmnl-dev
by osmith 03 May '22

03 May '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28021 ) Change subject: debian-bullseye-build: add libmnl-dev ...................................................................... debian-bullseye-build: add libmnl-dev As required by libosmocore, e.g. when building programs directly in this container with osmo-dev.git/ttcn3/ttcn3.sh. Change-Id: I4cd05ef2c164dfb765ee365ab38b8dfd4f955ac6 --- M debian-bullseye-build/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/21/28021/1 diff --git a/debian-bullseye-build/Dockerfile b/debian-bullseye-build/Dockerfile index 14f5625..baeba30 100644 --- a/debian-bullseye-build/Dockerfile +++ b/debian-bullseye-build/Dockerfile @@ -37,6 +37,7 @@ libgnutls28-dev \ libgps-dev \ libgsm1-dev \ + libmnl-dev \ libncurses5-dev \ libnewlib-arm-none-eabi \ libortp-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4cd05ef2c164dfb765ee365ab38b8dfd4f955ac6 Gerrit-Change-Number: 28021 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: ttcn3-bsc-test: set osmo-bts-omldummy features
by laforge 03 May '22

03 May '22

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28005 ) Change subject: ttcn3-bsc-test: set osmo-bts-omldummy features ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib22f25431330676d59900de7bfb3d89e7872baf1 Gerrit-Change-Number: 28005 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 May 2022 13:27:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-remsim[master]: encode actual hostname in RSPRO
by laforge 03 May '22

03 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28020 ) Change subject: encode actual hostname in RSPRO ...................................................................... encode actual hostname in RSPRO The RSPRO ComponentIdentity includes a 'name' for each remsim component. So far we always used "fixme-name" instead of something meaningful. Let's use the hostname of the system instead. Change-Id: I14925f16ae242dae89fa853a2fe31c5c1b32981d --- M src/bankd/bankd_main.c M src/client/user_ifdhandler.c M src/server/remsim_server.c 3 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/20/28020/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index d8dab03..012b48c 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -59,6 +59,7 @@ __thread void *talloc_asn1_ctx; struct bankd *g_bankd; static void *g_tall_ctx; +static char g_hostname[256]; static void *worker_main(void *arg); @@ -91,7 +92,7 @@ bankd->srvc.bankd.num_slots = 8; bankd->comp_id.type = ComponentType_remsimBankd; - OSMO_STRLCPY_ARRAY(bankd->comp_id.name, "fixme-name"); + OSMO_STRLCPY_ARRAY(bankd->comp_id.name, g_hostname); OSMO_STRLCPY_ARRAY(bankd->comp_id.software, "remsim-bankd"); OSMO_STRLCPY_ARRAY(bankd->comp_id.sw_version, PACKAGE_VERSION); /* FIXME: other members of app_comp_id */ @@ -363,6 +364,9 @@ g_bankd = talloc_zero(NULL, struct bankd); OSMO_ASSERT(g_bankd); + if (gethostname(g_hostname, sizeof(g_hostname)) < 0) + strncpy(g_hostname, "unknown", sizeof(g_hostname)); + bankd_init(g_bankd); srvc = &g_bankd->srvc; @@ -370,7 +374,7 @@ srvc->server_port = 9998; srvc->handle_rx = bankd_srvc_handle_rx; srvc->own_comp_id.type = ComponentType_remsimBankd; - OSMO_STRLCPY_ARRAY(srvc->own_comp_id.name, "fixme-name"); + OSMO_STRLCPY_ARRAY(srvc->own_comp_id.name, g_hostname); OSMO_STRLCPY_ARRAY(srvc->own_comp_id.software, "remsim-bankd"); OSMO_STRLCPY_ARRAY(srvc->own_comp_id.sw_version, PACKAGE_VERSION); diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c index 551db00..f3e5489 100644 --- a/src/client/user_ifdhandler.c +++ b/src/client/user_ifdhandler.c @@ -125,7 +125,6 @@ /* configuration of client thread; passed in from IFD thread */ struct client_thread_cfg { - const char *name; const char *server_host; int server_port; int client_id; @@ -367,8 +366,12 @@ struct client_thread_cfg *cfg = arg; struct client_config *ccfg; struct client_thread *ct; + char hostname[256]; int rc; + if (gethostname(hostname, sizeof(hostname)) < 0) + strncpy(hostname, "unknown", sizeof(hostname)); + osmo_select_init(); rc = osmo_ctx_init("client"); OSMO_ASSERT(rc == 0); @@ -387,7 +390,7 @@ if (!talloc_asn1_ctx) talloc_asn1_ctx= talloc_named_const(ct, 0, "asn1"); - ct->bc = remsim_client_create(ct, cfg->name, "remsim_ifdhandler", ccfg); + ct->bc = remsim_client_create(ct, hostname, "remsim_ifdhandler", ccfg); OSMO_ASSERT(ct->bc); ct->bc->data = ct; @@ -560,7 +563,6 @@ { struct ifd_client *ic; struct client_thread_cfg cfg = { - .name = "fixme-name", .server_host = "127.0.0.1", .server_port = -1, .client_id = 0, diff --git a/src/server/remsim_server.c b/src/server/remsim_server.c index c2d54e5..a2c1a8c 100644 --- a/src/server/remsim_server.c +++ b/src/server/remsim_server.c @@ -80,9 +80,13 @@ int main(int argc, char **argv) { + char hostname[256]; void *talloc_rest_ctx; int rc; + if (gethostname(hostname, sizeof(hostname)) < 0) + strncpy(hostname, "unknown", sizeof(hostname)); + g_tall_ctx = talloc_named_const(NULL, 0, "global"); talloc_asn1_ctx = talloc_named_const(g_tall_ctx, 0, "asn1"); talloc_rest_ctx = talloc_named_const(g_tall_ctx, 0, "rest"); @@ -106,7 +110,7 @@ goto out_rspro; g_rps->comp_id.type = ComponentType_remsimServer; - OSMO_STRLCPY_ARRAY(g_rps->comp_id.name, "fixme-name"); + OSMO_STRLCPY_ARRAY(g_rps->comp_id.name, hostname); OSMO_STRLCPY_ARRAY(g_rps->comp_id.software, "remsim-server"); OSMO_STRLCPY_ARRAY(g_rps->comp_id.sw_version, PACKAGE_VERSION); /* FIXME: other members of app_comp_id */ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I14925f16ae242dae89fa853a2fe31c5c1b32981d Gerrit-Change-Number: 28020 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: ttcn3-bsc-test: set osmo-bts-omldummy features
by osmith 03 May '22

03 May '22

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28005 ) Change subject: ttcn3-bsc-test: set osmo-bts-omldummy features ...................................................................... Patch Set 2: (1 comment) This change is ready for review. File ttcn3-bsc-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/28005/comment/fcd19f6e_325… PS1, Line 48: -f CCN > I had to add backslashes here to have it passed properly to osmo-bts-omldummy. syntax fixed -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib22f25431330676d59900de7bfb3d89e7872baf1 Gerrit-Change-Number: 28005 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 May 2022 13:12:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: bsc: Fix dangling subscriber talloc ctx in f_TC_paging_Nreq
by pespin 03 May '22

03 May '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28007 ) Change subject: bsc: Fix dangling subscriber talloc ctx in f_TC_paging_Nreq ...................................................................... bsc: Fix dangling subscriber talloc ctx in f_TC_paging_Nreq First, page only on BTS0, not all the BTS. This simplifies the test and also makes the subscriber be refcounted only on BTS0. Then, drop the OML connection after receiving all the expected paging requests; it will make the BSC flush the paging queue and hence avoid TTCN3 checks erroring due to dangling subscriber talloc contexts. Change-Id: Ibbd9168f3ac2c1cd4f4577644d75499d49c2823f --- M bsc/BSC_Tests.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f514c43..b35d316 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3607,8 +3607,10 @@ } for (i := 0; i < num_subscribers; i := i + 1) { + /* Page on LAC-CI of BTS0: */ BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, - ts_BSSMAP_Paging(imsis[i], valueof(ts_BSSMAP_CIL_noCell), omit, omit))); + ts_BSSMAP_Paging(imsis[i], valueof(ts_BSSMAP_CIL_LAC_CI({ts_BSSMAP_CI_LAC_CI(1, 0)})), + omit, omit))); } T_rx.start; @@ -3645,6 +3647,9 @@ } } + /* Drop OML connection to have all paging requests flushed: */ + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + f_shutdown_helper(); } /* Verify BSC can schedule 500 paging requests under one minute if BTS buffer is good enough */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28007 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: Ibbd9168f3ac2c1cd4f4577644d75499d49c2823f Gerrit-Change-Number: 28007 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: add TC_ipa_crcx_ack_addr reproducing OS#5242
by laforge 03 May '22

03 May '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27995 ) Change subject: BTS_Tests: add TC_ipa_crcx_ack_addr reproducing OS#5242 ...................................................................... BTS_Tests: add TC_ipa_crcx_ack_addr reproducing OS#5242 Change-Id: Ic85904c967238555a6243a3df2d9225b957d5a5c Related: OS#5242 --- M bts/BTS_Tests.ttcn 1 file changed, 34 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c2de538..5837a03 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5036,6 +5036,39 @@ vc_conn.done; } +/* Make sure that CRCX ACK contains a valid listen address (see OS#5242) */ +private function f_TC_ipa_crcx_ack_addr(charstring id) runs on ConnHdlr { + var OCT4 bind_ip := f_inet_addr("192.168.1.1"); + var PortNumber bind_port := 16811; + var RSL_Message crcx_ack; + + crcx_ack := f_rsl_transceive_ret(ts_RSL_IPA_CRCX(g_chan_nr, bind_ip, bind_port), + tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?), + "IPA CRCX ACK"); + var HostName bts_bind_ip := f_inet_ntoa(crcx_ack.ies[2].body.ipa_local_ip); + if (match(bts_bind_ip, "0.0.0.0")) { + setverdict(fail, "CRCX ACK indicates nonsense addr ", bts_bind_ip); + } + + var uint16_t conn_id := crcx_ack.ies[1].body.ipa_conn_id; + f_rsl_transceive(ts_RSL_IPA_DLCX(g_chan_nr, conn_id), + tr_RSL_IPA_DLCX_ACK(g_chan_nr, ?, ?), + "IPA DLCX ACK"); +} +testcase TC_ipa_crcx_ack_addr() runs on test_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init(); + + pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM1))); + vc_conn := f_start_handler(refers(f_TC_ipa_crcx_ack_addr), pars); + vc_conn.done; + + pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), ts_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM1))); + vc_conn := f_start_handler(refers(f_TC_ipa_crcx_ack_addr), pars); + vc_conn.done; +} + /*********************************************************************** * PCU Socket related tests @@ -8558,6 +8591,7 @@ execute( TC_ipa_crcx_mdcx_dlcx_not_active() ); execute( TC_ipa_crcx_mdcx_mdcx_dlcx_not_active() ); execute( TC_ipa_crcx_sdcch_not_active() ); + execute( TC_ipa_crcx_ack_addr() ); if (mp_pcu_socket != "") { execute( TC_paging_imsi_200percent_with_ps() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27995 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: Ic85904c967238555a6243a3df2d9225b957d5a5c Gerrit-Change-Number: 27995 Gerrit-PatchSet: 3 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

1 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: workaround addr='0.0.0.0' in f_rtpem_activate()
by laforge 03 May '22

03 May '22

laforge has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified 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: 3 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

1 0

Change in osmo-ttcn3-hacks[master]: library/RSL_Types: allow omitting IEs in ts_RSL_IPA_CRCX
by laforge 03 May '22

03 May '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27993 ) Change subject: library/RSL_Types: allow omitting IEs in ts_RSL_IPA_CRCX ...................................................................... library/RSL_Types: allow omitting IEs in ts_RSL_IPA_CRCX Change-Id: I7c36c3de1716968bccb07b03d2141d9abb3c175f Related: OS#5242 --- M library/RSL_Types.ttcn 1 file changed, 36 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index ccd43e6..b04a13a 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -2092,6 +2092,39 @@ /* Abis/IP specific messages */ + private function f_ts_RSL_IPA_CRCX_IEs(template (value) RslChannelNr chan_nr, + template (omit) OCT4 remote_ip, + template (omit) uint16_t remote_port) + return RSL_IE_List { + var RSL_IE_List ies; + + /* Channel Number is a mandatory IE */ + ies := { + valueof(RSL_IE:{ + iei := RSL_IE_CHAN_NR, + body := { chan_nr := chan_nr } + }) + }; + /* Remote IP / Port are optional IEs */ + if (not istemplatekind(remote_ip, "omit")) { + ies := ies & { + valueof(RSL_IE:{ + iei := RSL_IE_IPAC_REMOTE_IP, + body := { ipa_remote_ip := remote_ip } + }) + }; + } + if (not istemplatekind(remote_port, "omit")) { + ies := ies & { + valueof(RSL_IE:{ + iei := RSL_IE_IPAC_REMOTE_PORT, + body := { ipa_remote_port := remote_port } + }) + }; + } + + return ies; + } template RSL_Message tr_RSL_IPA_CRCX(template RslChannelNr chan_nr) := { msg_disc := tr_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), msg_type := RSL_MT_IPAC_CRCX, @@ -2102,15 +2135,11 @@ } template (value) RSL_Message ts_RSL_IPA_CRCX(template (value) RslChannelNr chan_nr, - template (value) OCT4 remote_ip := '7F000001'O, - template (value) uint16_t remote_port := 6766) := { + template (omit) OCT4 remote_ip := omit, + template (omit) uint16_t remote_port := omit) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), msg_type := RSL_MT_IPAC_CRCX, - ies := { - t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), - t_RSL_IE(RSL_IE_IPAC_REMOTE_IP, RSL_IE_Body:{ipa_remote_ip := remote_ip}), - t_RSL_IE(RSL_IE_IPAC_REMOTE_PORT, RSL_IE_Body:{ipa_remote_port := remote_port}) - } + ies := f_ts_RSL_IPA_CRCX_IEs(chan_nr, remote_ip, remote_port) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27993 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: I7c36c3de1716968bccb07b03d2141d9abb3c175f Gerrit-Change-Number: 27993 Gerrit-PatchSet: 3 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

1 0

2025

2024

2023

2022

gerrit-log