April 2022 - gerrit-log - lists.osmocom.org

Change in dahdi-linux[master]: Fix NULL pointer dereference for pseudo channels

by laforge

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

3 years, 2 months

1
0
0 0

Change in dahdi-linux[master]: Fix NULL pointer dereference for pseudo channels

by laforge

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

3 years, 2 months

1
0
0 0

Change in dahdi-linux[master]: Fix NULL pointer dereference for pseudo channels

by laforge

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

3 years, 2 months

1
0
0 0

Change in osmo-mgw[master]: mgcp_network: log RTP/RTCP reception failures

by laforge

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

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F

by fixeria

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

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: de-duplicate generation of BFI TCH frames

by fixeria

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

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: prioritize FACCH in s/tx_tch_common()/tch_dl_dequeue()/s

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27804 ) Change subject: osmo-bts-trx: prioritize FACCH in s/tx_tch_common()/tch_dl_dequeue()/s ...................................................................... osmo-bts-trx: prioritize FACCH in s/tx_tch_common()/tch_dl_dequeue()/s Unlike SACCH, FACCH has no dedicated slots on the multiframe layout. It's multiplexed together with TCH (speech or data) frames basically by replacing (stealing) them. This is common for both TCH/F and TCH/H, with the only difference that FACCH/H steals two TCH frames (not just one) due to a longer interleaving period. Let's implement the multiplexing in the common function, which is used to dequeue to be transmitted frames - this slightly reduces code duplication. Use a new name, so that it's clear what it does. Change-Id: I9822b1a17185d5487f0f6d3ed0203e806c053d7d 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, 38 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/27804/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 05cb2bf..5466598 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -298,10 +298,10 @@ /* 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) { - struct msgb *msg_tch = NULL, *msg_facch = NULL; struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; uint8_t tch_mode = chan_state->tch_mode; ubit_t *burst, **bursts_p = &chan_state->dl_bursts; + struct msgb *msg; /* send burst, if we already got a frame */ if (br->bid > 0) { @@ -310,8 +310,6 @@ goto send_burst; } - tx_tch_common(l1ts, br, &msg_tch, &msg_facch); - /* BURST BYPASS */ /* allocate burst memory, if not already, @@ -325,8 +323,11 @@ memset(*bursts_p + 464, 0, 464); } + /* dequeue a message to be transmitted */ + msg = tch_dl_dequeue(l1ts, br); + /* no message at all, send a dummy L2 frame on FACCH */ - if (!msg_tch && !msg_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, @@ -338,28 +339,24 @@ goto send_burst; } - /* encode bursts (prioritize FACCH) */ - if (msg_facch) { - gsm0503_tch_fr_encode(*bursts_p, msg_facch->l2h, msgb_l2len(msg_facch), - 1); + /* populate the buffer with bursts */ + if (msgb_l2len(msg) == GSM_MACBLOCK_LEN) { + gsm0503_tch_fr_encode(*bursts_p, msg->l2h, msgb_l2len(msg), 1); chan_state->dl_facch_bursts = 8; } else if (tch_mode == GSM48_CMODE_SPEECH_AMR) /* the first FN 4,13,21 defines that CMI is included in frame, * the first FN 0,8,17 defines that CMR is included in frame. */ - gsm0503_tch_afs_encode(*bursts_p, msg_tch->l2h + 2, - msgb_l2len(msg_tch) - 2, !dl_amr_fn_is_cmi(br->fn), + gsm0503_tch_afs_encode(*bursts_p, msg->l2h + 2, + msgb_l2len(msg) - 2, !dl_amr_fn_is_cmi(br->fn), chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); else - gsm0503_tch_fr_encode(*bursts_p, msg_tch->l2h, msgb_l2len(msg_tch), 1); + gsm0503_tch_fr_encode(*bursts_p, msg->l2h, msgb_l2len(msg), 1); /* free message */ - if (msg_tch) - msgb_free(msg_tch); - if (msg_facch) - msgb_free(msg_facch); + msgb_free(msg); send_burst: /* compose burst */ diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index a993100..4b021f9 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -334,10 +334,10 @@ /* 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) { - struct msgb *msg_tch = NULL, *msg_facch = NULL; struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; uint8_t tch_mode = chan_state->tch_mode; ubit_t *burst, **bursts_p = &chan_state->dl_bursts; + struct msgb *msg; /* send burst, if we already got a frame */ if (br->bid > 0) { @@ -346,9 +346,6 @@ goto send_burst; } - /* get TCH and/or FACCH */ - tx_tch_common(l1ts, br, &msg_tch, &msg_facch); - /* BURST BYPASS */ /* allocate burst memory, if not already, @@ -367,8 +364,11 @@ } } + /* dequeue a message to be transmitted */ + msg = tch_dl_dequeue(l1ts, br); + /* no message at all, send a dummy L2 frame on FACCH */ - if (!msg_tch && !msg_facch && !chan_state->dl_ongoing_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, @@ -380,9 +380,9 @@ goto send_burst; } - /* encode bursts (prioritize FACCH) */ - if (msg_facch) { - gsm0503_tch_hr_encode(*bursts_p, msg_facch->l2h, msgb_l2len(msg_facch)); + /* populate the buffer with bursts */ + if (msgb_l2len(msg) == GSM_MACBLOCK_LEN) { + gsm0503_tch_hr_encode(*bursts_p, msg->l2h, msgb_l2len(msg)); chan_state->dl_ongoing_facch = 1; /* first of two TCH frames */ chan_state->dl_facch_bursts = 6; } else if (chan_state->dl_ongoing_facch) /* second of two TCH frames */ @@ -391,19 +391,16 @@ /* the first FN 4,13,21 or 5,14,22 defines that CMI is included * in frame, the first FN 0,8,17 or 1,9,18 defines that CMR is * included in frame. */ - gsm0503_tch_ahs_encode(*bursts_p, msg_tch->l2h + 2, - msgb_l2len(msg_tch) - 2, !dl_amr_fn_is_cmi(br->fn), + gsm0503_tch_ahs_encode(*bursts_p, msg->l2h + 2, + msgb_l2len(msg) - 2, !dl_amr_fn_is_cmi(br->fn), chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); else - gsm0503_tch_hr_encode(*bursts_p, msg_tch->l2h, msgb_l2len(msg_tch)); + gsm0503_tch_hr_encode(*bursts_p, msg->l2h, msgb_l2len(msg)); /* free message */ - if (msg_tch) - msgb_free(msg_tch); - if (msg_facch) - msgb_free(msg_facch); + msgb_free(msg); send_burst: /* compose burst */ diff --git a/src/osmo-bts-trx/sched_tch.h b/src/osmo-bts-trx/sched_tch.h index 3b0b1e8..e77e05d 100644 --- a/src/osmo-bts-trx/sched_tch.h +++ b/src/osmo-bts-trx/sched_tch.h @@ -62,8 +62,7 @@ } /* 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) +static inline struct msgb *tch_dl_dequeue(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { struct msgb *msg1, *msg2, *msg_tch = NULL, *msg_facch = NULL; struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; @@ -128,8 +127,19 @@ msg_facch = NULL; } + /* prioritize FACCH over speech */ + if (msg_facch) { + /* Unlike SACCH, FACCH has no dedicated slots on the multiframe layout. + * It's multiplexed together with TCH (speech or data) frames basically + * by replacing (stealing) them. This is common for both TCH/F and + * TCH/H, with the only difference that FACCH/H steals two TCH frames + * (not just one) due to a longer interleaving period. */ + msgb_free(msg_tch); + return msg_facch; + } + /* check validity of message, get AMR ft and cmr */ - if (!msg_facch && msg_tch) { + if (msg_tch) { int len; uint8_t cmr_codec; int cmr, ft, i; @@ -209,11 +219,8 @@ /* free message */ msgb_free(msg_tch); msg_tch = NULL; - goto send_frame; } } -send_frame: - *_msg_tch = msg_tch; - *_msg_facch = msg_facch; + return msg_tch; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9822b1a17185d5487f0f6d3ed0203e806c053d7d Gerrit-Change-Number: 27804 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: move tx_tch_common() into a separate file

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27802 ) Change subject: osmo-bts-trx: move tx_tch_common() into a separate file ...................................................................... osmo-bts-trx: move tx_tch_common() into a separate file Having this function defined as 'static inline' in a header file would allow the compiler to optimize it better for particular caller. Change-Id: Id0b9d604e6969a8db73ef451fbcad00f57325fc4 Related: SYS#5919, OS#4823 --- M src/osmo-bts-trx/Makefile.am M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c A src/osmo-bts-trx/sched_tch.h 4 files changed, 218 insertions(+), 196 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/27802/1 diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index f6094dd..b7a4e8b 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -30,6 +30,7 @@ noinst_HEADERS = \ sched_utils.h \ + sched_tch.h \ trx_if.h \ l1_if.h \ amr_loop.h \ diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 8ca0961..e6e1eff 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -43,6 +43,7 @@ #include <osmo-bts/msg_utils.h> #include <sched_utils.h> +#include <sched_tch.h> #include <amr_loop.h> /* 3GPP TS 45.009, table 3.2.1.3-{1,3}: AMR on Uplink TCH/F. @@ -319,196 +320,6 @@ meas_avg.ci_cb, is_sub); } -/* common section for generation of TCH bursts (TCH/H and TCH/F). - * FIXME: this function is over-complicated, refactor / get rid of it. */ -void tx_tch_common(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br, - struct msgb **_msg_tch, struct msgb **_msg_facch) -{ - struct msgb *msg1, *msg2, *msg_tch = NULL, *msg_facch = NULL; - struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; - uint8_t rsl_cmode = chan_state->rsl_cmode; - uint8_t tch_mode = chan_state->tch_mode; - struct osmo_phsap_prim *l1sap; - - /* handle loss detection of received TCH frames */ - if (rsl_cmode == RSL_CMOD_SPD_SPEECH - && ++(chan_state->lost_frames) > 5) { - uint8_t tch_data[GSM_FR_BYTES]; - int len; - - 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) { - /* 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, - tch_data, len, 0, 10000, 0, 0, 0); - } - } - - /* get frame and unlink from queue */ - msg1 = _sched_dequeue_prim(l1ts, br); - msg2 = _sched_dequeue_prim(l1ts, br); - if (msg1) { - l1sap = msgb_l1sap_prim(msg1); - if (l1sap->oph.primitive == PRIM_TCH) { - msg_tch = msg1; - if (msg2) { - l1sap = msgb_l1sap_prim(msg2); - if (l1sap->oph.primitive == PRIM_TCH) { - LOGL1SB(DL1P, LOGL_FATAL, l1ts, br, "TCH twice, please FIX!\n"); - msgb_free(msg2); - } else - msg_facch = msg2; - } - } else { - msg_facch = msg1; - if (msg2) { - l1sap = msgb_l1sap_prim(msg2); - if (l1sap->oph.primitive != PRIM_TCH) { - LOGL1SB(DL1P, LOGL_FATAL, l1ts, br, "FACCH twice, please FIX!\n"); - msgb_free(msg2); - } else - msg_tch = msg2; - } - } - } - - /* check validity of message */ - if (msg_facch && msgb_l2len(msg_facch) != GSM_MACBLOCK_LEN) { - LOGL1SB(DL1P, LOGL_FATAL, l1ts, br, "Prim has odd len=%u != %u\n", - msgb_l2len(msg_facch), GSM_MACBLOCK_LEN); - /* free message */ - msgb_free(msg_facch); - msg_facch = NULL; - } - - /* check validity of message, get AMR ft and cmr */ - if (!msg_facch && msg_tch) { - int len; - uint8_t cmr_codec; - int cmr, ft, i; - enum osmo_amr_type ft_codec; - enum osmo_amr_quality bfi; - int8_t sti, cmi; - bool amr_is_cmr = !dl_amr_fn_is_cmi(br->fn); - - if (rsl_cmode != RSL_CMOD_SPD_SPEECH) { - LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Dropping speech frame, " - "because we are not in speech mode\n"); - goto free_bad_msg; - } - - switch (tch_mode) { - case GSM48_CMODE_SPEECH_V1: /* FR / HR */ - if (br->chan != TRXC_TCHF) /* HR */ - len = 15; - else - len = GSM_FR_BYTES; - break; - case GSM48_CMODE_SPEECH_EFR: /* EFR */ - if (br->chan != TRXC_TCHF) - goto inval_mode2; - len = GSM_EFR_BYTES; - break; - case GSM48_CMODE_SPEECH_AMR: /* AMR */ - len = osmo_amr_rtp_dec(msg_tch->l2h, msgb_l2len(msg_tch), - &cmr_codec, &cmi, &ft_codec, - &bfi, &sti); - if (len < 0) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot send invalid AMR payload\n"); - goto free_bad_msg; - } - cmr = -1; - ft = -1; - for (i = 0; i < chan_state->codecs; i++) { - if (chan_state->codec[i] == cmr_codec) - cmr = i; - if (chan_state->codec[i] == ft_codec) - ft = i; - } - if (cmr >= 0) { /* new request */ - chan_state->dl_cmr = cmr; - /* disable AMR loop */ - trx_loop_amr_set(chan_state, 0); - } else { - /* enable AMR loop */ - trx_loop_amr_set(chan_state, 1); - } - if (ft < 0) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, - "Codec (FT = %d) of RTP frame not in list\n", ft_codec); - goto free_bad_msg; - } - if (amr_is_cmr && chan_state->dl_ft != ft) { - LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Codec (FT = %d) " - " of RTP cannot be changed now, but in next frame\n", ft_codec); - goto free_bad_msg; - } - chan_state->dl_ft = ft; - if (bfi == AMR_BAD) { - LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Transmitting 'bad AMR frame'\n"); - goto free_bad_msg; - } - break; - default: -inval_mode2: - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "TCH mode invalid, please fix!\n"); - goto free_bad_msg; - } - if (msgb_l2len(msg_tch) != len) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot send payload with " - "invalid length! (expecting %d, received %d)\n", - len, msgb_l2len(msg_tch)); -free_bad_msg: - /* free message */ - msgb_free(msg_tch); - msg_tch = NULL; - goto send_frame; - } - } - -send_frame: - *_msg_tch = msg_tch; - *_msg_facch = msg_facch; -} - /* 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) { diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index e3ce600..bacd49b 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -43,6 +43,7 @@ #include <osmo-bts/msg_utils.h> #include <sched_utils.h> +#include <sched_tch.h> #include <amr_loop.h> /* 3GPP TS 45.009, table 3.2.1.3-{2,4}: AMR on Uplink TCH/H. @@ -350,12 +351,6 @@ meas_avg.ci_cb, is_sub); } -/* common section for generation of TCH bursts (TCH/H and TCH/F). - * FIXME: this function is over-complicated, refactor / get rid of it. */ -extern void tx_tch_common(struct l1sched_ts *l1ts, - const struct trx_dl_burst_req *br, - struct msgb **_msg_tch, struct msgb **_msg_facch); - /* 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) { diff --git a/src/osmo-bts-trx/sched_tch.h b/src/osmo-bts-trx/sched_tch.h new file mode 100644 index 0000000..f3e9c69 --- /dev/null +++ b/src/osmo-bts-trx/sched_tch.h @@ -0,0 +1,215 @@ +/* Common API for TCH channels. + * + * (C) 2013 by Andreas Eversberg <jolly(a)eversberg.eu> + * (C) 2015-2017 by Harald Welte <laforge(a)gnumonks.org> + * Contributions by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); + +/* 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) +{ + struct msgb *msg1, *msg2, *msg_tch = NULL, *msg_facch = NULL; + struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; + uint8_t rsl_cmode = chan_state->rsl_cmode; + uint8_t tch_mode = chan_state->tch_mode; + struct osmo_phsap_prim *l1sap; + + /* handle loss detection of received TCH frames */ + if (rsl_cmode == RSL_CMOD_SPD_SPEECH + && ++(chan_state->lost_frames) > 5) { + uint8_t tch_data[GSM_FR_BYTES]; + int len; + + 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) { + /* 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, + tch_data, len, 0, 10000, 0, 0, 0); + } + } + + /* get frame and unlink from queue */ + msg1 = _sched_dequeue_prim(l1ts, br); + msg2 = _sched_dequeue_prim(l1ts, br); + if (msg1) { + l1sap = msgb_l1sap_prim(msg1); + if (l1sap->oph.primitive == PRIM_TCH) { + msg_tch = msg1; + if (msg2) { + l1sap = msgb_l1sap_prim(msg2); + if (l1sap->oph.primitive == PRIM_TCH) { + LOGL1SB(DL1P, LOGL_FATAL, l1ts, br, "TCH twice, please FIX!\n"); + msgb_free(msg2); + } else + msg_facch = msg2; + } + } else { + msg_facch = msg1; + if (msg2) { + l1sap = msgb_l1sap_prim(msg2); + if (l1sap->oph.primitive != PRIM_TCH) { + LOGL1SB(DL1P, LOGL_FATAL, l1ts, br, "FACCH twice, please FIX!\n"); + msgb_free(msg2); + } else + msg_tch = msg2; + } + } + } + + /* check validity of message */ + if (msg_facch && msgb_l2len(msg_facch) != GSM_MACBLOCK_LEN) { + LOGL1SB(DL1P, LOGL_FATAL, l1ts, br, "Prim has odd len=%u != %u\n", + msgb_l2len(msg_facch), GSM_MACBLOCK_LEN); + /* free message */ + msgb_free(msg_facch); + msg_facch = NULL; + } + + /* check validity of message, get AMR ft and cmr */ + if (!msg_facch && msg_tch) { + int len; + uint8_t cmr_codec; + int cmr, ft, i; + enum osmo_amr_type ft_codec; + enum osmo_amr_quality bfi; + int8_t sti, cmi; + bool amr_is_cmr = !dl_amr_fn_is_cmi(br->fn); + + if (rsl_cmode != RSL_CMOD_SPD_SPEECH) { + LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Dropping speech frame, " + "because we are not in speech mode\n"); + goto free_bad_msg; + } + + switch (tch_mode) { + case GSM48_CMODE_SPEECH_V1: /* FR / HR */ + if (br->chan != TRXC_TCHF) /* HR */ + len = 15; + else + len = GSM_FR_BYTES; + break; + case GSM48_CMODE_SPEECH_EFR: /* EFR */ + if (br->chan != TRXC_TCHF) + goto inval_mode2; + len = GSM_EFR_BYTES; + break; + case GSM48_CMODE_SPEECH_AMR: /* AMR */ + len = osmo_amr_rtp_dec(msg_tch->l2h, msgb_l2len(msg_tch), + &cmr_codec, &cmi, &ft_codec, + &bfi, &sti); + if (len < 0) { + LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot send invalid AMR payload\n"); + goto free_bad_msg; + } + cmr = -1; + ft = -1; + for (i = 0; i < chan_state->codecs; i++) { + if (chan_state->codec[i] == cmr_codec) + cmr = i; + if (chan_state->codec[i] == ft_codec) + ft = i; + } + if (cmr >= 0) { /* new request */ + chan_state->dl_cmr = cmr; + /* disable AMR loop */ + trx_loop_amr_set(chan_state, 0); + } else { + /* enable AMR loop */ + trx_loop_amr_set(chan_state, 1); + } + if (ft < 0) { + LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, + "Codec (FT = %d) of RTP frame not in list\n", ft_codec); + goto free_bad_msg; + } + if (amr_is_cmr && chan_state->dl_ft != ft) { + LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Codec (FT = %d) " + " of RTP cannot be changed now, but in next frame\n", ft_codec); + goto free_bad_msg; + } + chan_state->dl_ft = ft; + if (bfi == AMR_BAD) { + LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Transmitting 'bad AMR frame'\n"); + goto free_bad_msg; + } + break; + default: +inval_mode2: + LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "TCH mode invalid, please fix!\n"); + goto free_bad_msg; + } + if (msgb_l2len(msg_tch) != len) { + LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot send payload with " + "invalid length! (expecting %d, received %d)\n", + len, msgb_l2len(msg_tch)); +free_bad_msg: + /* free message */ + msgb_free(msg_tch); + msg_tch = NULL; + goto send_frame; + } + } + +send_frame: + *_msg_tch = msg_tch; + *_msg_facch = msg_facch; +} -- 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-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Expect number-of-broadcadsts-completed-list in CBSP KILL COMPLETE

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27791 ) Change subject: bsc: Expect number-of-broadcadsts-completed-list in CBSP KILL COMPLETE ...................................................................... bsc: Expect number-of-broadcadsts-completed-list in CBSP KILL COMPLETE When responding to a CBSP KILL with a CBSP KILL COMPLETE, make sure we include the optional "Number of Broadcasts Completed List" IE in order to inform the CBC about how many times the just-killed message had been broadcast before it was killed. It seems some CBCs expect this IE to be present, while 3GPP TS 48.049 lists it as optional. osmo-bsc is including this IE as of Change-Id I47aebd613dfc6dd9261ea9019a51aff0cd6470d8 This change updates the test suite to expect this IE to be included. Change-Id: I5b56676c93479ec7b32cff66c9738fff7d0228cf Related: SYS#5906 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 11 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 0d8fb38..b291546 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -355,6 +355,7 @@ function f_cbsp_kill(uint16_t msg_id, uint16_t ser_no, template (omit) uint8_t channel_ind := 0, template (value) BSSMAP_FIELD_CellIdentificationList cell_list := ts_BSSMAP_CIL_BSS, template BSSMAP_FIELD_CellIdentificationList success_list := ?, + template CBSP_IE_NumBcastComplList compl_list := *, template CBSP_FailureListItems fail_list := omit) runs on cbsp_test_CT { var template (value) CBSP_PDU tx; @@ -363,10 +364,10 @@ tx := ts_CBSP_KILL(msg_id, ser_no, cell_list, channel_ind); CBSP[0].send(ts_CBSP_Send(g_cbsp_conn_id[0], tx)); if (istemplatekind(fail_list, "omit")) { - rx := tr_CBSP_KILL_COMPL(msg_id, ser_no, compl_list:=*, cell_list:=success_list, + rx := tr_CBSP_KILL_COMPL(msg_id, ser_no, compl_list:=compl_list, cell_list:=success_list, channel_ind:=channel_ind); } else { - rx := tr_CBSP_KILL_FAIL(msg_id, ser_no, fail_list, compl_list:=*, cell_list:=success_list, + rx := tr_CBSP_KILL_FAIL(msg_id, ser_no, fail_list, compl_list:=compl_list, cell_list:=success_list, channel_ind:=channel_ind); } alt { @@ -784,7 +785,7 @@ f_init(); cell_list := ts_BSSMAP_CIL_LAC_CI({bssmap_lac_ci(mp_cgi_bts0)}); - f_cbsp_kill(g_cbsp_msg_id, g_cbsp_ser_no, 0, cell_list, success_list:=omit, fail_list:=?); + f_cbsp_kill(g_cbsp_msg_id, g_cbsp_ser_no, 0, cell_list, success_list:=omit, compl_list:=omit, fail_list:=?); } /* Write a message, then kill it */ testcase TC_cbsp_write_then_kill() runs on cbsp_test_CT { @@ -793,9 +794,14 @@ g_pars := valueof(ts_CBSP_Pars_default(false, 13001, 13501)); f_init(); + /* write message, request more than one transmission on BTS0 */ cell_list := ts_BSSMAP_CIL_LAC_CI({bssmap_lac_ci(mp_cgi_bts0)}); - f_cbsp_write(g_cbsp_msg_id, g_cbsp_ser_no, cell_list, content:=pages, success_list:=?, fail_list:=omit); - f_cbsp_kill(g_cbsp_msg_id, g_cbsp_ser_no, 0, cell_list, success_list:=?, fail_list:=omit); + f_cbsp_write(g_cbsp_msg_id, g_cbsp_ser_no, cell_list, num_bcast_req := 5, content:=pages, success_list:=?, fail_list:=omit); + /* expect to receive it once on the BTS */ + var template (present) RSL_Message tr := f_page2rsl(pages[0], g_cbsp_msg_id, g_cbsp_ser_no); + IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)); + /* kill it, expecting non-empty completion list */ + f_cbsp_kill(g_cbsp_msg_id, g_cbsp_ser_no, 0, cell_list, success_list:=?, compl_list:=?, fail_list:=omit); } /* Write a message, then reset all messages */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27791 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: I5b56676c93479ec7b32cff66c9738fff7d0228cf Gerrit-Change-Number: 27791 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Expect number-of-broadcadsts-completed-list in CBSP KILL COMPLETE

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27791 ) Change subject: bsc: Expect number-of-broadcadsts-completed-list in CBSP KILL COMPLETE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27791 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: I5b56676c93479ec7b32cff66c9738fff7d0228cf Gerrit-Change-Number: 27791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 15 Apr 2022 04:54:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022