<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12056">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">implement removal of MSISDN<br><br>Add the first "official" way to remove the MSISDN from a subscriber entry, to<br>go back to 'MSISDN: none' like just after 'subscriber create'.<br><br>Add VTY command 'subscriber <ID> update msisdn none' to drop the MSISDN from<br>the subscriber. (Like 'subscriber <ID> update aud3g none')<br><br>Add DB_STMT_DELETE_MSISDN_BY_IMSI.<br><br>In db_subscr_update_msisdn_by_imsi(), allow passing a NULL msisdn, and if NULL,<br>call above delete SQL statement.<br><br>Change-Id: I15419105ea461137776adb92d384d8985210c90e<br>---<br>M src/db.c<br>M src/db.h<br>M src/db_hlr.c<br>M src/hlr_vty_subscr.c<br>M tests/test_subscriber.vty<br>5 files changed, 56 insertions(+), 20 deletions(-)<br><br></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 4b0577f..bcf83c6 100644</span><br><span>--- a/src/db.c</span><br><span>+++ b/src/db.c</span><br><span>@@ -62,6 +62,7 @@</span><br><span> [DB_STMT_SUBSCR_CREATE] = "INSERT INTO subscriber (imsi) VALUES ($imsi)",</span><br><span> [DB_STMT_DEL_BY_ID] = "DELETE FROM subscriber WHERE id = $subscriber_id",</span><br><span> [DB_STMT_SET_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = $msisdn WHERE imsi = $imsi",</span><br><span style="color: hsl(120, 100%, 40%);">+ [DB_STMT_DELETE_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = NULL WHERE imsi = $imsi",</span><br><span> [DB_STMT_AUC_2G_INSERT] =</span><br><span> "INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki)"</span><br><span> " VALUES($subscriber_id, $algo_id_2g, $ki)",</span><br><span>diff --git a/src/db.h b/src/db.h</span><br><span>index 956b5ed..34582c8 100644</span><br><span>--- a/src/db.h</span><br><span>+++ b/src/db.h</span><br><span>@@ -20,6 +20,7 @@</span><br><span> DB_STMT_SUBSCR_CREATE,</span><br><span> DB_STMT_DEL_BY_ID,</span><br><span> DB_STMT_SET_MSISDN_BY_IMSI,</span><br><span style="color: hsl(120, 100%, 40%);">+ DB_STMT_DELETE_MSISDN_BY_IMSI,</span><br><span> DB_STMT_AUC_2G_INSERT,</span><br><span> DB_STMT_AUC_2G_DELETE,</span><br><span> DB_STMT_AUC_3G_INSERT,</span><br><span>diff --git a/src/db_hlr.c b/src/db_hlr.c</span><br><span>index c4d4974..2bccc38 100644</span><br><span>--- a/src/db_hlr.c</span><br><span>+++ b/src/db_hlr.c</span><br><span>@@ -135,7 +135,7 @@</span><br><span> </span><br><span> /*! Set a subscriber's MSISDN in the HLR database.</span><br><span> * \param[in,out] dbc database context.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] imsi ASCII string of IMSI digits.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] imsi ASCII string of IMSI digits, or NULL to remove the MSISDN.</span><br><span> * \param[in] msisdn ASCII string of MSISDN digits.</span><br><span> * \returns 0 on success, -EINVAL in case of invalid MSISDN string, -EIO on</span><br><span> * database failure, -ENOENT if no such subscriber exists.</span><br><span>@@ -146,19 +146,22 @@</span><br><span> int rc;</span><br><span> int ret = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!osmo_msisdn_str_valid(msisdn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msisdn && !osmo_msisdn_str_valid(msisdn)) {</span><br><span> LOGHLR(imsi, LOGL_ERROR,</span><br><span> "Cannot update subscriber: invalid MSISDN: '%s'\n",</span><br><span> msisdn);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sqlite3_stmt *stmt = dbc->stmt[DB_STMT_SET_MSISDN_BY_IMSI];</span><br><span style="color: hsl(120, 100%, 40%);">+ sqlite3_stmt *stmt = dbc->stmt[</span><br><span style="color: hsl(120, 100%, 40%);">+ msisdn ? DB_STMT_SET_MSISDN_BY_IMSI : DB_STMT_DELETE_MSISDN_BY_IMSI];</span><br><span> </span><br><span> if (!db_bind_text(stmt, "$imsi", imsi))</span><br><span> return -EIO;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!db_bind_text(stmt, "$msisdn", msisdn))</span><br><span style="color: hsl(0, 100%, 40%);">- return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msisdn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!db_bind_text(stmt, "$msisdn", msisdn))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* execute the statement */</span><br><span> rc = sqlite3_step(stmt);</span><br><span>diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c</span><br><span>index ddbaf26..bc6f6a5 100644</span><br><span>--- a/src/hlr_vty_subscr.c</span><br><span>+++ b/src/hlr_vty_subscr.c</span><br><span>@@ -142,6 +142,7 @@</span><br><span> </span><br><span> #define SUBSCR_UPDATE SUBSCR "update "</span><br><span> #define SUBSCR_UPDATE_HELP SUBSCR_HELP "Set or update subscriber data\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define SUBSCR_MSISDN_HELP "Set MSISDN (phone number) of the subscriber\n"</span><br><span> </span><br><span> DEFUN(subscriber_show,</span><br><span> subscriber_show_cmd,</span><br><span>@@ -228,9 +229,9 @@</span><br><span> </span><br><span> DEFUN(subscriber_msisdn,</span><br><span> subscriber_msisdn_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- SUBSCR_UPDATE "msisdn MSISDN",</span><br><span style="color: hsl(0, 100%, 40%);">- SUBSCR_UPDATE_HELP</span><br><span style="color: hsl(0, 100%, 40%);">- "Set MSISDN (phone number) of the subscriber\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ SUBSCR_UPDATE "msisdn (none|MSISDN)",</span><br><span style="color: hsl(120, 100%, 40%);">+ SUBSCR_UPDATE_HELP SUBSCR_MSISDN_HELP</span><br><span style="color: hsl(120, 100%, 40%);">+ "Remove MSISDN (phone number)\n"</span><br><span> "New MSISDN (phone number)\n")</span><br><span> {</span><br><span> struct hlr_subscriber subscr;</span><br><span>@@ -238,15 +239,19 @@</span><br><span> const char *id = argv[1];</span><br><span> const char *msisdn = argv[2];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (strlen(msisdn) > sizeof(subscr.msisdn) - 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% MSISDN is too long, max. %zu characters are allowed%s",</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(subscr.msisdn)-1, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(msisdn, "none") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ msisdn = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strlen(msisdn) > sizeof(subscr.msisdn) - 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% MSISDN is too long, max. %zu characters are allowed%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(subscr.msisdn)-1, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!osmo_msisdn_str_valid(msisdn)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% MSISDN invalid: '%s'%s", msisdn, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_msisdn_str_valid(msisdn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% MSISDN invalid: '%s'%s", msisdn, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> if (get_subscr_by_argv(vty, id_type, id, &subscr))</span><br><span>@@ -258,11 +263,18 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Updated subscriber IMSI='%s' to MSISDN='%s'%s",</span><br><span style="color: hsl(0, 100%, 40%);">- subscr.imsi, msisdn, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msisdn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Updated subscriber IMSI='%s' to MSISDN='%s'%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr.imsi, msisdn, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (db_subscr_get_by_msisdn(g_hlr->dbc, msisdn, &subscr) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (db_subscr_get_by_msisdn(g_hlr->dbc, msisdn, &subscr) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hlr_subscriber_update_notify(&subscr);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Updated subscriber IMSI='%s': removed MSISDN%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr.imsi, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmo_hlr_subscriber_update_notify(&subscr);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty</span><br><span>index c22f2df..8677c9b 100644</span><br><span>--- a/tests/test_subscriber.vty</span><br><span>+++ b/tests/test_subscriber.vty</span><br><span>@@ -6,7 +6,7 @@</span><br><span> show subscriber (imsi|msisdn|id) IDENT</span><br><span> subscriber imsi IDENT create</span><br><span> subscriber (imsi|msisdn|id) IDENT delete</span><br><span style="color: hsl(0, 100%, 40%);">- subscriber (imsi|msisdn|id) IDENT update msisdn MSISDN</span><br><span style="color: hsl(120, 100%, 40%);">+ subscriber (imsi|msisdn|id) IDENT update msisdn (none|MSISDN)</span><br><span> subscriber (imsi|msisdn|id) IDENT update aud2g none</span><br><span> subscriber (imsi|msisdn|id) IDENT update aud2g (comp128v1|comp128v2|comp128v3|xor) ki KI</span><br><span> subscriber (imsi|msisdn|id) IDENT update aud3g none</span><br><span>@@ -86,6 +86,21 @@</span><br><span> OsmoHLR# subscriber msisdn 12345 show</span><br><span> % No subscriber for msisdn = '12345'</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# subscriber msisdn 423 update msisdn none</span><br><span style="color: hsl(120, 100%, 40%);">+% Updated subscriber IMSI='123456789023000': removed MSISDN</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# subscriber msisdn 423 show</span><br><span style="color: hsl(120, 100%, 40%);">+% No subscriber for msisdn = '423'</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# subscriber imsi 123456789023000 show</span><br><span style="color: hsl(120, 100%, 40%);">+ ID: 1</span><br><span style="color: hsl(120, 100%, 40%);">+ IMSI: 123456789023000</span><br><span style="color: hsl(120, 100%, 40%);">+ MSISDN: none</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# subscriber imsi 123456789023000 update msisdn 423</span><br><span style="color: hsl(120, 100%, 40%);">+% Updated subscriber IMSI='123456789023000' to MSISDN='423'</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# subscriber msisdn 423 show</span><br><span style="color: hsl(120, 100%, 40%);">+ ID: 1</span><br><span style="color: hsl(120, 100%, 40%);">+ IMSI: 123456789023000</span><br><span style="color: hsl(120, 100%, 40%);">+ MSISDN: 423</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoHLR# subscriber imsi 123456789023000 show</span><br><span> ID: 1</span><br><span> IMSI: 123456789023000</span><br><span>@@ -104,6 +119,10 @@</span><br><span> aud2g Set 2G authentication data</span><br><span> aud3g Set UMTS authentication data (3G, and 2G with UMTS AKA)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoHLR# subscriber imsi 123456789023000 update msisdn ?</span><br><span style="color: hsl(120, 100%, 40%);">+ none Remove MSISDN (phone number)</span><br><span style="color: hsl(120, 100%, 40%);">+ MSISDN New MSISDN (phone number)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoHLR# subscriber imsi 123456789023000 update aud2g ?</span><br><span> none Delete 2G authentication data</span><br><span> comp128v1 Use COMP128v1 algorithm</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12056">change 12056</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/12056"/><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: I15419105ea461137776adb92d384d8985210c90e </div>
<div style="display:none"> Gerrit-Change-Number: 12056 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@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: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>