osmocom-net-gprs

osmocom-net-gprs@lists.osmocom.org

6 participants
480 discussions

Padding patch and moving forward with EGPRS support/merge

by Holger Freyther

Dear Saurabh, it would be nice if you could address the review comment of Harald for the padding patch and send it again. In terms of the commit message it would be interesting to know how you found it, if something broke because of it (e.g. if a specific Handset+Chipset+Firmware release broke). Such information is nicely captured in a commit message and might help future developers to prevent doing a revert or similar. In terms of the EDGE support it is custom in Free Software projects to build on top of what is already present. I don't have a specific approach and there are multiple options but from what I see the situation is: * You seem to have added additional encoding regression tests. It would be nice to move them to the master version and see if the result is similar/correct as well. * Jacob has not implemented compressed bitmaps in the DL TBF handling. The reason is because we want to avoid bufferbloat our windows don't really get that big and it seems we didn't need it yet. Now that you have built a tree based encoder, it might make sense to include the encoder, add tests for the encoding, reason/explain the performance and then hook the encoding in the DL ACK handling. * Any other corrections/fixes you have. * Identify other areas where your support is behaving better than the code in master or features missing and implemented in your branch. Do you already have an idea yourself how you intend to move forward and get your improvements included in the main repository? kind regards holger

9 years, 3 months

[PATCH] Add test vectors for EGPRS messages

by Saurabh Sharan

This patch is the test suite modification for the fix encoding of padding bits. New test vectors have been added both in downlink and uplink. --- tests/rlcmac/RLCMACTest.cpp | 7 +++++-- tests/rlcmac/RLCMACTest.ok | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-)

9 years, 3 months

[PATCH] Fix encoding of padding bits to start with 0 bit

by Saurabh Sharan

This patch is for fixing encoding of padding bits according to the 3gpp spec 44.060 section 11, wherein it shall always start with 0 bit followed with spare padding bits. During introduction of basic EGPRS feature new hex dump messages from a different working network log were used in Unit test. These exposed the issue of incorrect handling of padding bits encoding in osmo-pcu. Corrections in the existing test vector of rlcmac is also updated. In testsuite tbf appropriate corrections for the Tbftest.err is also done. --- src/csn1.cpp | 7 ++++++- tests/rlcmac/RLCMACTest.cpp | 6 +++--- tests/rlcmac/RLCMACTest.ok | 18 +++++++++--------- tests/tbf/TbfTest.err | 18 +++++++++--------- 4 files changed, 27 insertions(+), 22 deletions(-)

9 years, 3 months

[PATCH 1/2] WIP..

