tbf: Move IMSI to MS object

Currently the IMSI is stored in the TBFs. Since it directly refers to
an MS, it should rather be stored in an MS object.

This patch move the m_imsi field from gprs_rlcmac_tbf to GprsMs,
changes gprs_rlcmac_tbf::imsi() to get the IMSI from the associated
MS object, and adds getter and setter to GprsMs. Before changing the
IMSI of the associated MS object, assign_imsi() checks if there is
already another MS object with the same IMSI and eventually resets
the IMSI of that one. So using update_ms() and assign_imsi() ensures
that there are not two MS object entries is the storage with the
same TLLI or the same IMSI.

Ticket: #1674
Sponsored-by: On-Waves ehf

1 files changed, 0 insertions, 8 deletions

diff --git a/src/tbf.h b/src/tbf.h
index 9dbbe51d..0820065f 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -223,9 +223,6 @@ struct gprs_rlcmac_tbf {
 	uint8_t m_tfi;
 	time_t m_created_ts;
 
-	/* store IMSI for look-up and PCH retransmission */
-	char m_imsi[16];
-
 protected:
 	gprs_rlcmac_bts *bts_data() const;
 
@@ -300,11 +297,6 @@ inline uint8_t gprs_rlcmac_tbf::tfi() const
 	return m_tfi;
 }
 
-inline const char *gprs_rlcmac_tbf::imsi() const
-{
-	return m_imsi;
-}
-
 inline gprs_rlcmac_tbf *gprs_rlcmac_tbf::new_tbf() const
 {
 	return m_new_tbf;