<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12411">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Reply to CHECK-IMEI GSUP messages<br><br>Decode the IMEI from incoming CHECK-IMEI messages, print the IMEI to<br>the log and always send ACK back to the VLR/MSC.<br><br>In the future, we will not only log the IMEI, but store it in the HLR<br>(OS#2541). This is not the original intention of CHECK-IMEI from the<br>3GPP spec, but an useful side effect.<br><br>Depends: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 (libosmocore)<br>Related: OS#3733<br>Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364<br>---<br>M src/hlr.c<br>1 file changed, 36 insertions(+), 0 deletions(-)<br><br></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 4873a66..ce5618a 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -32,6 +32,7 @@</span><br><span> #include <osmocom/vty/ports.h></span><br><span> #include <osmocom/ctrl/control_vty.h></span><br><span> #include <osmocom/gsm/apn.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm48_ie.h></span><br><span> </span><br><span> #include "db.h"</span><br><span> #include "hlr.h"</span><br><span>@@ -399,6 +400,38 @@</span><br><span> return osmo_gsup_conn_send(conn, msg_out);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int rx_check_imei_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message gsup_reply = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg_out;</span><br><span style="color: hsl(120, 100%, 40%);">+ char imei[GSM23003_IMEI_NUM_DIGITS+1] = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Encoded IMEI length check */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gsup->imei_enc || gsup->imei_enc_len < 1 || gsup->imei_enc[0] >= sizeof(imei)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "%s: wrong encoded IMEI length\n", gsup->imsi);</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 style="color: hsl(120, 100%, 40%);">+ /* Decode IMEI */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm48_decode_bcd_number(imei, sizeof(imei), gsup->imei_enc, 0) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "%s: failed to decode IMEI\n", gsup->imsi);</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 style="color: hsl(120, 100%, 40%);">+ /* Only print the IMEI for now, it's planned to store it here (OS#2541) */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "%s: has IMEI: %s\n", gsup->imsi, imei);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Accept all IMEIs */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_reply.imei_result = OSMO_GSUP_IMEI_RESULT_ACK;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_reply.message_type = OSMO_GSUP_MSGT_CHECK_IMEI_RESULT;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP Check_IMEI response");</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(gsup_reply.imsi, gsup->imsi, sizeof(gsup_reply.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_encode(msg_out, &gsup_reply);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_conn_send(conn, msg_out);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int read_cb(struct osmo_gsup_conn *conn, struct msgb *msg)</span><br><span> {</span><br><span> static struct osmo_gsup_message gsup;</span><br><span>@@ -459,6 +492,9 @@</span><br><span> lu_op_rx_gsup(luop, &gsup);</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST:</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_check_imei_req(conn, &gsup);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> LOGP(DMAIN, LOGL_DEBUG, "Unhandled GSUP message type %s\n",</span><br><span> osmo_gsup_message_type_name(gsup.message_type));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12411">change 12411</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/12411"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 </div>
<div style="display:none"> Gerrit-Change-Number: 12411 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Vadim Yanitskiy <axilirator@gmail.com> </div>