February 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, 5 months

3
5
0 0

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

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 19 originally caused by: Started by an SCM change 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 7527cab6d8364b2022bd4fa2fd03039eac2a99bb (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 7527cab6d8364b2022bd4fa2fd03039eac2a99bb # timeout=10 Commit message: "add missing libcommon.mk" First time build. Skipping changelog. > 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/jenkins5762361540671398993.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-stretch-jenkins /build/contrib/jenkins.sh --publish =============== relay-driver START ============== CLEAN CC console.c arm-none-eabi-gcc: error: /usr/lib/picolibc/arm-none-eabi/picolibc.specs: No such file or directory ../../mk/libopencm3.mk:227: recipe for target 'console.o' failed make: *** [console.o] Error 1 Build step 'Execute shell' marked build as failure

2 years, 1 month

1
29
0 0

Change in simtrace2[master]: firmware: bugfix: disable cardemu comms in local SIM mode

by James Tavares

James Tavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26865 ) Change subject: firmware: bugfix: disable cardemu comms in local SIM mode ...................................................................... firmware: bugfix: disable cardemu comms in local SIM mode This change prevents contention on the ISO7816 bus by disabling the card emulation state machine when the SIM switch is in the local mode. Without this change, the card emulation firmware can clobber ISO7816 communications and cause contention with certain (but not all) SIM cards. Changes: - Add 'enabled' flag to cardemu instance that is set/cleared by usb_command_sim_select() (the only place where sim switch occurs). - Flag is initialized as false (disabled) by default, to match local SIM mode default. - When card emulation is disabled, force SIM VCC to be "OFF", SIM RESET as "not in RESET", and drop bytes bytes received on the ISO7816 interface (but do service buffers). Change-Id: I4010f988712eac4a6af8568ccd60062f9de62449 --- M firmware/libcommon/source/mode_cardemu.c 1 file changed, 31 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/65/26865/1 diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 8e4acf9..00a062e 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -83,10 +83,21 @@ #ifdef DETECT_VCC_BY_ADC uint32_t vcc_uv; #endif + + /*! real-time state of VCC I/O line, irrespective of enabled flag */ bool vcc_active; + + /*! last VCC state we reported to the card emu state machine (conditioned by enabled flag) */ bool vcc_active_last; + + /*! real-time state of RST I/O line, irrespective of enabled flag */ bool rst_active; + + /*! last RST state we reported to the card emu state machine (conditioned by enabled flag) */ bool rst_active_last; + + /*! flag indicating whether this instance should perform card emulation, or not */ + bool enabled; }; struct cardem_inst cardem_inst[] = { @@ -505,19 +516,25 @@ #endif /* DETECT_VCC_BY_ADC */ -/* called from main loop; dispatches card I/O state changes to card_emu from main loop */ +/** + * called from main loop; dispatches card I/O state changes to card_emu from main loop. + * NOTE: conditions I/O state on the ci->enabled flag; if the instance is disabled, we assume VCC is + * disabled and the device is not in reset + */ static void process_io_statechg(struct cardem_inst *ci) { - if (ci->vcc_active != ci->vcc_active_last) { - card_emu_io_statechg(ci->ch, CARD_IO_VCC, ci->vcc_active); + const bool vcc_active = ci->vcc_active && ci->enabled; + if (vcc_active != ci->vcc_active_last) { + card_emu_io_statechg(ci->ch, CARD_IO_VCC, vcc_active); /* FIXME do this for real */ - card_emu_io_statechg(ci->ch, CARD_IO_CLK, ci->vcc_active); - ci->vcc_active_last = ci->vcc_active; + card_emu_io_statechg(ci->ch, CARD_IO_CLK, vcc_active); + ci->vcc_active_last = vcc_active; } - if (ci->rst_active != ci->rst_active_last) { - card_emu_io_statechg(ci->ch, CARD_IO_RST, ci->rst_active); - ci->rst_active_last = ci->rst_active; + const bool rst_active = ci->rst_active && ci->enabled; + if (rst_active != ci->rst_active_last) { + card_emu_io_statechg(ci->ch, CARD_IO_RST, rst_active); + ci->rst_active_last = rst_active; } } @@ -764,10 +781,8 @@ if (msgb_l2len(msg) < sizeof(*mss)) return -1; - if (mss->remote_sim) - sim_switch_use_physical(ci->num, 0); - else - sim_switch_use_physical(ci->num, 1); + ci->enabled = mss->remote_sim ? true : false; + sim_switch_use_physical(ci->num, !ci->enabled); return 0; } @@ -911,7 +926,10 @@ } uint8_t byte = rbuf_read(&ci->rb); __enable_irq(); - card_emu_process_rx_byte(ci->ch, byte); + + if (ci->enabled) { + card_emu_process_rx_byte(ci->ch, byte); + } //TRACE_ERROR("%uRx%02x\r\n", i, byte); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4010f988712eac4a6af8568ccd60062f9de62449 Gerrit-Change-Number: 26865 Gerrit-PatchSet: 1 Gerrit-Owner: James Tavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

2 years, 1 month

3
6
0 0

Change in pysim[master]: Initial support for GlobalPlatform

by fixeria

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27271 ) Change subject: Initial support for GlobalPlatform ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 Gerrit-Change-Number: 27271 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 17:49:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase)

by fixeria

Attention is currently required from: laforge, pespin, keith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 ) Change subject: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6034b0fab2b2e5962314c2fca2f893246ce5cf4f Gerrit-Change-Number: 27352 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 28 Feb 2022 17:47:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX)

by fixeria

