July 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-pcu[master]: pcuif_sock: do not retry when sending PCU version

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/37548?usp=email ) Change subject: pcuif_sock: do not retry when sending PCU version ...................................................................... pcuif_sock: do not retry when sending PCU version When some client connects to the PCU socket, the PCU sends a TXT indication with its version number in it. There is a retry mechanism in place that checks if the BTS got active. In case the BTS is not active yet, the TXT indication with the version number is repeated. This mechanism is unnecessary. It even can cause annoyance in cas the BTS on the other end does not send an info indication because it does not use GPRS/EGPRS at all. The TXT indication is sent after the PCU socket connection is made. We use a normal unix domain socket, which can not lose messages. It is guaranteed that the TXT indication reaches the client (BTS or BSC). Related: OS#6270 Change-Id: Iddd3eed113ed288e629b6029f9a56de427de8126 --- M src/pcuif_sock.c 1 file changed, 22 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/48/37548/1 diff --git a/src/pcuif_sock.c b/src/pcuif_sock.c index f8c0ecc..e1e32c9 100644 --- a/src/pcuif_sock.c +++ b/src/pcuif_sock.c @@ -53,24 +53,6 @@ pcu_l1if_open(); } -static void pcu_tx_txt_retry(void *_priv) -{ - struct gprs_rlcmac_bts *bts; - bool retry = llist_empty(&the_pcu->bts_list); - - llist_for_each_entry(bts, &the_pcu->bts_list, list) { - if (bts->active) - continue; - retry = true; - pcu_tx_txt_ind(PCU_VERSION, "%s", PACKAGE_VERSION); - break; - } - - /* If no BTS (or not all) yet active, retry */ - if (retry) - osmo_timer_schedule(&pcu_sock_state.timer, 5, 0); -} - int pcu_sock_send(struct msgb *msg) { struct osmo_fd *conn_bfd; @@ -241,7 +223,6 @@ pcu_tx_txt_ind(PCU_VERSION, "%s", PACKAGE_VERSION); /* Schedule a timer so we keep trying until the BTS becomes active. */ - osmo_timer_setup(&pcu_sock_state.timer, pcu_tx_txt_retry, NULL); osmo_timer_schedule(&pcu_sock_state.timer, 5, 0); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/37548?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iddd3eed113ed288e629b6029f9a56de427de8126 Gerrit-Change-Number: 37548 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: forward PCU_VERSION only once

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email ) Change subject: pcu_sock: forward PCU_VERSION only once ...................................................................... Abandoned There is a better solution for the problem. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id82fe0504d0cbdf71473c1e7dfe6125a3471bd85 Gerrit-Change-Number: 36018 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

11 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: forward PCU_VERSION only once

by dexter

Attention is currently required from: laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email ) Change subject: pcu_sock: forward PCU_VERSION only once ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/36018/comment/6e9d4e4f_138de651 PS1, Line 10: is not active the PCU even sends the version number in regular > is there any update/feedback here? I have checked the code again. Its indeed a bit strange. At least from what I can see this retry mechanism could be dropped entirely. So I think we should abandon this and start over. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id82fe0504d0cbdf71473c1e7dfe6125a3471bd85 Gerrit-Change-Number: 36018 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Jul 2024 15:57:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: asterisk: Enable use of EVS codec

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37547?usp=email ) Change subject: asterisk: Enable use of EVS codec ...................................................................... asterisk: Enable use of EVS codec We want to test Asterisk using only EVS against the IMS Core. Related: SYS#7012 Change-Id: I8bf781cbb0ae40a2bc67ede1110d50721d1f6025 --- M asterisk-master/Dockerfile M ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 3 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/47/37547/1 diff --git a/asterisk-master/Dockerfile b/asterisk-master/Dockerfile index 8ddbaa0..55734ba 100644 --- a/asterisk-master/Dockerfile +++ b/asterisk-master/Dockerfile @@ -75,6 +75,9 @@ RUN cd asterisk && \ ./bootstrap.sh && \ ./configure && \ + make menuselect.makeopts && \ + menuselect/menuselect --enable codec_vevs menuselect.makeopts && \ + menuselect/menuselect --check-deps menuselect.makeopts && \ make "-j$(nproc)" && \ make install && \ make samples && \ @@ -82,3 +85,7 @@ # Required to set up ipsec: RUN setcap 'cap_net_admin,cap_sys_resource=ep' /usr/sbin/asterisk + +RUN cd asterisk/codec_server && \ + make "-j$(nproc)" && \ + cp cserver /usr/bin/cserver diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh index 5c4387b..4dbbe93 100755 --- a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh +++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh @@ -23,6 +23,9 @@ cp /data/logger.conf "${ASTERISK_CFG_PATH}/" cat /data/extensions.conf >>"${ASTERISK_CFG_PATH}/extensions.conf" +echo "Starting codec server..." +/usr/bin/cserver & + SERVER_NAME="ims.mnc001.mcc238.3gppnetwork.org" for i in $(seq 30); do set -e diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index b735388..c1403b4 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -106,7 +106,6 @@ type=endpoint context=volte_ims disallow=all -allow=alaw allow=vevs transport=transport-tcp outbound_auth=volte_ims -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37547?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8bf781cbb0ae40a2bc67ede1110d50721d1f6025 Gerrit-Change-Number: 37547 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: enable EVS-only codec on IMS side

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37546?usp=email ) Change subject: asterisk: IMS: enable EVS-only codec on IMS side ...................................................................... asterisk: IMS: enable EVS-only codec on IMS side Related: SYS#7012 Change-Id: I1d1542f23ef7c6b2cd18afd90a169633d0d73a3f --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/37546/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 878b44e..0c95108 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -660,14 +660,19 @@ "t=0 0\r\n" & "a=rtcp-xr:rcvr-rtt=all:10000 stat-summary=loss,dup,jitt,TTL voip-metrics\r\n" & "a=record:off\r\n" & - "m=audio " & int2str(g_pars.subscr.cp.local_rtp_port) & " RTP/AVP 8 99 100 101\r\n" & - "a=rtpmap:8 PCMA/8000\r\n" & + "m=audio " & int2str(g_pars.subscr.cp.local_rtp_port) & " RTP/AVP 126 99 100 101\r\n" & + "b=AS:34\r\n" & + "b=RS:600\r\n" & + "b=RR:2000\r\n" & + "a=rtpmap:126 EVS/16000/1\r\n" & + "a=fmtp:126 br=5.9-16.4;bw=nb-fb;max-red=0\r\n" & "a=rtpmap:99 telephone-event/48000\r\n" & "a=rtpmap:100 telephone-event/16000\r\n" & "a=rtpmap:101 telephone-event/8000\r\n" & "a=rtcp:" & int2str(g_pars.subscr.cp.local_rtp_port + 1) & "\r\n" & "a=rtcp-fb:* trr-int 1000\r\n" & - "a=rtcp-fb:* ccm tmmbr\r\n"; + "a=rtcp-fb:* ccm tmmbr\r\n" & + "a=ptime:20\r\n" ; select (st) { case (IMS_GEN_SDP_None) { } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37546?usp=email 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: I1d1542f23ef7c6b2cd18afd90a169633d0d73a3f Gerrit-Change-Number: 37546 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 1 week

