Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32615 )
Change subject: ps_rab_ass_fsm.h: fix dup of FSM event enum
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32615
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I20d5fc6d52d08b185ef3aa4f7a59fa0ebb202b18
Gerrit-Change-Number: 32615
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 May 2023 10:24:14 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32619 )
Change subject: ranap_rab_ass_test.c: clarify talloc contexts
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Patchset:
PS1:
Failure seems to be related to a parent change
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32619
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I4256e0d94a7e7fbba236aa92c44229c12cf17313
Gerrit-Change-Number: 32619
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 May 2023 10:22:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32618 )
Change subject: simplify: one g_hnbgw as global state and root ctx
......................................................................
Patch Set 1:
(1 comment)
File src/osmo-hnbgw/hnbgw_cn.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/32618/comment/37d1f3e3_d7a56bf8
PS1, Line 85: void *)
Re-add the parameter name.
``` shell
hnbgw_cn.c: In function ‘cnlink_trafc_cb’:
hnbgw_cn.c:85:29: error: parameter name omitted
static void cnlink_trafc_cb(void *)
^~~~~~
make[3]: *** [Makefile:518: hnbgw_cn.o] Error 1
```
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32618
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I3d54a5bb30c16a990c6def2a0ed207f60a95ef5d
Gerrit-Change-Number: 32618
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 May 2023 10:21:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32617 )
Change subject: eliminate function hnb_contexts()
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32617
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Icd4100ddeb98f4dc2e2ec6de2d44a4b861a66078
Gerrit-Change-Number: 32617
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 May 2023 10:06:07 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32614 )
Change subject: rab_ass_fsm.c: fix asn1 memleak when replacing GTP address
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Patchset:
PS1:
Just to check I got this right, the calls to `ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies);` take care of freeing all the elements?
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32614
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I315d04a07b7dfd4dce26e5b5f871318e27e2bdf6
Gerrit-Change-Number: 32614
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 May 2023 10:04:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: jolly, neels, laforge, pespin, fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31417 )
Change subject: l1sap: Drop unsupported HR GSM payload
......................................................................
Patch Set 9:
(7 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bts/+/31417/comment/967db791_44a14ff8
PS8, Line 16: are accepted.
> Agree, I also mentioned that in my last review.
In l1sap_rtp_rx_cb() we convert the payload but the conversion is only carried out when there is an exact length match. If there are packets with invalid payloads (either too long or to short) received they would slip through. This code path is not about gatekeeping, its only about the conversion.
in rtppayload_is_valid() we make sure that the payload length matches the expectations of the BTS and ensures that no unsupported payload is passed on to lower layers.
That are essentially two different topics and I think it makes sense to split those in separate patches. I have spitted the conversion part in a separate patch.
File src/common/bts.c:
https://gerrit.osmocom.org/c/osmo-bts/+/31417/comment/069c0992_729468a0
PS8, Line 207: "
> add "...is supported" or "support for ... […]
Done
https://gerrit.osmocom.org/c/osmo-bts/+/31417/comment/94c8df84_7cbb2095
PS8, Line 208: t
> same
Done
File src/common/l1sap.c:
https://gerrit.osmocom.org/c/osmo-bts/+/31417/comment/1f78d62d_2270d00b
PS7, Line 1274: if (OSMO_UNLIKELY(rfc5993 && (resp_msg->len != GSM_HR_BYTES_RTP_RFC5993))) {
> I agree that a flag being zero should disallow that format, no matter what the other flag's value is […]
I think this is fixed now. In case no format is set both payload formats would be rejected. So a the hardware specific code now must have the flags set accordingly.
File src/common/l1sap.c:
https://gerrit.osmocom.org/c/osmo-bts/+/31417/comment/f6e84a99_ba4af586
PS8, Line 1274: /* BTS flags specify that RFC 5993 (and not ETSI TS 101.318) is understood by lower layers */
> Ack
Done
https://gerrit.osmocom.org/c/osmo-bts/+/31417/comment/e8e9663d_c97bc7c9
PS8, Line 1952: * formats are supported (either by setting both or none of the flags), no conversion will be carried out. */
> Ack
I have splatted the converting part into a follow up patch - so it is rejecting
https://gerrit.osmocom.org/c/osmo-bts/+/31417/comment/4e9352c1_ea24eff6
PS8, Line 1969: break;
> the code converting from one format to the other should be in separate functions
This turns out even more ugly due to the l1sap_msgb_alloc and the fallthrough.
Anyway, lets discuss this in: I9419b40c1171876879d41aba4f51c93e8ef5673c then
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31417
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I453562da412fde5b928bd2b588129c58ec8e2a7e
Gerrit-Change-Number: 31417
Gerrit-PatchSet: 9
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 May 2023 10:00:45 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: jolly, neels, laforge, pespin, fixeria.
Hello Jenkins Builder, jolly, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/31417
to look at the new patch set (#9).
Change subject: l1sap: Drop unsupported HR GSM payload
......................................................................
l1sap: Drop unsupported HR GSM payload
Unfotunately there are two different RTP formats for HR GSM specified.
and it is unclear which should be used with GSM networks. Also each BTS
model may support only either one or the other format.
In the past this has lead to confusion and situations that were
difficult to debug. The reception of RTP packets in an unsupported
format may lead to unexpected behavior.
Let's introduce BTS_INTERNAL flags, one for each format and set them for
each BTS model accordingly. Then let's add a check to make sure
unsupported RTP payload is not forwarded to lower layers and appropriate
error messages are printed so that the problem does not go unnoticed.
Change-Id: I453562da412fde5b928bd2b588129c58ec8e2a7e
Related: OS#5688
---
M include/osmo-bts/bts.h
M src/common/bts.c
M src/common/l1sap.c
M src/osmo-bts-lc15/main.c
M src/osmo-bts-oc2g/main.c
M src/osmo-bts-sysmo/main.c
M src/osmo-bts-trx/main.c
M src/osmo-bts-virtual/main.c
8 files changed, 69 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/31417/9
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31417
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I453562da412fde5b928bd2b588129c58ec8e2a7e
Gerrit-Change-Number: 31417
Gerrit-PatchSet: 9
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32630 )
Change subject: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload
......................................................................
l1sap: Accept RFC5993 and TS 101.318 HR GSM payload
Unfotunately there are two different RTP formats for HR GSM specified
and it is unclear which should be used with GSM networks. Also each BTS
model may support only either one or the other format.
Let's use the BTS feature flags to determine which format the BTS model
supports and then let's use this information to convert incoming RTP
packets into the supported format. Doing so we will make sure that
always both formats are accepted.
Related: OS#5688
Change-Id: I9419b40c1171876879d41aba4f51c93e8ef5673c
---
M src/common/l1sap.c
1 file changed, 56 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/30/32630/1
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 08bf0d3..5a9cb09 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1946,10 +1946,43 @@
if (lchan->loopback)
return;
- msg = l1sap_msgb_alloc(rtp_pl_len);
- if (!msg)
- return;
- memcpy(msgb_put(msg, rtp_pl_len), rtp_pl, rtp_pl_len);
+ /* There are two different specifications that describe how HR GSM audio should be encapsulated in RTP frames:
+ * RFC 5993 and ETSI TS 101.318 (TIPHON). In order to be able to accept both formats we convert them on
+ * reception depending on what the particular BTS model supports. In case the BTS flags indicate that both
+ * formats are supported (either by setting both or none of the flags), no conversion will be carried out. */
+ switch (lchan->tch_mode) {
+ case GSM48_CMODE_SPEECH_V1:
+ if (lchan->type == GSM_LCHAN_TCH_H) {
+ bool rfc5993 =
+ bts_internal_flag_get(lchan->ts->trx->bts, BTS_INTERNAL_FLAG_SPEECH_H_V1_RTP_RFC5993);
+ bool ts101318 =
+ bts_internal_flag_get(lchan->ts->trx->bts, BTS_INTERNAL_FLAG_SPEECH_H_V1_RTP_TS101318);
+
+ /* The only difference between TS 101.318 and RFC 5993 is that RFC 5993 specifies an additional
+ * one byte TOC header in front of the audio payload. (See also: RFC 5993, section 5.2) */
+ if (OSMO_UNLIKELY(rfc5993 && !ts101318 && rtp_pl_len == GSM_HR_BYTES_RTP_TS101318)) {
+ msg = l1sap_msgb_alloc(rtp_pl_len + 1);
+ if (!msg)
+ return;
+ msgb_put_u8(msg, 0x00);
+ memcpy(msgb_put(msg, rtp_pl_len), rtp_pl, rtp_pl_len);
+ break;
+ } else if (OSMO_UNLIKELY(ts101318 && !rfc5993 && rtp_pl_len == GSM_HR_BYTES_RTP_RFC5993)) {
+ msg = l1sap_msgb_alloc(rtp_pl_len - 1);
+ if (!msg)
+ return;
+ memcpy(msgb_put(msg, rtp_pl_len - 1), rtp_pl + 1, rtp_pl_len - 1);
+ break;
+ }
+ }
+ /* fallthrough, no conversion required */
+ default:
+ msg = l1sap_msgb_alloc(rtp_pl_len);
+ if (!msg)
+ return;
+ memcpy(msgb_put(msg, rtp_pl_len), rtp_pl, rtp_pl_len);
+ }
+
msgb_pull(msg, sizeof(struct osmo_phsap_prim));
/* Store RTP header Marker bit in control buffer */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32630
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I9419b40c1171876879d41aba4f51c93e8ef5673c
Gerrit-Change-Number: 32630
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/32622 )
Change subject: ctrl-test: drop bogus 'rm -f $(CTRL_TEST_DB)'
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/32622
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-smlc
Gerrit-Branch: master
Gerrit-Change-Id: Idcf9296a6e7e520c2f0b42f8aace01d616bcfc56
Gerrit-Change-Number: 32622
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 May 2023 09:52:19 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32627 )
Change subject: vty: fix doc strings for 'show {hnb,ue}'
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32627
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I79f8b13a9f22fb8311017005cc0a3ac3a7e78983
Gerrit-Change-Number: 32627
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 05 May 2023 09:51:08 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment