March 2023 - gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: codec: add osmo_efr_check_sid() function
by laforge 25 Mar '23

25 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32034 ) Change subject: codec: add osmo_efr_check_sid() function ...................................................................... codec: add osmo_efr_check_sid() function Previously existing code provides osmo_fr_check_sid() and osmo_hr_check_sid() functions for FR1 and HR1 codecs; these functions are used by various RTP-touching programs in the Osmocom CNI suite when they need to differentiate between speech and SID frames. However, there was no corresponding function of this form for EFR codec, with the result being that the same programs that handle speech vs SID distinction correctly for FR1 and HR1 fail to do so for EFR. The present change adds an osmo_efr_check_sid() function to libosmocodec that fully mirrors previously existing osmo_fr_check_sid() and osmo_hr_check_sid(), providing the first step toward more correct EFR handling in programs where a SID check may be needed. Change-Id: Iab9fb60028f4135375287bc42f5da7ca7838b5f0 --- M include/osmocom/codec/codec.h M src/codec/gsm660.c 2 files changed, 68 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/codec/codec.h b/include/osmocom/codec/codec.h index 58e3a29..65de20d 100644 --- a/include/osmocom/codec/codec.h +++ b/include/osmocom/codec/codec.h @@ -83,6 +83,7 @@ bool osmo_fr_check_sid(const uint8_t *rtp_payload, size_t payload_len); bool osmo_hr_check_sid(const uint8_t *rtp_payload, size_t payload_len); +bool osmo_efr_check_sid(const uint8_t *rtp_payload, size_t payload_len); int osmo_amr_rtp_enc(uint8_t *payload, uint8_t cmr, enum osmo_amr_type ft, enum osmo_amr_quality bfi); int osmo_amr_rtp_dec(const uint8_t *payload, int payload_len, uint8_t *cmr, diff --git a/src/codec/gsm660.c b/src/codec/gsm660.c index 34b10de..46ecdac 100644 --- a/src/codec/gsm660.c +++ b/src/codec/gsm660.c @@ -20,6 +20,10 @@ */ #include <stdint.h> +#include <stdbool.h> + +#include <osmocom/core/bitvec.h> +#include <osmocom/core/utils.h> #include <osmocom/codec/codec.h> /* GSM EFR - subjective importance bit ordering */ @@ -253,3 +257,43 @@ 243, /* 258 -> PULSE 4_9: b0 */ 246, /* 259 -> PULSE 4_10: b0 */ }; + +/*! Check whether RTP frame contains EFR SID code word according to + * TS 101 318 §5.3.2 + * \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_efr_check_sid(const uint8_t *rtp_payload, size_t payload_len) +{ + struct bitvec bv; + uint16_t i; + static const uint8_t sid_code_word_bits[95] = { + /* bit numbers relative to "pure" EFR frame beginning, + * not counting the signature bits. */ + 45, 46, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 94, 95, 96, 98, 99, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 148, 149, 150, + 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 196, 197, 198, 199, 200, 201, 202, 203, 204, + 205, 206, 207, 208, 209, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221 }; + + /* signature does not match Enhanced Full Rate SID */ + if ((rtp_payload[0] >> 4) != 0xC) + return false; + + bv.data = (uint8_t *) rtp_payload; + bv.data_len = payload_len; + + /* code word is all 1 at given bits */ + for (i = 0; i < ARRAY_SIZE(sid_code_word_bits); i++) { + if (bitvec_get_bit_pos(&bv, sid_code_word_bits[i]+4) != ONE) + return false; + } + + return true; +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iab9fb60028f4135375287bc42f5da7ca7838b5f0 Gerrit-Change-Number: 32034 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: codec: add osmo_efr_check_sid() function
by laforge 25 Mar '23

25 Mar '23

Attention is currently required from: falconia, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32034 ) Change subject: codec: add osmo_efr_check_sid() function ...................................................................... Patch Set 2: Code-Review+2 (3 comments) File src/codec/gsm660.c: https://gerrit.osmocom.org/c/libosmocore/+/32034/comment/65e9a36c_da0e8a15 PS1, Line 271: static con > @laforge: I checked the code produced by gcc (5.3.0, came with Slackware 14. […] Done https://gerrit.osmocom.org/c/libosmocore/+/32034/comment/a62e0f0b_2772895f PS1, Line 272: /* bit numbers relative to "pure" EFR frame beginning, : * not counting the signature bits. */ : 45, 46, 48, 49, 50, 51, 52, 53, 54, 55, : 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, : 66, 67, 68, 94, 95, 96, 98, 99, 100, 101, : 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, : 112, 113, 114, 115, 116, 117, 118, 148, 149, 150, : 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, : 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, : 171, 196, 197, 198, 199, 200, 201, 202, 203, 204, : 205, 206, 207, 208, 209, 212, 213, 214, 215, 216, : 217, 218, 219, 220, 221 }; > I was going for the same code structure and style as in osmo_fr_check_sid() in gsm610. […] Done https://gerrit.osmocom.org/c/libosmocore/+/32034/comment/436f4149_273a05d0 PS1, Line 293: for (i = 0; i < ARRAY_SIZE(sid_code_word_bits); i++) > Once again I was copying the code structure and style from osmo_fr_check_sid() and osmo_hr_check_sid […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iab9fb60028f4135375287bc42f5da7ca7838b5f0 Gerrit-Change-Number: 32034 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Mar 2023 08:04:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: Use new GSM0408 defines for half-octet tags
by pespin 25 Mar '23

