aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2015-08-31 14:32:05 +0200
committerJacob Erlbeck <jerlbeck@sysmocom.de>2015-09-01 11:48:25 +0200
commitcf6ae9d12f9bf406a8f164f8109410d01328d913 (patch)
tree656b396ba277b32d4ef5c97f243454074d11b16c /src
parentaf75ce8e15ec8584cbc96a0cd366a5df68b9dae8 (diff)
Revert "tbf: Do not kill DL TBF on Packet Resource Request"
This reverts commit e91bd3babd5c04a154f296607b401a5050dcba31. That commit seems to cause hanging DL TBFs when there was a RACH based UL TBF establishment while it that TBF is active. This could be caused by the use of a different PDCH for the SBA. Conflicts: tests/tbf/TbfTest.cpp tests/tbf/TbfTest.err
Diffstat (limited to 'src')
-rw-r--r--src/bts.cpp13
-rw-r--r--src/tbf.cpp4
2 files changed, 9 insertions, 8 deletions
diff --git a/src/bts.cpp b/src/bts.cpp
index cfb4385..98a23cc 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -988,11 +988,14 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request,
ul_tbf = NULL;
}
- if (dl_tbf)
- LOGP(DRLCMACUL, LOGL_INFO, "Got RACH from "
- "TLLI=0x%08x while %s still exists.\n",
- tlli, tbf_name(dl_tbf));
-
+ if (dl_tbf) {
+ LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from "
+ "TLLI=0x%08x while %s still exists. "
+ "Killing pending DL TBF\n", tlli,
+ tbf_name(dl_tbf));
+ tbf_free(dl_tbf);
+ dl_tbf = NULL;
+ }
LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF "
"in packet resource request of single "
"block, so we provide one:\n");
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 42d522b..5987754 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -986,8 +986,6 @@ int gprs_rlcmac_tbf::extract_tlli(const uint8_t *data, const size_t len)
}
old_ms = bts->ms_by_tlli(new_tlli);
- /* Keep the old MS object for the update_ms() */
- GprsMs::Guard guard(old_ms);
if (old_ms) {
/* Get them before calling set_ms() */
dl_tbf = old_ms->dl_tbf();
@@ -998,7 +996,7 @@ int gprs_rlcmac_tbf::extract_tlli(const uint8_t *data, const size_t len)
/* there might be an active and valid downlink TBF */
if (!ms()->dl_tbf() && dl_tbf)
- /* Move it to the current MS (see the guard above) */
+ /* Move it to the current MS */
dl_tbf->set_ms(ms());
}