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

Change in libosmocore[master]: Add osmo_sock_get_name_multiaddr_buf()

by pespin

Attention is currently required from: neels, fixeria, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28997 ) Change subject: Add osmo_sock_get_name_multiaddr_buf() ...................................................................... Patch Set 14: (1 comment) Patchset: PS14: I wonder why do we need an extra API for that. Cannot we improve the implementation of the existing API? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76595ebd1cf26ba904887a36c4cc14a1b5c4521 Gerrit-Change-Number: 28997 Gerrit-PatchSet: 14 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Oct 2022 13:27:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in docker-playground[master]: ttcn3-mgw: Increase number of enpoints in osmo-mgw.cfg

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Update to contain similar config from docker-playground.git

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved 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 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Fix f_two_crcx_mdcx_and_rtp_osmux()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29658 ) 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 1183429..5ff5247 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1446,7 +1446,7 @@ var MgcpResponse resp; var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; var MgcpCallId call_id := '1227'H; - var integer num_pkts_tx[2]; + var integer num_pkts_tx[2], num_pkts_rx[2]; var integer temp; f_init(ep, true); @@ -1507,53 +1507,68 @@ /* The first leg will now be switched into bidirectional * mode, but we do not expect any data comming back yet. */ f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); - stats_osmux := f_osmuxem_stats_get(OsmuxEM); - num_pkts_tx[1] := stats_osmux.num_pkts_tx; f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); + /* At this point in time, flow[1](Osmux)->MGW->flow[0](RTP) is active, + * hence if local CID was provided during CRCX we should already be seeing packets + * flowing in one direction, aka stats_rtp.num_pkts_rx sould be >0 after a while: */ f_sleep(0.5); stats_rtp := f_rtpem_stats_get(RTPEM[0]); if (stats_rtp.num_pkts_rx_err_disabled != 0) { setverdict(fail, "received packets from RTP MGW on recvonly connection"); mtc.stop; } + if (not crcx_osmux_wildcard and stats_rtp.num_pkts_rx == 0) { + setverdict(fail, "received 0 packets Osmux->MGW->RTP"); + mtc.stop; + } + stats_osmux := f_osmuxem_stats_get(OsmuxEM); if (stats_osmux.num_pkts_rx_err_disabled != 0) { setverdict(fail, "received packets from Osmux MGW on recvonly connection"); mtc.stop; } + if (stats_osmux.num_pkts_rx > 0) { + setverdict(fail, "received unexpected ", stats_osmux.num_pkts_rx, " packets RTP->MGW->Osmux"); + mtc.stop; + } /* When the second leg is switched into bidirectional mode * as well, then the MGW will connect the two together and * we should see RTP streams passing through from both ends. */ f_osmuxem_mode(OsmuxEM, OSMUXEM_MODE_BIDIR); - stats_rtp := f_rtpem_stats_get(RTPEM[0]); - num_pkts_tx[0] := stats_rtp.num_pkts_tx; - if (crcx_osmux_wildcard) { /* 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]); + stats_rtp := f_rtpem_stats_get(RTPEM[0]); + stats_osmux := f_osmuxem_stats_get(OsmuxEM); + num_pkts_tx[0] := stats_rtp.num_pkts_tx; + num_pkts_tx[1] := stats_osmux.num_pkts_tx; + num_pkts_rx[0] := stats_rtp.num_pkts_rx; + num_pkts_rx[1] := stats_osmux.num_pkts_rx; f_sleep(2.0); 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; + temp := (stats_rtp.num_pkts_tx - num_pkts_tx[0]) - + (stats_osmux.num_pkts_rx - num_pkts_rx[1]) * 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]); - setverdict(fail, "number of packets not within normal parameters (" & int2str(temp) & ")"); + setverdict(fail, "RTP-Tx vs OSmux-Rx number of packets not within normal parameters (" & int2str(temp) & ")"); 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 - num_pkts_rx[0])/ flow[1].osmux.cfg.batch_size); if (temp > 3 or temp < -3) { log("stats_rtp: ", stats_rtp); log("stats_osmux: ", stats_osmux); log("old_osmux_tx: ", num_pkts_tx[1]); - setverdict(fail, "number of packets not within normal parameters (" & int2str(temp) & ")"); + setverdict(fail, "Osmux-Tx vs RTP-Rx number of packets not within normal parameters (" & int2str(temp) & ")"); mtc.stop; } 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_crcx_osmux_257

by pespin

pespin has submitted this change. ( 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: I74e6c760e076fe2547b6297a54524255fb8b --- M mgw/MGCP_Test.ttcn M mgw/expected-results.xml M mgw/osmo-mgw.cfg 3 files changed, 49 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index c54fdb4..a99e273 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -85,7 +85,7 @@ 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; + integer mp_num_endpoints := 300; } private function f_vty_enable_osmux(boolean osmux_on) runs on dummy_CT { @@ -1178,6 +1178,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 { @@ -2851,6 +2896,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/expected-results.xml b/mgw/expected-results.xml index 8b17fb1..577b6e3 100644 --- a/mgw/expected-results.xml +++ b/mgw/expected-results.xml @@ -29,6 +29,7 @@ <testcase classname='MGCP_Test' name='TC_crcx_osmux_wildcard' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_crcx_osmux_fixed' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_crcx_osmux_fixed_twice' time='MASKED'/> + <testcase classname='MGCP_Test' name='TC_crcx_osmux_257' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_one_crcx_receive_only_osmux' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_one_crcx_loopback_osmux' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_and_rtp_osmux' time='MASKED'/> 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: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Remove hack in f_two_crcx_mdcx_and_rtp_osmux() no longer needed

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve 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: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Remove hack in f_two_crcx_mdcx_and_rtp_osmux() no longer needed

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( 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 ...................................................................... Patch Set 3: Code-Review+2 -- 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: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Oct 2022 13:23:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: ansible/ttcn3-slave: fix adding apt key

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29708 ) Change subject: ansible/ttcn3-slave: fix adding apt key ...................................................................... ansible/ttcn3-slave: fix adding apt key Downloading the apt key from obs.osmocom.org returns a 404 error unless an Accept HTTP header is sent. (Yes, really.) Also using apt-key is deprecated, so change it to download the key with get_url as shown in the ansible docs example. Fix for: Failed to download key at https://obs.osmocom.org/projects/osmocom/public_key: HTTP Error 404: Not Found Related: https://github.com/ansible/ansible/issues/50436#issuecomment-451205256 Related: https://docs.ansible.com/ansible/latest/collections/ansible/builtin/apt_key… Change-Id: Idb23231d629ba8a75510deace0d1f130e889d535 --- M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/08/29708/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml index 1e61fe5..67717fc 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml @@ -15,12 +15,17 @@ dest: "/home/{{ jenkins_user }}/jenkins/docker-playground" - name: add apt.key - apt_key: + get_url: url: https://obs.osmocom.org/projects/osmocom/public_key + dest: /etc/apt/trusted.gpg.d/obs.osmocom.org.asc + # OBS webserver needs this header, returns 404 otherwise + # https://github.com/ansible/ansible/issues/50436#issuecomment-451205256 + headers: + Accept: '*/*' - name: add apt repository apt_repository: - repo: "deb https://downloads.osmocom.org/packages/osmocom:/latest/{{ obs_distro }}/ ./" + repo: "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] https://downloads.osmocom.org/packages/osmocom:/latest/{{ obs_distro }}/ ./" filename: obs_osmocom update_cache: yes -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idb23231d629ba8a75510deace0d1f130e889d535 Gerrit-Change-Number: 29708 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-bts[master]: rsl: use unsigned int

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29685 ) Change subject: rsl: use unsigned int ...................................................................... rsl: use unsigned int The parameter l3_len in rsl_tx_meas_res() is defined as int, even though it can't be negative. Lets use unsigned int for l3_len. Change-Id: I99068a36e74a557000f406154dce32300615086c --- M include/osmo-bts/rsl.h M src/common/rsl.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index a530734..7f31ea9 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -30,6 +30,6 @@ int rsl_tx_cbch_load_indication(struct gsm_bts *bts, bool ext_cbch, bool overflow, uint8_t amount); -int rsl_tx_meas_res(struct gsm_lchan *lchan, const uint8_t *l3, int l3_len, int timing_offset); +int rsl_tx_meas_res(struct gsm_lchan *lchan, const uint8_t *l3, unsigned int l3_len, int timing_offset); #endif // _RSL_H */ diff --git a/src/common/rsl.c b/src/common/rsl.c index 8aa9b78..91af6cb 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3493,7 +3493,7 @@ } __attribute__((packed)); /* Compose and send 8.4.8 MEASUREMENT RESult via RSL. (timing_offset=-1 -> not present) */ -int rsl_tx_meas_res(struct gsm_lchan *lchan, const uint8_t *l3, int l3_len, int timing_offset) +int rsl_tx_meas_res(struct gsm_lchan *lchan, const uint8_t *l3, unsigned int l3_len, int timing_offset) { struct msgb *msg; uint8_t meas_res[16]; @@ -3512,7 +3512,7 @@ return -ENOMEM; LOGPLCHAN(lchan, DRSL, LOGL_DEBUG, - "Send Meas RES: NUM:%u, RXLEV_FULL:%u, RXLEV_SUB:%u, RXQUAL_FULL:%u, RXQUAL_SUB:%u, MS_PWR:%u, UL_TA:%u, L3_LEN:%d, TimingOff:%u\n", + "Send Meas RES: NUM:%u, RXLEV_FULL:%u, RXLEV_SUB:%u, RXQUAL_FULL:%u, RXQUAL_SUB:%u, MS_PWR:%u, UL_TA:%u, L3_LEN:%u, TimingOff:%u\n", lchan->meas.res_nr, lchan->meas.ul_res.full.rx_lev, lchan->meas.ul_res.sub.rx_lev, 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I99068a36e74a557000f406154dce32300615086c Gerrit-Change-Number: 29685 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-bts[master]: l1sap: do not call msgb_l2hlen without checking

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29650 ) Change subject: l1sap: do not call msgb_l2hlen without checking ...................................................................... l1sap: do not call msgb_l2hlen without checking We request the length using msgb_l2len() in two locations where whe cannot be sure that l2h is populated. Lets check this first. Change-Id: Ie13d0724f183ff240714dcdbd24e5a21b4276bfe Related: OS#5645 --- M src/common/l1sap.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 0598144..8bcd417 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -349,7 +349,7 @@ uint8_t chan_nr, link_id; *data = msgb_l2(msg); - *len = msgb_l2len(msg); + *len = msgb_l2(msg) ? msgb_l2len(msg) : 0; chan_nr = l1sap->u.data.chan_nr; link_id = l1sap->u.data.link_id; @@ -391,7 +391,7 @@ struct msgb *msg = l1sap->oph.msg; *data = msgb_l2(msg); - *len = msgb_l2len(msg); + *len = msgb_l2(msg) ? msgb_l2len(msg) : 0; if (L1SAP_IS_PTCCH(fn)) { *chan_type = GSMTAP_CHANNEL_PTCCH; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie13d0724f183ff240714dcdbd24e5a21b4276bfe Gerrit-Change-Number: 29650 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022