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

Change in simtrace2[master]: simtrace2-tool: hack: kick the comms by sending a fake message

by James Tavares

James Tavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26864 ) Change subject: simtrace2-tool: hack: kick the comms by sending a fake message ...................................................................... simtrace2-tool: hack: kick the comms by sending a fake message This is a workaround until the root cause of the communications failure between simtrace2-tool and simtrace2 firmware is identified. Additional details provided on simtrace mailing list. Change-Id: I40fa06bee5d8194516497e16597e069124ddf0fb --- M host/include/osmocom/simtrace2/simtrace2_api.h M host/lib/simtrace2_api.c M host/src/simtrace2-tool.c 3 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/64/26864/1 diff --git a/host/include/osmocom/simtrace2/simtrace2_api.h b/host/include/osmocom/simtrace2/simtrace2_api.h index d658d16..3a7e5ae 100644 --- a/host/include/osmocom/simtrace2/simtrace2_api.h +++ b/host/include/osmocom/simtrace2/simtrace2_api.h @@ -44,6 +44,7 @@ int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg, uint8_t msg_class, uint8_t msg_type); +int osmo_st2_generic_do_error_none(struct osmo_st2_cardem_inst *ci); int osmo_st2_cardem_request_card_insert(struct osmo_st2_cardem_inst *ci, bool inserted); int osmo_st2_cardem_request_pb_and_rx(struct osmo_st2_cardem_inst *ci, uint8_t pb, uint8_t le); diff --git a/host/lib/simtrace2_api.c b/host/lib/simtrace2_api.c index 4ad7eb7..beb6de4 100644 --- a/host/lib/simtrace2_api.c +++ b/host/lib/simtrace2_api.c @@ -155,6 +155,24 @@ } /*********************************************************************** + * Generic protocol + ***********************************************************************/ + +/*! \brief Send an empty DO_ERROR message to the simtrace2 board */ +int osmo_st2_generic_do_error_none(struct osmo_st2_cardem_inst *ci) +{ + struct msgb *msg = st_msgb_alloc(); + struct cardemu_usb_msg_error *err; + + LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s\n", __func__); + + err = (struct cardemu_usb_msg_error *) msgb_put(msg, sizeof(*err)); + memset(err, 0, sizeof(*err)); + + return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_GENERIC, SIMTRACE_CMD_DO_ERROR); +} + +/*********************************************************************** * Card Emulation protocol ***********************************************************************/ diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index d92638f..407eac9 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -297,6 +297,10 @@ fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); goto close_exit; } + + // HACK: kick the board with a fake message to get subsequent messages to be accepted + // TODO: figure out the real problem, and remove this + osmo_st2_generic_do_error_none(ci); } if (argc - optind <= 0) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I40fa06bee5d8194516497e16597e069124ddf0fb Gerrit-Change-Number: 26864 Gerrit-PatchSet: 1 Gerrit-Owner: James Tavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

1 year, 4 months

3
5
0 0

Build failed in Jenkins: master-osmo-opencm3-projects » a1=default,a2=default,a3=default,a4=default,osmocom-master-debian9 #73

by jenkins＠lists.osmocom.org

See <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…> Changes: ------------------------------------------ Started by upstream project "master-osmo-opencm3-projects" build number 73 originally caused by: Started by timer Running as SYSTEM Building remotely on build2-deb9build-ansible (ttcn3 osmocom-gerrit-debian9 osmocom-master-debian9 repo-install-test coverity) in workspace <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…> The recommended git tool is: NONE No credentials specified Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmo-opencm3-projects > git init <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…> # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-opencm3-projects > git --version # timeout=10 > git --version # 'git version 2.11.0' > git fetch --tags --progress -- git://git.osmocom.org/osmo-opencm3-projects +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmo-opencm3-projects # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 Avoid second fetch Checking out Revision cbff8e75d06b5e8ea9a196fa4fa706ba9f9ed124 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f cbff8e75d06b5e8ea9a196fa4fa706ba9f9ed124 # timeout=10 Commit message: "Make code compatible with picolibc >= 1.7.3" > git rev-list --no-walk cbff8e75d06b5e8ea9a196fa4fa706ba9f9ed124 # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.libopencm3.url # timeout=10 > git config -f .gitmodules --get submodule.libopencm3.path # timeout=10 > git config --get submodule.librfn.url # timeout=10 > git config -f .gitmodules --get submodule.librfn.path # timeout=10 > git submodule update --init --recursive libopencm3 # timeout=10 > git submodule update --init --recursive librfn # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins7080770160496406818.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true --cap-add SYS_PTRACE -e ARTIFACT_STORE=/artifact_store -e ASCIIDOC_WARNINGS_CHECK=1 -e HOME=/build -e JOB_NAME=master-osmo-opencm3-projects/a1=default,a2=default,a3=default,a4=default,label=osmocom-master-debian9 -e MAKE=make -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e OSMO_GSM_MANUALS_DIR=/opt/osmo-gsm-manuals -e PARALLEL_MAKE=-j 8 -e PUBLISH=1 -e WITH_MANUALS=1 -w /build -i -u build -v <https://jenkins.osmocom.org/jenkins/job/master-osmo-opencm3-projects/a1=def…>:/build -v /home/osmocom-build/jenkins_build_artifact_store:/artifact_store -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom-build/debian-bullseye-jenkins /build/contrib/jenkins.sh --publish =============== relay-driver START ============== CLEAN CC console.c CC console_stm32.c In file included from ../../libopencm3//include/libopencm3/cm3/nvic.h:147, from ../../librfn/librfn/libopencm3/console_stm32.c:24: ../../libopencm3//include/libopencm3/dispatch/nvic.h:8:11: fatal error: libopencm3/stm32/f1/nvic.h: No such file or directory # include <libopencm3/stm32/f1/nvic.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make: *** [../../mk/libopencm3.mk:228: console_stm32.o] Error 1 Build step 'Execute shell' marked build as failure

1 year, 8 months

1
24
0 0

Change in osmo-msc[master]: tests: use common stubs for SMS queue test

by laforge

Attention is currently required from: pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28842 ) Change subject: tests: use common stubs for SMS queue test ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a Gerrit-Change-Number: 28842 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sun, 31 Jul 2022 20:21:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: ESME: use osmo_sock_get_name() for logging

by laforge

Attention is currently required from: pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28841 ) Change subject: ESME: use osmo_sock_get_name() for logging ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sun, 31 Jul 2022 20:21:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by laforge

