Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/13380 )
Change subject: pcu: Fix MCC/MNC handling: use 'F' between MCC and MNC in
2-digit case
......................................................................
pcu: Fix MCC/MNC handling: use 'F' between MCC and MNC in 2-digit case
Change-Id: Ifdb64c501095839e86894716769adb53e3c17382
---
M library/Osmocom_Gb_Types.ttcn
M pcu/PCU_Tests.default
M pcu/PCU_Tests.ttcn
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
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 @@
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 @@
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 @@
cell_id := {
ra_id := {
lai := {
- mcc_mnc := '26242F'H, lac := 13135
+ mcc_mnc := '262F42'H, lac := 13135
},
rac := 0
},
--
To view, visit https://gerrit.osmocom.org/13380
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdb64c501095839e86894716769adb53e3c17382
Gerrit-Change-Number: 13380
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