25 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32017 ) Change subject: Use new GSM0408 defines for half-octet tags ...................................................................... Use new GSM0408 defines for half-octet tags The old ones have been deprecated and shall not be used anymore· Depends: libosmocore.git Change-Id I799e35dc8d4d153fa63bf50563a5482cdf4de2d7 Change-Id: Id3be8e38ec87ae39c4e1b4fab163563b24fb2cee --- M TODO-RELEASE M src/osmo-bsc/gsm_04_08_rr.c 2 files changed, 16 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 98023fc..2658cdd 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -12,4 +12,5 @@ osmo-bsc CTRL,VTY osmo_fsm instance IDs now use new dynamic timeslot names 'DYNAMIC_OSMOCOM' and 'DYNAMIC_IPACCESS' libosmogsm >1.8.0 circuit switched data stuff (gsm0808_enc/dec_channel_type etc.) libosmo-abis >1.4.0 osmo_ortp.h: add RTP_PT_CSDATA -libosmo-sccp >1.7.0 osmo_sccp_{get,set}_priv() \ No newline at end of file +libosmo-sccp >1.7.0 osmo_sccp_{get,set}_priv() +libosmocore >1.8.0 GSM48_IE_CIP_MODE_SET_HO and GSM48_IE_SYNC_IND_HO \ No newline at end of file diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index ee772df..8395dcf 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -565,7 +565,7 @@ * TODO: NCI (Normal cell indication), currently 0. */ const uint8_t sync_ind = async ? 0x00 : 0x01; /* T (4 bit) + V (4 bit), see 3GPP TS 44.018, 10.5.2.39 */ - msgb_v_put(msg, GSM48_IE_SYNC_IND | (sync_ind & 0x0f)); + msgb_v_put(msg, (GSM48_IE_SYNC_IND_HO << 4) | (sync_ind & 0x0f)); } if (new_lchan->ts->hopping.enabled) { @@ -595,7 +595,7 @@ if (new_lchan->encr.alg_a5_n > 0) cms = (new_lchan->encr.alg_a5_n - 1) << 1 | 1; /* T (4 bit) + V (4 bit), see 3GPP TS 44.018, 10.5.2.9 */ - msgb_v_put(msg, GSM48_IE_CIP_MODE_SET | (cms & 0x0f)); + msgb_v_put(msg, (GSM48_IE_CIP_MODE_SET_HO << 4) | (cms & 0x0f)); } /* in case of multi rate we need to attach a config */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id3be8e38ec87ae39c4e1b4fab163563b24fb2cee Gerrit-Change-Number: 32017 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: codec: add osmo_efr_check_sid() function
by pespin 25 Mar '23

25 Mar '23

Attention is currently required from: falconia, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32034 ) Change subject: codec: add osmo_efr_check_sid() function ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iab9fb60028f4135375287bc42f5da7ca7838b5f0 Gerrit-Change-Number: 32034 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 25 Mar 2023 01:11:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: main: Give specific error message
by pespin 25 Mar '23

25 Mar '23

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32062 ) Change subject: main: Give specific error message ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0015824a29ebf8aaeaa996ab4d2cb2769ea48864 Gerrit-Change-Number: 32062 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Mar 2023 01:09:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: modem: set logging cat for OSMO_GPRS_RLCMAC_LOGC_TBF{UL,DL}
by pespin 25 Mar '23

25 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32061 ) Change subject: modem: set logging cat for OSMO_GPRS_RLCMAC_LOGC_TBF{UL,DL} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I98efa4c8137c7ec57da6ef7ea1307b4e46b4fc98 Gerrit-Change-Number: 32061 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Mar 2023 01:09:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: layer23: add missing log_info_cat[] entry for DGMM
by pespin 25 Mar '23

25 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32060 ) Change subject: layer23: add missing log_info_cat[] entry for DGMM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icdc09b6edce7abb3ff88f12650d3b304447d39a6 Gerrit-Change-Number: 32060 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Mar 2023 01:08:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: fix wrong MSGT_PACKET_{RESOURCE_REQUEST->DOWNLINK_ACK_NACK}
by pespin 25 Mar '23

25 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32059 ) Change subject: rlcmac: fix wrong MSGT_PACKET_{RESOURCE_REQUEST->DOWNLINK_ACK_NACK} ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: unit test needs updating -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3c475afc3f7cca42dcf9b1d90c2ac425d3158708 Gerrit-Change-Number: 32059 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Mar 2023 01:08:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: fix wrong MSGT_PACKET_{RESOURCE_REQUEST->DOWNLINK_ACK_NACK}
by pespin 25 Mar '23

25 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32059 ) Change subject: rlcmac: fix wrong MSGT_PACKET_{RESOURCE_REQUEST->DOWNLINK_ACK_NACK} ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3c475afc3f7cca42dcf9b1d90c2ac425d3158708 Gerrit-Change-Number: 32059 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Mar 2023 01:07:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: trxcon: l1sched_prim_dequeue(): check TDMA Fn in PDCH prims
by pespin 25 Mar '23

25 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32057 ) Change subject: trxcon: l1sched_prim_dequeue(): check TDMA Fn in PDCH prims ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6b2d9cc93ce266524f56a1b6a97beecfc0ad042d Gerrit-Change-Number: 32057 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Mar 2023 01:06:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0