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

[M] Change in osmo-bts[master]: osmo-bts-trx: tx_tch[fh]_fn(): rework generation of dummy FACCH

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34991?usp=email ) Change subject: osmo-bts-trx: tx_tch[fh]_fn(): rework generation of dummy FACCH ...................................................................... osmo-bts-trx: tx_tch[fh]_fn(): rework generation of dummy FACCH Even though it might have a somewhat higher performance impact, opting for the common code path for FACCH by allocating a msgb on heap is more favorable for both readability and maintainability. This choice is preferred over directly calling gsm0503_tch_fr_encode() and then using a 'goto' statement. A similar strategy will be adopted in an follow up patch for CSD. Change-Id: I67cb5c6f4d15149996e17c78a59d66db396da8ff Related: OS#1572 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 61 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved falconia: Looks good to me, but someone else must approve diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 34af8a1..c0dfd47 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -490,6 +490,19 @@ } } +struct msgb *tch_dummy_msgb(size_t size, uint8_t pad) +{ + struct msgb *msg; + + msg = msgb_alloc(size, __func__); + OSMO_ASSERT(msg != NULL); + + msg->l2h = msgb_put(msg, size); + memset(msg->l2h, pad, size); + + return msg; +} + /* obtain a to-be-transmitted TCH/F (Full Traffic Channel) burst */ int tx_tchf_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { @@ -519,11 +532,6 @@ /* dequeue a TCH and/or a FACCH message to be transmitted */ tch_dl_dequeue(l1ts, br, &msg_tch, &msg_facch); if (msg_tch == NULL && msg_facch == NULL) { - static const uint8_t dummy[GSM_MACBLOCK_LEN] = { - 0x03, 0x03, 0x01, /* TODO: use randomized padding */ - 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, - 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, - }; int rc; LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "No TCH or FACCH prim for transmit.\n"); @@ -541,13 +549,18 @@ case GSM48_CMODE_SPEECH_EFR: rc = gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), NULL, 0, 1); if (rc == 0) - break; + goto send_burst; /* fall-through */ + case GSM48_CMODE_SIGN: default: - gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), dummy, sizeof(dummy), 1); - chan_state->dl_facch_bursts = 8; + /* TODO: use randomized padding */ + msg_facch = tch_dummy_msgb(GSM_MACBLOCK_LEN, GSM_MACBLOCK_PADDING); + /* dummy LAPDm func=UI frame */ + msg_facch->l2h[0] = 0x03; + msg_facch->l2h[1] = 0x03; + msg_facch->l2h[2] = 0x01; + break; } - goto send_burst; } /* Unlike SACCH, FACCH has no dedicated slots on the multiframe layout. diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 77309cf..96ee5e8 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -399,6 +399,8 @@ extern void tch_dl_dequeue(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br, struct msgb **msg_tch, struct msgb **msg_facch); +struct msgb *tch_dummy_msgb(size_t size, uint8_t pad); + /* obtain a to-be-transmitted TCH/H (Half Traffic Channel) burst */ int tx_tchh_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { @@ -445,11 +447,6 @@ /* no message at all, send a dummy L2 frame on FACCH */ if (msg_tch == NULL && msg_facch == NULL) { - static const uint8_t dummy[GSM_MACBLOCK_LEN] = { - 0x03, 0x03, 0x01, /* TODO: use randomized padding */ - 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, - 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, - }; int rc; LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for transmit.\n"); @@ -462,25 +459,30 @@ * and decide what is the correct BTS Tx behavior for frame * gaps in TCH/AHS. See OS#6049. */ - if (tch_mode == GSM48_CMODE_SPEECH_V1) { + switch (tch_mode) { + case GSM48_CMODE_SPEECH_V1: rc = gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), NULL, 0); if (rc == 0) goto send_burst; - } + /* fall-through */ + case GSM48_CMODE_SIGN: + default: + /* FACCH/H can only be scheduled at specific TDMA offset */ + if (!sched_tchh_dl_facch_map[br->fn % 26]) { + /* FACCH/H is not allowed, send half-filled bursts with even numbered + * bits contaning 232 encoded bits of the previous L2 frame, and 232 + * odd numbered bits all set to 0. */ + goto send_burst; + } - /* FACCH/H can only be scheduled at specific TDMA offset */ - if (!sched_tchh_dl_facch_map[br->fn % 26]) { - /* FACCH/H is not allowed, send half-filled bursts with even numbered - * bits contaning 232 encoded bits of the previous L2 frame, and 232 - * odd numbered bits all set to 0. */ - goto send_burst; + /* TODO: use randomized padding */ + msg_facch = tch_dummy_msgb(GSM_MACBLOCK_LEN, GSM_MACBLOCK_PADDING); + /* dummy LAPDm func=UI frame */ + msg_facch->l2h[0] = 0x03; + msg_facch->l2h[1] = 0x03; + msg_facch->l2h[2] = 0x01; + break; } - - gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), dummy, sizeof(dummy)); - if (chan_state->rsl_cmode != RSL_CMOD_SPD_DATA) - chan_state->dl_ongoing_facch = 1; - chan_state->dl_facch_bursts = 6; - goto send_burst; } /* Unlike SACCH, FACCH has no dedicated slots on the multiframe layout. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I67cb5c6f4d15149996e17c78a59d66db396da8ff Gerrit-Change-Number: 34991 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[M] Change in osmo-bts[master]: osmo-bts-trx: tx_tch[fh]_fn(): fix sending idle CSD frames

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34992?usp=email ) Change subject: osmo-bts-trx: tx_tch[fh]_fn(): fix sending idle CSD frames ...................................................................... osmo-bts-trx: tx_tch[fh]_fn(): fix sending idle CSD frames In accordance with 3GPP TS 44.021, sections 8.1.6 and 10.2.3, the transmission of idle frames to the DTE is mandated when no data is received from the radio interface. An idle frame has all data, status, and E-bits to binary '1' (excluding the alignment pattern). This requirement is currently implemented for the Uplink, see function csd_v110_rtp_encode(). However, 3GPP TS 44.021 does not explicitly specify whether the same rule is applicable to the Downlink, perhaps assuming a continuous stream of bits on the CSD-over-TDM link. Currently, we transmit a sequence of binary '0' on the Downlink instead of idle frames. * In non-transparent (RLP) mode, whether all bits in a block are set to binary '0' or '1' has no impact, as both scenarios lead to an incorrect FCS. * In transparent sync mode, any filling be it binary '0' or '1' is perceived as incorrect or unexpected. * In transparent async mode, it is more logical to transmit a sequence of binary '1,' which will be interpreted as a sequence of stop bits. Let's align the Downlink with the Uplink for consistency and transmit idle frames when no data is available for transmission. The modified 60-bit V.110 frames exclude the alignment pattern, so sending a sequence of binary '1' is enough to achieve the intended goal. Change-Id: I0b25cfac41b6d8dcf3bfd9d46d51a9665f1b047a Related: OS#1572 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 80 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve falconia: Looks good to me, but someone else must approve diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index c0dfd47..0138a2a 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -535,16 +535,25 @@ int rc; LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "No TCH or FACCH prim for transmit.\n"); - /* If the channel mode is TCH/FS or TCH/EFS, transmit a dummy - * speech block with inverted CRC3, designed to induce a BFI - * condition in the MS receiver. In all other channel modes, - * transmit dummy FACCH like we always did before. + /* - If the channel mode is TCH/FS or TCH/EFS, transmit a dummy + * speech block with inverted CRC3, designed to induce a BFI + * condition in the MS receiver. + * - If the channel mode is one of the CSD modes, transmit an + * idle frame as described in 3GPP TS 44.021, sections 8.1.6 + * and 10.2.3 (all data, status and E-bits set to binary '1'). + * - In all other channel modes, transmit dummy FACCH + * like we always did before. * * FIXME: someone who knows AMR needs to look at this problem * and decide what is the correct BTS Tx behavior for frame * gaps in TCH/AFS. See OS#6049. */ switch (tch_mode) { + case GSM48_CMODE_DATA_12k0: + case GSM48_CMODE_DATA_6k0: + case GSM48_CMODE_DATA_3k6: + case GSM48_CMODE_DATA_14k5: + break; /* see below */ case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: rc = gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), NULL, 0, 1); @@ -591,30 +600,36 @@ break; /* CSD (TCH/F9.6): 12.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_12k0: - if (msg_tch != NULL) - gsm0503_tch_fr96_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(4 * 60, 0x01); + gsm0503_tch_fr96_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; /* CSD (TCH/F4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: - if (msg_tch != NULL) - gsm0503_tch_fr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(2 * 60, 0x01); + gsm0503_tch_fr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; /* CSD (TCH/F2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: /* FACCH/F does steal a TCH/F2.4 frame completely */ - if (msg == msg_facch) + if (msg_facch != NULL) { gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); - else + } else { + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(2 * 36, 0x01); gsm0503_tch_fr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + } break; /* CSD (TCH/F14.4): 14.5 kbit/s radio interface rate */ case GSM48_CMODE_DATA_14k5: - if (msg_tch != NULL) - gsm0503_tch_fr144_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(290, 0x01); + gsm0503_tch_fr144_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 96ee5e8..e0d7aca 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -450,16 +450,23 @@ int rc; LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for transmit.\n"); - /* If the channel mode is TCH/HS, transmit a dummy speech block - * with inverted CRC3, designed to induce a BFI condition in - * the MS receiver. In all other channel modes, transmit - * dummy FACCH like we always did before. + /* - If the channel mode is TCH/HS, transmit a dummy speech block + * with inverted CRC3, designed to induce a BFI condition in + * the MS receiver. + * - If the channel mode is one of the CSD modes, transmit an + * idle frame as described in 3GPP TS 44.021, sections 8.1.6 + * and 10.2.3 (all data, status and E-bits set to binary '1'). + * - In all other channel modes, transmit dummy FACCH + * like we always did before. * * FIXME: someone who knows AMR needs to look at this problem * and decide what is the correct BTS Tx behavior for frame * gaps in TCH/AHS. See OS#6049. */ switch (tch_mode) { + case GSM48_CMODE_DATA_6k0: + case GSM48_CMODE_DATA_3k6: + break; /* see below */ case GSM48_CMODE_SPEECH_V1: rc = gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), NULL, 0); if (rc == 0) @@ -515,15 +522,17 @@ break; /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: - if (msg_tch != NULL) - gsm0503_tch_hr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(4 * 60, 0x01); + gsm0503_tch_hr48_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: - if (msg_tch != NULL) - gsm0503_tch_hr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); + if (msg_tch == NULL) + msg_tch = tch_dummy_msgb(4 * 36, 0x01); + gsm0503_tch_hr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_tch)); if (msg_facch != NULL) gsm0503_tch_hr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg_facch)); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34992?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b25cfac41b6d8dcf3bfd9d46d51a9665f1b047a Gerrit-Change-Number: 34992 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-trx: tx_tch[fh]_fn(): use BUFPOS macro everywhere

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34990?usp=email ) Change subject: osmo-bts-trx: tx_tch[fh]_fn(): use BUFPOS macro everywhere ...................................................................... osmo-bts-trx: tx_tch[fh]_fn(): use BUFPOS macro everywhere For the sake of consistency. Change-Id: I16ce4c979c5b44fd67324eb2ed3da28a4b78221b Related: OS#1572 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 15 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified falconia: Looks good to me, but someone else must approve laforge: 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 ae800a9..34af8a1 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -539,12 +539,12 @@ switch (tch_mode) { case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: - rc = gsm0503_tch_fr_encode(bursts_p, NULL, 0, 1); + rc = gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), NULL, 0, 1); if (rc == 0) break; /* fall-through */ default: - gsm0503_tch_fr_encode(bursts_p, dummy, sizeof(dummy), 1); + gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), dummy, sizeof(dummy), 1); chan_state->dl_facch_bursts = 8; } goto send_burst; diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 23e59cf..77309cf 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -463,7 +463,7 @@ * gaps in TCH/AHS. See OS#6049. */ if (tch_mode == GSM48_CMODE_SPEECH_V1) { - rc = gsm0503_tch_hr_encode(bursts_p, NULL, 0); + rc = gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), NULL, 0); if (rc == 0) goto send_burst; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I16ce4c979c5b44fd67324eb2ed3da28a4b78221b Gerrit-Change-Number: 34990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[M] Change in osmo-bts[master]: osmo-bts-trx: tx_tch[fh]_fn(): fix sending idle CSD frames

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34992?usp=email ) Change subject: osmo-bts-trx: tx_tch[fh]_fn(): fix sending idle CSD frames ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34992?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b25cfac41b6d8dcf3bfd9d46d51a9665f1b047a Gerrit-Change-Number: 34992 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 14 Nov 2023 12:20:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in osmo-bts[master]: osmo-bts-trx: tx_tch[fh]_fn(): rework generation of dummy FACCH

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34991?usp=email ) Change subject: osmo-bts-trx: tx_tch[fh]_fn(): rework generation of dummy FACCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I67cb5c6f4d15149996e17c78a59d66db396da8ff Gerrit-Change-Number: 34991 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 14 Nov 2023 12:20:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-trx: tx_tch[fh]_fn(): use BUFPOS macro everywhere

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34990?usp=email ) Change subject: osmo-bts-trx: tx_tch[fh]_fn(): use BUFPOS macro everywhere ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I16ce4c979c5b44fd67324eb2ed3da28a4b78221b Gerrit-Change-Number: 34990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 14 Nov 2023 12:20:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: coding: gsm0503_tch_a[fh]s_encode(): improve cmr/ft checks

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34995?usp=email ) Change subject: coding: gsm0503_tch_a[fh]s_encode(): improve cmr/ft checks ...................................................................... coding: gsm0503_tch_a[fh]s_encode(): improve cmr/ft checks Change-Id: If03d5b015ab1c8db56a4c67bdc8e36e260c06562 --- M src/coding/gsm0503_coding.c 1 file changed, 19 insertions(+), 26 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 0e7f689..f8840c9 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -2465,19 +2465,11 @@ h = 0; - if (codec_mode_req) { - if (cmr >= codecs) { - /* FIXME: CMR ID is not in codec list! */ - return -1; - } - id = cmr; - } else { - if (ft >= codecs) { - /* FIXME: FT ID is not in codec list! */ - return -1; - } - id = ft; - } + id = codec_mode_req ? cmr : ft; + if (OSMO_UNLIKELY(id >= ARRAY_SIZE(gsm0503_afs_ic_ubit))) + return -1; + if (OSMO_UNLIKELY(ft >= codecs)) + return -1; switch (codec[ft]) { case 7: /* TCH/AFS12.2 */ @@ -2970,19 +2962,11 @@ h = 0; - if (codec_mode_req) { - if (cmr >= codecs) { - /* FIXME: CMR ID %d not in codec list */ - return -1; - } - id = cmr; - } else { - if (ft >= codecs) { - /* FIXME: FT ID %d not in codec list */ - return -1; - } - id = ft; - } + id = codec_mode_req ? cmr : ft; + if (OSMO_UNLIKELY(id >= ARRAY_SIZE(gsm0503_ahs_ic_ubit))) + return -1; + if (OSMO_UNLIKELY(ft >= codecs)) + return -1; switch (codec[ft]) { case 5: /* TCH/AHS7.95 */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34995?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If03d5b015ab1c8db56a4c67bdc8e36e260c06562 Gerrit-Change-Number: 34995 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: coding: gsm0503_tch_a[fh]s_encode(): make *codec const

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34996?usp=email ) Change subject: coding: gsm0503_tch_a[fh]s_encode(): make *codec const ...................................................................... coding: gsm0503_tch_a[fh]s_encode(): make *codec const Change-Id: I9e37a47c080cf57005e0205aa0d3cd25755a75f0 --- M include/osmocom/coding/gsm0503_coding.h M src/coding/gsm0503_coding.c 2 files changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmocom/coding/gsm0503_coding.h b/include/osmocom/coding/gsm0503_coding.h index 13d5344..3c51127 100644 --- a/include/osmocom/coding/gsm0503_coding.h +++ b/include/osmocom/coding/gsm0503_coding.h @@ -56,7 +56,7 @@ int *n_errors, int *n_bits_total); int gsm0503_tch_afs_encode(ubit_t *bursts, const uint8_t *tch_data, int len, - int codec_mode_req, uint8_t *codec, int codecs, uint8_t ft, + int codec_mode_req, const uint8_t *codec, int codecs, uint8_t ft, uint8_t cmr); int gsm0503_tch_afs_decode(uint8_t *tch_data, const sbit_t *bursts, int codec_mode_req, uint8_t *codec, int codecs, uint8_t *ft, @@ -66,7 +66,7 @@ uint8_t *cmr, int *n_errors, int *n_bits_total, uint8_t *dtx); int gsm0503_tch_ahs_encode(ubit_t *bursts, const uint8_t *tch_data, int len, - int codec_mode_req, uint8_t *codec, int codecs, uint8_t ft, uint8_t cmr); + int codec_mode_req, const uint8_t *codec, int codecs, uint8_t ft, uint8_t cmr); int gsm0503_tch_ahs_decode(uint8_t *tch_data, const sbit_t *bursts, int odd, int codec_mode_req, uint8_t *codec, int codecs, uint8_t *ft, uint8_t *cmr, int *n_errors, int *n_bits_total); diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index f8840c9..8effef5 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -2447,7 +2447,7 @@ * \param[in] cmr Codec Mode Request (used in codec_mode_req = 1 only) * \returns 0 in case of success; negative on error */ int gsm0503_tch_afs_encode(ubit_t *bursts, const uint8_t *tch_data, int len, - int codec_mode_req, uint8_t *codec, int codecs, uint8_t ft, + int codec_mode_req, const uint8_t *codec, int codecs, uint8_t ft, uint8_t cmr) { ubit_t iB[912], cB[456], h; @@ -2935,7 +2935,7 @@ * \param[in] cmr Codec Mode Request (used in codec_mode_req = 1 only) * \returns 0 in case of success; negative on error */ int gsm0503_tch_ahs_encode(ubit_t *bursts, const uint8_t *tch_data, int len, - int codec_mode_req, uint8_t *codec, int codecs, uint8_t ft, + int codec_mode_req, const uint8_t *codec, int codecs, uint8_t ft, uint8_t cmr) { ubit_t iB[912], cB[456], h; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34996?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e37a47c080cf57005e0205aa0d3cd25755a75f0 Gerrit-Change-Number: 34996 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: run TC_second_rab_assignment on nightly

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35012?usp=email to look at the new patch set (#2). Change subject: hnbgw: run TC_second_rab_assignment on nightly ...................................................................... hnbgw: run TC_second_rab_assignment on nightly Fixes: OS#6253 Change-Id: Id09b1a22dbd391c19ecfe34af990ec1ef3bb5089 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/35012/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35012?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id09b1a22dbd391c19ecfe34af990ec1ef3bb5089 Gerrit-Change-Number: 35012 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: run TC_second_rab_assignment on nightly

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35012?usp=email ) Change subject: hnbgw: run TC_second_rab_assignment on nightly ...................................................................... hnbgw: run TC_second_rab_assignment on nightly Related: OS#6253 Change-Id: Id09b1a22dbd391c19ecfe34af990ec1ef3bb5089 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/35012/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index adb32bd..5bcd40c 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -2710,7 +2710,10 @@ execute( TC_sgsnpool_sccp_n_pcstate_detaches_cnlink() ); execute( TC_sgsnpool_sccp_n_pcstate_attaches_cnlink() ); - execute(TC_second_rab_assignment()); + /* Run only on nightly since it makes osmo-hnbgw <= 1.5.0 crash: OS#6253 */ + if (f_osmo_repo_is("nightly")) { + execute(TC_second_rab_assignment()); + } /* Run at the end since it makes osmo-hnbgw <= 1.3.0 crash: OS#5676 */ execute(TC_hnb_reregister_reuse_sctp_assoc()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35012?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id09b1a22dbd391c19ecfe34af990ec1ef3bb5089 Gerrit-Change-Number: 35012 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023