September 2022 - gerrit-log - lists.osmocom.org

Change in docker-playground[master]: ttcn3-hnbgw: Enable gsmtap logging

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29327 ) Change subject: ttcn3-hnbgw: Enable gsmtap logging ...................................................................... ttcn3-hnbgw: Enable gsmtap logging Change-Id: I2c5c98349190bc6c37013acd2bd84887cbe1d059 --- M ttcn3-hnbgw-test/osmo-hnbgw.cfg 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index a4d3787..e116c79 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -2,6 +2,10 @@ ! OsmoHNBGW (1.1.0) configuration saved from vty !! ! +log gsmtap 172.18.35.203 + logging level set-all debug + logging filter all 1 +! log stderr logging filter all 1 logging color 1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2c5c98349190bc6c37013acd2bd84887cbe1d059 Gerrit-Change-Number: 29327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-hnbgw: Enable gsmtap logging

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29327 ) Change subject: ttcn3-hnbgw: Enable gsmtap logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2c5c98349190bc6c37013acd2bd84887cbe1d059 Gerrit-Change-Number: 29327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Sep 2022 11:56:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmo-netif[master]: stream: Unset fd value after close() before calling closed_cb()

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29335 ) Change subject: stream: Unset fd value after close() before calling closed_cb() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I82d9bdfb38cf5e9f689eca0d9a4c19ddd5541af7 Gerrit-Change-Number: 29335 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Sep 2022 11:56:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmo-netif[master]: stream: Fix typos in log messages

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29323 ) Change subject: stream: Fix typos in log messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9e49e222c254c89d182402501024badfd3bf9d9c Gerrit-Change-Number: 29323 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 Sep 2022 11:55:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Add testscase & infra to validate Osmux support BTS<->BSC

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29010 ) Change subject: bsc: Add testscase & infra to validate Osmux support BTS<->BSC ...................................................................... bsc: Add testscase & infra to validate Osmux support BTS<->BSC New TC_assignment_osmux_bts is added which tests Osmux used only BTS<->BSC. Existing TC_assignment_osmux is renamed to TC_assignment_osmux_cn, and a new TC_assignment_osmux is added which tests using Osmux on both sides (towards BTS and CN). Related: SYS#5987 Change-Id: I6e82eb9d995de988b812001e1c4cf6923509de66 --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_VAMOS.ttcn M bsc/MSC_ConnectionHandler.ttcn M bsc/expected-results.xml M library/BSSMAP_Templates.ttcn M library/RSL_Types.ttcn 6 files changed, 231 insertions(+), 49 deletions(-) Approvals: pespin: Looks good to me, approved osmith: 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 46fb952..d4a7b20 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -636,6 +636,7 @@ /* Osmux is enabled through VTY */ var boolean g_osmux_enabled_cn := false; + var boolean g_osmux_enabled_bts := false; /*Configure T(tias) over VTY, seconds */ var integer g_bsc_sccp_timer_ias := 7 * 60; @@ -1270,6 +1271,15 @@ } /* wait until BSC tells us "connected" */ f_wait_oml(bts_idx, "connected", 5.0); + + /* Set up BTS with VTY commands: */ + f_vty_enter_cfg_bts(BSCVTY, bts_idx); + if (g_osmux_enabled_bts) { + f_vty_transceive(BSCVTY, "osmux on"); + } else { + f_vty_transceive(BSCVTY, "osmux off"); + } + f_vty_transceive(BSCVTY, "end"); } function f_init_bts_and_check_sysinfo(integer bts_idx := 0, @@ -1744,18 +1754,26 @@ } /* generate an assignment complete template for either AoIP or SCCPlite */ -function f_gen_exp_compl(boolean expect_osmux := false, integer bssap_idx := 0) return template PDU_BSSAP { +function f_gen_exp_compl(integer bssap_idx := 0) +runs on MSC_ConnHdlr return template PDU_BSSAP { var template PDU_BSSAP exp_compl; - var BSSMAP_IE_Osmo_OsmuxCID osmux_cid := valueof(ts_OsmuxCID(0)); if (mp_bssap_cfg[bssap_idx].transport == BSSAP_TRANSPORT_AoIP) { - if (expect_osmux) { - exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?, osmux_cid); - } else { - exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?, omit); + var template BSSMAP_IE_Osmo_OsmuxCID exp_osmux_cid := omit; + if (g_pars.use_osmux_cn) { + var template (present) INT1 exp_cid := ?; + if (isbound(g_media.mgcp_conn[0].local_osmux_cid) and isbound(g_media.mgcp_conn[1].local_osmux_cid)) { + exp_cid := (g_media.mgcp_conn[0].local_osmux_cid, g_media.mgcp_conn[1].local_osmux_cid); + } else if (isbound(g_media.mgcp_conn[0].local_osmux_cid)) { + exp_cid := g_media.mgcp_conn[0].local_osmux_cid; + } else if (isbound(g_media.mgcp_conn[1].local_osmux_cid)) { + exp_cid := g_media.mgcp_conn[1].local_osmux_cid; + } + exp_osmux_cid := tr_OsmuxCID(exp_cid); } + exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?, exp_osmux_cid); } else { /* CIC is optional "*" as the MSC allocated it */ - exp_compl := tr_BSSMAP_AssignmentComplete(*, omit); + exp_compl := tr_BSSMAP_AssignmentComplete(*, omit, omit); } return exp_compl; } @@ -4292,7 +4310,7 @@ private function f_assignment_codec(charstring id, boolean do_perform_clear := true) runs on MSC_ConnHdlr { var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux_cn); - var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux_cn); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { @@ -5226,7 +5244,8 @@ f_shutdown_helper(); } -testcase TC_assignment_osmux() runs on test_CT { +/* Test Osmux setup BSC<->MSC */ +testcase TC_assignment_osmux_cn() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; @@ -5256,6 +5275,54 @@ f_shutdown_helper(); } +/* Test Osmux setup BTS<->BSC */ +testcase TC_assignment_osmux_bts() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn; + + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000100'B; /* 5,90k */ + pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; + pars.expect_mr_conf_ie := mr_conf_amr_5_90; + pars.use_osmux_bts := true; + + g_osmux_enabled_bts := true; + f_init(1, true); + f_sleep(1.0); + f_vty_amr_start_mode_set(false, "1"); + + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); + vc_conn.done; + + f_vty_amr_start_mode_restore(false); + f_shutdown_helper(); +} + +/* Test Osmux setup BTS<->BSC<->MSC */ +testcase TC_assignment_osmux() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn; + + pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); + pars.ass_codec_list.codecElements[0].s0_7 := '00000100'B; /* 5,90k */ + pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; + pars.expect_mr_conf_ie := mr_conf_amr_5_90; + pars.use_osmux_cn := true; + pars.use_osmux_bts := true; + + g_osmux_enabled_cn := true; + g_osmux_enabled_bts := true; + f_init(1, true); + f_sleep(1.0); + f_vty_amr_start_mode_set(false, "1"); + + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); + vc_conn.done; + + f_vty_amr_start_mode_restore(false); + f_shutdown_helper(); +} + /* test the procedure of the MSC requesting a Classmark Update: * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY, * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */ @@ -10516,7 +10583,7 @@ private function f_TC_refuse_mode_modif_to_vamos(charstring id) runs on MSC_ConnHdlr { var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux_cn); - var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux_cn); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { @@ -11833,6 +11900,8 @@ execute( TC_assignment_sdcch_exhausted_req_voice_tch_forbidden() ); execute( TC_assignment_osmux() ); + execute( TC_assignment_osmux_cn() ); + execute( TC_assignment_osmux_bts() ); /* RLL Establish Indication on inactive DCHAN / SAPI */ execute( TC_rll_est_ind_inact_lchan() ); diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 131c2d4..cd9ffd0 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -299,7 +299,7 @@ private function f_est_lchan_and_mode_modify_to_vamos() runs on MSC_ConnHdlr { var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux_cn); - var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux_cn); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index d07c912..8524f4b 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -52,6 +52,9 @@ * Media related handling ***********************************************************************/ +/* TODO: import OSMUX_Types.ttcn */ +type INT1 OsmuxCID (0 .. 255); + /* Get the matching payload type for a specified BSSAP codec type * (see also: BSSAP_Types.ttcn */ private function f_get_mgcp_pt(BSSMAP_FIELD_CodecType codecType) return SDP_FIELD_PayloadType { @@ -88,7 +91,9 @@ integer ptime, /* 20 */ uint7_t rtp_pt, /* RTP Payload Type */ HostPort mgw, /* MGW side */ - HostPort peer /* CA side */ + HostPort peer, /* CA side */ + OsmuxCID local_osmux_cid optional, + OsmuxCID remote_osmux_cid optional }; /* BTS media state */ @@ -98,7 +103,9 @@ uint16_t conn_id, uint7_t rtp_pt, HostPort bts, - HostPort peer + HostPort peer, + OsmuxCID local_osmux_cid optional, + OsmuxCID remote_osmux_cid optional }; type record MediaState { @@ -119,7 +126,9 @@ host := bts, port_nr := 9000 + nr*2 }, - peer := - + peer := -, + local_osmux_cid := nr, + remote_osmux_cid := omit } g_media.bts1 := { @@ -131,7 +140,9 @@ host := bts, /* FIXME */ port_nr := 9000 + nr*2 }, - peer := - + peer := -, + local_osmux_cid := nr, + remote_osmux_cid := omit } g_media.mgcp_ep := "rtpbridge/" & int2str(nr) & "@mgw"; @@ -146,6 +157,8 @@ g_media.mgcp_conn[i].crcx_seen_exp := 0; g_media.mgcp_conn[i].mdcx_seen_exp := 0; g_media.mgcp_conn[i].conn_id := f_mgcp_alloc_conn_id(); + g_media.mgcp_conn[i].local_osmux_cid := i; + g_media.mgcp_conn[i].remote_osmux_cid := omit; } g_media.mgcp_conn[0].mgw := { @@ -199,10 +212,23 @@ if (f_rsl_find_ie(rsl, RSL_IE_IPAC_RTP_PAYLOAD2, ie)) { g_media.bts.rtp_pt := ie.ipa_rtp_pt2; } + if (f_rsl_find_ie(rsl, RSL_IE_OSMO_OSMUX_CID, ie)) { + if (not g_pars.use_osmux_bts) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx unexpected IPAC CRCX with Osmux CID IE"); + } + g_media.bts.remote_osmux_cid := ie.osmux_cid.cid; + } else { + if (g_pars.use_osmux_bts) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx unexpected IPAC CRCX without Osmux CID IE"); + } + g_media.bts.local_osmux_cid := omit; + g_media.bts.remote_osmux_cid := omit; + } rsl_pt.send(ts_RSL_IPA_CRCX_ACK(g_chan_nr, g_media.bts.conn_id, f_inet_addr(g_media.bts.bts.host), g_media.bts.bts.port_nr, - g_media.bts.rtp_pt)); + g_media.bts.rtp_pt, + g_media.bts.local_osmux_cid)); g_media.bts.ipa_crcx_seen := true; repeat; } @@ -224,10 +250,23 @@ if (f_rsl_find_ie(rsl, RSL_IE_IPAC_RTP_PAYLOAD2, ie)) { g_media.bts.rtp_pt := ie.ipa_rtp_pt2; } + if (f_rsl_find_ie(rsl, RSL_IE_OSMO_OSMUX_CID, ie)) { + if (not g_pars.use_osmux_bts) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx unexpected IPAC MDCX with Osmux CID IE"); + } + g_media.bts.remote_osmux_cid := ie.osmux_cid.cid; + } else { + if (g_pars.use_osmux_bts) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx unexpected IPAC MDCX without Osmux CID IE"); + } + g_media.bts.local_osmux_cid := omit; + g_media.bts.remote_osmux_cid := omit; + } rsl_pt.send(ts_RSL_IPA_MDCX_ACK(g_chan_nr, g_media.bts.conn_id, f_inet_addr(g_media.bts.peer.host), g_media.bts.peer.port_nr, - g_media.bts.rtp_pt)); + g_media.bts.rtp_pt, + g_media.bts.local_osmux_cid)); g_media.bts.ipa_mdcx_seen := true; repeat; } @@ -241,10 +280,23 @@ if (f_rsl_find_ie(rsl, RSL_IE_IPAC_RTP_PAYLOAD2, ie)) { g_media.bts1.rtp_pt := ie.ipa_rtp_pt2; } + if (f_rsl_find_ie(rsl, RSL_IE_OSMO_OSMUX_CID, ie)) { + if (not g_pars.use_osmux_bts) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx unexpected IPAC CRCX with Osmux CID IE"); + } + g_media.bts.remote_osmux_cid := ie.osmux_cid.cid; + } else { + if (g_pars.use_osmux_bts) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx unexpected IPAC CRCX without Osmux CID IE"); + } + g_media.bts.local_osmux_cid := omit; + g_media.bts.remote_osmux_cid := omit; + } rsl_pt_ho_target.send(ts_RSL_IPA_CRCX_ACK(g_chan_nr, g_media.bts1.conn_id, f_inet_addr(g_media.bts1.bts.host), g_media.bts1.bts.port_nr, - g_media.bts1.rtp_pt)); + g_media.bts1.rtp_pt, + g_media.bts.local_osmux_cid)); g_media.bts1.ipa_crcx_seen := true; repeat; } @@ -267,10 +319,23 @@ if (f_rsl_find_ie(rsl, RSL_IE_IPAC_RTP_PAYLOAD2, ie)) { g_media.bts1.rtp_pt := ie.ipa_rtp_pt2; } + if (f_rsl_find_ie(rsl, RSL_IE_OSMO_OSMUX_CID, ie)) { + if (not g_pars.use_osmux_bts) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx unexpected IPAC MDCX with Osmux CID IE"); + } + g_media.bts.remote_osmux_cid := ie.osmux_cid.cid; + } else { + if (g_pars.use_osmux_bts) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx unexpected IPAC MDCX without Osmux CID IE"); + } + g_media.bts.local_osmux_cid := omit; + g_media.bts.remote_osmux_cid := omit; + } rsl_pt_ho_target.send(ts_RSL_IPA_MDCX_ACK(g_chan_nr, g_media.bts1.conn_id, f_inet_addr(g_media.bts1.peer.host), g_media.bts1.peer.port_nr, - g_media.bts1.rtp_pt)); + g_media.bts1.rtp_pt, + g_media.bts.local_osmux_cid)); g_media.bts1.ipa_mdcx_seen := true; repeat; } @@ -280,10 +345,10 @@ function f_rx_crcx(MgcpCommand mgcp_cmd) runs on MSC_ConnHdlr return template MgcpResponse { - var MgcpOsmuxCID osmux_cid; var SDP_Message sdp; var integer cid := f_get_free_mgcp_conn(); var charstring local_rtp_addr; + var MgcpOsmuxCID osmux_cid; if (g_pars.media_mgw_offer_ipv6 == true) { local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */ @@ -318,9 +383,13 @@ int2str(mgcp_conn.sample_rate))), valueof(ts_SDP_ptime(mgcp_conn.ptime)) } )); var template MgcpResponse mgcp_resp; - if (g_pars.use_osmux_cn and f_MgcpCmd_contains_par(mgcp_cmd, "X-OSMUX")) { + if ((g_pars.use_osmux_cn or g_pars.use_osmux_bts) and + f_MgcpCmd_contains_par(mgcp_cmd, "X-OSMUX")) { osmux_cid := f_MgcpCmd_extract_osmux_cid(mgcp_cmd); - mgcp_resp := ts_CRCX_ACK_osmux(mgcp_cmd.line.trans_id, mgcp_conn.conn_id, osmux_cid, sdp); + if (osmux_cid != -1) { + mgcp_conn.remote_osmux_cid := osmux_cid; + } + mgcp_resp := ts_CRCX_ACK_osmux(mgcp_cmd.line.trans_id, mgcp_conn.conn_id, mgcp_conn.local_osmux_cid, sdp); } else { mgcp_resp := ts_CRCX_ACK(mgcp_cmd.line.trans_id, mgcp_conn.conn_id, sdp); } @@ -675,6 +744,7 @@ boolean exp_ms_power_params, boolean aoip, boolean use_osmux_cn, + boolean use_osmux_bts, charstring host_aoip_tla, TestHdlrParamsMSCPool mscpool, boolean media_mgw_offer_ipv6, @@ -713,6 +783,7 @@ exp_ms_power_params := false, aoip := true, use_osmux_cn := false, + use_osmux_bts := false, host_aoip_tla := "1.2.3.4", mscpool := { bssap_idx := 0, diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 23217ba..223800b 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -106,6 +106,7 @@ <testcase classname='BSC_Tests' name='TC_assignment_sdcch_exhausted_req_signalling_tch_forbidden' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_assignment_sdcch_exhausted_req_voice_tch_forbidden' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_assignment_osmux' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_assignment_osmux_bts' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_rll_est_ind_inact_lchan' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_rll_est_ind_inval_sapi1' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_rll_est_ind_inval_sapi3' time='MASKED'/> diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 633b060..26f7ed9 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -614,6 +614,10 @@ codecElements := valueof(elem) } +template (present) BSSMAP_IE_Osmo_OsmuxCID tr_OsmuxCID(template (present) INT1 cid := ?) := { + elementIdentifier := 'F1'O, + osmuxCID := cid +} template (value) BSSMAP_IE_Osmo_OsmuxCID ts_OsmuxCID(INT1 cid) := { elementIdentifier := 'F1'O, osmuxCID := cid diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 6c45ca9..3acd619 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -220,9 +220,11 @@ RSL_IE_TFO_STATUS ('00111011'B), RSL_IE_LLP_APDU ('00111100'B), + /* Osmocom extensions */ RSL_IE_OSMO_REP_ACCH_CAP ('01100000'B), RSL_IE_OSMO_TRAINING_SEQUENCE ('01100001'B), RSL_IE_OSMO_TOP_ACCH_CAP ('01100010'B), + RSL_IE_OSMO_OSMUX_CID ('01100011'B), /* ip.access */ RSL_IE_IPAC_SRTP_CONFIG ('11100000'B), @@ -961,6 +963,23 @@ overpower_db := overpower }; + type record RSL_IE_OSMO_Osmux_CID { + uint8_t len, + uint8_t cid + } with { variant (len) "LENGTHTO(cid)" } + + template (present) RSL_IE_OSMO_Osmux_CID + tr_RSL_IE_OSMO_Osmux_CID(template (present) uint8_t osmux_cid := ?) := { + len := ?, /* overwritten */ + cid := osmux_cid + }; + template (value) RSL_IE_OSMO_Osmux_CID + ts_RSL_IE_OSMO_Osmux_CID(template (value) uint8_t osmux_cid) := { + len := 0, /* overwritten */ + cid := osmux_cid + }; + + /* union of all IE bodies */ type union RSL_IE_Body { RslChannelNr chan_nr, @@ -1018,6 +1037,7 @@ RSL_IE_OSMO_TrainingSequence osmo_training_sequence, RSL_IE_OSMO_RepAcchCap rep_acch_cap, RSL_IE_OSMO_TopAcchCap top_acch_cap, + RSL_IE_OSMO_Osmux_CID osmux_cid, RSL_LV other } @@ -1083,6 +1103,7 @@ osmo_training_sequence, iei = RSL_IE_OSMO_TRAINING_SEQUENCE; rep_acch_cap, iei = RSL_IE_OSMO_REP_ACCH_CAP; top_acch_cap, iei = RSL_IE_OSMO_TOP_ACCH_CAP; + osmux_cid, iei = RSL_IE_OSMO_OSMUX_CID; other, OTHERWISE; )" }; @@ -2184,20 +2205,28 @@ ies := f_ts_RSL_IPA_CRCX_IEs(chan_nr, remote_ip, remote_port) } - - template (value) RSL_Message ts_RSL_IPA_CRCX_ACK(template (value) RslChannelNr chan_nr, - uint16_t ipa_conn_id, OCT4 local_ip, - uint16_t local_port, uint7_t rtp_pt2) := { - msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), - msg_type := RSL_MT_IPAC_CRCX_ACK, - ies := { - t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), - t_RSL_IE(RSL_IE_IPAC_CONN_ID, RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), - t_RSL_IE(RSL_IE_IPAC_LOCAL_IP, RSL_IE_Body:{ipa_local_ip := local_ip}), - t_RSL_IE(RSL_IE_IPAC_LOCAL_PORT, RSL_IE_Body:{ipa_local_port := local_port}), - t_RSL_IE(RSL_IE_IPAC_RTP_PAYLOAD2, RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) + function ts_RSL_IPA_CRCX_ACK(template (value) RslChannelNr chan_nr, + uint16_t ipa_conn_id, OCT4 local_ip, + uint16_t local_port, uint7_t rtp_pt2, + template (omit) uint8_t osmux_cid := omit) + return template (value) RSL_Message { + var template (value) RSL_Message msg := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), + msg_type := RSL_MT_IPAC_CRCX_ACK, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), + t_RSL_IE(RSL_IE_IPAC_CONN_ID, RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), + t_RSL_IE(RSL_IE_IPAC_LOCAL_IP, RSL_IE_Body:{ipa_local_ip := local_ip}), + t_RSL_IE(RSL_IE_IPAC_LOCAL_PORT, RSL_IE_Body:{ipa_local_port := local_port}), + t_RSL_IE(RSL_IE_IPAC_RTP_PAYLOAD2, RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) + } } + if (not istemplatekind(osmux_cid, "omit")) { + msg.ies[lengthof(msg.ies)] := t_RSL_IE(RSL_IE_OSMO_OSMUX_CID, RSL_IE_Body:{osmux_cid := ts_RSL_IE_OSMO_Osmux_CID(osmux_cid)}); + } + return msg; } + template RSL_Message tr_RSL_IPA_CRCX_ACK(template RslChannelNr chan_nr, template uint16_t ipa_conn_id, template OCT4 local_ip, @@ -2258,22 +2287,30 @@ } } - template (value) RSL_Message ts_RSL_IPA_MDCX_ACK(template (value) RslChannelNr chan_nr, - uint16_t ipa_conn_id, - OCT4 local_ip, uint16_t local_port, - uint7_t rtp_pt2) := { - msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), - msg_type := RSL_MT_IPAC_MDCX_ACK, - ies := { - t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), - /* optional */ - t_RSL_IE(RSL_IE_IPAC_CONN_ID, RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), - t_RSL_IE(RSL_IE_IPAC_LOCAL_IP, RSL_IE_Body:{ipa_local_ip := local_ip}), - t_RSL_IE(RSL_IE_IPAC_LOCAL_PORT, RSL_IE_Body:{ipa_local_port := local_port}), - /* optional: RTP Payload Type */ - t_RSL_IE(RSL_IE_IPAC_RTP_PAYLOAD2, RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) + function ts_RSL_IPA_MDCX_ACK(template (value) RslChannelNr chan_nr, + uint16_t ipa_conn_id, + OCT4 local_ip, uint16_t local_port, + uint7_t rtp_pt2, + template (omit) uint8_t osmux_cid := omit) + return template (value) RSL_Message { + var template (value) RSL_Message msg := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), + msg_type := RSL_MT_IPAC_MDCX_ACK, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), + /* optional */ + t_RSL_IE(RSL_IE_IPAC_CONN_ID, RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), + t_RSL_IE(RSL_IE_IPAC_LOCAL_IP, RSL_IE_Body:{ipa_local_ip := local_ip}), + t_RSL_IE(RSL_IE_IPAC_LOCAL_PORT, RSL_IE_Body:{ipa_local_port := local_port}), + /* optional: RTP Payload Type */ + t_RSL_IE(RSL_IE_IPAC_RTP_PAYLOAD2, RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) + } + } + if (not istemplatekind(osmux_cid, "omit")) { + msg.ies[lengthof(msg.ies)] := t_RSL_IE(RSL_IE_OSMO_OSMUX_CID, RSL_IE_Body:{osmux_cid := ts_RSL_IE_OSMO_Osmux_CID(osmux_cid)}); + } + return msg; } - } template RSL_Message tr_RSL_IPA_MDCX_ACK(template RslChannelNr chan_nr, template uint16_t ipa_conn_id, template OCT4 local_ip, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29010 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: I6e82eb9d995de988b812001e1c4cf6923509de66 Gerrit-Change-Number: 29010 Gerrit-PatchSet: 8 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

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: Add testscase & infra to validate Osmux support BTS<->BSC

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29070 ) Change subject: bts: Add testscase & infra to validate Osmux support BTS<->BSC ...................................................................... bts: Add testscase & infra to validate Osmux support BTS<->BSC Related: SYS#5987 Change-Id: I1af23c7a60b05edc3b544f1fea0023f48e89f7a7 --- M bts/BTS_Tests.ttcn M bts/gen_links.sh M bts/osmo-bts.cfg M bts/regen_makefile.sh M library/OSMUX_Types.ttcn M library/RSL_Types.ttcn 6 files changed, 351 insertions(+), 62 deletions(-) Approvals: pespin: Looks good to me, approved osmith: 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 68e5cf1..e71aed9 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -49,6 +49,11 @@ import from AMR_Types all; +import from OSMUX_Types all; +import from OSMUX_CodecPort all; +import from OSMUX_CodecPort_CtrlFunct all; +import from OSMUX_Emulation all; + import from IPL4asp_Types all; import from TRXC_Types all; import from TRXC_CodecPort all; @@ -99,6 +104,8 @@ integer mp_bsc_ctrl_port := 4249; charstring mp_rtpem_bind_ip := "127.0.0.1"; integer mp_rtpem_bind_port := 6766; + charstring mp_osmuxem_bind_ip := "127.0.0.1"; + integer mp_osmuxem_bind_port := 1984; integer mp_tolerance_rxqual := 1; integer mp_tolerance_rxlev := 3; integer mp_tolerance_timing_offset_256syms := 0; @@ -219,6 +226,9 @@ var RTP_Emulation_CT vc_RTPEM; port RTPEM_CTRL_PT RTPEM_CTRL; port RTPEM_DATA_PT RTPEM_DATA; + var OSMUX_Emulation_CT vc_OsmuxEM; + port OsmuxEM_CTRL_PT OsmuxEM_CTRL; + port OsmuxEM_DATA_PT OsmuxEM_DATA; } private function f_init_rsl(charstring id) runs on test_CT { @@ -319,7 +329,9 @@ /* Training Sequence Code */ GsmTsc tsc, /* Frequency hopping parameters */ - FreqHopPars fhp + FreqHopPars fhp, + OsmuxCID loc_osmux_cid, + OsmuxCID rem_osmux_cid optional }; /* Test-specific parameters */ @@ -907,7 +919,9 @@ maio_hsn := ts_HsnMaio(0, 0), ma_map := c_MA_null, ma := { } - } + }, + loc_osmux_cid := trx_nr, + rem_osmux_cid := omit } /* This altstep triggers on receipt of a L1CTL DATA.ind matching the given @@ -2622,7 +2636,7 @@ /* 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, ?, ?, ?), + tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?, omit), "IPA CRCX ACK"); var uint16_t conn_id := crcx_ack.ies[1].body.ipa_conn_id; @@ -2644,6 +2658,71 @@ f_rtpem_mode(RTPEM_CTRL, mode); } +/* Initialize and start the RTP emulation component for a ConnHdlr */ +friend function f_osmuxem_activate(inout octetstring payload, + OsmuxemConfig cfg := c_OsmuxemDefaultCfg, + OsmuxemMode mode := OSMUXEM_MODE_BIDIR) +runs on ConnHdlr { + var RSL_IE_Body ie; + var OsmuxTxHandle tx_hdl; + var OsmuxRxHandle rx_hdl; + /* Step 0: initialize, connect and start the emulation component */ + vc_OsmuxEM := OSMUX_Emulation_CT.create(testcasename() & "-OsmuxEM"); + map(vc_OsmuxEM:OSMUX, system:OSMUX); + connect(vc_OsmuxEM:CTRL, self:OsmuxEM_CTRL); + connect(vc_OsmuxEM:DATA, self:OsmuxEM_DATA); + vc_OsmuxEM.start(OSMUX_Emulation.f_main()); + + /* Step 1: configure the RTP parameters */ + var integer payload_len := 31; + var octetstring hdr := ''O; + + /* Pad the payload to conform the expected length */ + payload := f_pad_oct(hdr & payload, payload_len, '00'O); + cfg.tx_fixed_payload := payload; + f_osmuxem_configure(OsmuxEM_CTRL, cfg); + + /* Step 2: bind the RTP emulation to the configured address */ + var PortNumber osmuxem_bind_port := mp_osmuxem_bind_port; + f_osmuxem_bind(OsmuxEM_CTRL, mp_osmuxem_bind_ip, osmuxem_bind_port); + rx_hdl := c_OsmuxemDefaultRxHandle; + rx_hdl.cid := g_pars.loc_osmux_cid; + f_osmuxem_register_rxhandle(OsmuxEM_CTRL, rx_hdl); + + /* 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, g_pars.loc_osmux_cid), + tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?, ?), + "IPA CRCX ACK"); + var uint16_t conn_id := crcx_ack.ies[1].body.ipa_conn_id; + f_rsl_find_ie(crcx_ack, RSL_IE_OSMO_OSMUX_CID, ie); + g_pars.rem_osmux_cid := ie.osmux_cid.cid; + + + /* 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_osmuxem_bind_ip), + remote_port := osmuxem_bind_port, + rtp_pt2 := 0, + osmux_cid := g_pars.loc_osmux_cid), + tr_RSL_IPA_MDCX_ACK(g_chan_nr, conn_id, ?, ?, ?, g_pars.rem_osmux_cid), + "IPA MDCX ACK"); + + tx_hdl := valueof(t_TxHandleAMR590(g_pars.rem_osmux_cid)); + f_osmuxem_register_txhandle(OsmuxEM_CTRL, tx_hdl); + + /* 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_osmuxem_connect(OsmuxEM_CTRL, bts_bind_ip, bts_bind_port); + + /* Step 5: set the given RTP emulation mode */ + f_osmuxem_mode(OsmuxEM_CTRL, mode); +} + /* establish DChan, verify existance + contents of measurement reports */ private function f_TC_meas_res_periodic(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); @@ -8211,6 +8290,120 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } + +/* Verify handling of Downlink and Uplink Osmux speech frames */ +private function f_TC_speech_osmux(charstring id) runs on ConnHdlr { + var L1ctlDlMessage l1_dl; + var OSMUX_PDU osmux_pdu; + var octetstring pl; + var octetstring exp_rtp_pl; + timer Td, Tu; + + f_l1_tune(L1CTL); + f_est_dchan(); + + /* Activate the RTP emulation */ + pl := f_rnd_octstring(6); + f_osmuxem_activate(pl); + + /* Give the scheduler some time to fill up the buffers */ + f_sleep(2.0); + L1CTL.clear; + RSL.clear; + + /* we transmit using AMR_FT_2 (5.90), see t_TxHandleAMR590 in f_osmuxem_activate() */ + var integer amr_ft := get_start_amr_ft(); + var integer amr_pl_len := f_amrft_payload_len(amr_ft); + var octetstring hdr := enc_RTP_AMR_Hdr(valueof(ts_RTP_AMR_Hdr(amr_ft, amr_ft, '1'B))); + pl := f_osmux_gen_expected_rx_rtp_payload(amr_ft, pl); + exp_rtp_pl := hdr & pl; + + /* Make sure that Downlink frames are received at the UE */ + Td.start(2.0); + alt { + [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := exp_rtp_pl)) -> value l1_dl { + log("TCH received: ", l1_dl.payload.traffic_ind.data); + L1CTL.send(ts_L1CTL_TRAFFIC_REQ(g_chan_nr, l1_dl.dl_info.link_id, + l1_dl.payload.traffic_ind.data)); + setverdict(pass); + } + [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := ?)) -> value l1_dl { + setverdict(fail, "Rx unexpected Downlink speech frame ", + "(", l1_dl.payload.traffic_ind.data, ") ", + "expected (", exp_rtp_pl, ")"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + [] as_l1_sacch(); + [] L1CTL.receive { repeat; } + [] Td.timeout { + setverdict(fail, "Timeout waiting for Downlink speech frames"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } + + /* Make sure that Uplink frames are received at the BTS */ + OsmuxEM_DATA.clear; + var template (present) OSMUX_PDU osmux_pdu_exp := tr_PDU_Osmux_AMR(cid := g_pars.loc_osmux_cid, + amr_ft := amr_ft, + amr_cmr := amr_ft); + Tu.start(2.0); + alt { + [] OsmuxEM_DATA.receive(osmux_pdu_exp) -> value osmux_pdu { + var boolean matched := false; + for (var integer i := 0; i < osmux_pdu.osmux_amr.header.ctr + 1; i := i + 1) { + var octetstring rx_pl; + rx_pl := f_osmux_amr_get_nth_amr_payload(osmux_pdu.osmux_amr, i); + log("got ", rx_pl, " vs exp ", pl); + if (rx_pl == pl) { + matched := true; + break; + } + } + if (not matched) { + repeat; + } + } + [] OsmuxEM_DATA.receive { repeat; } + [] Tu.timeout { + setverdict(fail, "Timeout waiting for Uplink speech frames"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } + + f_osmuxem_mode(OsmuxEM_CTRL, OSMUXEM_MODE_NONE); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rsl_chan_deact(); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_speech_osmux_tchf() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS5, TCH/H0, V3 (AMR codec) */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), ts_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM3))); + pars.mr_conf := valueof(ts_RSL_MultirateCfg(false, 0, '00000100'B /* 5,90k */)); + vc_conn := f_start_handler(refers(f_TC_speech_osmux), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} +testcase TC_speech_osmux_tchh() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS5, TCH/H0, V3 (AMR codec) */ + pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), ts_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM3))); + pars.mr_conf := valueof(ts_RSL_MultirateCfg(false, 0, '00000100'B /* 5,90k */)); + vc_conn := f_start_handler(refers(f_TC_speech_osmux), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + private function f_TC_early_immediate_assignment(charstring id) runs on ConnHdlr { var GsmFrameNumber fn; var ChannelDescription ch_desc; @@ -8808,6 +9001,8 @@ execute( TC_speech_no_rtp_tchh() ); execute( TC_speech_rtp_tchf() ); execute( TC_speech_rtp_tchh() ); + execute( TC_speech_osmux_tchf() ); + execute( TC_speech_osmux_tchh() ); execute( TC_early_immediate_assignment() ); diff --git a/bts/gen_links.sh b/bts/gen_links.sh index b7ba2cc..c9eb786 100755 --- a/bts/gen_links.sh +++ b/bts/gen_links.sh @@ -47,6 +47,7 @@ FILES+="AMR_Types.ttcn " FILES+="RTP_CodecPort.ttcn RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_Emulation.ttcn IuUP_EncDec.cc " FILES+="RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc " +FILES+="OSMUX_CodecPort.ttcn OSMUX_Emulation.ttcn OSMUX_Types.ttcn OSMUX_CodecPort_CtrlFunct.ttcn OSMUX_CodecPort_CtrlFunctDef.cc " FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn " FILES+="IPA_Testing.ttcn" gen_links $DIR $FILES diff --git a/bts/osmo-bts.cfg b/bts/osmo-bts.cfg index f581be0..2eb84ff 100644 --- a/bts/osmo-bts.cfg +++ b/bts/osmo-bts.cfg @@ -24,7 +24,9 @@ logging level dsp info logging level pcu debug logging level trx info + logging level osmux info logging level lmib debug + logging level lmux info ! line vty no login @@ -60,6 +62,10 @@ min-qual-norm -5 !settsc pcu-socket /tmp/pcu_sock + osmux + use on + local-ip 127.0.0.1 + local-port 1984 trx 0 power-ramp max-initial 0 mdBm power-ramp step-size 8000 mdB diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh index 147d64f..054b750 100755 --- a/bts/regen_makefile.sh +++ b/bts/regen_makefile.sh @@ -11,6 +11,7 @@ IuUP_EncDec.cc L1CTL_PortType_CtrlFunctDef.cc Native_FunctionDefs.cc + OSMUX_CodecPort_CtrlFunctDef.cc RLCMAC_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc RTP_EncDec.cc diff --git a/library/OSMUX_Types.ttcn b/library/OSMUX_Types.ttcn index 8ff7451..bc592b7 100644 --- a/library/OSMUX_Types.ttcn +++ b/library/OSMUX_Types.ttcn @@ -11,6 +11,9 @@ module OSMUX_Types { import from General_Types all; +import from Misc_Helpers all; + +import from AMR_Types all; external function enc_OSMUX_PDU ( in OSMUX_PDU msg ) return octetstring with { extension "prototype(convert) encode(RAW)" }; @@ -83,4 +86,44 @@ )" }; +template (present) OSMUX_PDU tr_PDU_Osmux_AMR(template (present) BIT1 marker := ?, + template (present) INT3b ctr := ?, + template (present) BIT1 amr_f := ?, + template (present) BIT1 amr_q := ?, + template (present) INT1 seq := ?, + template (present) OsmuxCID cid := ?, + template (present) INT4b amr_ft := ?, + template (present) INT4b amr_cmr := ?, + template (present) octetstring payload := ?) := { + osmux_amr := { + header := { + marker := marker, + ft := 1, + ctr := ctr, + amr_f := amr_f, + amr_q := amr_q, + seq := seq, + cid := cid, + amr_ft := amr_ft, + amr_cmr := amr_cmr + }, + data := payload + } +} + +/* Get Nth AMR payload of osmux AMR frame (starting from 0) */ +function f_osmux_amr_get_nth_amr_payload(PDU_Osmux_AMR osmux_amr, integer nth) return octetstring +{ + var integer amr_pl_len := f_amrft_payload_len(osmux_amr.header.amr_ft); + if (nth > osmux_amr.header.ctr) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "nth > ctr"); + return ''O; + } + if (amr_pl_len * (nth+1) > lengthof(osmux_amr.data)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "osmux payload too short"); + } + var octetstring pl := substr(osmux_amr.data, amr_pl_len * nth, amr_pl_len); + return pl; +} + } with { encode "RAW"} diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 3acd619..a86be86 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -973,6 +973,14 @@ len := ?, /* overwritten */ cid := osmux_cid }; + function f_tr_RSL_IE_OSMO_Osmux_CID(template uint8_t osmux_cid := *) + return template RSL_IE_OSMO_Osmux_CID { + var template RSL_IE_OSMO_Osmux_CID ie := omit; + if (not istemplatekind(osmux_cid, "omit")) { + ie := tr_RSL_IE_OSMO_Osmux_CID(osmux_cid); + } + return ie; + } template (value) RSL_IE_OSMO_Osmux_CID ts_RSL_IE_OSMO_Osmux_CID(template (value) uint8_t osmux_cid) := { len := 0, /* overwritten */ @@ -2157,7 +2165,8 @@ private function f_ts_RSL_IPA_CRCX_IEs(template (value) RslChannelNr chan_nr, template (omit) OCT4 remote_ip, - template (omit) uint16_t remote_port) + template (omit) uint16_t remote_port, + template (omit) uint8_t osmux_cid) return RSL_IE_List { var RSL_IE_List ies; @@ -2185,6 +2194,15 @@ }) }; } + /* Osmux CID extension IE is optional: */ + if (not istemplatekind(osmux_cid, "omit")) { + ies := ies & { + valueof(RSL_IE:{ + iei := RSL_IE_OSMO_OSMUX_CID, + body := { osmux_cid := ts_RSL_IE_OSMO_Osmux_CID(osmux_cid) } + }) + }; + } return ies; } @@ -2199,10 +2217,11 @@ template (value) RSL_Message ts_RSL_IPA_CRCX(template (value) RslChannelNr chan_nr, template (omit) OCT4 remote_ip := omit, - template (omit) uint16_t remote_port := omit) := { + template (omit) uint16_t remote_port := omit, + template (omit) uint8_t osmux_cid := omit) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), msg_type := RSL_MT_IPAC_CRCX, - ies := f_ts_RSL_IPA_CRCX_IEs(chan_nr, remote_ip, remote_port) + ies := f_ts_RSL_IPA_CRCX_IEs(chan_nr, remote_ip, remote_port, osmux_cid) } function ts_RSL_IPA_CRCX_ACK(template (value) RslChannelNr chan_nr, @@ -2227,19 +2246,27 @@ return msg; } - template RSL_Message tr_RSL_IPA_CRCX_ACK(template RslChannelNr chan_nr, - template uint16_t ipa_conn_id, - template OCT4 local_ip, - template uint16_t local_port) := { - msg_disc := tr_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), - msg_type := RSL_MT_IPAC_CRCX_ACK, - ies := { - tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), - tr_RSL_IE(RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), - tr_RSL_IE(RSL_IE_Body:{ipa_local_ip := local_ip}), - tr_RSL_IE(RSL_IE_Body:{ipa_local_port := local_port}) - /* Optional: RTP Payload Type 2 IE */ + function tr_RSL_IPA_CRCX_ACK(template RslChannelNr chan_nr, + template uint16_t ipa_conn_id, + template OCT4 local_ip, + template uint16_t local_port, + template uint8_t osmux_cid := omit) + return template RSL_Message { + var template RSL_Message msg := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), + msg_type := RSL_MT_IPAC_CRCX_ACK, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), + tr_RSL_IE(RSL_IE_Body:{ipa_local_ip := local_ip}), + tr_RSL_IE(RSL_IE_Body:{ipa_local_port := local_port}) + /* Optional: RTP Payload Type 2 IE */ + } } + if (not istemplatekind(osmux_cid, "omit")) { + msg.ies[lengthof(msg.ies)] := tr_RSL_IE(RSL_IE_Body:{osmux_cid := f_tr_RSL_IE_OSMO_Osmux_CID(osmux_cid)}); + } + return msg; } template (value) RSL_Message ts_RSL_IPA_CRCX_NACK(template (value) RslChannelNr chan_nr, @@ -2261,20 +2288,28 @@ } } - template (value) RSL_Message ts_RSL_IPA_MDCX(template (value) RslChannelNr chan_nr, - uint16_t ipa_conn_id, - OCT4 remote_ip, uint16_t remote_port, - uint7_t rtp_pt2) := { - msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), - msg_type := RSL_MT_IPAC_MDCX, - ies := { - t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), - t_RSL_IE(RSL_IE_IPAC_CONN_ID, RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), - 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}), - /* optional: RTP Payload Type */ - t_RSL_IE(RSL_IE_IPAC_RTP_PAYLOAD2, RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) + function ts_RSL_IPA_MDCX(template (value) RslChannelNr chan_nr, + uint16_t ipa_conn_id, + OCT4 remote_ip, uint16_t remote_port, + uint7_t rtp_pt2, + template (omit) uint8_t osmux_cid := omit) + return template (value) RSL_Message { + var template (value) RSL_Message msg := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), + msg_type := RSL_MT_IPAC_MDCX, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), + t_RSL_IE(RSL_IE_IPAC_CONN_ID, RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), + 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}), + /* optional: RTP Payload Type */ + t_RSL_IE(RSL_IE_IPAC_RTP_PAYLOAD2, RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) + } } + if (not istemplatekind(osmux_cid, "omit")) { + msg.ies[lengthof(msg.ies)] := t_RSL_IE(RSL_IE_OSMO_OSMUX_CID, RSL_IE_Body:{osmux_cid := ts_RSL_IE_OSMO_Osmux_CID(osmux_cid)}); + } + return msg; } template RSL_Message tr_RSL_IPA_MDCX(template RslChannelNr chan_nr, template uint16_t ipa_conn_id) := { @@ -2292,41 +2327,49 @@ OCT4 local_ip, uint16_t local_port, uint7_t rtp_pt2, template (omit) uint8_t osmux_cid := omit) - return template (value) RSL_Message { - var template (value) RSL_Message msg := { - msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), - msg_type := RSL_MT_IPAC_MDCX_ACK, - ies := { - t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), - /* optional */ - t_RSL_IE(RSL_IE_IPAC_CONN_ID, RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), - t_RSL_IE(RSL_IE_IPAC_LOCAL_IP, RSL_IE_Body:{ipa_local_ip := local_ip}), - t_RSL_IE(RSL_IE_IPAC_LOCAL_PORT, RSL_IE_Body:{ipa_local_port := local_port}), - /* optional: RTP Payload Type */ - t_RSL_IE(RSL_IE_IPAC_RTP_PAYLOAD2, RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) - } + return template (value) RSL_Message { + var template (value) RSL_Message msg := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), + msg_type := RSL_MT_IPAC_MDCX_ACK, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), + /* optional */ + t_RSL_IE(RSL_IE_IPAC_CONN_ID, RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), + t_RSL_IE(RSL_IE_IPAC_LOCAL_IP, RSL_IE_Body:{ipa_local_ip := local_ip}), + t_RSL_IE(RSL_IE_IPAC_LOCAL_PORT, RSL_IE_Body:{ipa_local_port := local_port}), + /* optional: RTP Payload Type */ + t_RSL_IE(RSL_IE_IPAC_RTP_PAYLOAD2, RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) } - if (not istemplatekind(osmux_cid, "omit")) { - msg.ies[lengthof(msg.ies)] := t_RSL_IE(RSL_IE_OSMO_OSMUX_CID, RSL_IE_Body:{osmux_cid := ts_RSL_IE_OSMO_Osmux_CID(osmux_cid)}); + } + if (not istemplatekind(osmux_cid, "omit")) { + msg.ies[lengthof(msg.ies)] := t_RSL_IE(RSL_IE_OSMO_OSMUX_CID, RSL_IE_Body:{osmux_cid := ts_RSL_IE_OSMO_Osmux_CID(osmux_cid)}); + } + return msg; + } + function tr_RSL_IPA_MDCX_ACK(template RslChannelNr chan_nr, + template uint16_t ipa_conn_id, + template OCT4 local_ip, + template uint16_t local_port, + template uint7_t rtp_pt2, + template uint8_t osmux_cid := omit) + return template RSL_Message { + var template RSL_Message msg := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), + msg_type := RSL_MT_IPAC_MDCX_ACK, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + /* optional */ + tr_RSL_IE(RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), + tr_RSL_IE(RSL_IE_Body:{ipa_local_ip := local_ip}), + tr_RSL_IE(RSL_IE_Body:{ipa_local_port := local_port}), + /* optional: RTP Payload Type */ + tr_RSL_IE(RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) } - return msg; } - template RSL_Message tr_RSL_IPA_MDCX_ACK(template RslChannelNr chan_nr, - template uint16_t ipa_conn_id, - template OCT4 local_ip, - template uint16_t local_port, - template uint7_t rtp_pt2) := { - msg_disc := tr_RSL_MsgDisc(RSL_MDISC_IPACCESS, false), - msg_type := RSL_MT_IPAC_MDCX_ACK, - ies := { - tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), - /* optional */ - tr_RSL_IE(RSL_IE_Body:{ipa_conn_id := ipa_conn_id}), - tr_RSL_IE(RSL_IE_Body:{ipa_local_ip := local_ip}), - tr_RSL_IE(RSL_IE_Body:{ipa_local_port := local_port}), - /* optional: RTP Payload Type */ - tr_RSL_IE(RSL_IE_Body:{ipa_rtp_pt2 := rtp_pt2}) + if (not istemplatekind(osmux_cid, "omit")) { + msg.ies[lengthof(msg.ies)] := tr_RSL_IE(RSL_IE_Body:{osmux_cid := f_tr_RSL_IE_OSMO_Osmux_CID(osmux_cid)}); } + return msg; } template (value) RSL_Message ts_RSL_IPA_MDCX_NACK(template (value) RslChannelNr chan_nr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29070 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: I1af23c7a60b05edc3b544f1fea0023f48e89f7a7 Gerrit-Change-Number: 29070 Gerrit-PatchSet: 5 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

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: Add testscase & infra to validate Osmux support BTS<->BSC

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29070 ) Change subject: bts: Add testscase & infra to validate Osmux support BTS<->BSC ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29070 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: I1af23c7a60b05edc3b544f1fea0023f48e89f7a7 Gerrit-Change-Number: 29070 Gerrit-PatchSet: 4 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-Comment-Date: Tue, 13 Sep 2022 11:20:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Add testscase & infra to validate Osmux support BTS<->BSC

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29010 ) Change subject: bsc: Add testscase & infra to validate Osmux support BTS<->BSC ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29010 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: I6e82eb9d995de988b812001e1c4cf6923509de66 Gerrit-Change-Number: 29010 Gerrit-PatchSet: 7 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-Comment-Date: Tue, 13 Sep 2022 11:20:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts: Add osmux configurations

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29338 ) Change subject: ttcn3-bts: Add osmux configurations ...................................................................... ttcn3-bts: Add osmux configurations Requires: osmo-ttcn3-hacks.git I1af23c7a60b05edc3b544f1fea0023f48e89f7a7 Requires: osmo-bts.git Ib80be434c06d07b3611bd18ae25dff8b14a7aad9 Related: SYS#5987 Change-Id: I185b77eb4fa05501f098d89b80b66168349175bb --- M ttcn3-bts-test/generic/BTS_Tests.cfg M ttcn3-bts-test/generic/osmo-bts.confmerge 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/38/29338/1 diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg index fd2e05d..dbf7ae0 100644 --- a/ttcn3-bts-test/generic/BTS_Tests.cfg +++ b/ttcn3-bts-test/generic/BTS_Tests.cfg @@ -16,6 +16,7 @@ L1CTL_PortType.m_l1ctl_sock_path := "/data/unix/osmocom_l2" BTS_Tests.mp_ctrl_ip := "172.18.9.20" BTS_Tests.mp_rtpem_bind_ip := "172.18.9.10" +BTS_Tests.mp_osmuxem_bind_ip := "172.18.9.10" [MAIN_CONTROLLER] diff --git a/ttcn3-bts-test/generic/osmo-bts.confmerge b/ttcn3-bts-test/generic/osmo-bts.confmerge index 7837748..9015904 100644 --- a/ttcn3-bts-test/generic/osmo-bts.confmerge +++ b/ttcn3-bts-test/generic/osmo-bts.confmerge @@ -7,5 +7,7 @@ oml remote-ip 172.18.9.11 gsmtap-remote-host 172.18.9.10 pcu-socket /data/unix/pcu_sock + osmux + local-ip 172.18.9.20 ctrl bind 0.0.0.0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I185b77eb4fa05501f098d89b80b66168349175bb Gerrit-Change-Number: 29338 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: Abort if processing SCTP connection without HNB context

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29331 ) Change subject: Abort if processing SCTP connection without HNB context ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I intentionally did not want to ASSERT in my original patch as my branch doesn't fix all of the caus […] See https://gerrit.osmocom.org/c/osmo-hnbgw/+/29336 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1eedab6f3ac974e942b02eaae41556f87dd8b6ba Gerrit-Change-Number: 29331 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 13 Sep 2022 11:12:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022