Attention is currently required from: fixeria, dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32735 )
Change subject: gmm: Allow passing old RAI during attach
......................................................................
Patch Set 1:
(2 comments)
File include/osmocom/gprs/gmm/gmm_prim.h:
https://gerrit.osmocom.org/c/libosmo-gprs/+/32735/comment/970e3f06_07123805
PS1, Line 112: struct gprs_ra_id old_rai;
> I wonder where those old_rai fields are populated.
from the SIM EF.LOCIGPRS by the app.
File src/gmm/gmm_prim.c:
https://gerrit.osmocom.org/c/libosmo-gprs/+/32735/comment/903f75c6_4a0681d4
PS1, Line 389:
> here we use the old_rai, but where is that field populated before?
from the SIM EF.LOCIGPRS by the app ("modem").
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32735
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I22ffa8a169c09445e7126892616f61b8d01cbfe7
Gerrit-Change-Number: 32735
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 17 May 2023 09:19:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin, fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32735 )
Change subject: gmm: Allow passing old RAI during attach
......................................................................
Patch Set 1:
(3 comments)
File include/osmocom/gprs/gmm/gmm_prim.h:
https://gerrit.osmocom.org/c/libosmo-gprs/+/32735/comment/a9393714_f6be9c37
PS1, Line 112: struct gprs_ra_id old_rai;
I wonder where those old_rai fields are populated.
File src/gmm/gmm_pdu.c:
https://gerrit.osmocom.org/c/libosmo-gprs/+/32735/comment/a90879e9_4eb235b0
PS1, Line 224: gsm48_encode_ra(raid_enc, &gmme->ra);
I guess here we use the current ra as old ra since we are getting an attach request so the ra we currently stored will become the new old ra. This means that this is correct.
File src/gmm/gmm_prim.c:
https://gerrit.osmocom.org/c/libosmo-gprs/+/32735/comment/e542e3bb_f7b13cc4
PS1, Line 389:
here we use the old_rai, but where is that field populated before?
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32735
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I22ffa8a169c09445e7126892616f61b8d01cbfe7
Gerrit-Change-Number: 32735
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 17 May 2023 09:15:59 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: falconia.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32714 )
Change subject: TCH DL, FR & EFR: reshape SIDs per 06.31/06.81 section 5.1.2
......................................................................
Patch Set 4: Code-Review+1
(5 comments)
Patchset:
PS4:
This looks very clean to me. The elaborated comments are also very helpful to understand whats going on.
File src/common/l1sap.c:
https://gerrit.osmocom.org/c/osmo-bts/+/32714/comment/cffdfbcd_ae7c04dd
PS3, Line 1308: static inline bool nonamr_mand_sid_position(struct gsm_lchan *lchan,
> In the latest patchset just uploaded, I renamed this function to fr_hr_efr_sid_position().
Done
https://gerrit.osmocom.org/c/osmo-bts/+/32714/comment/2dc50c4e_60b78772
PS3, Line 1441: if (!resp_msg && lchan->tch.dtx_fr_efr.last_rtp_input_was_sid &&
> In the new patchset I added a bunch of comments, extensively documenting the flow of that complex co […]
maybe just putting the whole code path in a static function would already improve the readability of the code.
File src/common/l1sap.c:
https://gerrit.osmocom.org/c/osmo-bts/+/32714/comment/bfe2abc9_78f645a3
PS4, Line 1384: /* non-AMR SID handling */
maybe /* FR, HR, EFR SID handling */, or just /* SID handling */ (I think is obvious that this only affects HR/FR and EFR.)
https://gerrit.osmocom.org/c/osmo-bts/+/32714/comment/282d3d2f_d818b0d1
PS4, Line 1393: * until OS#5688 is resolved. */
I guess the problem is that you do not know which of the two payload formats you will see here. I have submitted a patch (I25728299b757fbc87dd1b3f5adaec9b8b240c5d1) to make osmo_hr_check_sid() compatible with both payload types. So you can use it here without worrying about in which format the payload is.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32714
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I924ab21952dcf8bb03ba7ccef790474bf66fc9e5
Gerrit-Change-Number: 32714
Gerrit-PatchSet: 4
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-Comment-Date: Wed, 17 May 2023 08:52:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32740 )
Change subject: gsm630: make osmo_hr_check_sid compatible with RFC 5993
......................................................................
gsm630: make osmo_hr_check_sid compatible with RFC 5993
RFC 5993 specifies a one byte TOC at the beginning of the RTP payload,
while TS 101 318 does not have such a TOC byte. Since both formats are
used in the field, let's make sure that osmo_hr_check_sid will work with
both formats.
Related: OS#5688
Related: OS#5996
Change-Id: I25728299b757fbc87dd1b3f5adaec9b8b240c5d1
---
M src/codec/gsm620.c
1 file changed, 28 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/32740/1
diff --git a/src/codec/gsm620.c b/src/codec/gsm620.c
index 4eae514..9b4083c 100644
--- a/src/codec/gsm620.c
+++ b/src/codec/gsm620.c
@@ -265,16 +265,24 @@
};
/*! Check whether RTP frame contains HR SID code word according to
- * TS 101 318 §5.2.2
+ * TS 101 318 §5.2.2 (payload may be supplied in TS 101 318 or RFC 5993 formt).
* \param[in] rtp_payload Buffer with RTP payload
* \param[in] payload_len Length of payload
* \returns true if code word is found, false otherwise
*/
bool osmo_hr_check_sid(const uint8_t *rtp_payload, size_t payload_len)
{
- struct bitvec bv = {
- .data = (uint8_t *)rtp_payload,
- .data_len = payload_len,
+ struct bitvec bv;
+ size_t offset = 0;
+
+ /* In case the payload is supplied in RFC 5993 format, we need to apply
+ * an offset to remove the one byte TOC at the beginning */
+ if (payload_len == GSM_HR_BYTES_RTP_RFC5993)
+ offset = 1;
+
+ bv = (struct bitvec) {
+ .data = (uint8_t *)rtp_payload + offset,
+ .data_len = payload_len - offset,
};
/* A SID frame is identified by a SID codeword consisting of 79 bits which are all 1,
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32740
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I25728299b757fbc87dd1b3f5adaec9b8b240c5d1
Gerrit-Change-Number: 32740
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: falconia, dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32714 )
Change subject: TCH DL, FR & EFR: reshape SIDs per 06.31/06.81 section 5.1.2
......................................................................
Patch Set 4: Code-Review+1
(1 comment)
Patchset:
PS4:
I think the comments are a bit too verbose (could be more schematic) but ok, let's see what others have to say.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32714
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I924ab21952dcf8bb03ba7ccef790474bf66fc9e5
Gerrit-Change-Number: 32714
Gerrit-PatchSet: 4
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: falconia <falcon(a)freecalypso.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 17 May 2023 08:16:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin, dexter.
falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32714 )
Change subject: TCH DL, FR & EFR: reshape SIDs per 06.31/06.81 section 5.1.2
......................................................................
Patch Set 4:
(3 comments)
File src/common/l1sap.c:
https://gerrit.osmocom.org/c/osmo-bts/+/32714/comment/cc2531aa_8b1bc365
PS3, Line 1308: static inline bool nonamr_mand_sid_position(struct gsm_lchan *lchan,
> But this particular function is not limited to FR & EFR, this one already supports TCH/H too, so it […]
In the latest patchset just uploaded, I renamed this function to fr_hr_efr_sid_position().
https://gerrit.osmocom.org/c/osmo-bts/+/32714/comment/f00d59ae_c0ccc0b6
PS3, Line 1415: } else
> Fair enough - I'll fix it in the next revision.
Done
https://gerrit.osmocom.org/c/osmo-bts/+/32714/comment/0718334c_cef7fc42
PS3, Line 1441: if (!resp_msg && lchan->tch.dtx_fr_efr.last_rtp_input_was_sid &&
> In the classic GSM architecture this logic was split between two separate components: the first part […]
In the new patchset I added a bunch of comments, extensively documenting the flow of that complex code stage by stage. Please see if it's any clearer now.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32714
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I924ab21952dcf8bb03ba7ccef790474bf66fc9e5
Gerrit-Change-Number: 32714
Gerrit-PatchSet: 4
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: dexter <pmaier(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 17 May 2023 07:20:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment