Attention is currently required from: keith.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27358 )
Change subject: osmo-ggsn: update libgtp-queue_depth_32.patch
......................................................................
Patch Set 3: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27358
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: meta-telephony
Gerrit-Branch: laforge/nightly
Gerrit-Change-Id: Ib8803fba7d1308042d12186009344b2a61abb6e3
Gerrit-Change-Number: 27358
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-Comment-Date: Wed, 02 Mar 2022 15:43:01 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith, keith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27358 )
Change subject: osmo-ggsn: update libgtp-queue_depth_32.patch
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27358
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: meta-telephony
Gerrit-Branch: laforge/nightly
Gerrit-Change-Id: Ib8803fba7d1308042d12186009344b2a61abb6e3
Gerrit-Change-Number: 27358
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-Comment-Date: Wed, 02 Mar 2022 15:09:49 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith, keith.
Hello pespin, keith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/meta-telephony/+/27358
to look at the new patch set (#3).
Change subject: osmo-ggsn: update libgtp-queue_depth_32.patch
......................................................................
osmo-ggsn: update libgtp-queue_depth_32.patch
Adjust to change in osmo-ggsn I6034b0fab2b2e5962314c2fca2f893246ce5cf4f
("libgtp: Define retransmit QUEUE_SIZE relative to PDP_MAX (increase)").
Set it to 128, as Pau suggested.
Fix for:
Applying patch libgtp-queue_depth_32.patch
patching file gtp/queue.h
Hunk #1 FAILED at 19.
Change-Id: Ib8803fba7d1308042d12186009344b2a61abb6e3
---
A recipes-osmocom/osmo-ggsn/files/0001-libgtp-set-PDP_MAX-to-128.patch
D recipes-osmocom/osmo-ggsn/files/libgtp-queue_depth_32.patch
M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
3 files changed, 36 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/58/27358/3
--
To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27358
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: meta-telephony
Gerrit-Branch: laforge/nightly
Gerrit-Change-Id: Ib8803fba7d1308042d12186009344b2a61abb6e3
Gerrit-Change-Number: 27358
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-MessageType: newpatchset
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27360 )
Change subject: bts-trx: amr: Fix return code of osmo_amr_rtp_dec() checked too late
......................................................................
bts-trx: amr: Fix return code of osmo_amr_rtp_dec() checked too late
If len is < 0, it means osmo_amr_rtp_dec() failed and some of the out
variables there are not set. We should check the return code before
continuing and using potentially uninitialized values.
Change-Id: I76020c6b5dc8d3e52e8c5be8cdecdf8a0bb52ed9
---
M src/osmo-bts-trx/sched_lchan_tchf.c
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index 08a58bb..b100fab 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -441,6 +441,10 @@
len = osmo_amr_rtp_dec(msg_tch->l2h, msgb_l2len(msg_tch),
&cmr_codec, &cmi, &ft_codec,
&bfi, &sti);
+ if (len < 0) {
+ LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot send invalid AMR payload\n");
+ goto free_bad_msg;
+ }
cmr = -1;
ft = -1;
for (i = 0; i < chan_state->codecs; i++) {
@@ -478,10 +482,6 @@
LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "TCH mode invalid, please fix!\n");
goto free_bad_msg;
}
- if (len < 0) {
- LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot send invalid AMR payload\n");
- goto free_bad_msg;
- }
if (msgb_l2len(msg_tch) != len) {
LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot send payload with "
"invalid length! (expecting %d, received %d)\n",
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27360
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I76020c6b5dc8d3e52e8c5be8cdecdf8a0bb52ed9
Gerrit-Change-Number: 27360
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: neels, laforge, dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27361 )
Change subject: bts-trx: Fix dropping of DL AMR SID frames
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
This is still not tested, I'll mark it as WIP while I try to write a ttcn3 test for it.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27361
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Icb6f72c091bb7855dba5a2d6bb1eba838bf6ec92
Gerrit-Change-Number: 27361
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 02 Mar 2022 13:17:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27361 )
Change subject: bts-trx: Fix dropping of DL AMR SID frames
......................................................................
bts-trx: Fix dropping of DL AMR SID frames
Received DL RTP packets from the MGW containing AMR SID frames (FT=8)
were being checked to be in the active AMR codec mode subset, and
subsequently failing because the SID frames can always be expected there
and are not part of any active mode subset.
As a result, they were being dropped:
"(bts=0,trx=0,ts=4) TCH/F: Codec (FT = 8) of RTP frame not in list".
Related: SYS#5838
Change-Id: Icb6f72c091bb7855dba5a2d6bb1eba838bf6ec92
---
M src/osmo-bts-trx/sched_lchan_tchf.c
1 file changed, 22 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/27361/1
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index b100fab..6b745f3 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -446,12 +446,11 @@
goto free_bad_msg;
}
cmr = -1;
- ft = -1;
for (i = 0; i < chan_state->codecs; i++) {
- if (chan_state->codec[i] == cmr_codec)
+ if (chan_state->codec[i] == cmr_codec) {
cmr = i;
- if (chan_state->codec[i] == ft_codec)
- ft = i;
+ break;
+ }
}
if (cmr >= 0) { /* new request */
chan_state->dl_cmr = cmr;
@@ -461,17 +460,26 @@
/* enable AMR loop */
trx_loop_amr_set(chan_state, 1);
}
- if (ft < 0) {
- LOGL1SB(DL1P, LOGL_ERROR, l1ts, br,
- "Codec (FT = %d) of RTP frame not in list\n", ft_codec);
- goto free_bad_msg;
+ if (ft_codec < AMR_SID) {
+ ft = -1;
+ for (i = 0; i < chan_state->codecs; i++) {
+ if (chan_state->codec[i] == ft_codec) {
+ ft = i;
+ break;
+ }
+ }
+ if (ft < 0) {
+ LOGL1SB(DL1P, LOGL_ERROR, l1ts, br,
+ "Codec (FT = %d) of RTP frame not in list\n", ft_codec);
+ goto free_bad_msg;
+ }
+ if (amr_is_cmr && chan_state->dl_ft != ft) {
+ LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Codec (FT = %d) "
+ " of RTP cannot be changed now, but in next frame\n", ft_codec);
+ goto free_bad_msg;
+ }
+ chan_state->dl_ft = ft;
}
- if (amr_is_cmr && chan_state->dl_ft != ft) {
- LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Codec (FT = %d) "
- " of RTP cannot be changed now, but in next frame\n", ft_codec);
- goto free_bad_msg;
- }
- chan_state->dl_ft = ft;
if (bfi == AMR_BAD) {
LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Transmitting 'bad AMR frame'\n");
goto free_bad_msg;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27361
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Icb6f72c091bb7855dba5a2d6bb1eba838bf6ec92
Gerrit-Change-Number: 27361
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith, keith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27358 )
Change subject: osmo-ggsn: update libgtp-queue_depth_32.patch
......................................................................
Patch Set 2:
(1 comment)
File recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb:
https://gerrit.osmocom.org/c/meta-telephony/+/27358/comment/b77bd9d6_3379b3…
PS2, Line 9: PR = "${INC_PR}.0"
> it will increase automatically by INC_PR
I don't see you are touching INC_PR either:
recipes-osmocom/osmo-ggsn/osmo-ggsn.inc
8:INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
In any case, the increase should be done in here (PR) since the change is in this file.
--
To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27358
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: meta-telephony
Gerrit-Branch: laforge/nightly
Gerrit-Change-Id: Ib8803fba7d1308042d12186009344b2a61abb6e3
Gerrit-Change-Number: 27358
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-Comment-Date: Wed, 02 Mar 2022 13:13:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment