- gerrit-log - lists.osmocom.org

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F
by fixeria 17 Apr '22

17 Apr '22

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27805 ) Change subject: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/27805/comment/02cd1fec_3babd0b7 PS1, Line 333: chan_state->dl_facch_bursts = 8; > you're not setting dl_ongoing_facch here (unlike TCH/H). […] Yes, this is intentional: dl_ongoing_facch is only used in tx_tchh_fn(), where you need to skip encoding of the buffer while sending the middle two bursts of FACCH/H. Here both speech and FACCH/F have equal interleaving period. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Gerrit-Change-Number: 27805 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 16 Apr 2022 15:52:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F
by laforge 17 Apr '22

17 Apr '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27805 ) Change subject: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/27805/comment/1197182a_bba4ab3f PS1, Line 333: chan_state->dl_facch_bursts = 8; you're not setting dl_ongoing_facch here (unlike TCH/H). Is this intentional? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Gerrit-Change-Number: 27805 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Apr 2022 14:27:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: de-duplicate generation of BFI TCH frames
by laforge 17 Apr '22

17 Apr '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27803 ) Change subject: osmo-bts-trx: de-duplicate generation of BFI TCH frames ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3efcd4a547beb0c0be6a959dc6f140b61b448b4e Gerrit-Change-Number: 27803 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Apr 2022 14:24:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: move tx_tch_common() into a separate file
by laforge 17 Apr '22

17 Apr '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27802 ) Change subject: osmo-bts-trx: move tx_tch_common() into a separate file ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: do we have actual evidence to that? I'm always skeptical making theoretical assumptions/claims about what the compiler might or might not do. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id0b9d604e6969a8db73ef451fbcad00f57325fc4 Gerrit-Change-Number: 27802 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Apr 2022 14:24:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in dahdi-linux[master]: Fix NULL pointer dereference for pseudo channels
by laforge 16 Apr '22

16 Apr '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27806 ) Change subject: Fix NULL pointer dereference for pseudo channels ...................................................................... Fix NULL pointer dereference for pseudo channels pseudo channels are characterized by the fact that they have their span member set to NULL. This is illustrated by the is_pseudo_chan() function. However, when using RXMIRROR/TXMIRROR, __putbuf_chunk() is called not just on the real channel, but also on the mirror (pseudo) channel. Hence, __putbuf_chunk() and friends must not dereference the ->span member without first checking that this channel actually does have a non-NULL span assigned. I originally thought that those unconditional de-references must have been introduced after the RXMIRROR/TXMIRROR was merged - but checked the git history and it seems like the bug has been present ever sicne this functionality was merged in 2010 in commit 9090c6fcd289b497e00e8e5fb9cc3546e0dfe7d6 Change-Id: I747a696c9a5865c11461b6357a10346a8d0d1621 Closes: OS#5531 --- M drivers/dahdi/dahdi-base.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 96e4afd..2b6256b 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -9203,7 +9203,7 @@ buf[ms->readidx[ms->inreadbuf]++] = rxc; /* Pay attention to the possibility of an overrun */ if (ms->readidx[ms->inreadbuf] >= ms->blocksize) { - if (!ss->span->alarms) + if (ss->span && !ss->span->alarms) module_printk(KERN_WARNING, "HDLC Receiver overrun on channel %s (master=%s)\n", ss->name, ss->master->name); abort=DAHDI_EVENT_OVERRUN; /* Force the HDLC state back to frame-search mode */ @@ -9375,7 +9375,7 @@ tasklet_schedule(&ms->ppp_calls); } else #endif - if (test_bit(DAHDI_FLAGBIT_OPEN, &ms->flags) && !ss->span->alarms) { + if (test_bit(DAHDI_FLAGBIT_OPEN, &ms->flags) && ss->span && !ss->span->alarms) { /* Notify the receiver... */ __qevent(ss->master, abort); } @@ -9443,7 +9443,7 @@ { if (ss->inreadbuf >= 0) ss->readidx[ss->inreadbuf] = 0; - if (test_bit(DAHDI_FLAGBIT_OPEN, &ss->flags) && !ss->span->alarms) + if (test_bit(DAHDI_FLAGBIT_OPEN, &ss->flags) && ss->span && !ss->span->alarms) __qevent(ss->master, event); } -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I747a696c9a5865c11461b6357a10346a8d0d1621 Gerrit-Change-Number: 27806 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in dahdi-linux[master]: Fix NULL pointer dereference for pseudo channels
by laforge 16 Apr '22

16 Apr '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27806 ) Change subject: Fix NULL pointer dereference for pseudo channels ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I747a696c9a5865c11461b6357a10346a8d0d1621 Gerrit-Change-Number: 27806 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 16 Apr 2022 11:49:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in dahdi-linux[master]: Fix NULL pointer dereference for pseudo channels
by laforge 16 Apr '22

16 Apr '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27806 ) Change subject: Fix NULL pointer dereference for pseudo channels ...................................................................... Fix NULL pointer dereference for pseudo channels pseudo channels are characterized by the fact that they have their span member set to NULL. This is illustrated by the is_pseudo_chan() function. However, when using RXMIRROR/TXMIRROR, __putbuf_chunk() is called not just on the real channel, but also on the mirror (pseudo) channel. Hence, __putbuf_chunk() and friends must not dereference the ->span member without first checking that this channel actually does have a non-NULL span assigned. I originally thought that those unconditional de-references must have been introduced after the RXMIRROR/TXMIRROR was merged - but checked the git history and it seems like the bug has been present ever sicne this functionality was merged in 2010 in commit 9090c6fcd289b497e00e8e5fb9cc3546e0dfe7d6 Change-Id: I747a696c9a5865c11461b6357a10346a8d0d1621 Closes: OS#5531 --- M drivers/dahdi/dahdi-base.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/06/27806/1 diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 96e4afd..2b6256b 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -9203,7 +9203,7 @@ buf[ms->readidx[ms->inreadbuf]++] = rxc; /* Pay attention to the possibility of an overrun */ if (ms->readidx[ms->inreadbuf] >= ms->blocksize) { - if (!ss->span->alarms) + if (ss->span && !ss->span->alarms) module_printk(KERN_WARNING, "HDLC Receiver overrun on channel %s (master=%s)\n", ss->name, ss->master->name); abort=DAHDI_EVENT_OVERRUN; /* Force the HDLC state back to frame-search mode */ @@ -9375,7 +9375,7 @@ tasklet_schedule(&ms->ppp_calls); } else #endif - if (test_bit(DAHDI_FLAGBIT_OPEN, &ms->flags) && !ss->span->alarms) { + if (test_bit(DAHDI_FLAGBIT_OPEN, &ms->flags) && ss->span && !ss->span->alarms) { /* Notify the receiver... */ __qevent(ss->master, abort); } @@ -9443,7 +9443,7 @@ { if (ss->inreadbuf >= 0) ss->readidx[ss->inreadbuf] = 0; - if (test_bit(DAHDI_FLAGBIT_OPEN, &ss->flags) && !ss->span->alarms) + if (test_bit(DAHDI_FLAGBIT_OPEN, &ss->flags) && ss->span && !ss->span->alarms) __qevent(ss->master, event); } -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I747a696c9a5865c11461b6357a10346a8d0d1621 Gerrit-Change-Number: 27806 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-mgw[master]: mgcp_network: log RTP/RTCP reception failures
by laforge 16 Apr '22

16 Apr '22