Attention is currently required from: pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28839 ) Change subject: Ignore .deb build byproducts ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sun, 31 Jul 2022 20:20:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add missing imports for envelope_sms command

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28872 ) Change subject: ts_31_102: Add missing imports for envelope_sms command ...................................................................... ts_31_102: Add missing imports for envelope_sms command The envelope_sms command fails due to some missing imports prior to this patch. Change-Id: I98e692745e7e1cfbc64b88b248700b1e54915b96 --- M pySim/ts_31_102.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 02ef005..65a2afe 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -39,6 +39,7 @@ from pySim.filesystem import * from pySim.ts_31_102_telecom import DF_PHONEBOOK, EF_UServiceTable from pySim.construct import * +from pySim.cat import SMS_TPDU, DeviceIdentities, SMSPPDownload from construct import Optional as COptional from construct import * from typing import Tuple -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I98e692745e7e1cfbc64b88b248700b1e54915b96 Gerrit-Change-Number: 28872 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in pysim[master]: Fix printing of SwMatchError after introduction of logical channels

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28870 ) Change subject: Fix printing of SwMatchError after introduction of logical channels ...................................................................... Fix printing of SwMatchError after introduction of logical channels the interpret_sw() method was moved from RuntimeState to RuntimeLchan in Change-Id I7aa994b625467d4e46a2edd8123240b930305360 - but the code in pySim/exceptions.py was not adjusted accordingly. Change-Id: I0614436c99c6a6ebc22c4dc14fb361c5f5f16686 --- M pySim/exceptions.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/exceptions.py b/pySim/exceptions.py index 24aff85..c6a81a1 100644 --- a/pySim/exceptions.py +++ b/pySim/exceptions.py @@ -53,8 +53,8 @@ self.rs = rs def __str__(self): - if self.rs: - r = self.rs.interpret_sw(self.sw_actual) + if self.rs and self.rs.lchan[0]: + r = self.rs.lchan[0].interpret_sw(self.sw_actual) if r: return "SW match failed! Expected %s and got %s: %s - %s" % (self.sw_expected, self.sw_actual, r[0], r[1]) return "SW match failed! Expected %s and got %s." % (self.sw_expected, self.sw_actual) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0614436c99c6a6ebc22c4dc14fb361c5f5f16686 Gerrit-Change-Number: 28870 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in pysim[master]: ts_31_102: Fix terminal_profile, envelope and envelope_sms commands

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28871 ) Change subject: ts_31_102: Fix terminal_profile, envelope and envelope_sms commands ...................................................................... ts_31_102: Fix terminal_profile, envelope and envelope_sms commands In commit Ib88bb7d12faaac7d149ee1f6379bc128b83bbdd5 I accidentially broke those commands by adding argparse definitions for better documentation. When adding the @cmd2.with_argparser decorator, the method argument changes from the raw string to an argparse.Namespace object. This patch fixes the below exception: pySIM-shell (MF/ADF.USIM)> terminal_profile ffffffff Traceback (most recent call last): File "/usr/local/lib/python3.10/dist-packages/cmd2/cmd2.py", line 2129, in onecmd_plus_hooks stop = self.onecmd(statement, add_to_history=add_to_history) File "/usr/local/lib/python3.10/dist-packages/cmd2/cmd2.py", line 2559, in onecmd stop = func(statement) File "/usr/local/lib/python3.10/dist-packages/cmd2/decorators.py", line 336, in cmd_wrapper return func(*args_list, **kwargs) File "/space/home/laforge/projects/git/pysim/pySim/ts_31_102.py", line 1274, in do_terminal_profile (data, sw) = self._cmd.card._scc.terminal_profile(arg) File "/space/home/laforge/projects/git/pysim/pySim/commands.py", line 583, in terminal_profile data_length = len(payload) // 2 TypeError: object of type 'Namespace' has no len() Change-Id: Ia861eeb2970627d3ecfd0ca73f75ca571c6885b2 Fixes: Ib88bb7d12faaac7d149ee1f6379bc128b83bbdd5 --- M pySim/ts_31_102.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 7850459..02ef005 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1264,40 +1264,40 @@ term_prof_parser.add_argument('PROFILE', help='Hexstring of encoded terminal profile') @cmd2.with_argparser(term_prof_parser) - def do_terminal_profile(self, arg): + def do_terminal_profile(self, opts): """Send a TERMINAL PROFILE command to the card. This is used to inform the card about which optional features the terminal (modem/phone) supports, particularly in the context of SIM Toolkit, Proactive SIM and OTA. You must specify a hex-string with the encoded terminal profile you want to send to the card.""" - (data, sw) = self._cmd.card._scc.terminal_profile(arg) + (data, sw) = self._cmd.card._scc.terminal_profile(opts.PROFILE) self._cmd.poutput('SW: %s, data: %s' % (sw, data)) envelope_parser = argparse.ArgumentParser() envelope_parser.add_argument('PAYLOAD', help='Hexstring of encoded payload to ENVELOPE') @cmd2.with_argparser(envelope_parser) - def do_envelope(self, arg): + def do_envelope(self, opts): """Send an ENVELOPE command to the card. This is how a variety of information is communicated from the terminal (modem/phone) to the card, particularly in the context of SIM Toolkit, Proactive SIM and OTA.""" - (data, sw) = self._cmd.card._scc.envelope(arg) + (data, sw) = self._cmd.card._scc.envelope(opts.PAYLOAD) self._cmd.poutput('SW: %s, data: %s' % (sw, data)) envelope_sms_parser = argparse.ArgumentParser() envelope_sms_parser.add_argument('TPDU', help='Hexstring of encoded SMS TPDU') @cmd2.with_argparser(envelope_sms_parser) - def do_envelope_sms(self, arg): + def do_envelope_sms(self, opts): """Send an ENVELOPE(SMS-PP-Download) command to the card. This emulates a terminal (modem/phone) having received a SMS with a PID of 'SMS for the SIM card'. You can use this command in the context of testing OTA related features without a modem/phone or a cellular netwokr.""" tpdu_ie = SMS_TPDU() - tpdu_ie.from_bytes(h2b(arg)) + tpdu_ie.from_bytes(h2b(opts.TPDU)) dev_ids = DeviceIdentities( decoded={'source_dev_id': 'network', 'dest_dev_id': 'uicc'}) sms_dl = SMSPPDownload(children=[dev_ids, tpdu_ie]) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia861eeb2970627d3ecfd0ca73f75ca571c6885b2 Gerrit-Change-Number: 28871 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add missing imports for envelope_sms command

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28872 ) Change subject: ts_31_102: Add missing imports for envelope_sms command ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I98e692745e7e1cfbc64b88b248700b1e54915b96 Gerrit-Change-Number: 28872 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 31 Jul 2022 20:19:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: ts_31_102: Fix terminal_profile, envelope and envelope_sms commands

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28871 ) Change subject: ts_31_102: Fix terminal_profile, envelope and envelope_sms commands ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia861eeb2970627d3ecfd0ca73f75ca571c6885b2 Gerrit-Change-Number: 28871 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 31 Jul 2022 20:19:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: Fix printing of SwMatchError after introduction of logical channels

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28870 ) Change subject: Fix printing of SwMatchError after introduction of logical channels ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0614436c99c6a6ebc22c4dc14fb361c5f5f16686 Gerrit-Change-Number: 28870 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 31 Jul 2022 20:18:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Fix use of incorrect variable in loop

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28855 ) Change subject: cbc: Fix use of incorrect variable in loop ...................................................................... cbc: Fix use of incorrect variable in loop This went unnoticed before because all tests were running with both bsc and mme set to 1. Change-Id: I978c92819cb4e218c95bc719ade71787dc474b23 --- M cbc/CBC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 11b8e5a..5240d85 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -150,7 +150,7 @@ } function f_start() runs on test_CT { - for (var integer i := 0; i < g_num_mme; i := i + 1) { + for (var integer i := 0; i < g_num_bsc; i := i + 1) { f_start_bsc(i, testcasename(), g_pars_BSC[i]); } for (var integer i := 0; i < g_num_mme; i := i + 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28855 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: I978c92819cb4e218c95bc719ade71787dc474b23 Gerrit-Change-Number: 28855 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-cbc[master]: cbc_main: Enable logging of fsm timeouts

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28852 ) Change subject: cbc_main: Enable logging of fsm timeouts ...................................................................... cbc_main: Enable logging of fsm timeouts Change-Id: I6ffbfbc8eddb3efff0b6401223b9b5563cf83b51 --- M src/cbc_main.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/cbc_main.c b/src/cbc_main.c index 7e13e52..fd8e4fe 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -35,6 +35,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> #include <osmocom/core/application.h> +#include <osmocom/core/fsm.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/stats.h> @@ -268,6 +269,7 @@ log_enable_multithread(); sbcap_set_log_area(DSBcAP, DASN1C); osmo_stats_init(tall_cbc_ctx); + osmo_fsm_log_timeouts(true); vty_init(&vty_info); g_cbc = cbc_alloc(tall_cbc_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6ffbfbc8eddb3efff0b6401223b9b5563cf83b51 Gerrit-Change-Number: 28852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-cbc[master]: Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28853 ) Change subject: Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails ...................................................................... Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails Change-Id: Ie40c8e41c297398bbec48f7bb2c60cfdc703fa5d --- M include/osmocom/cbc/cbsp_link.h M include/osmocom/cbc/sbcap_link.h M src/cbc_message.c M src/cbsp_link.c M src/sbcap_link.c 5 files changed, 19 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/cbc/cbsp_link.h b/include/osmocom/cbc/cbsp_link.h index a96162d..0a18d21 100644 --- a/include/osmocom/cbc/cbsp_link.h +++ b/include/osmocom/cbc/cbsp_link.h @@ -47,6 +47,6 @@ void cbc_cbsp_link_free(struct cbc_cbsp_link *link); const char *cbc_cbsp_link_name(const struct cbc_cbsp_link *link); int cbc_cbsp_link_open_cli(struct cbc_cbsp_link *link); -void cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp); +int cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp); void cbc_cbsp_link_close(struct cbc_cbsp_link *link); int cbc_cbsp_link_rx_cb(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *dec); diff --git a/include/osmocom/cbc/sbcap_link.h b/include/osmocom/cbc/sbcap_link.h index 0c23710..ee87be4 100644 --- a/include/osmocom/cbc/sbcap_link.h +++ b/include/osmocom/cbc/sbcap_link.h @@ -47,6 +47,6 @@ void cbc_sbcap_link_free(struct cbc_sbcap_link *link); const char *cbc_sbcap_link_name(const struct cbc_sbcap_link *link); int cbc_sbcap_link_open_cli(struct cbc_sbcap_link *link); -void cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); +int cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); void cbc_sbcap_link_close(struct cbc_sbcap_link *link); int cbc_sbcap_link_rx_cb(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); diff --git a/src/cbc_message.c b/src/cbc_message.c index a2bf86a..f17ab75 100644 --- a/src/cbc_message.c +++ b/src/cbc_message.c @@ -70,8 +70,8 @@ peer->name); return -EINVAL; } - cbc_cbsp_link_tx(peer->link.cbsp, cbsp); - break; + return cbc_cbsp_link_tx(peer->link.cbsp, cbsp); + case CBC_PEER_PROTO_SBcAP: /* skip peers without any current SBc-AP connection */ if (!peer->link.sbcap) { @@ -84,17 +84,16 @@ peer->name); return -EINVAL; } - cbc_sbcap_link_tx(peer->link.sbcap, sbcap); - break; + return cbc_sbcap_link_tx(peer->link.sbcap, sbcap); + case CBC_PEER_PROTO_SABP: LOGP(DLGLOBAL, LOGL_ERROR, "Sending message to peer proto %s not implemented!\n", get_value_string(cbc_peer_proto_name, peer->proto)); return -1; + default: OSMO_ASSERT(0); } - - return 0; } /* receive a new CBC message from the user (REST). Allocates new memory, diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 343ac26..a6462ee 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -318,14 +318,14 @@ return 0; } -void cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp) +int cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp) { struct msgb *msg; if (!link) { LOGP(DCBSP, LOGL_NOTICE, "Cannot transmit %s: no connection\n", get_value_string(cbsp_msg_type_names, cbsp->msg_type)); - return ; + return -ENOLINK; } LOGPCC(link, LOGL_INFO, "Transmitting %s\n", @@ -336,13 +336,14 @@ LOGPCC(link, LOGL_ERROR, "Failed to encode CBSP %s: %s\n", get_value_string(cbsp_msg_type_names, cbsp->msg_type), osmo_cbsp_errstr); talloc_free(cbsp); - return; + return -EINVAL; } talloc_free(cbsp); if (link->is_client) osmo_stream_cli_send(link->cli_conn, msg); else osmo_stream_srv_send(link->srv_conn, msg); + return 0; } void cbc_cbsp_link_close(struct cbc_cbsp_link *link) diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 91fa75c..b2a5aa2 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -379,27 +379,30 @@ return 0; } -void cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) +int cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) { struct msgb *msg; + int rc = 0; if (!pdu) { LOGP(DSBcAP, LOGL_NOTICE, "Cannot transmit msg: no pdu\n"); - return; + return -ENOMSG; } if (!link) { LOGP(DSBcAP, LOGL_NOTICE, "Cannot transmit msg %s: no connection\n", sbcap_pdu_get_name(pdu)); - return; + return -ENOLINK; } LOGPSBCAPC(link, LOGL_INFO, "Tx msg %s\n", sbcap_pdu_get_name(pdu)); OSMO_ASSERT(link->conn); msg = sbcap_encode(pdu); - if (!msg) + if (!msg) { + rc = -EINVAL; goto ret_free; + } LOGPSBCAPC(link, LOGL_DEBUG, "Encoded message %s: %s\n", sbcap_pdu_get_name(pdu), msgb_hexdump(msg)); if (link->is_client) @@ -408,6 +411,7 @@ osmo_stream_srv_send(link->srv_conn, msg); ret_free: sbcap_pdu_free(pdu); + return rc; } void cbc_sbcap_link_close(struct cbc_sbcap_link *link) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie40c8e41c297398bbec48f7bb2c60cfdc703fa5d Gerrit-Change-Number: 28853 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-hnbgw[master]: reduce code dup in handle_cn_data_ind()

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 ) Change subject: reduce code dup in handle_cn_data_ind() ...................................................................... Patch Set 2: (1 comment) File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827/comment/51c26986_9c7909f7 PS1, Line 376: if (!map->is_ps) { > I'd personally first check for the type of procedure ("switch (message->procedureCode)") and then in […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4bca25d1643693cf3a9d3c49f35b29ff1dce0859 Gerrit-Change-Number: 28827 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 20:09:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-hnbgw[master]: reduce code dup in handle_cn_data_ind()

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 ) Change subject: reduce code dup in handle_cn_data_ind() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4bca25d1643693cf3a9d3c49f35b29ff1dce0859 Gerrit-Change-Number: 28827 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 20:09:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: add library/PFCP_*, deps/PFCP

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 ) Change subject: add library/PFCP_*, deps/PFCP ...................................................................... Patch Set 3: (1 comment) File library/PFCP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/466a9b10_0587… PS1, Line 18: type enumerated e_PFCP_Cause { > I disagree, having a _Types file it should go there. was going to move now but noticed that PFCP_Types.ttcn is from deps/titan.ProtocolModules.PFCP_v15.1.0/ so it's upstream code. these types are only there for use with the templates, i hope you're not making me create a PFCP_Types2.ttcn for these? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 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: I0723b931b3f755ea291bffa2f27c34ba446c2f2f Gerrit-Change-Number: 28817 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 20:04:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: add library/PFCP_*, deps/PFCP

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 ) Change subject: add library/PFCP_*, deps/PFCP ...................................................................... Patch Set 3: (1 comment) File library/PFCP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/8084122f_59b5… PS1, Line 418: function ts_PFCP_Session_Est_Req(charstring node_id, OCT8 cp_seid, Create_PDR_list create_pdr, Create_FAR_list create_far) return template PDU_PFCP { > I'm sorry but your personal tooling is not an acceptable motivation to avoid specifying template typ […] honestly i'd like to know. i don't see constrictions nor errors with these templates. i still don't understand the benefit. does someone have examples where a (value) and where a (present) actually improves usage of a template? (also i find my tooling pretty important, since it translates to work hours our employer actually pays me) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 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: I0723b931b3f755ea291bffa2f27c34ba446c2f2f Gerrit-Change-Number: 28817 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 19:56:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-upf[master]: add contrib/set_cap_net_admin.sh

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28311 ) Change subject: add contrib/set_cap_net_admin.sh ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: if i get no veto i'm just going to merge this soon -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: If31c304e2602d3c37d5d8a5a2705417b2fc4686c Gerrit-Change-Number: 28311 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 19:46:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28784 ) Change subject: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_ ...................................................................... sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_ Some functions act on a struct sdp_audio_codecs but begin with the name sdp_audio_codec (singular). That's confusing. Related: SYS#5066 Change-Id: Id87eb350c1f17f8dbf776909824bfa06634c1d04 --- M include/osmocom/msc/sdp_msg.h M src/libmsc/sdp_msg.c M tests/sdp_msg/sdp_msg_test.c 3 files changed, 27 insertions(+), 27 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/include/osmocom/msc/sdp_msg.h b/include/osmocom/msc/sdp_msg.h index 537713c..9073e91 100644 --- a/include/osmocom/msc/sdp_msg.h +++ b/include/osmocom/msc/sdp_msg.h @@ -41,15 +41,15 @@ int sdp_audio_codecs_cmp(const struct sdp_audio_codecs *a, const struct sdp_audio_codecs *b, bool cmp_fmtp, bool cmp_payload_type); -struct sdp_audio_codec *sdp_audio_codec_add(struct sdp_audio_codecs *ac, unsigned int payload_type, - const char *subtype_name, unsigned int rate, const char *fmtp); -struct sdp_audio_codec *sdp_audio_codec_add_copy(struct sdp_audio_codecs *ac, - const struct sdp_audio_codec *codec); -int sdp_audio_codec_remove(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec); -struct sdp_audio_codec *sdp_audio_codec_by_payload_type(struct sdp_audio_codecs *ac, - unsigned int payload_type, bool create); -struct sdp_audio_codec *sdp_audio_codec_by_descr(struct sdp_audio_codecs *ac, - const struct sdp_audio_codec *codec); +struct sdp_audio_codec *sdp_audio_codecs_add(struct sdp_audio_codecs *ac, unsigned int payload_type, + const char *subtype_name, unsigned int rate, const char *fmtp); +struct sdp_audio_codec *sdp_audio_codecs_add_copy(struct sdp_audio_codecs *ac, + const struct sdp_audio_codec *codec); +int sdp_audio_codecs_remove(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec); +struct sdp_audio_codec *sdp_audio_codecs_by_payload_type(struct sdp_audio_codecs *ac, + unsigned int payload_type, bool create); +struct sdp_audio_codec *sdp_audio_codecs_by_descr(struct sdp_audio_codecs *ac, + const struct sdp_audio_codec *codec); void sdp_audio_codecs_intersection(struct sdp_audio_codecs *ac_dest, const struct sdp_audio_codecs *ac_other, bool translate_payload_type_numbers); diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index a2a2d3d..eda6ac9 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -116,13 +116,13 @@ * The payload_type must exist in sdp_msg_payload_type_names. * Return the audio codec created or already existing for this payload type number. */ -struct sdp_audio_codec *sdp_audio_codec_add(struct sdp_audio_codecs *ac, unsigned int payload_type, - const char *subtype_name, unsigned int rate, const char *fmtp) +struct sdp_audio_codec *sdp_audio_codecs_add(struct sdp_audio_codecs *ac, unsigned int payload_type, + const char *subtype_name, unsigned int rate, const char *fmtp) { struct sdp_audio_codec *codec; /* Does an entry already exist? */ - codec = sdp_audio_codec_by_payload_type(ac, payload_type, false); + codec = sdp_audio_codecs_by_payload_type(ac, payload_type, false); if (codec) { /* Already exists, sanity check */ if (!codec->subtype_name[0]) @@ -141,7 +141,7 @@ } /* None exists, create codec entry for this payload type number */ - codec = sdp_audio_codec_by_payload_type(ac, payload_type, true); + codec = sdp_audio_codecs_by_payload_type(ac, payload_type, true); /* NULL means unable to add an entry */ if (!codec) return NULL; @@ -152,14 +152,14 @@ return codec; } -struct sdp_audio_codec *sdp_audio_codec_add_copy(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) +struct sdp_audio_codec *sdp_audio_codecs_add_copy(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) { - return sdp_audio_codec_add(ac, codec->payload_type, codec->subtype_name, codec->rate, - codec->fmtp[0] ? codec->fmtp : NULL); + return sdp_audio_codecs_add(ac, codec->payload_type, codec->subtype_name, codec->rate, + codec->fmtp[0] ? codec->fmtp : NULL); } -struct sdp_audio_codec *sdp_audio_codec_by_payload_type(struct sdp_audio_codecs *ac, unsigned int payload_type, - bool create) +struct sdp_audio_codec *sdp_audio_codecs_by_payload_type(struct sdp_audio_codecs *ac, unsigned int payload_type, + bool create) { struct sdp_audio_codec *codec; foreach_sdp_audio_codec(codec, ac) { @@ -185,7 +185,7 @@ /* Return a given sdp_msg's codec entry that matches the subtype_name and rate of the given codec, or NULL if no * match is found. Comparison is made by sdp_audio_codec_cmp(cmp_payload_type=false). */ -struct sdp_audio_codec *sdp_audio_codec_by_descr(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) +struct sdp_audio_codec *sdp_audio_codecs_by_descr(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) { struct sdp_audio_codec *i; foreach_sdp_audio_codec(i, ac) { @@ -196,9 +196,9 @@ } /* Remove the codec entry pointed at by 'codec'. 'codec' must point at an entry of 'sdp' (to use an external codec - * instance, use sdp_audio_codec_by_descr()). + * instance, use sdp_audio_codecs_by_descr()). * Return 0 on success, -ENOENT if codec does not point at the sdp->codec array. */ -int sdp_audio_codec_remove(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) +int sdp_audio_codecs_remove(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) { struct sdp_audio_codec *i; if ((codec < ac->codec) @@ -290,7 +290,7 @@ if (!audio_name || audio_name >= sdp_msg_line_end(src)) return -EINVAL; - codec = sdp_audio_codec_by_payload_type(&sdp->audio_codecs, payload_type, true); + codec = sdp_audio_codecs_by_payload_type(&sdp->audio_codecs, payload_type, true); if (!codec) return -ENOSPC; @@ -314,7 +314,7 @@ if (fmtp_str >= line_end) return -EINVAL; - codec = sdp_audio_codec_by_payload_type(&sdp->audio_codecs, payload_type, true); + codec = sdp_audio_codecs_by_payload_type(&sdp->audio_codecs, payload_type, true); if (!codec) return -ENOSPC; @@ -400,7 +400,7 @@ if (sscanf(payload_type_str, "%u", &payload_type) < 1) return -EINVAL; - codec = sdp_audio_codec_by_payload_type(&sdp->audio_codecs, payload_type, true); + codec = sdp_audio_codecs_by_payload_type(&sdp->audio_codecs, payload_type, true); if (!codec) return -ENOSPC; @@ -519,10 +519,10 @@ struct sdp_audio_codec *other; OSMO_ASSERT(i < ARRAY_SIZE(ac_dest->codec)); - other = sdp_audio_codec_by_descr((struct sdp_audio_codecs*)ac_other, codec); + other = sdp_audio_codecs_by_descr((struct sdp_audio_codecs *)ac_other, codec); if (!other) { - OSMO_ASSERT(sdp_audio_codec_remove(ac_dest, codec) == 0); + OSMO_ASSERT(sdp_audio_codecs_remove(ac_dest, codec) == 0); i--; continue; } diff --git a/tests/sdp_msg/sdp_msg_test.c b/tests/sdp_msg/sdp_msg_test.c index e891953..ee48e80 100644 --- a/tests/sdp_msg/sdp_msg_test.c +++ b/tests/sdp_msg/sdp_msg_test.c @@ -531,7 +531,7 @@ break; } printf("SDP: %s\n", sdp_audio_codecs_to_str(&sdp.audio_codecs)); - codec = sdp_audio_codec_by_payload_type(&sdp.audio_codecs, t->select_payload_type, false); + codec = sdp_audio_codecs_by_payload_type(&sdp.audio_codecs, t->select_payload_type, false); OSMO_ASSERT(codec); printf("Select: %s\n", sdp_audio_codec_to_str(codec)); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id87eb350c1f17f8dbf776909824bfa06634c1d04 Gerrit-Change-Number: 28784 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28783 ) Change subject: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags ...................................................................... sdp_msg: add sdp_audio_codecs_cmp(), add compare flags A problem with SDP fmtp handling is visible in this patch: when cmp_fmtp is true, we compare fmtp strings 1:1, which is not how things should be done. The intention is to fix fmtp handling in a later patch. At least there now is a flag to bypass fmtp comparison altogether. Related: SYS#5066 Change-Id: I18d33e189674229501afec950aa1c732386455a2 --- M include/osmocom/msc/sdp_msg.h M src/libmsc/sdp_msg.c 2 files changed, 73 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/include/osmocom/msc/sdp_msg.h b/include/osmocom/msc/sdp_msg.h index 44a8a30..537713c 100644 --- a/include/osmocom/msc/sdp_msg.h +++ b/include/osmocom/msc/sdp_msg.h @@ -36,7 +36,10 @@ const char *sdp_msg_line_end(const char *src); -int sdp_audio_codec_cmp(const struct sdp_audio_codec *a, const struct sdp_audio_codec *b); +int sdp_audio_codec_cmp(const struct sdp_audio_codec *a, const struct sdp_audio_codec *b, + bool cmp_fmtp, bool cmp_payload_type); +int sdp_audio_codecs_cmp(const struct sdp_audio_codecs *a, const struct sdp_audio_codecs *b, + bool cmp_fmtp, bool cmp_payload_type); struct sdp_audio_codec *sdp_audio_codec_add(struct sdp_audio_codecs *ac, unsigned int payload_type, const char *subtype_name, unsigned int rate, const char *fmtp); diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index 08a2186..a2a2d3d 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -31,30 +31,83 @@ #include <osmocom/msc/sdp_msg.h> /* Compare name, rate and fmtp, returning typical cmp result: 0 on match, and -1 / 1 on mismatch. - * Do *not* compare the payload_type number. + * If cmp_fmtp is false, do *not* compare the fmtp string; if true, compare fmtp 1:1 as strings. + * If cmp_payload_type is false, do *not* compare the payload_type number. * The fmtp is only string-compared -- e.g. if AMR parameters appear in a different order, it amounts to a mismatch even * though all parameters are the same. */ -int sdp_audio_codec_cmp(const struct sdp_audio_codec *a, const struct sdp_audio_codec *b) +int sdp_audio_codec_cmp(const struct sdp_audio_codec *a, const struct sdp_audio_codec *b, + bool cmp_fmtp, bool cmp_payload_type) { - int rc; + int cmp; if (a == b) return 0; if (!a) return -1; if (!b) return 1; - rc = strncmp(a->subtype_name, b->subtype_name, sizeof(a->subtype_name)); - if (rc) - return rc; + cmp = strncmp(a->subtype_name, b->subtype_name, sizeof(a->subtype_name)); + if (cmp) + return cmp; + cmp = OSMO_CMP(a->rate, b->rate); + if (cmp) + return cmp; + if (cmp_fmtp) { + cmp = strncmp(a->fmtp, b->fmtp, sizeof(a->fmtp)); + if (cmp) + return cmp; + } + if (cmp_payload_type) { + cmp = OSMO_CMP(a->payload_type, b->payload_type); + if (cmp) + return cmp; + } + return 0; +} - if (a->rate < b->rate) +/* Compare two lists of audio codecs, returning typical cmp result: 0 on match, and -1 / 1 on mismatch. + * The ordering in the two lists may differ, except that the first codec in 'a' must also be the first codec in 'b'. + * This is because the first codec typically expresses the preferred codec to use. + * If cmp_fmtp is false, do *not* compare the fmtp strings; if true, compare fmtp 1:1 as strings. + * If cmp_payload_type is false, do *not* compare the payload_type numbers. + * The fmtp is only string-compared -- e.g. if AMR parameters appear in a different order, it amounts to a mismatch even + * though all parameters are the same. */ +int sdp_audio_codecs_cmp(const struct sdp_audio_codecs *a, const struct sdp_audio_codecs *b, + bool cmp_fmtp, bool cmp_payload_type) +{ + const struct sdp_audio_codec *codec_a; + const struct sdp_audio_codec *codec_b; + int cmp; + if (a == b) + return 0; + if (!a) return -1; - if (a->rate > b->rate) + if (!b) return 1; - rc = strncmp(a->fmtp, b->fmtp, sizeof(a->fmtp)); - if (rc) - return rc; + cmp = OSMO_CMP(a->count, b->count); + if (cmp) + return cmp; + + if (!a->count) + return 0; + + /* The first codec is the "chosen" codec and should match. The others may appear in different order. */ + cmp = sdp_audio_codec_cmp(&a->codec[0], &b->codec[0], cmp_fmtp, cmp_payload_type); + if (cmp) + return cmp; + + /* See if each codec in a is also present in b */ + foreach_sdp_audio_codec(codec_a, a) { + bool match_found = false; + foreach_sdp_audio_codec(codec_b, b) { + if (!sdp_audio_codec_cmp(codec_a, codec_b, cmp_fmtp, cmp_payload_type)) { + match_found = true; + break; + } + } + if (!match_found) + return -1; + } return 0; } @@ -130,13 +183,13 @@ return codec; } -/* Return a given sdp_msg's codec entry that matches the subtype_name, rate and fmtp of the given codec, or NULL if no - * match is found. Comparison is made by sdp_audio_codec_cmp(). */ +/* Return a given sdp_msg's codec entry that matches the subtype_name and rate of the given codec, or NULL if no + * match is found. Comparison is made by sdp_audio_codec_cmp(cmp_payload_type=false). */ struct sdp_audio_codec *sdp_audio_codec_by_descr(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) { struct sdp_audio_codec *i; foreach_sdp_audio_codec(i, ac) { - if (!sdp_audio_codec_cmp(i, codec)) + if (!sdp_audio_codec_cmp(i, codec, false, false)) return i; } return NULL; @@ -452,8 +505,8 @@ } /* Leave only those codecs in 'ac_dest' that are also present in 'ac_other'. - * The matching is made by sdp_audio_codec_cmp(), i.e. payload_type numbers are not compared and fmtp parameters are - * compared 1:1 as plain strings. + * The matching is made by sdp_audio_codec_cmp(cmp_payload_type=false), i.e. payload_type numbers are not compared and + * fmtp parameters are compared 1:1 as plain strings. * If translate_payload_type_numbers has an effect if ac_dest and ac_other have mismatching payload_type numbers for the * same SDP codec descriptions. If translate_payload_type_numbers is true, take the payload_type numbers from ac_other. * If false, keep payload_type numbers in ac_dest unchanged. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I18d33e189674229501afec950aa1c732386455a2 Gerrit-Change-Number: 28783 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28784 ) Change subject: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_ ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: this is a pretty trivial thing, i'm going to pass this for the benefit of the rest of the codecs patches -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id87eb350c1f17f8dbf776909824bfa06634c1d04 Gerrit-Change-Number: 28784 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 19:45:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28783 ) Change subject: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I18d33e189674229501afec950aa1c732386455a2 Gerrit-Change-Number: 28783 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 19:43:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28819 ) Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... Patch Set 3: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/12db3bfe_4af0829b PS2, Line 8: > I see no need for writing an issue if it's a generic patch simply refactoring/improving some code. […] it's about a hint to me where i can account the review work to File src/sbcap/sbcap_common.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/f96f757d_038eb039 PS2, Line 162: static char pdu_name[256] = "<unknown>"; > I rather have a static buf in the app than using OTC_SELECT. […] hmm. a while back my impression was that we consciously decided to avoid static buffers, because over the years they build up, amounting to a lot of memory being hogged, completely unused for the vast majority of runtime. Ever since that decision i've been going out of my way to avoid static buffers There are functional benefits to talloc strings; in addition to the ones i posted before, a talloc string will never cut short a string because the static buffer is too small; i.e. we don't need to pick a size that the largest possible string might ever need. Since my attention was brought to this aspect, my opinion is that static buffers should be avoided. they are bad in various ways. this patch is already merged but i consider this still an open issue you brushed over -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 19:41:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,ass_updown}()

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28869 to look at the new patch set (#2). Change subject: BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,ass_updown}() ...................................................................... BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,ass_updown}() We used to rely on trxcon sendig dummy RR Measurement Reports and patching the L1 SACCH Header with the configured MS Power Level and Timing Advance values. Recently TC_rsl_ms_pwr_dyn_ass_updown started to fail because trxcon does not patch dummy MRs anymore. Do not rely on dummy MRs, send SACCH blocks with the expected MS Power Level and Timing Advance values from the testsuites. Change-Id: I31dd6b9026d04403092256176f67785a0a6486ad Related: OS#5635 --- M bts/BTS_Tests.ttcn 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/28869/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28869 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: I31dd6b9026d04403092256176f67785a0a6486ad Gerrit-Change-Number: 28869 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: make ts_SacchL1Header easier to use

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28875 ) Change subject: library/GSM_RR_Types: make ts_SacchL1Header easier to use ...................................................................... library/GSM_RR_Types: make ts_SacchL1Header easier to use Move parameter 'fpc' at the end and assign false by default, so that there is not need to pass false. We never set it to true anyway. Change-Id: I8a0ef562c2426a637fbb9fe3d50711ee7738d04f --- M bts/BTS_Tests.ttcn M library/GSM_RR_Types.ttcn M library/LAPDm_RAW_PT.ttcn 3 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/28875/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 47d7ce1..adb0c2f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -795,8 +795,7 @@ /* TITAN has weird (and often unusable) padding model, so we pad here manaully */ l3 := f_pad_oct(enc_GsmRrL3Message(meas_rep), 18, '00'O); l2 := f_pad_oct(enc_LapdmFrameAB(valueof(ts_LAPDm_AB(0, meas_rep))), 21, '00'O); - l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, - g_pars.l1_pars.ms_actual_ta); + l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); /* Send RR Measurement Report over the Um interface */ L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); @@ -2121,8 +2120,7 @@ log("LAPDm: ", lb); var template (value) SacchL1Header l1h := ts_SacchL1Header( - g_pars.l1_pars.ms_power_level, false, - g_pars.l1_pars.ms_actual_ta); + g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); /* According to 3GPP TS 44.018, section 10.5.2.20, we should pad with zeroes */ var octetstring l2 := f_pad_oct(enc_LapdmFrameAB(valueof(lb)), 21, '00'O); @@ -6897,7 +6895,7 @@ /* TODO: we can use an extension of TTCN-3 for padding, i.e. PADDING('2B'O) */ if (valueof(link_id.c) == SACCH) { /* Compose dummy L1 header */ - l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta); + l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, link_id, l1h, f_pad_oct(l2, 21, '2B'O))); } else { /* If required, pad L2 frame with constant 0x2b filling */ diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 980020e..335e290 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -198,7 +198,10 @@ external function dec_SacchL1Header(in octetstring stream) return SacchL1Header with { extension "prototype(convert) decode(RAW)" }; - template (value) SacchL1Header ts_SacchL1Header(uint5_t ms_power_lvl, boolean fpc, uint8_t actual_ta) := { + template (value) SacchL1Header + ts_SacchL1Header(uint5_t ms_power_lvl, + uint8_t actual_ta, + boolean fpc := false) := { reserved := 0, fpc := fpc, ms_power_lvl := ms_power_lvl, diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn index 3e2fba2..946da67 100644 --- a/library/LAPDm_RAW_PT.ttcn +++ b/library/LAPDm_RAW_PT.ttcn @@ -494,7 +494,7 @@ link_id := valueof(ts_RslLinkID_SACCH(lpd.sapi)); buf := f_pad_oct(enc_LapdmFrame(lpd.lapdm), 21, '2B'O); var SacchL1Header l1h := valueof(ts_SacchL1Header(ms_power_lvl, - false, timing_adv)); + timing_adv)); L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(chan_desc.chan_nr, link_id, l1h, buf)); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28875 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: I8a0ef562c2426a637fbb9fe3d50711ee7738d04f Gerrit-Change-Number: 28875 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma}

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 ) Change subject: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma} ...................................................................... BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma} Change-Id: I89eb90815e86db466ea626f4c25f2634c1d942d5 Depends: osmocom-bb.git I0f467fc07cf844cc73465f235b36ba7d00788c9f Related: OS#5635 --- M bts/BTS_Tests.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/28876/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index adb0c2f..270c0fb 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -7860,6 +7860,12 @@ /* Ensure that 'rx-current' equals 'rx-target' */ f_trxc_fake_rssi(mp_uplink_power_target); + /* Populate SACCH cache with a Measurement Report */ + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), + ts_SacchL1Header(g_pars.l1_pars.ms_power_level, + g_pars.l1_pars.ms_actual_ta), + f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O))); + /* Establish a dedicated channel */ f_est_dchan(more_ies := valueof(ies)); @@ -7921,6 +7927,12 @@ /* Ensure that 'rx-current' equals 'rx-target' */ f_trxc_fake_rssi(mp_uplink_power_target); + /* Populate SACCH cache with a Measurement Report */ + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), + ts_SacchL1Header(g_pars.l1_pars.ms_power_level, + g_pars.l1_pars.ms_actual_ta), + f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O))); + /* Establish a dedicated channel */ f_est_dchan(more_ies := valueof(ies)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 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: I89eb90815e86db466ea626f4c25f2634c1d942d5 Gerrit-Change-Number: 28876 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: allow populating global SACCH cache via L1CTL

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28874 ) Change subject: trxcon: allow populating global SACCH cache via L1CTL ...................................................................... trxcon: allow populating global SACCH cache via L1CTL Change-Id: I0f467fc07cf844cc73465f235b36ba7d00788c9f Related: OS#5635, OS#5599 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_fsm.c 6 files changed, 75 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/74/28874/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 3f7dae0..04303f0 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -374,6 +374,8 @@ void (*clock_cb)(struct l1sched_state *sched); /*! List of timeslots maintained by this scheduler */ struct l1sched_ts *ts[TRX_TS_COUNT]; + /*! SACCH cache (common for all lchans) */ + uint8_t sacch_cache[GSM_MACBLOCK_LEN]; /*! BSIC value learned from SCH bursts */ uint8_t bsic; /*! Logging context (used as prefix for messages) */ diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 6a43bcb..430b26e 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -25,6 +25,7 @@ TRXCON_EV_SET_TCH_MODE_REQ, TRXCON_EV_PHY_CONFIG_REQ, TRXCON_EV_TX_ACCESS_BURST_REQ, + TRXCON_EV_UPDATE_SACCH_CACHE_REQ, TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, TRXCON_EV_TX_TRAFFIC_REQ, diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index b907917..c6939f5 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -644,10 +644,18 @@ "Recv %s Req (chan_nr=0x%02x, link_id=0x%02x, len=%zu)\n", traffic ? "TRAFFIC" : "DATA", req.chan_nr, req.link_id, req.data_len); - if (traffic) - osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_TRAFFIC_REQ, &req); - else - osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_DATA_REQ, &req); + switch (trxcon->fi->state) { + case TRXCON_ST_DEDICATED: + if (traffic) + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_TRAFFIC_REQ, &req); + else + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_DATA_REQ, &req); + break; + default: + if (!traffic && req.link_id == 0x40) + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_UPDATE_SACCH_CACHE_REQ, &req); + /* TODO: log an error about uhnandled DATA.req / TRAFFIC.req */ + } msgb_free(msg); return 0; diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 9b6d28d..f97e505 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -116,8 +116,7 @@ } /** - * Composes a new primitive using either cached (if populated), - * or "dummy" Measurement Report message. + * Composes a new primitive from cached RR Measurement Report. * * @param lchan lchan to assign a primitive * @return SACCH primitive to be transmitted @@ -125,38 +124,8 @@ static struct l1sched_ts_prim *prim_compose_mr(struct l1sched_lchan_state *lchan) { struct l1sched_ts_prim *prim; - uint8_t *mr_src_ptr; bool cached; - /* "Dummy" Measurement Report */ - static const uint8_t meas_rep_dummy[] = { - /* L1 SACCH pseudo-header */ - 0x0f, 0x00, - - /* LAPDm header */ - 0x01, 0x03, 0x49, - - /* RR Management messages, Measurement Report */ - 0x06, 0x15, - - /* Measurement results (see 3GPP TS 44.018, section 10.5.2.20): - * 0... .... = BA-USED: 0 - * .0.. .... = DTX-USED: DTX was not used - * ..11 0110 = RXLEV-FULL-SERVING-CELL: -57 <= x < -56 dBm (54) - * 0... .... = 3G-BA-USED: 0 - * .1.. .... = MEAS-VALID: The measurement results are not valid - * ..11 0110 = RXLEV-SUB-SERVING-CELL: -57 <= x < -56 dBm (54) - * 0... .... = SI23_BA_USED: 0 - * .000 .... = RXQUAL-FULL-SERVING-CELL: BER < 0.2%, Mean value 0.14% (0) - * .... 000. = RXQUAL-SUB-SERVING-CELL: BER < 0.2%, Mean value 0.14% (0) - * .... ...1 11.. .... = NO-NCELL-M: Neighbour cell information not available */ - 0x36, 0x76, 0x01, 0xc0, - - /* 0** -- Padding with zeroes */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }; - /* Allocate a new primitive */ prim = prim_alloc(lchan, GSM_MACBLOCK_LEN, L1SCHED_PRIM_DATA, l1sched_lchan_desc[lchan->type].chan_nr, @@ -167,43 +136,24 @@ cached = (lchan->sacch.mr_cache[2] != 0x00 && lchan->sacch.mr_cache[3] != 0x00 && lchan->sacch.mr_cache[4] != 0x00); - if (cached) { /* Use the cached one */ - mr_src_ptr = lchan->sacch.mr_cache; - lchan->sacch.mr_cache_usage++; - } else { /* Use "dummy" one */ - mr_src_ptr = (uint8_t *) meas_rep_dummy; + if (!cached) { + memcpy(&lchan->sacch.mr_cache[0], + &lchan->ts->sched->sacch_cache[0], + sizeof(lchan->sacch.mr_cache)); } /* Compose a new Measurement Report primitive */ - memcpy(prim->payload, mr_src_ptr, GSM_MACBLOCK_LEN); - - /** - * Update the L1 SACCH pseudo-header (only for cached MRs) - * - * TODO: filling of the actual values into cached Measurement - * Reports would break the distance spoofing feature. If it - * were known whether the spoofing is enabled or not, we could - * decide whether to update the cached L1 SACCH header here. - */ - if (!cached) { -#warning "FIXME: no direct access to trxcon->l1p.{tx_power,ta}" -#if 0 - prim->payload[0] = lchan->ts->sched->trx->tx_power; - prim->payload[1] = lchan->ts->sched->trx->ta; -#endif - } + memcpy(&prim->payload[0], &lchan->sacch.mr_cache[0], GSM_MACBLOCK_LEN); /* Inform about the cache usage count */ - if (cached && lchan->sacch.mr_cache_usage > 5) { + if (++lchan->sacch.mr_cache_usage > 5) { LOGP_LCHAND(lchan, LOGL_NOTICE, "SACCH MR cache usage count=%u > 5 " "=> ancient measurements, please fix!\n", lchan->sacch.mr_cache_usage); } - LOGP_LCHAND(lchan, LOGL_NOTICE, - "Using a %s Measurement Report\n", - cached ? "cached" : "dummy"); + LOGP_LCHAND(lchan, LOGL_NOTICE, "Using cached Measurement Report\n"); return prim; } diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 10a4c5f..00adcd6 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -39,6 +39,35 @@ int l1sched_log_cat_common = DLGLOBAL; int l1sched_log_cat_data = DLGLOBAL; +/* "Dummy" Measurement Report */ +static const uint8_t meas_rep_dummy[] = { + /* L1 SACCH pseudo-header */ + 0x0f, 0x00, + + /* LAPDm header */ + 0x01, 0x03, 0x49, + + /* RR Management messages, Measurement Report */ + 0x06, 0x15, + + /* Measurement results (see 3GPP TS 44.018, section 10.5.2.20): + * 0... .... = BA-USED: 0 + * .0.. .... = DTX-USED: DTX was not used + * ..11 0110 = RXLEV-FULL-SERVING-CELL: -57 <= x < -56 dBm (54) + * 0... .... = 3G-BA-USED: 0 + * .1.. .... = MEAS-VALID: The measurement results are not valid + * ..11 0110 = RXLEV-SUB-SERVING-CELL: -57 <= x < -56 dBm (54) + * 0... .... = SI23_BA_USED: 0 + * .000 .... = RXQUAL-FULL-SERVING-CELL: BER < 0.2%, Mean value 0.14% (0) + * .... 000. = RXQUAL-SUB-SERVING-CELL: BER < 0.2%, Mean value 0.14% (0) + * .... ...1 11.. .... = NO-NCELL-M: Neighbour cell information not available */ + 0x36, 0x76, 0x01, 0xc0, + + /* 0** -- Padding with zeroes */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + static int l1sched_cfg_pchan_comb_req(struct l1sched_state *sched, uint8_t tn, enum gsm_phys_chan_config pchan) { @@ -175,6 +204,8 @@ .priv = priv, }; + memcpy(&sched->sacch_cache[0], &meas_rep_dummy[0], sizeof(meas_rep_dummy)); + if (cfg->log_prefix == NULL) sched->log_prefix = talloc_asprintf(sched, "l1sched[0x%p]: ", sched); else @@ -217,6 +248,8 @@ /* Stop and reset clock counter if required */ if (reset_clock) l1sched_clck_reset(sched); + + memcpy(&sched->sacch_cache[0], &meas_rep_dummy[0], sizeof(meas_rep_dummy)); } struct l1sched_ts *l1sched_add_ts(struct l1sched_state *sched, int tn) diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index fb9bd8f..b5a153a 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -82,6 +82,22 @@ } break; } + case TRXCON_EV_UPDATE_SACCH_CACHE_REQ: + { + const struct trxcon_param_tx_traffic_data_req *req = data; + + if (req->link_id != L1SCHED_CH_LID_SACCH) { + LOGPFSML(fi, LOGL_ERROR, "Unexpected link_id=%u\n", req->link_id); + break; + } + if (req->data_len != GSM_MACBLOCK_LEN) { + LOGPFSML(fi, LOGL_ERROR, "Unexpected data length=%u\n", req->data_len); + break; + } + + memcpy(&trxcon->sched->sacch_cache[0], req->data, req->data_len); + break; + } default: OSMO_ASSERT(0); } @@ -483,6 +499,7 @@ OSMO_VALUE_STRING(TRXCON_EV_SET_TCH_MODE_REQ), OSMO_VALUE_STRING(TRXCON_EV_PHY_CONFIG_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_REQ), + OSMO_VALUE_STRING(TRXCON_EV_UPDATE_SACCH_CACHE_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_TRAFFIC_REQ), @@ -503,7 +520,8 @@ | S(TRXCON_EV_L2IF_FAILURE) | S(TRXCON_EV_RESET_FULL_REQ) | S(TRXCON_EV_RESET_SCHED_REQ) - | S(TRXCON_EV_PHY_CONFIG_REQ), + | S(TRXCON_EV_PHY_CONFIG_REQ) + | S(TRXCON_EV_UPDATE_SACCH_CACHE_REQ), .allstate_action = &trxcon_allstate_action, .timer_cb = &trxcon_timer_cb, .pre_term = &trxcon_fsm_pre_term_cb, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0f467fc07cf844cc73465f235b36ba7d00788c9f Gerrit-Change-Number: 28874 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in docker-playground[master]: OsmoMSC: add image to test gerrit patchset

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28873 ) Change subject: OsmoMSC: add image to test gerrit patchset ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cc4c804825e653c2da285396a395e4d986fc157 Gerrit-Change-Number: 28873 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 30 Jul 2022 17:00:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add missing imports for envelope_sms command

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28872 ) Change subject: ts_31_102: Add missing imports for envelope_sms command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I98e692745e7e1cfbc64b88b248700b1e54915b96 Gerrit-Change-Number: 28872 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 30 Jul 2022 15:16:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: ts_31_102: Fix terminal_profile, envelope and envelope_sms commands

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28871 ) Change subject: ts_31_102: Fix terminal_profile, envelope and envelope_sms commands ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia861eeb2970627d3ecfd0ca73f75ca571c6885b2 Gerrit-Change-Number: 28871 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 30 Jul 2022 15:16:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: Fix printing of SwMatchError after introduction of logical channels

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28870 ) Change subject: Fix printing of SwMatchError after introduction of logical channels ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0614436c99c6a6ebc22c4dc14fb361c5f5f16686 Gerrit-Change-Number: 28870 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 30 Jul 2022 15:15:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add missing imports for envelope_sms command

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28872 ) Change subject: ts_31_102: Add missing imports for envelope_sms command ...................................................................... ts_31_102: Add missing imports for envelope_sms command The envelope_sms command fails due to some missing imports prior to this patch. Change-Id: I98e692745e7e1cfbc64b88b248700b1e54915b96 --- M pySim/ts_31_102.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/72/28872/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 02ef005..65a2afe 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -39,6 +39,7 @@ from pySim.filesystem import * from pySim.ts_31_102_telecom import DF_PHONEBOOK, EF_UServiceTable from pySim.construct import * +from pySim.cat import SMS_TPDU, DeviceIdentities, SMSPPDownload from construct import Optional as COptional from construct import * from typing import Tuple -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I98e692745e7e1cfbc64b88b248700b1e54915b96 Gerrit-Change-Number: 28872 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in pysim[master]: Fix printing of SwMatchError after introduction of logical channels

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28870 ) Change subject: Fix printing of SwMatchError after introduction of logical channels ...................................................................... Fix printing of SwMatchError after introduction of logical channels the interpret_sw() method was moved from RuntimeState to RuntimeLchan in Change-Id I7aa994b625467d4e46a2edd8123240b930305360 - but the code in pySim/exceptions.py was not adjusted accordingly. Change-Id: I0614436c99c6a6ebc22c4dc14fb361c5f5f16686 --- M pySim/exceptions.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/70/28870/1 diff --git a/pySim/exceptions.py b/pySim/exceptions.py index 24aff85..c6a81a1 100644 --- a/pySim/exceptions.py +++ b/pySim/exceptions.py @@ -53,8 +53,8 @@ self.rs = rs def __str__(self): - if self.rs: - r = self.rs.interpret_sw(self.sw_actual) + if self.rs and self.rs.lchan[0]: + r = self.rs.lchan[0].interpret_sw(self.sw_actual) if r: return "SW match failed! Expected %s and got %s: %s - %s" % (self.sw_expected, self.sw_actual, r[0], r[1]) return "SW match failed! Expected %s and got %s." % (self.sw_expected, self.sw_actual) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0614436c99c6a6ebc22c4dc14fb361c5f5f16686 Gerrit-Change-Number: 28870 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in pysim[master]: ts_31_102: Fix terminal_profile, envelope and envelope_sms commands

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28871 ) Change subject: ts_31_102: Fix terminal_profile, envelope and envelope_sms commands ...................................................................... ts_31_102: Fix terminal_profile, envelope and envelope_sms commands In commit Ib88bb7d12faaac7d149ee1f6379bc128b83bbdd5 I accidentially broke those commands by adding argparse definitions for better documentation. When adding the @cmd2.with_argparser decorator, the method argument changes from the raw string to an argparse.Namespace object. This patch fixes the below exception: pySIM-shell (MF/ADF.USIM)> terminal_profile ffffffff Traceback (most recent call last): File "/usr/local/lib/python3.10/dist-packages/cmd2/cmd2.py", line 2129, in onecmd_plus_hooks stop = self.onecmd(statement, add_to_history=add_to_history) File "/usr/local/lib/python3.10/dist-packages/cmd2/cmd2.py", line 2559, in onecmd stop = func(statement) File "/usr/local/lib/python3.10/dist-packages/cmd2/decorators.py", line 336, in cmd_wrapper return func(*args_list, **kwargs) File "/space/home/laforge/projects/git/pysim/pySim/ts_31_102.py", line 1274, in do_terminal_profile (data, sw) = self._cmd.card._scc.terminal_profile(arg) File "/space/home/laforge/projects/git/pysim/pySim/commands.py", line 583, in terminal_profile data_length = len(payload) // 2 TypeError: object of type 'Namespace' has no len() Change-Id: Ia861eeb2970627d3ecfd0ca73f75ca571c6885b2 Fixes: Ib88bb7d12faaac7d149ee1f6379bc128b83bbdd5 --- M pySim/ts_31_102.py 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/71/28871/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 7850459..02ef005 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1264,40 +1264,40 @@ term_prof_parser.add_argument('PROFILE', help='Hexstring of encoded terminal profile') @cmd2.with_argparser(term_prof_parser) - def do_terminal_profile(self, arg): + def do_terminal_profile(self, opts): """Send a TERMINAL PROFILE command to the card. This is used to inform the card about which optional features the terminal (modem/phone) supports, particularly in the context of SIM Toolkit, Proactive SIM and OTA. You must specify a hex-string with the encoded terminal profile you want to send to the card.""" - (data, sw) = self._cmd.card._scc.terminal_profile(arg) + (data, sw) = self._cmd.card._scc.terminal_profile(opts.PROFILE) self._cmd.poutput('SW: %s, data: %s' % (sw, data)) envelope_parser = argparse.ArgumentParser() envelope_parser.add_argument('PAYLOAD', help='Hexstring of encoded payload to ENVELOPE') @cmd2.with_argparser(envelope_parser) - def do_envelope(self, arg): + def do_envelope(self, opts): """Send an ENVELOPE command to the card. This is how a variety of information is communicated from the terminal (modem/phone) to the card, particularly in the context of SIM Toolkit, Proactive SIM and OTA.""" - (data, sw) = self._cmd.card._scc.envelope(arg) + (data, sw) = self._cmd.card._scc.envelope(opts.PAYLOAD) self._cmd.poutput('SW: %s, data: %s' % (sw, data)) envelope_sms_parser = argparse.ArgumentParser() envelope_sms_parser.add_argument('TPDU', help='Hexstring of encoded SMS TPDU') @cmd2.with_argparser(envelope_sms_parser) - def do_envelope_sms(self, arg): + def do_envelope_sms(self, opts): """Send an ENVELOPE(SMS-PP-Download) command to the card. This emulates a terminal (modem/phone) having received a SMS with a PID of 'SMS for the SIM card'. You can use this command in the context of testing OTA related features without a modem/phone or a cellular netwokr.""" tpdu_ie = SMS_TPDU() - tpdu_ie.from_bytes(h2b(arg)) + tpdu_ie.from_bytes(h2b(opts.TPDU)) dev_ids = DeviceIdentities( decoded={'source_dev_id': 'network', 'dest_dev_id': 'uicc'}) sms_dl = SMSPPDownload(children=[dev_ids, tpdu_ie]) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia861eeb2970627d3ecfd0ca73f75ca571c6885b2 Gerrit-Change-Number: 28871 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,ass_updown}()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28869 ) Change subject: BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,ass_updown}() ...................................................................... BTS_Tests: send SACCH blocks in TC_rsl_ms_pwr_dyn_{up,ass_updown}() We used to rely on trxcon sendig dummy RR Measurement Reports and patching the L1 SACCH Header with the configured MS Power Level and Timing Advance values. Recently TC_rsl_ms_pwr_dyn_ass_updown started to fail because trxcon does not patch dummy MRs anymore. Do not rely on dummy MRs, send SACCH blocks with the expected MS Power Level and Timing Advance values from the testsuites. Change-Id: I31dd6b9026d04403092256176f67785a0a6486ad Related: OS#5635 --- M bts/BTS_Tests.ttcn 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/28869/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index ed5d316..47d7ce1 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2965,6 +2965,9 @@ T2.start; alt { [] as_l1_sacch_l1h(l1h) { + var octetstring l2 := f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O); + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); + if (l1h.ms_power_lvl < (pwr_var + 6)) { repeat; } @@ -2984,6 +2987,9 @@ T4.start; alt { [] as_l1_sacch_l1h(l1h) { + var octetstring l2 := f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O); + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); + if (l1h.ms_power_lvl > pwr_var) { repeat; } @@ -3072,7 +3078,11 @@ timer T1 := 9.0 * 1.92 + 1.92; T1.start; alt { - [] as_l1_sacch_l1h(l1h) { repeat; } + [] as_l1_sacch_l1h(l1h) { + var octetstring l2 := f_pad_oct('010349'O & '0615004001C0'O, 21, '00'O); + L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); + repeat; + } [] L1CTL.receive { repeat; } [] T1.timeout { if (not isbound(l1h)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28869 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: I31dd6b9026d04403092256176f67785a0a6486ad Gerrit-Change-Number: 28869 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: increate Tguard to 30.0s for TC_rsl_ms_pwr_dyn_up

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28868 ) Change subject: BTS_Tests: increate Tguard to 30.0s for TC_rsl_ms_pwr_dyn_up ...................................................................... BTS_Tests: increate Tguard to 30.0s for TC_rsl_ms_pwr_dyn_up A comment in f_TC_rsl_ms_pwr_dyn_up() states: > By default, the MS power loop gets triggered every 4th SACCH block (1.92s). > We need 9 * 4 dB steps to get from 0 dBm to 33 dBm, so 9 * 1.92s total. > Add an extra offset to avoid race conditions: +1.92s. so the alt statement is expected to block for 19.2s, while the guard timer is set to 20.0s by default. This is not enough, given that f_TC_rsl_ms_pwr_dyn_up() also needs to wait for the first SACCH block before entering the alt statement. Let's give it more time to run in order to avoid sporadic failures. Change-Id: Ib7de8383c95ac9e00560f786ec4c56f79f7d81bc Related: OS#5635 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/28868/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 58a7e44..ed5d316 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3337,7 +3337,7 @@ f_init(); f_vty_config(BTSVTY, "phy 0", "osmotrx ms-power-loop -10"); for (var integer tn := 1; tn <= 1; tn := tn+1) { - pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN)); + pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN, t_guard := 30.0)); pars.bts0_band := f_vty_get_bts0_band(); vc_conn := f_start_handler(refers(f_TC_rsl_ms_pwr_dyn_up), pars, trxc_comp := true); vc_conn.done; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28868 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: Ib7de8383c95ac9e00560f786ec4c56f79f7d81bc Gerrit-Change-Number: 28868 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in osmo-cbc[master]: sbcap_link_fsm: cbc_sbcap_link_rx_cb(): fix NULL pointer dereference

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28867 ) Change subject: sbcap_link_fsm: cbc_sbcap_link_rx_cb(): fix NULL pointer dereference ...................................................................... sbcap_link_fsm: cbc_sbcap_link_rx_cb(): fix NULL pointer dereference Change-Id: Ic2fe72d5eef650c364ecbd91417b141fd4071c8d Related: CID#275347 --- M src/sbcap_link_fsm.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/67/28867/1 diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 685ce7d..bc8f0ad 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -306,8 +306,7 @@ cbc_sbcap_link_tx(link, err_ind_pdu); else LOGPSBCAPC(link, LOGL_ERROR, - "Tx SBc-AP %s: msg gen failed\n", - sbcap_pdu_get_name(err_ind_pdu)); + "Tx SBc-AP Error-Indication: msg gen failed\n"); return 0; } break; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ic2fe72d5eef650c364ecbd91417b141fd4071c8d Gerrit-Change-Number: 28867 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1sched: ensure n_bits_total is always initialized

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28866 ) Change subject: trxcon: l1sched: ensure n_bits_total is always initialized ...................................................................... trxcon: l1sched: ensure n_bits_total is always initialized Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125 Related: CID#205451 --- M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/66/28866/1 diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index 1a1b93d..96acf0e 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -39,7 +39,7 @@ uint32_t fn, uint8_t bid, const sbit_t *bits, const struct l1sched_meas_set *meas) { - int n_errors = -1, n_bits_total, rc; + int n_errors = -1, n_bits_total = 0, rc; sbit_t *buffer, *offset; uint8_t l2[128], *mask; size_t l2_len; diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index a8c641b..12ddc15 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -195,7 +195,7 @@ uint32_t fn, uint8_t bid, const sbit_t *bits, const struct l1sched_meas_set *meas) { - int n_errors = -1, n_bits_total, rc; + int n_errors = -1, n_bits_total = 0, rc; sbit_t *buffer, *offset; uint8_t l2[128], *mask; size_t l2_len; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I590cfe55365b7ad021a3d0925a0f1ea136e67125 Gerrit-Change-Number: 28866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: tests: use common stubs for SMS queue test

