aboutsummaryrefslogtreecommitdiffstats
path: root/src/tbf.cpp
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2015-08-21 18:19:29 +0200
committerJacob Erlbeck <jerlbeck@sysmocom.de>2015-08-21 19:02:18 +0200
commite91bd3babd5c04a154f296607b401a5050dcba31 (patch)
treedb0b3ed52841b8ce10f0d8e28f5adc3cf0f72013 /src/tbf.cpp
parentb139598b1c5bd271675386be77370899b5707d61 (diff)
tbf: Do not kill DL TBF on Packet Resource Request
Currently all active TBF of an MS are killed if a Packet Resource Request is received from the MS. In general this happens after a RACH request. This does not happen after a resource request that has been included into a Downlink Ack/Nack. Sometimes an UL TBF is requested by an MS via RACH while a DL TBF is running for instance to send a TCP Ack. This can happen, if a former request via PACCH did not work. This commit removes the killing of the DL TBF from gprs_rlcmac_pdch::rcv_resource_request(). Sponsored-by: On-Waves ehf
Diffstat (limited to 'src/tbf.cpp')
-rw-r--r--src/tbf.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 457fe24e..2e6da026 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -887,6 +887,8 @@ 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();
@@ -897,7 +899,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 */
+ /* Move it to the current MS (see the guard above) */
dl_tbf->set_ms(ms());
}