aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2015-04-09 19:18:59 +0200
committerJacob Erlbeck <jerlbeck@sysmocom.de>2015-04-09 19:24:47 +0200
commit90de3a7ffed01e8f5196c2dd2af6d23ac47734f3 (patch)
tree29ad6313d6fc57fb1a15f9ecbd8d09984007d041
parentd58b711eec1aad9cde3693be3097f0923dc66abd (diff)
tbf: Send BSSGP LLC discarded on TBI exhaustion
Currently the PCU silently discard LLC frames from the SGSN if a DL TBF cannot be allocated. This commit changes tbf_new_dl_assignment and reuse_tbf to send an LLC discarded message to the SGSN in this case. Ticket: #607 Sponsored-by: On-Waves ehf
-rw-r--r--src/tbf_dl.cpp31
-rw-r--r--tests/tbf/TbfTest.err1
2 files changed, 15 insertions, 17 deletions
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index e8c5dfe..442aa36 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -150,7 +150,7 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts,
uint8_t trx, ta, ss;
int8_t use_trx;
struct gprs_rlcmac_ul_tbf *ul_tbf, *old_ul_tbf;
- struct gprs_rlcmac_dl_tbf *dl_tbf;
+ struct gprs_rlcmac_dl_tbf *dl_tbf = NULL;
int8_t tfi; /* must be signed */
int rc;
@@ -186,16 +186,14 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts,
// Create new TBF (any TRX)
#warning "Copy and paste with alloc_ul_tbf"
tfi = bts->bts->tfi_find_free(GPRS_RLCMAC_DL_TBF, &trx, use_trx);
- if (tfi < 0) {
- LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
- /* FIXME: send reject */
- return -EBUSY;
- }
- /* set number of downlink slots according to multislot class */
- dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf, tfi, trx, ms_class, ss);
+ if (tfi >= 0)
+ /* set number of downlink slots according to multislot class */
+ dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf, tfi, trx, ms_class, ss);
+
if (!dl_tbf) {
LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
- /* FIXME: send reject */
+ bssgp_tx_llc_discarded(gprs_bssgp_pcu_current_bctx(), tlli,
+ 1, len);
return -EBUSY;
}
dl_tbf->m_tlli = tlli;
@@ -767,22 +765,21 @@ int gprs_rlcmac_dl_tbf::rcvd_dl_ack(uint8_t final_ack, uint8_t ssn, uint8_t *rbb
void gprs_rlcmac_dl_tbf::reuse_tbf(const uint8_t *data, const uint16_t len)
{
uint8_t trx;
- struct gprs_rlcmac_dl_tbf *new_tbf;
+ struct gprs_rlcmac_dl_tbf *new_tbf = NULL;
int8_t tfi; /* must be signed */
struct msgb *msg;
bts->tbf_reused();
tfi = bts->tfi_find_free(GPRS_RLCMAC_DL_TBF, &trx, this->trx->trx_no);
- if (tfi < 0) {
- LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
- /* FIXME: send reject */
- return;
- }
- new_tbf = tbf_alloc_dl_tbf(bts->bts_data(), NULL, tfi, trx, ms_class, 0);
+ if (tfi >= 0)
+ new_tbf = tbf_alloc_dl_tbf(bts->bts_data(), NULL, tfi, trx,
+ ms_class, 0);
+
if (!new_tbf) {
LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
- /* FIXME: send reject */
+ bssgp_tx_llc_discarded(gprs_bssgp_pcu_current_bctx(), m_tlli,
+ 1, len);
return;
}
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index d6da0c1..1498c1e 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -907,3 +907,4 @@ TA unknown, assuming 0
Searching for first unallocated TFI: TRX=0 first TS=4
No TFI available.
No PDCH resource
+BSSGP (BVCI=1234) Tx LLC-DISCARDED TLLI=0xc0000020, FRAMES=1, OCTETS=256