by fixeria

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28842 ) Change subject: tests: use common stubs for SMS queue test ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a Gerrit-Change-Number: 28842 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 09:57:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: ESME: use osmo_sock_get_name() for logging

by fixeria

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28841 ) Change subject: ESME: use osmo_sock_get_name() for logging ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 09:57:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by fixeria

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28839 ) Change subject: Ignore .deb build byproducts ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 09:56:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: SMPP: clarify (re)start logic

by fixeria

Attention is currently required from: msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28843 ) Change subject: SMPP: clarify (re)start logic ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I353f5b82c9f5308d93e926538d4ef7e24d0b0339 Gerrit-Change-Number: 28843 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 09:42:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Introduce libsmpputil

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28844 ) Change subject: Introduce libsmpputil ...................................................................... Patch Set 7: (2 comments) This change is ready for review. File include/osmocom/msc/smpp.h: https://gerrit.osmocom.org/c/osmo-msc/+/28844/comment/a6a5bac6_08ba56c4 PS2, Line 5: //Length limits according to SMPP 3.4 spec including NUL-byte: > /* */ Done File src/utils/Makefile.am: https://gerrit.osmocom.org/c/osmo-msc/+/28844/comment/d6bfffb5_35c97dac PS2, Line 32: $(top_srcdir)/src/libmsc/smpp_smsc.h \ > it may make sense to define a new SMPP_UTIL_HEADERS with this file, and include SMPP_UTILS_HEADERS h […] Given it's internal build-time optional library I don't think it's worth the effort. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I61910651bc7c188dc2fb67d96189a66a47e7e8fb Gerrit-Change-Number: 28844 Gerrit-PatchSet: 7 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 09:03:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28839 ) Change subject: Ignore .deb build byproducts ...................................................................... Patch Set 4: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/28839/comment/5775aaa4_0d11f754 PS1, Line 9: Signed-off-by: Max <msuraev(a)sysmocom.de> > BTW, no need for signed-off-by? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 08:39:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: ESME: use osmo_sock_get_name() for logging

