summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-03-21 21:33:28 +0100
committerHarald Welte <laforge@gnumonks.org>2019-03-27 11:17:49 +0000
commit797ab3a91c4f2d0bd08e83120ecf54f0439e8d10 (patch)
treecf1e677aa5adf434435d94cb08b9fceb15180006
parent23989a64da481633a43158d23f90bb7028b3f03e (diff)
pcu: Fix MCC/MNC handling: use 'F' between MCC and MNC in 2-digit case
-rw-r--r--library/Osmocom_Gb_Types.ttcn6
-rw-r--r--pcu/PCU_Tests.default2
-rw-r--r--pcu/PCU_Tests.ttcn2
3 files changed, 5 insertions, 5 deletions
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index 623be33..95d3028 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -867,9 +867,9 @@ octetstring sdu) := {
ret.mccDigit1 := cid.ra_id.lai.mcc_mnc[0];
ret.mccDigit2 := cid.ra_id.lai.mcc_mnc[1];
ret.mccDigit3 := cid.ra_id.lai.mcc_mnc[2];
- ret.mncDigit3 := cid.ra_id.lai.mcc_mnc[5];
- ret.mncDigit2 := cid.ra_id.lai.mcc_mnc[4];
- ret.mncDigit1 := cid.ra_id.lai.mcc_mnc[3];
+ ret.mncDigit3 := cid.ra_id.lai.mcc_mnc[3];
+ ret.mncDigit2 := cid.ra_id.lai.mcc_mnc[5];
+ ret.mncDigit1 := cid.ra_id.lai.mcc_mnc[4];
}
if (isvalue(cid.ra_id.lai.lac)) {
ret.lac := f_oct_or_wc(cid.ra_id.lai.lac, 2);
diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default
index 67c05f8..2a87345 100644
--- a/pcu/PCU_Tests.default
+++ b/pcu/PCU_Tests.default
@@ -13,7 +13,7 @@ PCU_Tests.mp_gb_cfg := {
cell_id := {
ra_id := {
lai := {
- mcc_mnc := '26242F'H, lac := 13135
+ mcc_mnc := '262F42'H, lac := 13135
},
rac := 0
},
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 09885bd..b18b999 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -28,7 +28,7 @@ modulepar {
cell_id := {
ra_id := {
lai := {
- mcc_mnc := '26242F'H, lac := 13135
+ mcc_mnc := '262F42'H, lac := 13135
},
rac := 0
},