Attention is currently required from: fixeria, pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27608 ) Change subject: mgcp_network: log RTP/RTCP reception failures ...................................................................... Patch Set 3: (1 comment) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/27608/comment/0c491a23_58717088 PS1, Line 1515: if (rc < 0) { > Ack indeed, we need specific information what has failed (in the code where that failure is detected) rather than some generic statement that "something" has failed. Also, keep in mind that RTP packets occur at high rates and we always have to be careful not to overload logs with tons of stuff. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic0e60fe2fb9d96b8ae18bb862b5715359a10e849 Gerrit-Change-Number: 27608 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Apr 2022 08:47:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F
by fixeria 16 Apr '22

16 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27805 ) Change subject: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F ...................................................................... osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F * dl_ongoing_facch must be set for correct FACCH/H scheduling; * dl_facch_bursts must be set for FACCH overpower to work. Also take a chance to move the payload into shared header file. Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Related: SYS#5919, OS#4823 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/sched_tch.h 3 files changed, 11 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/27805/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 5466598..e82433c 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -328,14 +328,9 @@ /* no message at all, send a dummy L2 frame on FACCH */ if (msg == 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, - }; - LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "No TCH or FACCH prim for transmit.\n"); - gsm0503_tch_fr_encode(*bursts_p, dummy, sizeof(dummy), 1); + gsm0503_tch_fr_encode(*bursts_p, tch_dummy_facch, sizeof(tch_dummy_facch), 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 4b021f9..3304321 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -369,14 +369,10 @@ /* no message at all, send a dummy L2 frame on FACCH */ if (msg == NULL && !chan_state->dl_ongoing_facch) { - 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, - }; - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for transmit.\n"); - gsm0503_tch_hr_encode(*bursts_p, dummy, sizeof(dummy)); + gsm0503_tch_hr_encode(*bursts_p, tch_dummy_facch, sizeof(tch_dummy_facch)); + chan_state->dl_ongoing_facch = 1; + chan_state->dl_facch_bursts = 6; goto send_burst; } diff --git a/src/osmo-bts-trx/sched_tch.h b/src/osmo-bts-trx/sched_tch.h index e77e05d..5a7462b 100644 --- a/src/osmo-bts-trx/sched_tch.h +++ b/src/osmo-bts-trx/sched_tch.h @@ -23,6 +23,12 @@ #pragma once +static const uint8_t tch_dummy_facch[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, +}; + void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); /* Populate the given buffer with a BFI payload */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Gerrit-Change-Number: 27805 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bts[master]: osmo-bts-trx: de-duplicate generation of BFI TCH frames
by fixeria 16 Apr '22