Attention is currently required from: pespin, keith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 ) Change subject: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX) ...................................................................... Patch Set 1: Code-Review+1 (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ggsn/+/27351/comment/4b08511e_5302604d PS1, Line 9: context 1024 1024-th context https://gerrit.osmocom.org/c/osmo-ggsn/+/27351/comment/f956329a_ef749dfe PS1, Line 18: ws File gtp/gtp.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/27351/comment/90c91148_87676111 PS1, Line 1815: "Failed creating a new PDP context, array full (%u)\n", PDP_MAX); Cosmetic: alignment. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0d94ffad97eb4fef477d981bf285bf99740592a3 Gerrit-Change-Number: 27351 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 28 Feb 2022 17:45:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_addr_pool_exhaustion

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27350 ) Change subject: ggsn: Introduce test TC_addr_pool_exhaustion ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27350 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: Iee24384b35f9277475b02cb59bf04cd6c9f23b1c Gerrit-Change-Number: 27350 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 17:41:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 ) Change subject: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 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: Iab19963f8e869af8fe0c385abd0fd7bbd9221790 Gerrit-Change-Number: 27347 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 17:40:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_addr_pool_exhaustion

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27350 to look at the new patch set (#2). Change subject: ggsn: Introduce test TC_addr_pool_exhaustion ...................................................................... ggsn: Introduce test TC_addr_pool_exhaustion Related: OS#5469 Related: https://github.com/open5gs/open5gs/pull/1397 Change-Id: Iee24384b35f9277475b02cb59bf04cd6c9f23b1c --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 103 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/27350/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27350 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: Iee24384b35f9277475b02cb59bf04cd6c9f23b1c Gerrit-Change-Number: 27350 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in osmo-ggsn[master]: vty: Fix cmd 'no echo-interval' doing nothing

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 ) Change subject: vty: Fix cmd 'no echo-interval' doing nothing ...................................................................... vty: Fix cmd 'no echo-interval' doing nothing It was incorrectly implemented and in practice was a NOOP. Change-Id: I5e03c4965d05871d3f2e56675da6e75af0ec18c2 --- M ggsn/ggsn_vty.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 1738e70..9591bf7 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -389,10 +389,9 @@ NO_STR "Send an echo request to this static GGSN every interval.\n") { struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index; - int prev_interval = ggsn->cfg.echo_interval; struct sgsn_peer *sgsn; - if (prev_interval == ggsn->cfg.echo_interval) + if (ggsn->cfg.echo_interval == 0) return CMD_SUCCESS; ggsn->cfg.echo_interval = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5e03c4965d05871d3f2e56675da6e75af0ec18c2 Gerrit-Change-Number: 27346 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase)

by pespin

Attention is currently required from: laforge, keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 ) Change subject: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase) ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I think there's one static such array per remote GSN so in real networks with many SGSNs this might […] I'd expect a host targeting many SGSNs to really have enough memory to handle that. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6034b0fab2b2e5962314c2fca2f893246ce5cf4f Gerrit-Change-Number: 27352 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 28 Feb 2022 14:38:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ggsn[master]: vty: Fix cmd 'no echo-interval' doing nothing

by osmith

Attention is currently required from: pespin, keith, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 ) Change subject: vty: Fix cmd 'no echo-interval' doing nothing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5e03c4965d05871d3f2e56675da6e75af0ec18c2 Gerrit-Change-Number: 27346 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 13:47:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites: adjust nplab-m3ua timers

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27349 ) Change subject: jobs/ttcn3-testsuites: adjust nplab-m3ua timers ...................................................................... jobs/ttcn3-testsuites: adjust nplab-m3ua timers Fix sporadic errors related to the clean up script running while images being built: failed to get digest sha256:8ea2ba9a1... Closes: OS#5447 Change-Id: If722fddce8de65a1ae012a46d6a202f430e0c69d --- M jobs/ttcn3-testsuites.yml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index f2fadc5..5fb994d 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -23,7 +23,7 @@ # debian-stretch nightly - order by time - nplab-m3ua-test: blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" - timer: 00 03 * * * + timer: 10 03 * * * - nplab-sua-test: blocking: "^(nplab|NPLAB-.*)-sua-test.*" timer: 15 03 * * * @@ -158,7 +158,7 @@ # debian-stretch latest stable - nplab-m3ua-test-latest: blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" - timer: 00 03 * * * + timer: 10 03 * * * - nplab-sua-test-latest: blocking: "^(nplab|NPLAB-.*)-sua-test.*" timer: 15 03 * * * -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If722fddce8de65a1ae012a46d6a202f430e0c69d Gerrit-Change-Number: 27349 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites: adjust nplab-m3ua timers

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27349 ) Change subject: jobs/ttcn3-testsuites: adjust nplab-m3ua timers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If722fddce8de65a1ae012a46d6a202f430e0c69d Gerrit-Change-Number: 27349 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 13:44:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase)

by laforge

Attention is currently required from: pespin, keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 ) Change subject: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase) ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I think there's one static such array per remote GSN so in real networks with many SGSNs this might become a problem. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6034b0fab2b2e5962314c2fca2f893246ce5cf4f Gerrit-Change-Number: 27352 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 28 Feb 2022 13:43:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX)

by laforge

Attention is currently required from: pespin, keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 ) Change subject: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0d94ffad97eb4fef477d981bf285bf99740592a3 Gerrit-Change-Number: 27351 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 28 Feb 2022 13:41:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27348 ) Change subject: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > please make sure to also do those changes in the configs in osmo-ttcn3-hacks I don't see any osmo-ggsn.cfg in ggsn_tests/ there, so I thought I leave whoever uses it without docker to fill in a proper config file which works for him. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3344c8acc9bc3b43ed0a13af52807d2a6050a81 Gerrit-Change-Number: 27348 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 28 Feb 2022 13:34:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase)

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 ) Change subject: libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase) ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: With this patch, most probably meta-telephony.git/recipes-osmocom/osmo-ggsn/files/libgtp-queue_depth_32.patch needs to be updated. It probably makes more sense to actually reduce PDP_MAX in there, since in those kind of embedded devices we expect to run only 1 BTS so we shouldn't need more than let's say 128 concurrent pdp contexts. For a 2 TRX BTS, we could have up to 15 PDCH TS, at a maximum of 7 USFs per TS: 15 * 7 = 105 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6034b0fab2b2e5962314c2fca2f893246ce5cf4f Gerrit-Change-Number: 27352 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 28 Feb 2022 13:30:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ggsn[master]: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX)

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 ) Change subject: libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX) ...................................................................... libgtp: Fix ggsn crash if pdp alloc array is full (PDP_MAX) osmo-ggsn crashes when concurrent pdp context 1024 is created, due to the gsn->pdpa array (of size PDP_MAX, 1024) being full. The crash happens because return code of gtp_pdp_newpdp was not checked, and hence a pointer "pdp" pointing to a temporary not-fully-allocated object was being passed to gsn->cb_create_context_ind() callback. Let's avoid crashing and instead reject the PDP context. Related: OS#5469 Change-Id: I0d94ffad97eb4fef477d981bf285bf99740592a3 --- M gtp/gtp.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/51/27351/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 59fd355..7c781de 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1809,7 +1809,16 @@ } } - gtp_pdp_newpdp(gsn, &pdp, pdp->imsi, pdp->nsapi, pdp); + rc = gtp_pdp_newpdp(gsn, &pdp, pdp->imsi, pdp->nsapi, pdp); + if (rc != 0) { + GTP_LOGPKG(LOGL_ERROR, peer, pack, len, + "Failed creating a new PDP context, array full (%u)\n", PDP_MAX); + /* &pdp in gtp_pdp_newpdp is untouched if it failed: */ + rc = gtp_create_pdp_resp(gsn, version, pdp, GTPCAUSE_NO_MEMORY); + /* Don't pass it to emit_cb_recovery, since allocation failed and it was already rejected: */ + pdp = NULL; + goto recover_ret; + } /* Callback function to validate login */ if (gsn->cb_create_context_ind != 0) @@ -1820,6 +1829,8 @@ rc = gtp_create_pdp_resp(gsn, version, pdp, GTPCAUSE_NOT_SUPPORTED); } + +recover_ret: if (recovery_recvd) emit_cb_recovery(gsn, peer, pdp, recovery); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0d94ffad97eb4fef477d981bf285bf99740592a3 Gerrit-Change-Number: 27351 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_addr_pool_exhaustion

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27350 ) Change subject: ggsn: Introduce test TC_addr_pool_exhaustion ...................................................................... ggsn: Introduce test TC_addr_pool_exhaustion Related: OS#5469 Related: https://github.com/open5gs/open5gs/pull/1397 Change-Id: Iee24384b35f9277475b02cb59bf04cd6c9f23b1c --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 101 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/27350/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 58a12a6..44386e9 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1975,6 +1975,105 @@ setverdict(pass); } + /* Test callocation of PDP contexts until reaching addr pool exhaustion */ + type record of OCT4 TEIClist; + testcase TC_addr_pool_exhaustion() runs on GT_CT { + var Gtp1cUnitdata udc; + var Gtp1uUnitdata udu; + var PdpContext ctx; + timer T_next := 0.005; + var integer next_req_ctx := 0; + var integer rx_resp_ctx := 0; + var integer num_ctx; + var boolean cont_req := true; + var CreatePDPContextResponse cpr; + var TEIClist teic_list := {}; + var integer teic; + + f_init(); + + T_default.start(120.0); + + T_next.start; + alt { + [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } + [] pingpong(); + [] T_next.timeout { + if (cont_req) { + ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_rnd_msisdn('1234'O), c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.nsapi := '0001'B; + ctx.teic := int2oct(next_req_ctx+1, 4); /* +1: skip TEIC=0 */ + ctx.teid := int2oct(next_req_ctx+1, 4); /* +1: skip TEID=0 */ + f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx.imsi, g_restart_ctr, + ctx.teid, ctx.teic, ctx.nsapi, + ctx.eua, ctx.apn, g_sgsn_ip_c, g_sgsn_ip_u, + ctx.msisdn, ctx.pco_req, ctx.ratType, + ctx.uli)); + next_req_ctx := next_req_ctx + 1; + T_next.start; + } + repeat; + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ?)) -> value udc { + cpr := udc.gtpc.gtpc_pdu.createPDPContextResponse; + + if (cpr.cause.causevalue == '80'O) { + teic_list := teic_list & {cpr.teidControlPlane.teidControlPlane}; + } else { + if (cont_req == true) { + num_ctx := rx_resp_ctx; + log("Successfully created ", num_ctx, " PDP contexts before exhausting the pool"); + setverdict(pass); + } + cont_req := false; + } + rx_resp_ctx := rx_resp_ctx + 1; + if (not cont_req and next_req_ctx == rx_resp_ctx) { + break; + } else { + repeat; + } + } + [] GTPC.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPC"); } + [] GTPU.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPU"); } + } + + /* Let's close them now: */ + next_req_ctx := 0; + rx_resp_ctx := 0; + T_next.start; + alt { + [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } + [] pingpong(); + [] T_next.timeout { + f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, teic_list[next_req_ctx], '0001'B, '1'B)); + next_req_ctx := next_req_ctx + 1; + if (next_req_ctx < num_ctx) { + T_next.start; + } + repeat; + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, ?)) -> value udc { + teic := oct2int(udc.gtpc.teid); + if (not match(teic, (1 .. num_ctx))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx Unexpected TEIC"); + } + rx_resp_ctx := rx_resp_ctx + 1; + if (rx_resp_ctx < num_ctx) { + repeat; + } + setverdict(pass); + } + [] GTPC.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPC"); } + [] GTPU.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPU"); } + } + T_next.stop; + + T_default.stop; + setverdict(pass); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -2019,5 +2118,7 @@ execute(TC_pdp_act_restart_ctr_echo()); execute(TC_lots_of_concurrent_pdp_ctx()); + /* Keep at the end, crashes older osmo-ggsn versions (OS#5469): */ + execute(TC_addr_pool_exhaustion()); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27350 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: Iee24384b35f9277475b02cb59bf04cd6c9f23b1c Gerrit-Change-Number: 27350 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: inter-BSC HO in: add Codec List (BSS Supported) IE to HO Req Ack

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27310 ) Change subject: inter-BSC HO in: add Codec List (BSS Supported) IE to HO Req Ack ...................................................................... inter-BSC HO in: add Codec List (BSS Supported) IE to HO Req Ack Related: SYS#5839 Depends: Iab0a7b4d81592157fc111d1adb9e9f4cb53a94e9 (libosmocore) Change-Id: I3c0576505a3ceb3cd5cc31dc69c5bc4a86a4ea08 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved laforge: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index e9a2543..aba652a 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1448,6 +1448,10 @@ LOG_HO(conn, LOGL_ERROR, "Unable to compose Speech Codec (Chosen)\n"); return -EINVAL; } + + /* Codec list (BSS Supported) */ + params.more_items = true; + gen_bss_supported_codec_list(&params.codec_list_bss_supported, conn->sccp.msc, new_lchan->ts->trx->bts); } rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_HANDOVER_RQST_ACKNOWLEDGE)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3c0576505a3ceb3cd5cc31dc69c5bc4a86a4ea08 Gerrit-Change-Number: 27310 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27309 ) Change subject: inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack ...................................................................... inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack Related: SYS#5839 Change-Id: I1d0b395c97145b5aa1af4ef67aec9338d2f8f43b --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 33603cc..e9a2543 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1422,6 +1422,8 @@ if (gscon_is_aoip(conn) && new_lchan->activate.info.requires_voice_stream) { struct osmo_sockaddr_str to_msc_rtp; const struct mgcp_conn_peer *rtp_info = osmo_mgcpc_ep_ci_get_rtp_info(conn->user_plane.mgw_endpoint_ci_msc); + int rc; + int perm_spch; if (!rtp_info) { LOG_HO(conn, LOGL_ERROR, "Handover Request Acknowledge: no RTP address known to send as" @@ -1437,6 +1439,15 @@ return -EINVAL; } params.aoip_transport_layer = &ss; + + /* speech_codec_chosen */ + perm_spch = gsm0808_permitted_speech(new_lchan->type, new_lchan->current_ch_mode_rate.chan_mode); + params.speech_codec_chosen_present = true; + rc = gsm0808_speech_codec_from_chan_type(&params.speech_codec_chosen, perm_spch); + if (rc) { + LOG_HO(conn, LOGL_ERROR, "Unable to compose Speech Codec (Chosen)\n"); + return -EINVAL; + } } rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_HANDOVER_RQST_ACKNOWLEDGE)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1d0b395c97145b5aa1af4ef67aec9338d2f8f43b Gerrit-Change-Number: 27309 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: inter-BSC HO in: add speech IEs only on speech mode lchans

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27308 ) Change subject: inter-BSC HO in: add speech IEs only on speech mode lchans ...................................................................... inter-BSC HO in: add speech IEs only on speech mode lchans Related: SYS#5839 Change-Id: I830654f419e6f0a196dc6d3e58422e00b324af9e --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index cab78ed..33603cc 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1419,7 +1419,7 @@ new_lchan->current_ch_mode_rate.chan_mode), }; - if (gscon_is_aoip(conn)) { + if (gscon_is_aoip(conn) && new_lchan->activate.info.requires_voice_stream) { struct osmo_sockaddr_str to_msc_rtp; const struct mgcp_conn_peer *rtp_info = osmo_mgcpc_ep_ci_get_rtp_info(conn->user_plane.mgw_endpoint_ci_msc); if (!rtp_info) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I830654f419e6f0a196dc6d3e58422e00b324af9e Gerrit-Change-Number: 27308 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: inter-BSC HO in: add Codec List (BSS Supported) IE to HO Req Ack

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27310 ) Change subject: inter-BSC HO in: add Codec List (BSS Supported) IE to HO Req Ack ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3c0576505a3ceb3cd5cc31dc69c5bc4a86a4ea08 Gerrit-Change-Number: 27310 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 11:12:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: BSSAP: HO Request Ack: add missing Codec List (BSS Supported)

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27307 ) Change subject: BSSAP: HO Request Ack: add missing Codec List (BSS Supported) ...................................................................... BSSAP: HO Request Ack: add missing Codec List (BSS Supported) Related: SYS#5839 Related: I3c0576505a3ceb3cd5cc31dc69c5bc4a86a4ea08 (osmo-bsc) Change-Id: Iab0a7b4d81592157fc111d1adb9e9f4cb53a94e9 --- M TODO-RELEASE M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 3 files changed, 12 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 3855145..8902371 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmogsm ABI BREAKAGE CELL_IDENT_WHOLE_GLOBAL_PS changed enum number +libosmogsm add struct member Add codec_list_bss_supported to gsm0808_handover_request_ack (more_items flag ensures ABI compat) diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index c79da6a..b4c7803 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -246,8 +246,12 @@ const struct sockaddr_storage *aoip_transport_layer; + bool more_items; /*!< set this to true iff any fields below are used */ + + struct gsm0808_speech_codec_list codec_list_bss_supported; /*< omit when .len == 0 */ + /* more items are defined in the spec and may be added later */ - bool more_items; /*!< always set this to false */ + bool more_items2; /*!< always set this to false */ }; struct msgb *gsm0808_create_handover_request_ack2(const struct gsm0808_handover_request_ack *params); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 4f9c687..7013d8d 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -1045,6 +1045,12 @@ if (params->aoip_transport_layer) gsm0808_enc_aoip_trasp_addr(msg, params->aoip_transport_layer); + /* AoIP: add Codec List (BSS Supported) 3.2.2.103. + * (codec_list_bss_supported was added to struct gsm0808_handover_request_ack later than speech_codec_chosen + * below, but it needs to come before it in the message coding). */ + if (params->more_items && params->codec_list_bss_supported.len) + gsm0808_enc_speech_codec_list(msg, &params->codec_list_bss_supported); + /* AoIP: Speech Codec (Chosen) 3.2.2.104 */ if (params->speech_codec_chosen_present) gsm0808_enc_speech_codec(msg, &params->speech_codec_chosen); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iab0a7b4d81592157fc111d1adb9e9f4cb53a94e9 Gerrit-Change-Number: 27307 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27309 ) Change subject: inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1d0b395c97145b5aa1af4ef67aec9338d2f8f43b Gerrit-Change-Number: 27309 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 11:02:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack

by neels

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27309 to look at the new patch set (#2). Change subject: inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack ...................................................................... inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack Related: SYS#5839 Change-Id: I1d0b395c97145b5aa1af4ef67aec9338d2f8f43b --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/27309/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1d0b395c97145b5aa1af4ef67aec9338d2f8f43b Gerrit-Change-Number: 27309 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27309 ) Change subject: inter-BSC HO in: add Speech Codec (Chosen) IE to HO Req Ack ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27309/comment/11b6dece_51e36a43 PS1, Line 1449: return HO_RESULT_ERROR > Everywhere in this function I see -ERRNO returned, but here you return a positive integer from 'enum […] yikes! good catch! -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1d0b395c97145b5aa1af4ef67aec9338d2f8f43b Gerrit-Change-Number: 27309 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 10:42:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites: adjust nplab-m3ua timers

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27349 ) Change subject: jobs/ttcn3-testsuites: adjust nplab-m3ua timers ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Having this sort of race conditions between building and cleaning up images doesn't look really great. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If722fddce8de65a1ae012a46d6a202f430e0c69d Gerrit-Change-Number: 27349 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 10:15:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: inter-BSC HO in: add Codec List (BSS Supported) IE to HO Req Ack

by dexter

Attention is currently required from: neels. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27310 ) Change subject: inter-BSC HO in: add Codec List (BSS Supported) IE to HO Req Ack ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3c0576505a3ceb3cd5cc31dc69c5bc4a86a4ea08 Gerrit-Change-Number: 27310 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 09:59:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites: adjust nplab-m3ua timers

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27349 ) Change subject: jobs/ttcn3-testsuites: adjust nplab-m3ua timers ...................................................................... jobs/ttcn3-testsuites: adjust nplab-m3ua timers Fix sporadic errors related to the clean up script running while images being built: failed to get digest sha256:8ea2ba9a1... Closes: OS#5447 Change-Id: If722fddce8de65a1ae012a46d6a202f430e0c69d --- M jobs/ttcn3-testsuites.yml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/49/27349/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index f2fadc5..5fb994d 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -23,7 +23,7 @@ # debian-stretch nightly - order by time - nplab-m3ua-test: blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" - timer: 00 03 * * * + timer: 10 03 * * * - nplab-sua-test: blocking: "^(nplab|NPLAB-.*)-sua-test.*" timer: 15 03 * * * @@ -158,7 +158,7 @@ # debian-stretch latest stable - nplab-m3ua-test-latest: blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" - timer: 00 03 * * * + timer: 10 03 * * * - nplab-sua-test-latest: blocking: "^(nplab|NPLAB-.*)-sua-test.*" timer: 15 03 * * * -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If722fddce8de65a1ae012a46d6a202f430e0c69d Gerrit-Change-Number: 27349 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass: check for more than one RAB assignment req

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 ) Change subject: ranap_rab_ass: check for more than one RAB assignment req ...................................................................... ranap_rab_ass: check for more than one RAB assignment req The spec permits RAB AssignmentRequests with multiple RABs at a time. Even though one voice call is assigned only one RAB in practice. Since the current FSM implementation only supports a 1:1 scenario, lets check if the MSC really assigns only one RAB and block RAB Assignments that do not fit in this scheme. Change-Id: I0f1d868fd0b4dc413533d6fcc5482862825181be Related: OS#5152 --- M include/osmocom/hnbgw/ranap_rab_ass.h M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/ranap_rab_ass.c M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 5 files changed, 56 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/include/osmocom/hnbgw/ranap_rab_ass.h b/include/osmocom/hnbgw/ranap_rab_ass.h index eb18de8..13fd2df 100644 --- a/include/osmocom/hnbgw/ranap_rab_ass.h +++ b/include/osmocom/hnbgw/ranap_rab_ass.h @@ -17,3 +17,5 @@ bool ranap_rab_ass_req_ies_check_release(RANAP_RAB_AssignmentRequestIEs_t *ies, uint8_t rab_id); bool ranap_rab_ass_resp_ies_check_failure(RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id); + +int ranap_rab_ass_req_ies_get_count(RANAP_RAB_AssignmentRequestIEs_t *ies); diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index 3da2b60..d90571b 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -689,6 +689,16 @@ mgw_fsm_priv = talloc_zero(map, struct mgw_fsm_priv); mgw_fsm_priv->ranap_rab_ass_req_message = message; + /* This FSM only supports RAB assignments with a single RAB assignment only. This limitation has been taken + * into account under the assumption that voice calls typically require a single RAB only. Nevertheless, we + * will block all incoming RAB assignments that try to assign more (or less) than one RAB. */ + if (ranap_rab_ass_req_ies_get_count(&message->msg.raB_AssignmentRequestIEs) != 1) { + LOGP(DMGW, LOGL_ERROR, + "mgw_fsm_alloc_and_handle_rab_ass_req() rua_ctx_id=%d, RAB-AssignmentRequest with more than one RAB assignment -- abort!\n", + map->rua_ctx_id); + goto error; + } + /* Parse the RAB Assignment Request now, if it is bad for some reason we will exit early and not bother with * creating an FSM etc. */ ies = &mgw_fsm_priv->ranap_rab_ass_req_message->msg.raB_AssignmentRequestIEs; diff --git a/src/osmo-hnbgw/ranap_rab_ass.c b/src/osmo-hnbgw/ranap_rab_ass.c index 56886c7..5930451 100644 --- a/src/osmo-hnbgw/ranap_rab_ass.c +++ b/src/osmo-hnbgw/ranap_rab_ass.c @@ -620,3 +620,18 @@ return result; } + +/*! Find out how many RAB items are present in a RAB-SetupOrModifyList inside RANAP_RAB_AssignmentRequestIEs. + * \ptmap[in] ies user provided memory with RANAP_RAB_AssignmentRequestIEs. + * \returns number of RAB items, -1 on failure. */ +int ranap_rab_ass_req_ies_get_count(RANAP_RAB_AssignmentRequestIEs_t *ies) +{ + /* Make sure we indeed deal with a setup-or-modify list */ + if (!(ies->presenceMask & RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT)) { + RANAP_DEBUG + ("Decoding failed, the RANAP RAB AssignmentRequest did not contain a setup-or-modify list!\n"); + return -1; + } + + return ies->raB_SetupOrModifyList.list.count; +} diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index 052549e..9a98cf8 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -320,6 +320,33 @@ ranap_ran_rx_co_free(&message); } +void test_ranap_rab_ass_req_ies_get_count(void) +{ + int rc; + ranap_message message; + uint8_t testvec[] = { + 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x01, 0x00, + 0x36, 0x40, 0x52, 0x00, 0x00, 0x01, 0x00, 0x35, + 0x00, 0x48, 0x78, 0x22, 0xcd, 0x80, 0x10, 0x2f, + 0xa7, 0x20, 0x1a, 0x2c, 0x00, 0x00, 0xf4, 0x4c, + 0x08, 0x0a, 0x02, 0x80, 0x00, 0x51, 0x40, 0x00, + 0x27, 0x20, 0x28, 0x14, 0x00, 0x67, 0x40, 0x00, + 0x00, 0x22, 0x28, 0x14, 0x00, 0x3c, 0x40, 0x00, + 0x00, 0x00, 0x50, 0x3d, 0x02, 0x00, 0x02, 0x27, + 0xc0, 0x35, 0x00, 0x01, 0x0a, 0x09, 0x01, 0xa2, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x76, + 0x00, 0x00, 0x40, 0x01, 0x00, 0x00 + }; + + rc = ranap_ran_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); + OSMO_ASSERT(rc == 0); + + rc = ranap_rab_ass_req_ies_get_count(&message.msg.raB_AssignmentRequestIEs); + printf("ranap_rab_ass_req_ies_get_count rc=%d\n", rc); + ranap_ran_rx_co_free(&message); +} + static const struct log_info_cat log_cat[] = { [DRANAP] = { .name = "RANAP", .loglevel = LOGL_DEBUG, .enabled = 1, @@ -382,6 +409,7 @@ test_ranap_rab_ass_resp_ies_replace_inet_addr(); test_ranap_rab_ass_resp_ies_check_failure(); test_ranap_rab_ass_req_ies_check_release(); + test_ranap_rab_ass_req_ies_get_count(); test_cleanup(); return 0; diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index 688925c..aca4ff3 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -18,3 +18,4 @@ ranap_rab_ass_resp_ies_check_failure rab_failed_at_hnb=0 (RAB ID 44, which is not in the message) ranap_rab_ass_req_ies_check_release rab_release_req=1 (RAB ID 23) ranap_rab_ass_req_ies_check_release rab_release_req=0 (RAB ID 44, which is not in the message) +ranap_rab_ass_req_ies_get_count rc=1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0f1d868fd0b4dc413533d6fcc5482862825181be Gerrit-Change-Number: 27321 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass: check for more than one RAB assignment req