1
0
0 0

[S] Change in ...osmo-python-tests[master]: contrib/jenkins.sh: do not run test_py3.py twice

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37539?usp=email ) Change subject: contrib/jenkins.sh: do not run test_py3.py twice ...................................................................... contrib/jenkins.sh: do not run test_py3.py twice Change-Id: Ib7e8e358d38be37055d44c8ff284d1578a30f6ac --- M contrib/jenkins.sh 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b129190..810cb7e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -8,7 +8,6 @@ PY3=python3 PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" $PY3 ./setup.py install --user -$PY3 tests/test_py3.py for f in $PY3_LIST do $PY3 $COM_FLAGS $f -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ib7e8e358d38be37055d44c8ff284d1578a30f6ac Gerrit-Change-Number: 37539 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

11 months, 1 week

1
0
0 0

[S] Change in ...osmo-python-tests[master]: contrib/jenkins.sh: use virtualenv and pip

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37540?usp=email ) Change subject: contrib/jenkins.sh: use virtualenv and pip ...................................................................... contrib/jenkins.sh: use virtualenv and pip setup.py install is deprecated: https://packaging.python.org/en/latest/discussions/setup-py-deprecated/ Change-Id: I42ba71e2fd0ceb8466758ea46e9ae33e3d4fcb91 --- M contrib/jenkins.sh 1 file changed, 18 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 810cb7e..916a537 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -2,16 +2,12 @@ set -ex -COM_FLAGS='-m compileall' - -rm -rf ./build PY3=python3 -PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" -$PY3 ./setup.py install --user -for f in $PY3_LIST -do - $PY3 $COM_FLAGS $f -done + +rm -rf ./env +virtualenv --system-site-packages env +. ./env/bin/activate +pip install . # Run async server which tests scripts/osmo_ctrl.py interaction $PY3 tests/test_py3.py -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I42ba71e2fd0ceb8466758ea46e9ae33e3d4fcb91 Gerrit-Change-Number: 37540 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

11 months, 1 week

1
0
0 0

[S] Change in ...osmo-python-tests[master]: [pylint] osmopy/obscvty.py: fix E1130 (invalid-unary-operand-type)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37538?usp=email ) Change subject: [pylint] osmopy/obscvty.py: fix E1130 (invalid-unary-operand-type) ...................................................................... [pylint] osmopy/obscvty.py: fix E1130 (invalid-unary-operand-type) This is not really a problem. Just making pylint happy. Change-Id: I32b637fdc0941d051e80e677857321b861ae0c20 --- M osmopy/obscvty.py 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py index 5789f98..8228bda 100755 --- a/osmopy/obscvty.py +++ b/osmopy/obscvty.py @@ -191,7 +191,7 @@ if close: self._close_socket() - return res[len(request) + 2: -end] + return res[len(request) + 2: end * -1] """A generator function yielding lines separated by delim. Behaves similar to a file readlines() method. -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37538?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I32b637fdc0941d051e80e677857321b861ae0c20 Gerrit-Change-Number: 37538 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

11 months, 1 week

1
0
0 0

[S] Change in ...osmo-python-tests[master]: contrib/jenkins.sh: use virtualenv and pip

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37540?usp=email ) Change subject: contrib/jenkins.sh: use virtualenv and pip ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I42ba71e2fd0ceb8466758ea46e9ae33e3d4fcb91 Gerrit-Change-Number: 37540 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Jul 2024 13:54:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

[S] Change in ...osmo-python-tests[master]: contrib/jenkins.sh: do not run test_py3.py twice

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37539?usp=email ) Change subject: contrib/jenkins.sh: do not run test_py3.py twice ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/37539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ib7e8e358d38be37055d44c8ff284d1578a30f6ac Gerrit-Change-Number: 37539 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 22 Jul 2024 13:53:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024