16 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27803 ) Change subject: osmo-bts-trx: de-duplicate generation of BFI TCH frames ...................................................................... osmo-bts-trx: de-duplicate generation of BFI TCH frames Change-Id: I3efcd4a547beb0c0be6a959dc6f140b61b448b4e Related: SYS#5919, OS#4823 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/sched_tch.h 3 files changed, 49 insertions(+), 90 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/27803/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index e6e1eff..05cb2bf 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -278,35 +278,10 @@ goto compose_l1sap; } - switch (tch_mode) { - case GSM48_CMODE_SPEECH_V1: /* FR */ - memset(tch_data, 0, GSM_FR_BYTES); - tch_data[0] = 0xd0; - rc = GSM_FR_BYTES; - break; - case GSM48_CMODE_SPEECH_EFR: /* EFR */ - memset(tch_data, 0, GSM_EFR_BYTES); - tch_data[0] = 0xc0; - rc = GSM_EFR_BYTES; - break; - case GSM48_CMODE_SPEECH_AMR: /* AMR */ - rc = osmo_amr_rtp_enc(tch_data, - chan_state->codec[chan_state->ul_cmr], - chan_state->codec[chan_state->ul_ft], - AMR_BAD); - if (rc < 2) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi, - "Failed to encode AMR_BAD frame (rc=%d), " - "not sending BFI\n", rc); - return -EINVAL; - } - memset(tch_data + 2, 0, rc - 2); - break; - default: - LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi, - "TCH mode %u invalid, please fix!\n", tch_mode); - return -EINVAL; - } + /* populate the buffer with a BFI payload */ + rc = tch_compose_bfi(tch_data, chan_state, + true /* Uplink */, + true /* FR */); } } diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index bacd49b..a993100 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -314,30 +314,10 @@ goto compose_l1sap; } - switch (tch_mode) { - case GSM48_CMODE_SPEECH_V1: /* HR */ - tch_data[0] = 0x70; /* F = 0, FT = 111 */ - memset(tch_data + 1, 0, 14); - rc = 15; - break; - case GSM48_CMODE_SPEECH_AMR: /* AMR */ - rc = osmo_amr_rtp_enc(tch_data, - chan_state->codec[chan_state->ul_cmr], - chan_state->codec[chan_state->ul_ft], - AMR_BAD); - if (rc < 2) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi, - "Failed to encode AMR_BAD frame (rc=%d), " - "not sending BFI\n", rc); - return -EINVAL; - } - memset(tch_data + 2, 0, rc - 2); - break; - default: - LOGL1SB(DL1P, LOGL_ERROR, l1ts, bi, - "TCH mode %u invalid, please fix!\n", tch_mode); - return -EINVAL; - } + /* populate the buffer with a BFI payload */ + rc = tch_compose_bfi(tch_data, chan_state, + true /* Uplink */, + false /* HR */); } } diff --git a/src/osmo-bts-trx/sched_tch.h b/src/osmo-bts-trx/sched_tch.h index f3e9c69..3b0b1e8 100644 --- a/src/osmo-bts-trx/sched_tch.h +++ b/src/osmo-bts-trx/sched_tch.h @@ -25,6 +25,42 @@ void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); +/* Populate the given buffer with a BFI payload */ +static inline int tch_compose_bfi(uint8_t *tch_data, + const struct l1sched_chan_state *chan_state, + bool uplink, bool fr) +{ + uint8_t cmr, ft; + int len; + + switch (chan_state->tch_mode) { + case GSM48_CMODE_SPEECH_V1: /* FR / HR */ + if (fr) { + memset(&tch_data[1], 0, GSM_FR_BYTES - 1); + tch_data[0] = 0xd0; /* FR magic */ + return GSM_FR_BYTES; + } else { + memset(&tch_data[1], 0, GSM_HR_BYTES); + tch_data[0] = 0x70; /* F = 0, FT = 111 */ + return GSM_HR_BYTES + 1; + } + break; + case GSM48_CMODE_SPEECH_EFR: + memset(&tch_data[1], 0, GSM_EFR_BYTES - 1); + tch_data[0] = 0xc0; /* EFR magic */ + return GSM_EFR_BYTES; + case GSM48_CMODE_SPEECH_AMR: + cmr = chan_state->codec[uplink ? chan_state->ul_cmr : chan_state->dl_cmr]; + ft = chan_state->codec[uplink ? chan_state->ul_ft : chan_state->dl_ft]; + len = osmo_amr_rtp_enc(tch_data, cmr, ft, AMR_BAD); + if (len > 2) + memset(tch_data + 2, 0, len - 2); + return len; + default: + OSMO_ASSERT(0); + } +} + /* Common section for generation of Downlink bursts (TCH/H and TCH/F) */ static inline void tx_tch_common(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br, struct msgb **_msg_tch, struct msgb **_msg_facch) @@ -43,43 +79,11 @@ LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Missing TCH bursts detected, sending BFI\n"); - /* indicate bad frame */ - switch (tch_mode) { - case GSM48_CMODE_SPEECH_V1: /* FR / HR */ - if (br->chan != TRXC_TCHF) { /* HR */ - tch_data[0] = 0x70; /* F = 0, FT = 111 */ - memset(tch_data + 1, 0, 14); - len = 15; - break; - } - memset(tch_data, 0, GSM_FR_BYTES); - len = GSM_FR_BYTES; - break; - case GSM48_CMODE_SPEECH_EFR: /* EFR */ - if (br->chan != TRXC_TCHF) - goto inval_mode1; - memset(tch_data, 0, GSM_EFR_BYTES); - len = GSM_EFR_BYTES; - break; - case GSM48_CMODE_SPEECH_AMR: /* AMR */ - len = osmo_amr_rtp_enc(tch_data, - chan_state->codec[chan_state->dl_cmr], - chan_state->codec[chan_state->dl_ft], AMR_BAD); - if (len < 2) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, - "Failed to encode AMR_BAD frame (rc=%d), " - "not sending BFI\n", len); - return; - } - memset(tch_data + 2, 0, len - 2); - break; - default: -inval_mode1: - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "TCH mode invalid, please fix!\n"); - len = 0; - } - - if (len) { + /* populate the buffer with a BFI payload */ + len = tch_compose_bfi(tch_data, chan_state, + false /* Downlink */, + br->chan == TRXC_TCHF); + if (len > 0) { /* Note: RSSI/ToA256 is set to 0 to indicate to the higher * layers that this is a faked tch_ind */ _sched_compose_tch_ind(l1ts, br->fn, br->chan, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3efcd4a547beb0c0be6a959dc6f140b61b448b4e Gerrit-Change-Number: 27803 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log