by Holger Freyther

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> --- tests/rlcmac/RLCMACTest.cpp | 8 ++++---- tests/rlcmac/RLCMACTest.ok | 26 +++++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 66bc53c..124e643 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -89,7 +89,7 @@ void testRlcMacDownlink() std::string testData[] = { "4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment - "48282407a6a074227201000b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment + "48282407a6a07422720100032b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment "47240c00400000000000000079eb2ac9402b2b2b2b2b2b", // Packet Uplink Ack Nack "47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b" // Packet Uplink Assignment "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b" @@ -152,9 +152,9 @@ void testRlcMacUplink() bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); std::string testData[] = { - "400e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block - "400b8020000000000000002480e00b2b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack - "4016713dc094270ca2ae57ef909006aa0fc0001f80222b" // Packet Resource Request + "400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block + "400b8020000000000000002480e0032b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack + "4016713dc094270ca2ae57ef909006aa0fc0001f80222b", // Packet Resource Request "400a9020000000000000003010012a0800132b2b2b2b2b" }; diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 99117ff..801de42 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -7,13 +7,13 @@ vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b vector1 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b vector2 = 4e8250e3f1a81d882080b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE -vector1 = 4828247a6a074227210b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 4828247a6a074227210b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 4828247a6a074227210b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b +vector2 = 4828247a6a07422721032b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE vector1 = 4724c040000000079eb2ac9402b2b2b2b2b2b =========Start DECODE=========== @@ -32,21 +32,21 @@ vector1 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b vector2 = 47283c367513ba33304242b2b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE UPLINK -vector1 = 40e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -vector2 = 40e1e61d11f2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector1 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +vector2 = 40e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE -vector1 = 40b802000000002480e0b2b2b2b2b2b2b2b2b +vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ =========Start ENCODE============= +++++++++Finish ENCODE+++++++++++ -vector1 = 40b802000000002480e0b2b2b2b2b2b2b2b2b -vector2 = 40b802000000002480e0b2b2b2b2b2b2b2b2b +vector1 = 40b802000000002480e032b2b2b2b2b2b2b2b +vector2 = 40b802000000002480e032b2b2b2b2b2b2b2b vector1 == vector2 : TRUE vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b =========Start DECODE=========== @@ -56,3 +56,11 @@ vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b vector1 = 4016713dc09427ca2ae57ef90906aafc001f80222b vector2 = 4016713dc09427ca2ae57ef90906aafc001f80222b vector1 == vector2 : TRUE +vector1 = 40a90200000000301012a80132b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 40a90200000000301012a80132b2b2b2b2b +vector2 = 40a90200000000301012a80132b2b2b2b2b +vector1 == vector2 : TRUE -- 2.6.3

9 years, 3 months

[PATCH] Add test vectors for EGPRS messages

by Holger Freyther

9 years, 3 months

[PATCH] WIP: test patchwork test setup please ignore..

by Holger Hans Peter Freyther

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index a449398..97500c8 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,6 @@ * Make the TBF ul/dl list per BTS + + * Make the SBA per BTS * Make the tbf point to the BTS so we can kill plenty of parameters * Group more into in classes.. remove bts pointers. -- 2.6.3

9 years, 3 months

[PATCH] WIP: test patchwork test setup please ignore..

by Holger Hans Peter Freyther

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index a449398..b154940 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ + * Make the TBF ul/dl list per BTS * Make the SBA per BTS * Make the tbf point to the BTS so we can kill plenty of parameters -- 2.6.3

9 years, 3 months

[PATCH] WIP: test patchwork test setup please ignore..

by Holger Hans Peter Freyther

9 years, 3 months

Regarding integration of NURAN L1 1.0

by Prasad Kaup

Hello, We are starting to integrate and test NURAN L1 1.0 with osmo-bts / osmo-pcu at Radisys. We downloaded latest osmo-bts master branch. When we checked the code, we see that NURAN specific code is present in osmo-bts/src/osmo-bts-litecell15. When we tried to compile osmo-bts/src/osmo-bts-litecell15 , we see the following error nrw/litecell15/litecell15.h: No such file or directory Let us know if these files are missing or we are missing some steps. Thanks and regards Prasad

9 years, 3 months

[PATCH] Structure modifications for FANR feature

by Aravind Sirsikar

Adds new variable m_fanr_enabled in the gprs_rlcmac_tbf structure Adds new variable m_is_fanr_capable in GprsMs class Adds new variable pan_allowed in mcs_info structure variable This is the fourth patch among series of patches for FANR feature --- src/gprs_coding_scheme.cpp | 60 ++++++++++++++++++++++++++------------------ src/gprs_ms.cpp | 1 + src/gprs_ms.h | 17 +++++++++++++ src/tbf.cpp | 3 ++- src/tbf.h | 14 +++++++++++ 5 files changed, 69 insertions(+), 26 deletions(-) diff --git a/src/gprs_coding_scheme.cpp b/src/gprs_coding_scheme.cpp index 232cee3..53ce868 100644 --- a/src/gprs_coding_scheme.cpp +++ b/src/gprs_coding_scheme.cpp @@ -30,23 +30,24 @@ static struct { unsigned int num_blocks; const char *name; GprsCodingScheme::HeaderType data_hdr; + bool pan_allowed; } mcs_info[GprsCodingScheme::NUM_SCHEMES] = { - {{0, 0}, {0, 0}, 0, 0, "UNKNOWN", GprsCodingScheme::HEADER_INVALID}, - {{23, 0}, {23, 0}, 20, 1, "CS-1", GprsCodingScheme::HEADER_GPRS_DATA}, - {{33, 7}, {33, 7}, 30, 1, "CS-2", GprsCodingScheme::HEADER_GPRS_DATA}, - {{39, 3}, {39, 3}, 36, 1, "CS-3", GprsCodingScheme::HEADER_GPRS_DATA}, - {{53, 7}, {53, 7}, 50, 1, "CS-4", GprsCodingScheme::HEADER_GPRS_DATA}, - - {{26, 1}, {26, 1}, 22, 1, "MCS-1", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3}, - {{32, 1}, {32, 1}, 28, 1, "MCS-2", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3}, - {{41, 1}, {41, 1}, 37, 1, "MCS-3", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3}, - {{48, 1}, {48, 1}, 44, 1, "MCS-4", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3}, - - {{60, 7}, {59, 6}, 56, 1, "MCS-5", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2}, - {{78, 7}, {77, 6}, 74, 1, "MCS-6", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2}, - {{118, 2}, {117, 4}, 56, 2, "MCS-7", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1}, - {{142, 2}, {141, 4}, 68, 2, "MCS-8", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1}, - {{154, 2}, {153, 4}, 74, 2, "MCS-9", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1}, + {{0, 0}, {0, 0}, 0, 0, "UNKNOWN", GprsCodingScheme::HEADER_INVALID,false}, + {{23, 0}, {23, 0}, 20, 1, "CS-1", GprsCodingScheme::HEADER_GPRS_DATA, false}, + {{33, 7}, {33, 7}, 30, 1, "CS-2", GprsCodingScheme::HEADER_GPRS_DATA, false}, + {{39, 3}, {39, 3}, 36, 1, "CS-3", GprsCodingScheme::HEADER_GPRS_DATA, false}, + {{53, 7}, {53, 7}, 50, 1, "CS-4", GprsCodingScheme::HEADER_GPRS_DATA, false}, + + {{26, 1}, {26, 1}, 22, 1, "MCS-1", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, true}, + {{32, 1}, {32, 1}, 28, 1, "MCS-2", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, true}, + {{41, 1}, {41, 1}, 37, 1, "MCS-3", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, true}, + {{48, 1}, {48, 1}, 44, 1, "MCS-4", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, false}, + + {{60, 7}, {59, 6}, 56, 1, "MCS-5", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, true}, + {{78, 7}, {77, 6}, 74, 1, "MCS-6", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, true}, + {{118, 2}, {117, 4}, 56, 2, "MCS-7", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, true}, + {{142, 2}, {141, 4}, 68, 2, "MCS-8", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, true}, + {{154, 2}, {153, 4}, 74, 2, "MCS-9", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, false}, }; /* CPS table for Header Type 3 */ @@ -132,20 +133,29 @@ uint8_t GprsCodingScheme::get_cps(uint8_t ps, bool is_padding) GprsCodingScheme GprsCodingScheme::getBySizeUL(unsigned size) { + /* The size 31, 37, 46, 66, 84, 124, 148 corresponds to PAN field + * inclusion in egprs UL frame. i.e 4 bytes extra. */ switch (size) { case 23: return GprsCodingScheme(CS1); - case 27: return GprsCodingScheme(MCS1); - case 33: return GprsCodingScheme(MCS2); + case 27: return GprsCodingScheme(MCS1, EGPRS); + case 31: return GprsCodingScheme(MCS1,EGPRS); + case 33:return GprsCodingScheme(MCS2); + case 37: return GprsCodingScheme(MCS2,EGPRS); case 34: return GprsCodingScheme(CS2); case 40: return GprsCodingScheme(CS3); - case 42: return GprsCodingScheme(MCS3); - case 49: return GprsCodingScheme(MCS4); + case 42: return GprsCodingScheme(MCS3,EGPRS); + case 46: return GprsCodingScheme(MCS3,EGPRS); + case 49: return GprsCodingScheme(MCS4,EGPRS); case 54: return GprsCodingScheme(CS4); - case 62: return GprsCodingScheme(MCS5); - case 80: return GprsCodingScheme(MCS6); - case 120: return GprsCodingScheme(MCS7); - case 144: return GprsCodingScheme(MCS8); - case 156: return GprsCodingScheme(MCS9); + case 62: return GprsCodingScheme(MCS5,EGPRS); + case 66: return GprsCodingScheme(MCS5,EGPRS); + case 80: return GprsCodingScheme(MCS6, EGPRS); + case 84: return GprsCodingScheme(MCS6,EGPRS); + case 120: return GprsCodingScheme(MCS7, EGPRS); + case 124: return GprsCodingScheme(MCS7,EGPRS); + case 144: return GprsCodingScheme(MCS8, EGPRS); + case 148: return GprsCodingScheme(MCS8,EGPRS); + case 156: return GprsCodingScheme(MCS9, EGPRS); } return GprsCodingScheme(UNKNOWN); diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp index cd4582f..67c3e95 100644 --- a/src/gprs_ms.cpp +++ b/src/gprs_ms.cpp @@ -137,6 +137,7 @@ GprsMs::GprsMs(BTS *bts, uint32_t tlli) : gprs_codel_set_interval(m_codel_state, codel_interval); } m_last_cs_not_low = now_msec(); + m_is_fanr_capable = false; } GprsMs::~GprsMs() diff --git a/src/gprs_ms.h b/src/gprs_ms.h index 3c91e3c..3cd94bd 100644 --- a/src/gprs_ms.h +++ b/src/gprs_ms.h @@ -130,6 +130,8 @@ public: /* internal use */ static void timeout(void *priv_); + bool is_fanr_capable() const; + void set_fanr_capable(bool); protected: void update_status(); GprsMs *ref(); @@ -161,6 +163,11 @@ private: gprs_llc_queue m_llc_queue; bool m_is_idle; + /* member to validate fanr support. will be set after + * after decoding RA capability of the MS + */ + bool m_is_fanr_capable; + int m_ref; LListHead<GprsMs> m_list; struct osmo_timer_list m_timer; @@ -182,6 +189,16 @@ inline bool GprsMs::is_idle() const return !m_ul_tbf && !m_dl_tbf && !m_ref && llist_empty(&m_old_tbfs); } +inline bool GprsMs::is_fanr_capable() const +{ + return this->m_is_fanr_capable; +} + +inline void GprsMs::set_fanr_capable(bool is_fanr_capable) +{ + this->m_is_fanr_capable = is_fanr_capable; +} + inline bool GprsMs::need_dl_tbf() const { if (dl_tbf() != NULL && dl_tbf()->state_is_not(GPRS_RLCMAC_WAIT_RELEASE)) diff --git a/src/tbf.cpp b/src/tbf.cpp index aedb9ae..93dd8c2 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -87,7 +87,8 @@ gprs_rlcmac_tbf::gprs_rlcmac_tbf(BTS *bts_, gprs_rlcmac_tbf_direction dir) : m_ta(0), m_ms_class(0), m_ms_list(this), - m_egprs_enabled(false) + m_egprs_enabled(false), + m_fanr_enabled(false) { /* The classes of these members do not have proper constructors yet. * Just set them to 0 like talloc_zero did */ diff --git a/src/tbf.h b/src/tbf.h index 1f5d928..6e482c7 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -177,6 +177,9 @@ struct gprs_rlcmac_tbf { void enable_egprs(); void disable_egprs(); + bool is_fanr_enabled() const; + void enable_fanr(); + /* attempt to make things a bit more fair */ void rotate_in_list(); @@ -261,6 +264,7 @@ protected: private: LListHead<gprs_rlcmac_tbf> m_ms_list; bool m_egprs_enabled; + bool m_fanr_enabled; mutable char m_name_buf[60]; }; @@ -343,6 +347,16 @@ inline void gprs_rlcmac_tbf::disable_egprs() m_egprs_enabled = false; } +inline bool gprs_rlcmac_tbf::is_fanr_enabled() const +{ + return m_fanr_enabled; +} + +inline void gprs_rlcmac_tbf::enable_fanr() +{ + m_fanr_enabled = true; +} + struct gprs_rlcmac_dl_tbf : public gprs_rlcmac_tbf { gprs_rlcmac_dl_tbf(BTS *bts); -- 1.7.9.5

9 years, 3 months

← Newer
1
...
35
36
37
38
39
40
41
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

osmocom-net-gprs