- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: mgw: Update to contain similar config from docker-playground.git
by pespin 07 Oct '22

07 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29667 ) Change subject: mgw: Update to contain similar config from docker-playground.git ...................................................................... mgw: Update to contain similar config from docker-playground.git Change-Id: I2aa4d86e548d6644f1dd9358f6b8b48a19c96c3c --- M mgw/osmo-mgw.cfg 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/29667/1 diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index 417026e..3844e79 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -2,11 +2,17 @@ ! OsmoMGW (1.2.0.17-52e3) configuration saved from vty !! ! +log gsmtap 127.0.0.1 + logging level set-all debug + logging filter all 1 +! log stderr logging filter all 1 logging color 1 + logging print level 1 logging print category 1 logging timestamp 1 + logging print file basename last logging print extended-timestamp 1 logging level set-all notice logging level lmgcp debug @@ -16,6 +22,8 @@ line vty no login bind 127.0.0.1 +ctrl + bind 127.0.0.1 ! stats interval 0 stats reporter statsd @@ -27,6 +35,9 @@ mtu 1024 enable ! +e1_input + e1_line 0 driver ipa +! mgcp bind ip 127.0.0.1 bind port 2427 @@ -49,3 +60,12 @@ osmux off osmux bind-ip 127.0.0.1 osmux bind-ip-v6 ::1 + trunk 1 + sdp audio-payload send-ptime + sdp audio-payload send-name + no rtp keep-alive + loop 0 + no rtcp-omit + no rtp-patch + allow-transcoding + line 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29667 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: I2aa4d86e548d6644f1dd9358f6b8b48a19c96c3c Gerrit-Change-Number: 29667 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: ttcn3-mgw: Increase number of enpoints in osmo-mgw.cfg
by pespin 07 Oct '22

07 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29666 ) Change subject: ttcn3-mgw: Increase number of enpoints in osmo-mgw.cfg ...................................................................... ttcn3-mgw: Increase number of enpoints in osmo-mgw.cfg This is needed by test TC_crcx_osmux_257 Related: osmo-ttcn3-hacks.git Change-Id I74e6c760e076fe2547b6297a54524255fb8b Related: SYS#5987 Change-Id: I14e3abdf63c585e4518b0c0a61dbc57e6710a998 --- M ttcn3-mgw-test/MGCP_Test.cfg M ttcn3-mgw-test/osmo-mgw.cfg 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/29666/1 diff --git a/ttcn3-mgw-test/MGCP_Test.cfg b/ttcn3-mgw-test/MGCP_Test.cfg index f984173..5a9d9e6 100644 --- a/ttcn3-mgw-test/MGCP_Test.cfg +++ b/ttcn3-mgw-test/MGCP_Test.cfg @@ -13,6 +13,7 @@ mp_local_ipv6 := "fd02:db8:4::181"; mp_remote_ipv4 := "172.18.4.180"; mp_remote_ipv6 := "fd02:db8:4::180"; +mp_num_endpoints := 300; [MAIN_CONTROLLER] diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index 36485d8..f009bef 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -55,7 +55,7 @@ sdp audio-payload send-name conn-timeout 0 loop 0 - number endpoints 31 + number endpoints 300 allow-transcoding osmux off osmux bind-ip 172.18.4.180 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I14e3abdf63c585e4518b0c0a61dbc57e6710a998 Gerrit-Change-Number: 29666 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: ttcn3-mgw: jenkins.sh Fix centos tests
by pespin 07 Oct '22

07 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29665 ) Change subject: ttcn3-mgw: jenkins.sh Fix centos tests ...................................................................... ttcn3-mgw: jenkins.sh Fix centos tests The sed lines dropping the new configs must be applied to any non-master run. Fixes: e077fec68419d13c2dbe347b6799f407dd927ffd Change-Id: I369bb61f3979bd9118fad17c3d202253411ba14b --- M ttcn3-mgw-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/65/29665/1 diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 48cd1d1..2dee534 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -16,7 +16,7 @@ mkdir $VOL_BASE_DIR/mgw cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ # Can be dropped once released osmo-mgw is >1.10.0: -if image_suffix_is_latest; then +if ! image_suffix_is_master; then sed -i "/^ osmux bind-ip-v6 fd02:db8:4::180/d" $VOL_BASE_DIR/mgw/osmo-mgw.cfg fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I369bb61f3979bd9118fad17c3d202253411ba14b Gerrit-Change-Number: 29665 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Avoid hardcoding in test the amount of endpoints configured in o...
by pespin 07 Oct '22

