Change in osmo-hnodeb[master]: Generate proper rnc_id and plmn in LuRequest

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 )

Change subject: Generate proper rnc_id and plmn in LuRequest
......................................................................

Generate proper rnc_id and plmn in LuRequest

Change-Id: Ib40b5eb96b7cc13c424076a4ca725019514d52af
---
M include/osmocom/hnodeb/ranap.h
M src/osmo-hnodeb/ranap.c
M src/osmo-hnodeb/vty.c
3 files changed, 6 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  fixeria: Looks good to me, but someone else must approve



diff --git a/include/osmocom/hnodeb/ranap.h b/include/osmocom/hnodeb/ranap.h
index df756b1..7864c69 100644
--- a/include/osmocom/hnodeb/ranap.h
+++ b/include/osmocom/hnodeb/ranap.h
@@ -30,4 +30,4 @@
 void hnb_rua_dt_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg);
 void hnb_rua_cl_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg);
 void hnb_tx_iu_release_req(struct hnb *hnb);
-struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi);
+struct msgb *gen_initue_lu(const struct hnb *hnb, int is_ps, uint32_t conn_id, const char *imsi);
diff --git a/src/osmo-hnodeb/ranap.c b/src/osmo-hnodeb/ranap.c
index fae87b7..3dd759f 100644
--- a/src/osmo-hnodeb/ranap.c
+++ b/src/osmo-hnodeb/ranap.c
@@ -110,16 +110,17 @@
 	}
 }
 
-struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi)
+struct msgb *gen_initue_lu(const struct hnb *hnb, int is_ps, uint32_t conn_id, const char *imsi)
 {
 	uint8_t lu[] = { GSM48_PDISC_MM, GSM48_MT_MM_LOC_UPD_REQUEST,
 		         0x70, 0x62, 0xf2, 0x30, 0xff, 0xf3, 0x57,
 		/*	 len, IMSI/type, IMSI-------------------------------- */
 			 0x08, 0x29, 0x26, 0x24, 0x10, 0x32, 0x54, 0x76, 0x98,
 			 0x33, 0x03, 0x57, 0x18 , 0xb2 };
-	uint8_t plmn_id[] = { 0x09, 0x01, 0x99 };
+	uint8_t plmn_id[3];
+	osmo_plmn_to_bcd(plmn_id, &hnb->plmn);
 	RANAP_GlobalRNC_ID_t rnc_id = {
-		.rNC_ID = 23,
+		.rNC_ID = g_hnb->rnc_id,
 		.pLMNidentity.buf = plmn_id,
 		.pLMNidentity.size = sizeof(plmn_id),
 	};
diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c
index 714e00d..61a3f4c 100644
--- a/src/osmo-hnodeb/vty.c
+++ b/src/osmo-hnodeb/vty.c
@@ -354,7 +354,7 @@
 	chan->conn_id = conn_id;
 	conn_id++;
 
-	msg = gen_initue_lu(chan->is_ps, chan->conn_id, chan->imsi);
+	msg = gen_initue_lu(g_hnb, chan->is_ps, chan->conn_id, chan->imsi);
 	rua = rua_new_conn(chan->is_ps, chan->conn_id, msg);
 
 	hnb_iuh_send(g_hnb, rua);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hnodeb
Gerrit-Branch: master
Gerrit-Change-Id: Ib40b5eb96b7cc13c424076a4ca725019514d52af
Gerrit-Change-Number: 26023
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211102/60837a89/attachment.htm>