aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2015-05-18 11:56:50 +0200
committerJacob Erlbeck <jerlbeck@sysmocom.de>2015-05-21 17:10:49 +0200
commit87597358cfe216a80405c21559ba640eedf44ad2 (patch)
treeb27bc841c789accbb2d92aad60a3e6096cc7d00f
parent939904672961fa7e28397e27f942a7d1fff4bbdf (diff)
tbf: Get the TLLI from the MS object
Since the synchronisation of the TBF's concerning the TLLIs has been removed in 'Support new and old TLLI's', gprs_rlcmac_tbf::tlli() can return the old TLLI which is probably different to ms()->tlli() in that case. This can lead to a wrong TLLI being used in BSSGP messages. This commit modifies the TBF's tlli() method to get the current TLLI from the MS object. Sponsored-by: On-Waves ehf
-rw-r--r--src/tbf.cpp5
-rw-r--r--src/tbf.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tbf.cpp b/src/tbf.cpp
index a379363..c8659cf 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -46,6 +46,11 @@ gprs_rlcmac_bts *gprs_rlcmac_tbf::bts_data() const
return bts->bts_data();
}
+uint32_t gprs_rlcmac_tbf::tlli() const
+{
+ return m_ms ? m_ms->tlli() : m_tlli;
+}
+
void gprs_rlcmac_tbf::assign_imsi(const char *imsi)
{
strncpy(m_imsi, imsi, sizeof(m_imsi));
diff --git a/src/tbf.h b/src/tbf.h
index a2f5bf7..a1edff3 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -293,11 +293,6 @@ inline GprsMs *gprs_rlcmac_tbf::ms()
return m_ms;
}
-inline uint32_t gprs_rlcmac_tbf::tlli() const
-{
- return m_tlli;
-}
-
inline bool gprs_rlcmac_tbf::is_tlli_valid() const
{
return m_tlli_valid;