07 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29663 ) Change subject: mgw: Avoid hardcoding in test the amount of endpoints configured in osmo-mgw ...................................................................... mgw: Avoid hardcoding in test the amount of endpoints configured in osmo-mgw Some tests require to match what's configured in osmo-mgw. Let's make it possible to change it through a module parameter. This will be needed for a follow-up patch to test >256 concurrent osmux conns, which will require increasing the number of configured endpoints above that value. Change-Id: Ia1e5a0b59ba7c49e97c2cf7ee7a009f3827cf36d --- M mgw/MGCP_Test.ttcn 1 file changed, 15 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/29663/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 859a677..c54fdb4 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -84,6 +84,8 @@ PortNumber mp_local_osmux_port := 1985; PortNumber mp_mgw_statsd_port := 8125; PortNumber mp_mgw_ctrl_port := 4267; + /* Maximum number of available endpoints in osmo-mgw.cfg ("number endpoints"): */ + integer mp_num_endpoints := 31; } private function f_vty_enable_osmux(boolean osmux_on) runs on dummy_CT { @@ -941,18 +943,19 @@ } /* test valid wildcarded CRCX */ + type record of MgcpEndpoint MgcpEndpointList; testcase TC_crcx_wildcarded_exhaust() runs on dummy_CT { - const integer n_endpoints := 31; var integer i; var template MgcpCommand cmd; var MgcpResponse resp; var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "*@" & c_mgw_domain; var MgcpCallId call_id := '1234'H; - var MgcpEndpoint ep_assigned[n_endpoints]; + var MgcpEndpoint ep_assigned; + var MgcpEndpointList ep_assigned_li := {}; f_init(); /* Exhaust all endpoint resources on the virtual trunk */ - for (i := 0; i < n_endpoints; i := i+1) { + for (i := 0; i < mp_num_endpoints; i := i+1) { cmd := ts_CRCX(get_next_trans_id(), ep, "recvonly", call_id); resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); @@ -962,10 +965,11 @@ var MgcpMessage resp_msg := { response := resp } - if (f_mgcp_find_param(resp_msg, "Z", ep_assigned[i]) == false) { + if (f_mgcp_find_param(resp_msg, "Z", ep_assigned) == false) { setverdict(fail, "No SpecificEndpointName in MGCP response", resp); mtc.stop; } + ep_assigned_li := ep_assigned_li & {ep_assigned} } /* Try to allocate one more endpoint, which should fail */ @@ -975,8 +979,8 @@ setverdict(pass); /* clean-up */ - for (i := 0; i < n_endpoints; i := i+1) { - f_dlcx_ok(ep_assigned[i], call_id); + for (i := 0; i < mp_num_endpoints; i := i+1) { + f_dlcx_ok(ep_assigned_li[i], call_id); } setverdict(pass); } @@ -1040,7 +1044,8 @@ testcase TC_dlcx_non_existant_ep() runs on dummy_CT { var template MgcpCommand cmd; var MgcpResponse resp; - var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "AA@" & c_mgw_domain; + var charstring non_existant_ep := hex2str(int2hex(mp_num_endpoints + 1, 4)) + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & non_existant_ep & "@" & c_mgw_domain; var template MgcpResponse rtmpl := { line := { code := ("500"), @@ -1090,14 +1095,13 @@ var template MgcpCommand cmd; var MgcpResponse resp; var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "*@" & c_mgw_domain; - const integer n_endpoints := 31; var integer i; var MgcpCallId call_id := '1234'H; var StatsDExpects expect; f_init(ep); /* Allocate a few endpoints */ - for (i := 0; i < n_endpoints; i := i+1) { + for (i := 0; i < mp_num_endpoints; i := i+1) { cmd := ts_CRCX(get_next_trans_id(), ep, "recvonly", call_id); resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); } @@ -1106,7 +1110,7 @@ * occupied endpoints */ f_sleep(1.0) expect := { - { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := n_endpoints, max := n_endpoints} + { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := mp_num_endpoints, max := mp_num_endpoints} }; f_statsd_expect(expect); @@ -1125,7 +1129,7 @@ /* Query a the statsd once to ensure that intermediate results are pulled from the * pipeline. The second query (below) will return the actual result. */ expect := { - { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := 0, max := n_endpoints} + { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := 0, max := mp_num_endpoints} }; f_statsd_expect(expect); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29663 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: Ia1e5a0b59ba7c49e97c2cf7ee7a009f3827cf36d Gerrit-Change-Number: 29663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Remove hack in f_two_crcx_mdcx_and_rtp_osmux() no longer needed
by pespin 07 Oct '22

07 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29664 ) Change subject: mgw: Remove hack in f_two_crcx_mdcx_and_rtp_osmux() no longer needed ...................................................................... mgw: Remove hack in f_two_crcx_mdcx_and_rtp_osmux() no longer needed Since osmo-mgw.git 2177919edb3bc0dd308be388272486ffd97f4761, osmo-mgw can handle properly conns containing a different remote and local CID. Hence this hack can be dropped. Related: SYS#5987 Change-Id: I531631d716581f68c11d3c0b07fc6755a822a0d3 --- M mgw/MGCP_Test.ttcn 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/29664/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index a99e273..1183429 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1530,9 +1530,8 @@ num_pkts_tx[0] := stats_rtp.num_pkts_tx; if (crcx_osmux_wildcard) { - /* For now we must set same CID as the MGW recvCID, - * having sendCID!=recvCID is not yet supported. */ - flow[1].osmux.local_cid := flow[1].osmux.remote_cid; + /* We set now the local CID in MDCX: */ + flow[1].osmux.local_cid := 2; } f_flow_modify_osmux(OsmuxEM, ep, call_id, "sendrecv", flow[1]); f_sleep(2.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29664 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: I531631d716581f68c11d3c0b07fc6755a822a0d3 Gerrit-Change-Number: 29664 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Rename osmux RtpFlowData fields to clarify them
by pespin 07 Oct '22

07 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29662 ) Change subject: mgw: Rename osmux RtpFlowData fields to clarify them ...................................................................... mgw: Rename osmux RtpFlowData fields to clarify them Change-Id: I64b4060706a321bc1f5e46d791035e6d85fa8e1e --- M mgw/MGCP_Test.ttcn 1 file changed, 45 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/29662/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index cbc22a6..5665981 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -333,6 +333,12 @@ charstring hostname, integer portnr optional } + type record RtpOsmuxFlowData { + boolean local_cid_sent, /* whther non wildcarded CID was already sent to MGW */ + MgcpOsmuxCID local_cid optional, + MgcpOsmuxCID remote_cid optional, + OsmuxemConfig cfg optional + } type record RtpFlowData { HostPort em, /* emulation side */ HostPort mgw, /* mgw side */ @@ -340,10 +346,7 @@ charstring codec, MgcpConnectionId mgcp_conn_id optional, RtpemConfig rtp_cfg optional, - boolean osmux_cid_sent, /* whther non wildcarded CID was already sent to MGW */ - MgcpOsmuxCID osmux_cid optional, - MgcpOsmuxCID osmux_cid_response optional, - OsmuxemConfig osmux_cfg optional, + RtpOsmuxFlowData osmux, charstring fmtp optional } @@ -426,12 +429,12 @@ f_osmuxem_bind(pt, flow.em.hostname, flow.em.portnr); /* configure osmux-emulation */ - if (ispresent(flow.osmux_cfg)) { - f_osmuxem_configure(pt, flow.osmux_cfg); + if (ispresent(flow.osmux.cfg)) { + f_osmuxem_configure(pt, flow.osmux.cfg); } else { var OsmuxemConfig osmux_cfg := c_OsmuxemDefaultCfg; f_osmuxem_configure(pt, osmux_cfg); - flow.osmux_cfg := osmux_cfg + flow.osmux.cfg := osmux_cfg } if (one_phase) { @@ -439,14 +442,14 @@ * part that tells the MGW where we are listening for Osmux streams * that come from the MGW. We get a fully working connection in * one go. */ - if (flow.osmux_cid != -1) { + if (flow.osmux.local_cid != -1) { /* We may still want to negotiate osmux CID later at MDCX */ rx_hdl := c_OsmuxemDefaultRxHandle; - rx_hdl.cid := flow.osmux_cid; + rx_hdl.cid := flow.osmux.local_cid; f_osmuxem_register_rxhandle(pt, rx_hdl); - flow.osmux_cid_sent := true; + flow.osmux.local_cid_sent := true; } - cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux_cid); + cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux.local_cid); cmd.sdp := ts_SDP(flow.em.hostname, flow.em.hostname, "23", "42", flow.em.portnr, { int2str(flow.pt) }, attributes); resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK_osmux); @@ -461,7 +464,7 @@ * data back to us. In order to turn the connection in a fully * bi-directional one, a separate MDCX is needed. */ - cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux_cid); + cmd := ts_CRCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.osmux.local_cid); resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK_osmux); flow.mgcp_conn_id := extract_conn_id(resp); @@ -481,12 +484,12 @@ } /* Make sure response is no wildcard */ - flow.osmux_cid_response := f_mgcp_osmux_cid_decode(cid_response); - if (flow.osmux_cid_response == -1) { + flow.osmux.remote_cid := f_mgcp_osmux_cid_decode(cid_response); + if (flow.osmux.remote_cid == -1) { setverdict(fail, "Osmux CID in MGCP response contains unexpected wildcard"); mtc.stop; } - tx_hdl := valueof(t_TxHandleAMR590(flow.osmux_cid_response)); + tx_hdl := valueof(t_TxHandleAMR590(flow.osmux.remote_cid)); f_osmuxem_register_txhandle(pt, tx_hdl); /* finally, connect the emulation-side RTP socket to the MGW */ @@ -551,23 +554,23 @@ f_osmuxem_bind(pt, flow.em.hostname, flow.em.portnr); /* configure osmux-emulation */ - if (ispresent(flow.osmux_cfg)) { - f_osmuxem_configure(pt, flow.osmux_cfg); + if (ispresent(flow.osmux.cfg)) { + f_osmuxem_configure(pt, flow.osmux.cfg); } else { var OsmuxemConfig osmux_cfg := c_OsmuxemDefaultCfg; f_osmuxem_configure(pt, osmux_cfg); } /* We didn't send a non-wildcarded Osmux CID yet. If caller wants to submit it, register handler */ - if (flow.osmux_cid_sent == false and flow.osmux_cid != -1) { + if (flow.osmux.local_cid_sent == false and flow.osmux.local_cid != -1) { rx_hdl := c_OsmuxemDefaultRxHandle; - rx_hdl.cid := flow.osmux_cid; + rx_hdl.cid := flow.osmux.local_cid; f_osmuxem_register_rxhandle(pt, rx_hdl); - flow.osmux_cid_sent := true; + flow.osmux.local_cid_sent := true; } /* connect MGW side Osmux socket to the emulation-side Osmux socket using SDP */ - cmd := ts_MDCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.mgcp_conn_id, flow.osmux_cid); + cmd := ts_MDCX_osmux(get_next_trans_id(), ep, mode, call_id, flow.mgcp_conn_id, flow.osmux.local_cid); cmd.sdp := ts_SDP(flow.em.hostname, flow.em.hostname, "23", "42", flow.em.portnr, { int2str(flow.pt) }, attributes); resp := mgcp_transceive_mgw(cmd, tr_MDCX_ACK); @@ -593,7 +596,7 @@ setverdict(fail, "Osmux CID in MGCP response contains unexpected wildcard"); mtc.stop; } - if (cid_resp_parsed != flow.osmux_cid_response) { + if (cid_resp_parsed != flow.osmux.remote_cid) { setverdict(fail, "Osmux CID in MGCP MDCX response changed from prev value"); mtc.stop; } @@ -1183,7 +1186,7 @@ f_init(ep, true); flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000/1")); flow.em.portnr := mp_local_osmux_port; - flow.osmux_cid := -1; + flow.osmux.local_cid := -1; f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow, false); /* create a transmitter not yet known by MGW */ @@ -1196,10 +1199,10 @@ stats := f_osmuxem_stats_get(OsmuxEM); - if (stats.num_pkts_tx < 40 / flow.osmux_cfg.batch_size) { + if (stats.num_pkts_tx < 40 / flow.osmux.cfg.batch_size) { setverdict(fail); } - if (stats.bytes_payload_tx < stats.num_pkts_tx * f_amrft_payload_len(tx_hdl.amr_ft) * flow.osmux_cfg.batch_size) { + if (stats.bytes_payload_tx < stats.num_pkts_tx * f_amrft_payload_len(tx_hdl.amr_ft) * flow.osmux.cfg.batch_size) { setverdict(fail); } @@ -1220,7 +1223,7 @@ f_init(ep, true); flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1")); flow.em.portnr := mp_local_osmux_port; - flow.osmux_cid := 2; + flow.osmux.local_cid := 2; f_flow_create_osmux(OsmuxEM, ep, call_id, "loopback", flow); f_osmuxem_mode(OsmuxEM, OSMUXEM_MODE_BIDIR); @@ -1314,8 +1317,8 @@ /* from MGW back to us */ flow[1] := valueof(t_RtpFlow(local_ip_osmux, remote_ip_osmux, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; - flow[1].osmux_cid := 2; - flow[1].osmux_cfg := c_OsmuxemDefaultCfg; + flow[1].osmux.local_cid := 2; + flow[1].osmux.cfg := c_OsmuxemDefaultCfg; f_flow_create_osmux(OsmuxEM, ep, call_id, "sendrecv", flow[1]); if (bidir) { @@ -1344,7 +1347,7 @@ stats_rtp := f_rtpem_stats_get(RTPEM[0]); stats_osmux := f_osmuxem_stats_get(OsmuxEM); - if (not f_rtp_osmux_stats_compare(stats_rtp, stats_osmux, flow[1].osmux_cfg.batch_size, tolerance)) { + if (not f_rtp_osmux_stats_compare(stats_rtp, stats_osmux, flow[1].osmux.cfg.batch_size, tolerance)) { setverdict(fail, "RTP and Osmux endpoint statistics don't match"); mtc.stop; } @@ -1416,11 +1419,11 @@ flow[1] := valueof(t_RtpFlow(local_ip_osmux, remote_ip_osmux, 110, "AMR/8000")); flow[1].em.portnr := mp_local_osmux_port; if (crcx_osmux_wildcard) { - flow[1].osmux_cid := -1; + flow[1].osmux.local_cid := -1; } else { - flow[1].osmux_cid := 2; + flow[1].osmux.local_cid := 2; } - flow[1].osmux_cfg := c_OsmuxemDefaultCfg; + flow[1].osmux.cfg := c_OsmuxemDefaultCfg; f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow[1], true); @@ -1480,7 +1483,7 @@ if (crcx_osmux_wildcard) { /* For now we must set same CID as the MGW recvCID, * having sendCID!=recvCID is not yet supported. */ - flow[1].osmux_cid := flow[1].osmux_cid_response; + flow[1].osmux.local_cid := flow[1].osmux.remote_cid; } f_flow_modify_osmux(OsmuxEM, ep, call_id, "sendrecv", flow[1]); f_sleep(2.0); @@ -1488,8 +1491,8 @@ stats_rtp := f_rtpem_stats_get(RTPEM[0]); stats_osmux := f_osmuxem_stats_get(OsmuxEM); - temp := stats_rtp.num_pkts_tx - num_pkts_tx[0] - stats_osmux.num_pkts_rx * flow[1].osmux_cfg.batch_size; - if (temp > 3 * flow[1].osmux_cfg.batch_size or temp < -3 * flow[1].osmux_cfg.batch_size) { + temp := stats_rtp.num_pkts_tx - num_pkts_tx[0] - stats_osmux.num_pkts_rx * flow[1].osmux.cfg.batch_size; + if (temp > 3 * flow[1].osmux.cfg.batch_size or temp < -3 * flow[1].osmux.cfg.batch_size) { log("stats_rtp: ", stats_rtp); log("stats_osmux: ", stats_osmux); log("old_rtp_tx: ", num_pkts_tx[0]); @@ -1497,7 +1500,7 @@ mtc.stop; } - temp := stats_osmux.num_pkts_tx - num_pkts_tx[1] - stats_rtp.num_pkts_rx / flow[1].osmux_cfg.batch_size; + temp := stats_osmux.num_pkts_tx - num_pkts_tx[1] - stats_rtp.num_pkts_rx / flow[1].osmux.cfg.batch_size; if (temp > 3 or temp < -3) { setverdict(fail, "number of packets not within normal parameters (" & int2str(temp) & ")"); mtc.stop; @@ -1684,7 +1687,12 @@ }, pt := pt, codec := codec, - osmux_cid_sent := false + osmux:= { + local_cid_sent := false, + local_cid := omit, + remote_cid := omit, + cfg := omit + } } /* transmit RTP streams between two RTP Emulations back-to-back; expect no loss */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29662 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: I64b4060706a321bc1f5e46d791035e6d85fa8e1e Gerrit-Change-Number: 29662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Fix f_two_crcx_mdcx_and_rtp_osmux()
by pespin 07 Oct '22

07 Oct '22

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29658 to look at the new patch set (#2). Change subject: mgw: Fix f_two_crcx_mdcx_and_rtp_osmux() ...................................................................... mgw: Fix f_two_crcx_mdcx_and_rtp_osmux() Previously the test was starting to count Osmux packets too early. Now that osmux conn state has been improved in osmo-mgw [1], Osmux Rx packets are not forwarded until the conn is completely configured through MGCP, hence first osmux packets snet by our async emulation are dropped. So we must start counting the transmitted valid osmux packets according to what the test says, when the full conn is set up. [1] osmo-mgw.git Change-Id I7654ddf51d197a4107e55f4e406053b2e4a02f83. Related: SYS#5987 Change-Id: I7efd87bbbda2ffa8fd0c5a64658d42edd0f30857 --- M mgw/MGCP_Test.ttcn 1 file changed, 25 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/29658/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29658 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: I7efd87bbbda2ffa8fd0c5a64658d42edd0f30857 Gerrit-Change-Number: 29658 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

Build failure of network:osmocom:nightly/osmo-hlr in Raspbian_10/armv7l
by OBS Notification 07 Oct '22

07 Oct '22

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-hlr failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 388s] [456/473] installing texlive-bibtex-extra-2018.20190227-2 [ 406s] [457/473] installing texlive-latex-recommended-2018.20190227-2 [ 411s] [458/473] installing tipa-2:1.3-20 [ 413s] Regenerating '/var/lib/texmf/fmtutil.cnf-DEBIAN'... done. [ 413s] Regenerating '/var/lib/texmf/fmtutil.cnf-TEXLIVEDIST'... done. [ 413s] update-fmtutil has updated the following file(s): [ 413s] /var/lib/texmf/fmtutil.cnf-DEBIAN [ 413s] /var/lib/texmf/fmtutil.cnf-TEXLIVEDIST [ 413s] If you want to activate the changes in the above file(s), [ 413s] you should run fmtutil-sys or fmtutil. [ 413s] [459/473] installing texlive-extra-utils-2018.20190227-2 [ 423s] [460/473] installing texlive-2018.20190227-2 [ 423s] [461/473] installing texlive-pictures-2018.20190227-2 [ 426s] [462/473] installing texlive-science-2018.20190227-2 [ 428s] [463/473] installing libgtk2.0-0-2.24.32-3 [ 429s] dpkg-deb (subprocess): decompressing archive member: lzma error: compressed data is corrupt [ 429s] dpkg-deb: error: <decompress> subprocess returned error exit status 2 [ 429s] dpkg: error processing archive .init_b_cache/libgtk2.0-0.deb (--install): [ 429s] cannot copy extracted data for './usr/lib/arm-linux-gnueabihf/libgtk-x11-2.0.so.0.2400.32' to '/usr/lib/arm-linux-gnueabihf/libgtk-x11-2.0.so.0.2400.32.dpkg-new': unexpected end of file or stream [ 429s] Errors were encountered while processing: [ 429s] .init_b_cache/libgtk2.0-0.deb [ 429s] exit ... [ 429s] ### VM INTERACTION START ### [ 429s] [ 369.469174] sysrq: SysRq : Power Off [ 429s] [ 369.492535] reboot: Power down [ 430s] ### VM INTERACTION END ### [ 430s] [ 430s] armbuild02 failed "build osmo-hlr_1.5.0.8.53f60.202210070052.dsc" at Fri Oct 7 10:00:34 UTC 2022. [ 430s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_crcx_osmux_257
by pespin 07 Oct '22

07 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29661 ) Change subject: mgw: Introduce test TC_crcx_osmux_257 ...................................................................... mgw: Introduce test TC_crcx_osmux_257 Related: SYS#5987 Change-Id: I74e6c760e076fe2547b6297a54524255fb8bc41b --- M mgw/MGCP_Test.ttcn M mgw/osmo-mgw.cfg 2 files changed, 47 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/29661/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index ef99403..2a040f2 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1171,6 +1171,51 @@ setverdict(pass); } + /* test Creating 257 concurrent osmux conns. It should fail since maximum is 256. */ + testcase TC_crcx_osmux_257() runs on dummy_CT { + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "*@" & c_mgw_domain; + var template MgcpCommand cmd; + var MgcpResponse resp; + var charstring cid_response; + var integer i; + + f_init(ep, true); + + for (i := 0; i < 256; i := i + 1) { + + cmd := ts_CRCX_osmux(get_next_trans_id(), ep, "recvonly", int2hex(i, 4), -1); + resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK_osmux); + extract_conn_id(resp); + + /* extract Osmux CID we got assigned by the MGW */ + var MgcpMessage resp_msg := { + response := resp + } + + if (f_mgcp_find_param(resp_msg, "X-OSMUX", cid_response) == false) { + setverdict(fail, "No Osmux CID in MGCP response", resp); + mtc.stop; + } + + /* Make sure response is no wildcard */ + if (f_mgcp_osmux_cid_decode(cid_response) == -1) { + setverdict(fail, "Osmux CID in MGCP response contains unexpected wildcard"); + mtc.stop; + } + } + + /* Now conn num 257, it should fail due to all Osmux conns already allocated: */ + cmd := ts_CRCX_osmux(get_next_trans_id(), ep, "recvonly", int2hex(i, 4), -1); + resp := mgcp_transceive_mgw(cmd, tr_MgcpResp_Err("400")); + + setverdict(pass); + + /* Clean up */ + for (i := 0; i < 256; i := i + 1) { + f_dlcx_ok(ep, int2hex(i, 4)); + } + } + /* Create one half open connection in receive-only mode. The MGW must accept * the packets but must not send any. */ testcase TC_one_crcx_receive_only_osmux() runs on dummy_CT { @@ -2839,6 +2884,7 @@ execute(TC_crcx_osmux_wildcard()); execute(TC_crcx_osmux_fixed()); execute(TC_crcx_osmux_fixed_twice()); + execute(TC_crcx_osmux_257()); execute(TC_one_crcx_receive_only_osmux()); execute(TC_one_crcx_loopback_osmux()); execute(TC_two_crcx_and_rtp_osmux()); diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index 1c5cfce..417026e 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -44,7 +44,7 @@ sdp audio-payload send-name conn-timeout 0 loop 0 - number endpoints 31 + number endpoints 300 allow-transcoding osmux off osmux bind-ip 127.0.0.1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29661 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: I74e6c760e076fe2547b6297a54524255fb8bc41b Gerrit-Change-Number: 29661 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmocom-bb[master]: mobile: check return value of gsm_arfcn2band_rc()
by pespin 07 Oct '22

07 Oct '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29660 ) Change subject: mobile: check return value of gsm_arfcn2band_rc() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia5bc9f8bf4aa3ea7374c67e329db22612bb350ca Gerrit-Change-Number: 29660 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Oct 2022 08:02:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log