tbf: Store MS class in GprsMs objects

The ms_class value is a property of the MS and thus belongs to the
GprsMs class. Nevertheless the MS object is created after the TLLI
gets known, so the value still has to be stored in the TBF initially.

This commit add the ms_class value to the GprsMs class and introduces
TBF accessor functions which either access that object or, if that is
not available, the value stored locally.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/tbf.h b/src/tbf.h
index 7f8d660d..c5bb9009 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -151,6 +151,8 @@ struct gprs_rlcmac_tbf {
 	void assign_imsi(const char *imsi);
 	uint8_t ta() const;
 	void set_ta(uint8_t);
+	uint8_t ms_class() const;
+	void set_ms_class(uint8_t);
 	gprs_llc_queue *llc_queue();
 	const gprs_llc_queue *llc_queue() const;
 
@@ -167,7 +169,6 @@ struct gprs_rlcmac_tbf {
 	uint8_t first_common_ts; /* first TS that the phone can send and
 		reveive simultaniously */
 	uint8_t control_ts; /* timeslot control messages and polling */
-	uint8_t ms_class;
 	struct gprs_rlcmac_pdch *pdch[8]; /* list of PDCHs allocated to TBF */
 
 	gprs_llc m_llc;
@@ -229,8 +230,9 @@ protected:
 
 	class GprsMs *m_ms;
 
-	/* Field to take the TA value if no MS is associated */
+	/* Fields to take the TA/MS class values if no MS is associated */
 	uint8_t m_ta;
+	uint8_t m_ms_class;
 
 private:
 	mutable char m_name_buf[60];