by msuraev

Attention is currently required from: fixeria, pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28841 ) Change subject: ESME: use osmo_sock_get_name() for logging ...................................................................... Patch Set 4: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/28841/comment/86ea6cc8_59191975 PS1, Line 7: ESME: log more connection details > Agreed with Pau. I would say "use osmo_sock_get_name() to print conn details" or so. Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 08:38:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Introduce libsmpputil

by msuraev

Attention is currently required from: msuraev. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28844 ) Change subject: Introduce libsmpputil ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I61910651bc7c188dc2fb67d96189a66a47e7e8fb Gerrit-Change-Number: 28844 Gerrit-PatchSet: 6 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 08:37:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Make esme struct shared

by msuraev

Attention is currently required from: msuraev. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28846 ) Change subject: Make esme struct shared ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8f7ac2c00d16660925dd0b03aa1a0973edf9eb70 Gerrit-Change-Number: 28846 Gerrit-PatchSet: 6 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 08:37:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Add ESME-specific logging

by msuraev

Attention is currently required from: msuraev. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28845 ) Change subject: Add ESME-specific logging ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie5ddde762350385f8d18ee1d441584a41b0290ec Gerrit-Change-Number: 28845 Gerrit-PatchSet: 6 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 08:36:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by msuraev

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 to look at the new patch set (#4). Change subject: Ignore .deb build byproducts ...................................................................... Ignore .deb build byproducts Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 --- M .gitignore 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/28839/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 8 months

1
0
0 0

2024

2023

2022

gerrit-log July 2022