dexter has uploaded this change for review.

View Change

hbgw_hnbap: use osmo_plmn_from_bcd instead of gsm48_mcc_mnc_from_bcd

The function gsm48_mcc_mnc_from_bcd is deprecated. Lets use
osmo_plmn_from_bcd instead.

Change-Id: I01406a4cf86d4f3ed162c9df55880941e54d654e
---
M src/osmo-hnbgw/hnbgw_hnbap.c
1 file changed, 4 insertions(+), 1 deletion(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/20/26920/1

diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c
index 5b92e4e..4c3a5c0 100644
--- a/src/osmo-hnbgw/hnbgw_hnbap.c
+++ b/src/osmo-hnbgw/hnbgw_hnbap.c
@@ -398,6 +398,7 @@
 	struct hnb_context *hnb;
 	HNBAP_HNBRegisterRequestIEs_t ies;
 	int rc;
+	struct osmo_plmn_id plmn;
 
 	rc = hnbap_decode_hnbregisterrequesties(&ies, in);
 	if (rc < 0) {
@@ -413,7 +414,9 @@
 	ctx->id.sac = asn1str_to_u16(&ies.sac);
 	ctx->id.rac = asn1str_to_u8(&ies.rac);
 	ctx->id.cid = asn1bitstr_to_u28(&ies.cellIdentity);
-	gsm48_mcc_mnc_from_bcd(ies.plmNidentity.buf, &ctx->id.mcc, &ctx->id.mnc);
+	osmo_plmn_from_bcd(ies.plmNidentity.buf, &plmn);
+	ctx->id.mcc = plmn.mcc;
+	ctx->id.mnc = plmn.mnc;
 
 	llist_for_each_entry(hnb, &ctx->gw->hnb_list, list) {
 		if (hnb->hnb_registered && ctx != hnb && memcmp(&ctx->id, &hnb->id, sizeof(ctx->id)) == 0) {

To view, visit change 26920. To unsubscribe, or for help writing mail filters, visit settings.