laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bsc/+/14678 )
Change subject: rest_octets: add Serving Cell Priority Parameters
..
rest_octets: add Serving Cell Priority Parameters
When we add an EARFCN to to the SI2quater struct we do not add Serving
Cell Priority Parameters. This essentially causes to MS to ignore the
EARFCN because it is still undefined under which conditions the MS
should change to LTE.
Related: SYS#4510
Change-Id: I7eaf7de4386fe8aea404e8a187d8a1f5ed596ead
---
M src/osmo-bsc/rest_octets.c
M tests/gsm0408/gsm0408_test.ok
2 files changed, 87 insertions(+), 70 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/rest_octets.c b/src/osmo-bsc/rest_octets.c
index 9f2b4c0..1d2279b 100644
--- a/src/osmo-bsc/rest_octets.c
+++ b/src/osmo-bsc/rest_octets.c
@@ -190,8 +190,25 @@
/* Priority and E-UTRAN Parameters Description */
bitvec_set_bit(bv, 1);
- /* No Serving Cell Priority Parameters Descr. */
- bitvec_set_bit(bv, 0);
+ /* Serving Cell Priority Parameters Descr. is Present,
+* see also: 3GPP TS 44.018, Table 10.5.2.33b.1 */
+ bitvec_set_bit(bv, 1);
+
+ /* GERAN_PRIORITY */
+ bitvec_set_uint(bv, 0, 3);
+
+ /* THRESH_Priority_Search */
+ bitvec_set_uint(bv, 0, 4);
+
+ /* THRESH_GSM_low */
+ bitvec_set_uint(bv, 0, 4);
+
+ /* H_PRIO */
+ bitvec_set_uint(bv, 0, 2);
+
+ /* T_Reselection */
+ bitvec_set_uint(bv, 0, 2);
+
/* No 3G Priority Parameters Description */
bitvec_set_bit(bv, 0);
/* E-UTRAN Parameters Description */
diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok
index b083f08..e3290b5 100644
--- a/tests/gsm0408/gsm0408_test.ok
+++ b/tests/gsm0408/gsm0408_test.ok
@@ -71,25 +71,25 @@
generating SI2quater for 0 EARFCNs and 0 UARFCNs...
generated invalid SI2quater [00/00]: [23] 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00
added EARFCN 1917 - generating SI2quater for 1 EARFCNs and 0 UARFCNs...
-generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 86 59 83 be e8 50 0b
2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d d0
a0 2b 2b 2b 2b 2b 2b 2b 2b 2b
removed EARFCN 1917 - generating SI2quater for 0 EARFCNs and 0 UARFCNs...
-generated invalid SI2quater [00/00]: [23] 59 06 07 40 00 04 86 59 83 be e8 50
0b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+generated invalid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d
d0 a0 2b 2b 2b 2b 2b 2b 2b 2b 2b
added EARFCN 1917 - generating SI2quater for 1 EARFCNs and 0 UARFCNs...
-generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 86 59 83 be c8 50 0b
2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d 90
a0 2b 2b 2b 2b 2b 2b 2b 2b 2b
added EARFCN 1932 - generating SI2quater for 2 EARFCNs and 0 UARFCNs...
-generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 86 59 83 be cc 1e 30
14 03 2b 2b 2b 2b 2b 2b 2b 2b
+generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d 98
3c 60 28 0b 2b 2b 2b 2b 2b 2b
added EARFCN 1937 - generating SI2quater for 3 EARFCNs and 0 UARFCNs...
-generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 86 59 83 be cc 1e 31
07 91 a0 a0 2b 2b 2b 2b 2b 2b
+generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d 98
3c 62 0f 23 41 40 2b 2b 2b 2b
added EARFCN 1945 - generating SI2quater for 4 EARFCNs and 0 UARFCNs...
-generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 86 59 83 be cc 1e 31
07 91 a8 3c c8 28 0b 2b 2b 2b
+generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d 98
3c 62 0f 23 50 79 90 50 0b 2b
added EARFCN 1965 - generating SI2quater for 5 EARFCNs and 0 UARFCNs...
-generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 86 59 83 be cc 1e 31
07 91 a8 3c ca 0f 5a 0a 03 2b
+generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d 98
3c 62 0f 23 50 79 94 1e b4 14
added EARFCN 1967 - generating SI2quater for 6 EARFCNs and 0 UARFCNs...
-generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 86 59 83 be cc 1e 31
07 91 a8 3c ca 0f 5a 0a 03 2b
-generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 86 59 83 d7 e0 50 0b
2b 2b 2b 2b 2b 2b 2b 2b 2b 2b
+generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98
3c 62 0f 23 50 79 94 1e b4 14
+generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 af c0
a0 2b 2b 2b 2b 2b 2b 2b 2b 2b
added EARFCN 1982 - generating SI2quater for 7 EARFCNs and 0 UARFCNs...
-generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 86 59 83 be cc 1e 31
07 91 a8 3c ca 0f 5a 0a 03 2b
-generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 86 59 83 d7 e4 1e fa
c2 80 2b 2b