llc: Separate LLC queue handling from gprs_llc

Currently the gprs_llc class handles both LLC queueing and the
partition into smaller pieces for RLC/MAC encapsulation. This hinders
the separation of TBF and MS related data, since LLC queueing belongs
to the MS related code while the RLC/MAC encoding/decoding belongs to
the TBF layer.

This commits takes the LLC queueing related methods and members and
puts them into a new class gprs_llc_queue. It puts the queueing
object into gprs_rlcmac_tbf and adds accessor functions. The
implementation in tbf.cpp and tbf_dl.cpp is adapted accordingly.

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

1 files changed, 14 insertions, 0 deletions

diff --git a/src/tbf.h b/src/tbf.h
index d288669d..2a403c65 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);
+	gprs_llc_queue *llc_queue();
+	const gprs_llc_queue *llc_queue() const;
 
 	time_t created_ts() const;
 
@@ -229,6 +231,8 @@ protected:
 
 	/* Field to take the TA value if no MS is associated */
 	uint8_t m_ta;
+
+	gprs_llc_queue m_llc_queue;
 private:
 	mutable char m_name_buf[60];
 };
@@ -285,6 +289,16 @@ inline GprsMs *gprs_rlcmac_tbf::ms()
 	return m_ms;
 }
 
+inline gprs_llc_queue *gprs_rlcmac_tbf::llc_queue()
+{
+	return &m_llc_queue;
+}
+
+inline const gprs_llc_queue *gprs_rlcmac_tbf::llc_queue() const
+{
+	return &m_llc_queue;
+}
+
 inline bool gprs_rlcmac_tbf::is_tlli_valid() const
 {
 	return tlli() != 0;