by dexter

Attention is currently required from: pespin, daniel. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 ) Change subject: ranap_rab_ass: check for more than one RAB assignment req ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0f1d868fd0b4dc413533d6fcc5482862825181be Gerrit-Change-Number: 27321 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(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: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 09:26:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass: check for more than one RAB assignment req

by dexter

Attention is currently required from: pespin, daniel. Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 to look at the new patch set (#3). Change subject: ranap_rab_ass: check for more than one RAB assignment req ...................................................................... ranap_rab_ass: check for more than one RAB assignment req The spec permits RAB AssignmentRequests with multiple RABs at a time. Even though one voice call is assigned only one RAB in practice. Since the current FSM implementation only supports a 1:1 scenario, lets check if the MSC really assigns only one RAB and block RAB Assignments that do not fit in this scheme. Change-Id: I0f1d868fd0b4dc413533d6fcc5482862825181be Related: OS#5152 --- M include/osmocom/hnbgw/ranap_rab_ass.h M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/ranap_rab_ass.c M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 5 files changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/21/27321/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0f1d868fd0b4dc413533d6fcc5482862825181be Gerrit-Change-Number: 27321 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass: check for more than one RAB assignment req

by dexter

Attention is currently required from: pespin, daniel. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 ) Change subject: ranap_rab_ass: check for more than one RAB assignment req ...................................................................... Patch Set 3: (1 comment) File src/osmo-hnbgw/mgw_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321/comment/bcea1a2c_f2e9ddc1 PS1, Line 694: then > than Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0f1d868fd0b4dc413533d6fcc5482862825181be Gerrit-Change-Number: 27321 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Feb 2022 09:22:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-hnbgw[master]: mgw_fsm: release call when FSM is not created

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27320 ) Change subject: mgw_fsm: release call when FSM is not created ...................................................................... mgw_fsm: release call when FSM is not created While the FSM is created the RAB Assignment Requests is checked and parsed. In case of failure the context is freed, but the CN is not informed about the problem. The RAB AssignmentRequest will then most likely time out. However, lets make sure the call is released by re requesting an IU Release. Change-Id: I1904f7e95d86bbcecee14f8721bd4075d0e33ab4 Related: OS#5152 --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index d4ef800..3da2b60 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -719,9 +719,9 @@ return 0; error: - /* TODO: If we fail in this early stage, we should generate an appropriate RAB AssignmentResponse to inform - * the core network about the failure. */ + /* Cleanup context and make sure that the call is cleared. */ mgw_fsm_priv_cleanup(mgw_fsm_priv); + tx_release_req(map); return -EINVAL; } 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1904f7e95d86bbcecee14f8721bd4075d0e33ab4 Gerrit-Change-Number: 27320 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 ) Change subject: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config ...................................................................... simtrace: Add support for slot_mux_nr to CardEmu_BD_Config This catches up with a recent change in simtrace2.git (Change-Id I4cdb250d2e1dbc5b8b0169f8b7c21e288b492e1d) adding a new optional field to CardEmu_BD_Config Change-Id: Id29584764a2f27b9de5fa9ff67fd0ae3e912f02e --- M library/SIMTRACE_Templates.ttcn M library/SIMTRACE_Types.ttcn 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/SIMTRACE_Templates.ttcn b/library/SIMTRACE_Templates.ttcn index 934253e..05f738f 100644 --- a/library/SIMTRACE_Templates.ttcn +++ b/library/SIMTRACE_Templates.ttcn @@ -216,11 +216,13 @@ template (value) SIMTRACE_PDU ts_SIMTRACE_CEMU_CONFIG(template (value) CardEmu_FeatureFlags flags) := - ts_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags } }); + ts_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags, + slot_mux_nr := 0} }); template (present) SIMTRACE_PDU tr_SIMTRACE_CEMU_CONFIG(template (present) CardEmu_FeatureFlags flags) := - tr_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags } }); + tr_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags, + slot_mux_nr := * } }); /*********************************************************************** diff --git a/library/SIMTRACE_Types.ttcn b/library/SIMTRACE_Types.ttcn index 7b1c857..d28df2f 100644 --- a/library/SIMTRACE_Types.ttcn +++ b/library/SIMTRACE_Types.ttcn @@ -273,7 +273,8 @@ }; type record CardEmu_BD_Config { - CardEmu_FeatureFlags features + CardEmu_FeatureFlags features, + uint8_t slot_mux_nr optional }; /*********************************************************************** -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 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: Id29584764a2f27b9de5fa9ff67fd0ae3e912f02e Gerrit-Change-Number: 27340 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 ) Change subject: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 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: Id29584764a2f27b9de5fa9ff67fd0ae3e912f02e Gerrit-Change-Number: 27340 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Sun, 27 Feb 2022 17:45:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-hnbgw[master]: osmo-hnbgw.cfg: use local port 2729 as default for MGCP client

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27331 ) Change subject: osmo-hnbgw.cfg: use local port 2729 as default for MGCP client ...................................................................... osmo-hnbgw.cfg: use local port 2729 as default for MGCP client There are several osmo processes that talk to osmo-mgw via osmo-mgcp-client. The sample config for osmo-bsc suggest 2727 and the sample config for osmo-msc suggests 2728 as local port default. To make it less likely for users to get port collisions whlie setting up their networks we should use a different port for osmo-hnbgw. Lets use 2729. Change-Id: I55179c2bff3e6ef0e54fee6b1b90fc76f541e58e --- M doc/examples/osmo-hnbgw/osmo-hnbgw.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg b/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg index a683187..53b5508 100644 --- a/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg +++ b/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg @@ -25,6 +25,7 @@ hnbap-allow-tmsi 1 mgcp mgw remote-ip 127.0.0.1 + mgw local-port 2729 mgw remote-port 2427 mgw reset-endpoint rtpbridge/* -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I55179c2bff3e6ef0e54fee6b1b90fc76f541e58e Gerrit-Change-Number: 27331 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: octsim: tester support

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345 to look at the new patch set (#2). Change subject: octsim: tester support ...................................................................... octsim: tester support This adds tests for the octsim tester that try all voltages on all slots, 5v tests use the default (slow) rate because the cables apparently make higher rates at higher voltages a bit error prone. Change-Id: Id7c7e529a5444cffc8e79b385959a522dc9a6beb --- M octsim/OCTSIM_Tests.cfg M octsim/OCTSIM_Tests.ttcn 2 files changed, 439 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/27345/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345 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: Id7c7e529a5444cffc8e79b385959a522dc9a6beb Gerrit-Change-Number: 27345 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace emulation: adjust templates to support octsim tester

by Hoernchen

Attention is currently required from: laforge. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344 ) Change subject: simtrace emulation: adjust templates to support octsim tester ...................................................................... Patch Set 2: (1 comment) File library/SIMTRACE_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344/comment/0a1eaa0b_40e4… PS1, Line 218: ts_SIMTRACE_CEMU_CONFIG(template (value) CardEmu_FeatureFlags flags, integer slotnr) := > if you say "integer slotnr := 0" then the template will be backwards compatible, i. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344 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: I00576170a2b6921d99906ed8bd45d9eece053056 Gerrit-Change-Number: 27344 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Feb 2022 19:03:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config

by Hoernchen

Attention is currently required from: laforge. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 ) Change subject: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config ...................................................................... Patch Set 2: (1 comment) File library/SIMTRACE_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340/comment/6cd1903a_f84c… PS1, Line 225: ? > I guess this should be * not ?, otherwise any message without this entirely optional part would no l […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 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: Id29584764a2f27b9de5fa9ff67fd0ae3e912f02e Gerrit-Change-Number: 27340 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Feb 2022 19:02:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Further decode TAI in EF.OPL5G

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27337 ) Change subject: ts_31_102: Further decode TAI in EF.OPL5G ...................................................................... ts_31_102: Further decode TAI in EF.OPL5G The TAI is not just an opaque bytestring but it consists of 3 fields. Change-Id: Ie5a5ce74713deb0e151218ae553d3f3d96cef17d --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 231d387..fec81bf 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1033,7 +1033,8 @@ class EF_OPL5G(LinFixedEF): def __init__(self, fid='6f08', sfid=0x08, name='EF.OPL5G', desc='5GS Operator PLMN List', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={10, None}, **kwargs) - self._construct = Struct('tai'/Bytes(9), 'pnn_record_id'/Int8ub) + Tai = Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'tac_min'/Bytes(3), 'tac_max'/Bytes(3)) + self._construct = Struct('tai'/Tai, 'pnn_record_id'/Int8ub) # TS 31.102 Section 4.4.11.10 class EF_SUPI_NAI(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie5a5ce74713deb0e151218ae553d3f3d96cef17d Gerrit-Change-Number: 27337 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Further decode LAI in EF_LOCI

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27336 ) Change subject: ts_31_102: Further decode LAI in EF_LOCI ...................................................................... ts_31_102: Further decode LAI in EF_LOCI Change-Id: I21d9356e541eb320848a373804781ae0bef7d012 --- M pySim/ts_31_102.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 3298534..231d387 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -712,8 +712,8 @@ class EF_LOCI(TransparentEF): def __init__(self, fid='6f7e', sfid=0x0b, name='EF.LOCI', desc='Location information', size={11, 11}): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/HexAdapter(Bytes(5)), 'rfu'/Int8ub, - 'lu_status'/Int8ub) + Lai = Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'lac'/HexAdapter(Bytes(2))) + self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/Lai, 'rfu'/Int8ub, 'lu_status'/Int8ub) # TS 31.102 Section 4.2.18 class EF_AD(TransparentEF): class OP_MODE(enum.IntEnum): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I21d9356e541eb320848a373804781ae0bef7d012 Gerrit-Change-Number: 27336 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_51_011: Properly decode EF.OPL

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27333 ) Change subject: ts_51_011: Properly decode EF.OPL ...................................................................... ts_51_011: Properly decode EF.OPL The OPL has 7 bytes "LAI" as the LAI actually contains a LAC range (so two more bytes for the end of the 16bit range). Change-Id: I74bcf10b0a8977af0f2844044a812c5780af1706 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index ddfed95..9a6aff9 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -889,7 +889,7 @@ class EF_OPL(LinFixedEF): def __init__(self, fid='6fc6', sfid=None, name='EF.OPL', rec_len={8, 8}, desc='Operator PLMN List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('lai'/Bytes(5), 'pnn_record_id'/Int8ub) + self._construct = Struct('lai'/Bytes(7), 'pnn_record_id'/Int8ub) # TS 51.011 Section 10.3.44 + TS 31.102 4.2.62 class EF_MBI(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I74bcf10b0a8977af0f2844044a812c5780af1706 Gerrit-Change-Number: 27333 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_51_011: Better decode of EF_OPL LAI

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27334 ) Change subject: ts_51_011: Better decode of EF_OPL LAI ...................................................................... ts_51_011: Better decode of EF_OPL LAI before: { "lai": "62f2300000fffe", "pnn_record_id": 1 } after: { "lai": { "mcc_mnc": "262f03", "lac_min": "0000", "lac_max": "fffe" }, "pnn_record_id": 1 } Change-Id: I82581220e9c33a8e67cbefd5dfeb40bbc2c31179 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 9a6aff9..209a273 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -889,7 +889,7 @@ class EF_OPL(LinFixedEF): def __init__(self, fid='6fc6', sfid=None, name='EF.OPL', rec_len={8, 8}, desc='Operator PLMN List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('lai'/Bytes(7), 'pnn_record_id'/Int8ub) + self._construct = Struct('lai'/Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'lac_min'/Bytes(2), 'lac_max'/Bytes(2)), 'pnn_record_id'/Int8ub) # TS 51.011 Section 10.3.44 + TS 31.102 4.2.62 class EF_MBI(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I82581220e9c33a8e67cbefd5dfeb40bbc2c31179 Gerrit-Change-Number: 27334 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Fix decoding of UServiceTable

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27332 ) Change subject: ts_31_102: Fix decoding of UServiceTable ...................................................................... ts_31_102: Fix decoding of UServiceTable range(0,7) in python is 0..6, and not 0..7, so we need range(0.8) to produce the desired range covering all bits of a byte. This resulted in services 8,16,24,... not being displayed in the decoded output of EF.UST / EF.IST. Change-Id: I22bbc481de342685352bf5b13d54931d3f37f9b7 --- M pySim/ts_31_102.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index c6bfa2d..3298534 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -554,7 +554,7 @@ ret = {} for i in range(0, len(in_bin)): byte = in_bin[i] - for bitno in range(0, 7): + for bitno in range(0, 8): service_nr = i * 8 + bitno + 1 ret[service_nr] = { 'activated': True if byte & (1 << bitno) else False -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I22bbc481de342685352bf5b13d54931d3f37f9b7 Gerrit-Change-Number: 27332 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Further decode TAI in EF.OPL5G

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27337 ) Change subject: ts_31_102: Further decode TAI in EF.OPL5G ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie5a5ce74713deb0e151218ae553d3f3d96cef17d Gerrit-Change-Number: 27337 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:18:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_31_102: Further decode LAI in EF_LOCI

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27336 ) Change subject: ts_31_102: Further decode LAI in EF_LOCI ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I21d9356e541eb320848a373804781ae0bef7d012 Gerrit-Change-Number: 27336 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:18:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in pysim[master]: ts_51_011: Better decode of EF_OPL LAI

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27334 ) Change subject: ts_51_011: Better decode of EF_OPL LAI ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File pySim/ts_51_011.py: https://gerrit.osmocom.org/c/pysim/+/27334/comment/b0ca1ada_6cccb501 PS1, Line 892: mcc_nmc > typo! Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I82581220e9c33a8e67cbefd5dfeb40bbc2c31179 Gerrit-Change-Number: 27334 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:18:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

2024

2023

2022

gerrit-log February 2022