From 0e50ce614569b9ae7bcc6e7becc4aeec46e8369d Mon Sep 17 00:00:00 2001 From: Jacob Erlbeck Date: Thu, 21 May 2015 16:58:22 +0200 Subject: tbf: Always call set_tlli/confirm_tlli in update_ms Currently the m_tlli member in GprsMs is set by the constructor, circumventing the TLLI confirmation mechanism. This commit replaces the get_or_create_ms() method by a create_ms() method which takes the TLLI and the direction (UL or DL) as parameters to select either set_tlli() or confirm_tlli(). The MS object is instantiated with TLLI = 0, and therefore GprsMs::tlli() is extended to return the DL TLLI if both of the other TLLI are not set. Note that create_ms() will not check whether an MS object with a matching TLLI is already stored in the list, so it should only be called after a corresponding get_ms() in general. Sponsored-by: On-Waves ehf --- tests/ms/MsTest.err | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/ms/MsTest.err') diff --git a/tests/ms/MsTest.err b/tests/ms/MsTest.err index bec98b98..4f704cbc 100644 --- a/tests/ms/MsTest.err +++ b/tests/ms/MsTest.err @@ -35,8 +35,10 @@ Modifying MS object, TLLI: 0xaa000000 confirmed The MS object cannot fully confirm an unexpected TLLI: 0xff001111, partly confirmed Modifying MS object, TLLI: 0xaa000000 -> 0xff001111, already confirmed partly Destroying MS object, TLLI = 0xff001111 -Creating MS object, TLLI = 0xffeeddbb -Creating MS object, TLLI = 0xffeeddbc +Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xffeeddbb, not yet confirmed +Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xffeeddbc, not yet confirmed Attaching TBF to MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Detaching TBF from MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Destroying MS object, TLLI = 0xffeeddbb -- cgit v1.2.3