<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13714">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add lu-ignore-nam-cs<br><br>Change-Id: I62e750faab92b142b9ca89ad2de5dc63afaeb61c<br>---<br>M src/hlr.c<br>M src/hlr.h<br>M src/hlr_vty.c<br>3 files changed, 50 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/13714/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index b739e71..882362d 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -320,8 +320,15 @@</span><br><span> /* Check if subscriber is generally permitted on CS or PS</span><br><span> * service (as requested) */</span><br><span> if (!luop->is_ps && !luop->subscr.nam_cs) {</span><br><span style="color: hsl(0, 100%, 40%);">- lu_op_tx_error(luop, GMM_CAUSE_PLMN_NOTALLOWED);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->lu_ignore_nam_cs)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Subscriber will be kicked later in the IMEI check, which the operator must enable together</span><br><span style="color: hsl(120, 100%, 40%);">+ * with lu-ignore-nam-cs. See rx_check_imei_req() below. */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_DEBUG, "LU REQ: subscriber not allowed for CS, but allowing anyway"</span><br><span style="color: hsl(120, 100%, 40%);">+ " (lu-ignore-nam-cs)");</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ lu_op_tx_error(luop, GMM_CAUSE_PLMN_NOTALLOWED);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if (luop->is_ps && !luop->subscr.nam_ps) {</span><br><span> lu_op_tx_error(luop, GMM_CAUSE_GPRS_NOTALLOWED);</span><br><span> return 0;</span><br><span>@@ -413,6 +420,7 @@</span><br><span> </span><br><span> static int rx_check_imei_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hlr_subscriber subscr;</span><br><span> struct osmo_gsup_message gsup_reply = {0};</span><br><span> struct msgb *msg_out;</span><br><span> char imei[GSM23003_IMEI_NUM_DIGITS+1] = {0};</span><br><span>@@ -431,6 +439,12 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get subscriber */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (db_subscr_get_by_imsi(g_hlr->dbc, gsup->imsi, &subscr) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_send_err_reply(conn, gsup->imsi, gsup->message_type, GMM_CAUSE_INV_MAND_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Save in DB if desired */</span><br><span> if (g_hlr->store_imei) {</span><br><span> LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': storing IMEI = %s\n", gsup->imsi, imei);</span><br><span>@@ -438,18 +452,21 @@</span><br><span> gsup_send_err_reply(conn, gsup->imsi, gsup->message_type, GMM_CAUSE_INV_MAND_INFO);</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Check if subscriber exists and print IMEI */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span> LOGP(DMAIN, LOGL_INFO, "IMSI='%s': has IMEI = %s (consider setting 'store-imei')\n", gsup->imsi, imei);</span><br><span style="color: hsl(0, 100%, 40%);">- struct hlr_subscriber subscr;</span><br><span style="color: hsl(0, 100%, 40%);">- if (db_subscr_get_by_imsi(g_hlr->dbc, gsup->imsi, &subscr) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_send_err_reply(conn, gsup->imsi, gsup->message_type, GMM_CAUSE_INV_MAND_INFO);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> /* Accept all IMEIs */</span><br><span> gsup_reply.imei_result = OSMO_GSUP_IMEI_RESULT_ACK;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* lu-ignore-nam-cs: use Check IMEI to do a late check for CS/PS enabled. This would usually be done in the LU</span><br><span style="color: hsl(120, 100%, 40%);">+ * REQ, but then the ME will immediatelly disconnect without sending the IMEI. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->lu_ignore_nam_cs && !subscr.nam_cs && !subscr.nam_ps) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': pretending that the IMEI is not allowed, because subscriber"</span><br><span style="color: hsl(120, 100%, 40%);">+ " has both CS and PS NAM disabled (lu-ignore-nam-cs)", gsup->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_reply.imei_result = OSMO_GSUP_IMEI_RESULT_NACK;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send response */</span><br><span> gsup_reply.message_type = OSMO_GSUP_MSGT_CHECK_IMEI_RESULT;</span><br><span> msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP Check_IMEI response");</span><br><span> memcpy(gsup_reply.imsi, gsup->imsi, sizeof(gsup_reply.imsi));</span><br><span>diff --git a/src/hlr.h b/src/hlr.h</span><br><span>index dc1c720..ad9ef7e 100644</span><br><span>--- a/src/hlr.h</span><br><span>+++ b/src/hlr.h</span><br><span>@@ -54,6 +54,7 @@</span><br><span> </span><br><span> bool store_imei;</span><br><span> bool create_subscr_on_demand;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool lu_ignore_nam_cs;</span><br><span> };</span><br><span> </span><br><span> extern struct hlr *g_hlr;</span><br><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index 7bf27da..2804fd0 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -342,6 +342,26 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_lu_ignore_nam_cs, cfg_lu_ignore_nam_cs_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "lu-ignore-nam-cs",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Allow subscribers to do the LU (Location Update) for the CS domain, even if they should not have access to it."</span><br><span style="color: hsl(120, 100%, 40%);">+ " OsmoHLR will do the CS domain check again after the LU, during the Check IMEI procedure, and pretend that the"</span><br><span style="color: hsl(120, 100%, 40%);">+ " IMEI is not allowed on the network if the CS domain is disabled for the subscriber. This is needed to make"</span><br><span style="color: hsl(120, 100%, 40%);">+ " store-imei work with subscriber-create-on-demand. ONLY ENABLE TOGETHER WITH ENFORCED IMEI CHECKING IN YOUR"</span><br><span style="color: hsl(120, 100%, 40%);">+ " MSC! (OsmoMSC: 'check-imei-rqd 1')")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->lu_ignore_nam_cs = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_no_lu_ignore_nam_cs, cfg_no_lu_ignore_nam_cs_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no lu-ignore-nam-cs",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Only allow LU (Location Update) for the CS domain, if the subscriber has access to it.")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->lu_ignore_nam_cs = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span> * Common Code</span><br><span> ***********************************************************************/</span><br><span>@@ -410,6 +430,8 @@</span><br><span> install_element(HLR_NODE, &cfg_no_store_imei_cmd);</span><br><span> install_element(HLR_NODE, &cfg_subscr_create_on_demand_cmd);</span><br><span> install_element(HLR_NODE, &cfg_no_subscr_create_on_demand_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(HLR_NODE, &cfg_lu_ignore_nam_cs_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(HLR_NODE, &cfg_no_lu_ignore_nam_cs_cmd);</span><br><span> </span><br><span> hlr_vty_subscriber_init();</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13714">change 13714</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13714"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I62e750faab92b142b9ca89ad2de5dc63afaeb61c </div>
<div style="display:none"> Gerrit-Change-Number: 13714 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>