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

Change in libosmocore[master]: gsm0808_chan_indicator: add SPEECH_CTM_TEXT_TELEPHONY

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31264 ) Change subject: gsm0808_chan_indicator: add SPEECH_CTM_TEXT_TELEPHONY ...................................................................... gsm0808_chan_indicator: add SPEECH_CTM_TEXT_TELEPHONY Add it, so a follow-up patch can use it in gsm0808_dec_channel_type where 3GPP TS 48.008 § 3.2.2.11 refers to "if octet 3 indicates speech or speech + CTM Text Telephony". Related: OS#4393 Change-Id: Iaf12202c89b68290c2121bc016d08b9200a7278a --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 96ac6af..a33b01a 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -443,6 +443,7 @@ GSM0808_CHAN_SPEECH = 1, GSM0808_CHAN_DATA = 2, GSM0808_CHAN_SIGN = 3, + GSM0808_CHAN_SPEECH_CTM_TEXT_TELEPHONY = 4, }; /* GSM 08.08 3.2.2.11 Channel Type */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaf12202c89b68290c2121bc016d08b9200a7278a Gerrit-Change-Number: 31264 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: gsm0808_dec_channel_type: add missing len check

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31262 ) Change subject: gsm0808_dec_channel_type: add missing len check ...................................................................... gsm0808_dec_channel_type: add missing len check Stop iterating if the extension bit (0x80) is set but elem is too short to read another byte. Related: OS#4393 Change-Id: Id37109dba0f5d40f4b83f0cef9b1dbd9d6bb2c68 --- M src/gsm/gsm0808_utils.c M tests/gsm0808/gsm0808_test.c 2 files changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 9d787f2..83d2ce7 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -550,6 +550,9 @@ elem++; for (i = 0; i < ARRAY_SIZE(ct->perm_spch); i++) { + if (elem - old_elem >= len) + return -EOVERFLOW; + byte = *elem; elem++; ct->perm_spch[i] = byte & 0x7f; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index ab9f29b..f68d560 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1117,6 +1117,17 @@ msgb_free(msg); } +static void test_gsm0808_dec_channel_type_err(void) +{ + struct gsm0808_channel_type ct; + int rc; + + /* Speech: extension bit is set in last byte */ + const uint8_t hex[] = { 0x01, 0x0b, 0xa1, 0xa5 }; + rc = gsm0808_dec_channel_type(&ct, hex, sizeof(hex)); + OSMO_ASSERT(rc == -EOVERFLOW); +} + static void test_gsm0808_enc_dec_encrypt_info(void) { struct gsm0808_encrypt_info enc_ei = { @@ -2569,6 +2580,7 @@ test_gsm0808_enc_dec_speech_codec_list(); test_gsm0808_enc_dec_empty_speech_codec_list(); test_gsm0808_enc_dec_channel_type(); + test_gsm0808_dec_channel_type_err(); test_gsm0808_enc_dec_encrypt_info(); test_gsm0808_enc_dec_cell_id_list_lac(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id37109dba0f5d40f4b83f0cef9b1dbd9d6bb2c68 Gerrit-Change-Number: 31262 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: test gsm0808 enc dec channel type -> … speech

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31263 ) Change subject: test_gsm0808_enc_dec_channel_type -> …_speech ...................................................................... test_gsm0808_enc_dec_channel_type -> …_speech Rename the function in preparation for a new test for _data. Related: OS#4393 Change-Id: Ifa6654cc0a38f160268698efaa4bb867be3f7701 --- M tests/gsm0808/gsm0808_test.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index f68d560..a9f1311 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1086,7 +1086,7 @@ msgb_free(msg); } -static void test_gsm0808_enc_dec_channel_type(void) +static void test_gsm0808_enc_dec_channel_type_speech(void) { struct gsm0808_channel_type enc_ct = { .ch_indctr = GSM0808_CHAN_SPEECH, @@ -2579,7 +2579,7 @@ test_gsm0808_enc_dec_speech_codec_with_cfg(); test_gsm0808_enc_dec_speech_codec_list(); test_gsm0808_enc_dec_empty_speech_codec_list(); - test_gsm0808_enc_dec_channel_type(); + test_gsm0808_enc_dec_channel_type_speech(); test_gsm0808_dec_channel_type_err(); test_gsm0808_enc_dec_encrypt_info(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifa6654cc0a38f160268698efaa4bb867be3f7701 Gerrit-Change-Number: 31263 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: gsm0808_chan_indicator: add SPEECH_CTM_TEXT_TELEPHONY

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31264 ) Change subject: gsm0808_chan_indicator: add SPEECH_CTM_TEXT_TELEPHONY ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaf12202c89b68290c2121bc016d08b9200a7278a Gerrit-Change-Number: 31264 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Feb 2023 12:01:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: test gsm0808 enc dec channel type -> … speech

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31263 ) Change subject: test_gsm0808_enc_dec_channel_type -> …_speech ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifa6654cc0a38f160268698efaa4bb867be3f7701 Gerrit-Change-Number: 31263 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Feb 2023 12:00:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: gsm0808_dec_channel_type: add missing len check

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31262 ) Change subject: gsm0808_dec_channel_type: add missing len check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id37109dba0f5d40f4b83f0cef9b1dbd9d6bb2c68 Gerrit-Change-Number: 31262 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Feb 2023 11:59:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: test gsm0808 enc dec channel type -> … speech

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31263 ) Change subject: test_gsm0808_enc_dec_channel_type -> …_speech ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifa6654cc0a38f160268698efaa4bb867be3f7701 Gerrit-Change-Number: 31263 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: Thu, 09 Feb 2023 11:43:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: gsm0808_dec_channel_type: add missing len check

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31262 ) Change subject: gsm0808_dec_channel_type: add missing len check ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id37109dba0f5d40f4b83f0cef9b1dbd9d6bb2c68 Gerrit-Change-Number: 31262 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: Thu, 09 Feb 2023 11:42:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: gsm0808_enc/dec_channel_type: support data

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31265 ) Change subject: gsm0808_enc/dec_channel_type: support data ...................................................................... Patch Set 2: Code-Review+1 (2 comments) File include/osmocom/gsm/protocol/gsm_08_08.h: https://gerrit.osmocom.org/c/libosmocore/+/31265/comment/7b674970_d7ae78a9 PS2, Line 503: /* GSM 08.08 3.2.2.11 Channel Type TS 48.008 everywhere? File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/c/libosmocore/+/31265/comment/00583749_83fc424a PS2, Line 511: byte = ct->data_transparent ? 0x40 : 0x00; /* Set T/NT */ this looks a bit confusing. I'd be clearer probably: byte = ct->data_rate; if (ct->data_transparent) byte |= 0x40; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib7b75c9d86aace329decf20003b68de459021c64 Gerrit-Change-Number: 31265 Gerrit-PatchSet: 2 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: Thu, 09 Feb 2023 11:41:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: gsm0808_chan_indicator: add SPEECH_CTM_TEXT_TELEPHONY

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31264 ) Change subject: gsm0808_chan_indicator: add SPEECH_CTM_TEXT_TELEPHONY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaf12202c89b68290c2121bc016d08b9200a7278a Gerrit-Change-Number: 31264 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: Thu, 09 Feb 2023 11:33:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023