diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-21 14:45:13 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-22 05:23:11 +0100 |
| commit | 408856088bcf376f5317803fd8d1747f8b920054 (patch) | |
| tree | 9266e5698859483ef5b359f4d6f2e3e7cdd4f109 /openbsc/src/libiu/iu.c | |
| parent | 8469818e33ef81e9f707a0c4dd13d7b91ecf83f5 (diff) | |
backport support for 3-digit MNC with leading zerosneels/mnc3
Backport the patches with the following change-ids:
osmo-bsc.git:
I5b097dbb6329f284e3b4914a744d5c3ad628f715
I8e722103344186fde118b26d8353db95a4581daa
I78f30aef7aa224b2e9db54c3a844d8f520b3aee0
I38ac98a4d25159cfd4f686efbfbaf8f00625a6d8
osmo-iuh.git:
I29ebcddd45fe3079f8883589a83cc7216a535475
Also apply change of ipac_bcch_info.cgi to struct osmo_cell_global_id in
src/ipaccess/network_listen.c, a change that appears to not have been necessary
in the new split repositories.
Related: OS#3010
Change-Id: Ibf50fd7e1ca5472d0a38fcb87c68227d6de44f42
Diffstat (limited to 'openbsc/src/libiu/iu.c')
| -rw-r--r-- | openbsc/src/libiu/iu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/openbsc/src/libiu/iu.c b/openbsc/src/libiu/iu.c index 8ba6fa49d..b4e7ac855 100644 --- a/openbsc/src/libiu/iu.c +++ b/openbsc/src/libiu/iu.c @@ -57,8 +57,7 @@ * PLMN identity is a BCD representation of the MCC and MNC. * See iu_grnc_id_parse(). */ struct iu_grnc_id { - uint16_t mcc; - uint16_t mnc; + struct osmo_plmn_id plmn; uint16_t rnc_id; }; @@ -265,8 +264,7 @@ static int iu_grnc_id_parse(struct iu_grnc_id *dst, " should be 3, is %d\n", src->pLMNidentity.size); return -1; } - gsm48_mcc_mnc_from_bcd(&src->pLMNidentity.buf[0], - &dst->mcc, &dst->mnc); + osmo_plmn_from_bcd(&src->pLMNidentity.buf[0], &dst->plmn); dst->rnc_id = (uint16_t)src->rNC_ID; return 0; } |