<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13712">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">db_hlr.c: add db_subscr_exists_by_imsi()<br><br>Check if a subscriber exists without generating an error log entry if<br>it does not. This is cheaper than db_subscr_get_by_imsi(), as it does<br>not fetch the subscriber entry. subscriber-create-on-demand will use<br>this function.<br><br>Related: OS#2542<br>Change-Id: I63818c0dd4fd22b41dadeeba2a07a651b5454c54<br>---<br>M src/db.c<br>M src/db.h<br>M src/db_hlr.c<br>M tests/db/db_test.c<br>M tests/db/db_test.err<br>5 files changed, 40 insertions(+), 0 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/12/13712/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/db.c b/src/db.c</span><br><span>index 770c3a4..9cad263 100644</span><br><span>--- a/src/db.c</span><br><span>+++ b/src/db.c</span><br><span>@@ -79,6 +79,7 @@</span><br><span> " VALUES($subscriber_id, $algo_id_3g, $k, $op, $opc, $ind_bitlen)",</span><br><span> [DB_STMT_AUC_3G_DELETE] = "DELETE FROM auc_3g WHERE subscriber_id = $subscriber_id",</span><br><span> [DB_STMT_SET_LAST_LU_SEEN] = "UPDATE subscriber SET last_lu_seen = datetime($val, 'unixepoch') WHERE id = $subscriber_id",</span><br><span style="color: hsl(120, 100%, 40%);">+ [DB_STMT_EXISTS_BY_IMSI] = "SELECT 1 FROM subscriber WHERE imsi = $imsi",</span><br><span> };</span><br><span> </span><br><span> static void sql3_error_log_cb(void *arg, int err_code, const char *msg)</span><br><span>diff --git a/src/db.h b/src/db.h</span><br><span>index 7187bb3..1ebdaeb 100644</span><br><span>--- a/src/db.h</span><br><span>+++ b/src/db.h</span><br><span>@@ -28,6 +28,7 @@</span><br><span> DB_STMT_AUC_3G_INSERT,</span><br><span> DB_STMT_AUC_3G_DELETE,</span><br><span> DB_STMT_SET_LAST_LU_SEEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ DB_STMT_EXISTS_BY_IMSI,</span><br><span> _NUM_DB_STMT</span><br><span> };</span><br><span> </span><br><span>@@ -127,6 +128,8 @@</span><br><span> const struct sub_auth_data_str *aud);</span><br><span> int db_subscr_update_imei_by_imsi(struct db_context *dbc, const char* imsi, const char *imei);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int db_subscr_exists_by_imsi(struct db_context *dbc, const char *imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int db_subscr_get_by_imsi(struct db_context *dbc, const char *imsi,</span><br><span> struct hlr_subscriber *subscr);</span><br><span> int db_subscr_get_by_msisdn(struct db_context *dbc, const char *msisdn,</span><br><span>diff --git a/src/db_hlr.c b/src/db_hlr.c</span><br><span>index e879ae8..10f6287 100644</span><br><span>--- a/src/db_hlr.c</span><br><span>+++ b/src/db_hlr.c</span><br><span>@@ -512,6 +512,31 @@</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Check if a subscriber exists in the HLR database.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in, out] dbc database context.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] imsi ASCII string of IMSI digits.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 if it exists, -ENOENT if it does not exist, -EIO on database error.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int db_subscr_exists_by_imsi(struct db_context *dbc, const char *imsi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sqlite3_stmt *stmt = dbc->stmt[DB_STMT_EXISTS_BY_IMSI];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *err;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!db_bind_text(stmt, NULL, imsi))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sqlite3_step(stmt);</span><br><span style="color: hsl(120, 100%, 40%);">+ db_remove_reset(stmt);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == SQLITE_ROW)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0; /* exists */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == SQLITE_DONE)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOENT; /* does not exist */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ err = sqlite3_errmsg(dbc->db);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAUC, LOGL_ERROR, "Failed to check if subscriber exists by IMSI='%s': %s\n", imsi, err);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Retrieve subscriber data from the HLR database.</span><br><span> * \param[in,out] dbc database context.</span><br><span> * \param[in] imsi ASCII string of IMSI digits.</span><br><span>diff --git a/tests/db/db_test.c b/tests/db/db_test.c</span><br><span>index 0ec366b..2bd7819 100644</span><br><span>--- a/tests/db/db_test.c</span><br><span>+++ b/tests/db/db_test.c</span><br><span>@@ -255,6 +255,10 @@</span><br><span> ASSERT_SEL(imsi, short_imsi, 0);</span><br><span> id_short = g_subscr.id;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ comment("Check if subscriber exists");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_exists_by_imsi(dbc, imsi0), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_exists_by_imsi(dbc, unknown_imsi), -ENOENT);</span><br><span> </span><br><span> comment("Set valid / invalid MSISDN");</span><br><span> </span><br><span>diff --git a/tests/db/db_test.err b/tests/db/db_test.err</span><br><span>index bfab345..39f3e54 100644</span><br><span>--- a/tests/db/db_test.err</span><br><span>+++ b/tests/db/db_test.err</span><br><span>@@ -93,6 +93,13 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+--- Check if subscriber exists</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_exists_by_imsi(dbc, imsi0) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_exists_by_imsi(dbc, unknown_imsi) --> -ENOENT</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> --- Set valid / invalid MSISDN</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13712">change 13712</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/13712"/><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: I63818c0dd4fd22b41dadeeba2a07a651b5454c54 </div>
<div style="display:none"> Gerrit-Change-Number: 13712 </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>