<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11233">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix and re-enable osmo_hlr_subscriber_update_notify()<br><br>Send updated subscriber data out to exactly those GSUP clients that match the<br>last LU operations (depending on each client sending distinct identification).<br><br>As this adds logging on DLGSUP, also change adjacent GSUP related logging from<br>DMAIN to DLGSUP.<br><br>Related: OS#2785<br>Change-Id: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8<br>---<br>M src/hlr.c<br>1 file changed, 42 insertions(+), 23 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 26be8d5..78d6c91 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -54,16 +54,15 @@</span><br><span> void</span><br><span> osmo_hlr_subscriber_update_notify(struct hlr_subscriber *subscr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: the below code can only be re-enabled after we make sure that an ISD</span><br><span style="color: hsl(0, 100%, 40%);">- * is only sent tot the currently serving VLR and/or SGSN (if there are any).</span><br><span style="color: hsl(0, 100%, 40%);">- * We cannot blindly flood the entire PLMN with this, as it would create subscriber</span><br><span style="color: hsl(0, 100%, 40%);">- * state in every VLR/SGSN out there, even those that have never seen the subscriber.</span><br><span style="color: hsl(0, 100%, 40%);">- * See https://osmocom.org/issues/3154 for details. */</span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span> struct osmo_gsup_conn *co;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (g_hlr->gs == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->gs == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "IMSI %s: NOT Notifying peers of subscriber data change,"</span><br><span style="color: hsl(120, 100%, 40%);">+ " there is no GSUP server\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr->imsi);</span><br><span> return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> llist_for_each_entry(co, &g_hlr->gs->clients, list) {</span><br><span> struct osmo_gsup_message gsup = { };</span><br><span>@@ -72,20 +71,50 @@</span><br><span> struct msgb *msg_out;</span><br><span> uint8_t *peer;</span><br><span> int peer_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t peer_strlen;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *peer_compare;</span><br><span> enum osmo_gsup_cn_domain cn_domain;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (co->supports_ps)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (co->supports_ps) {</span><br><span> cn_domain = OSMO_GSUP_CN_DOMAIN_PS;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (co->supports_cs)</span><br><span style="color: hsl(120, 100%, 40%);">+ peer_compare = subscr->sgsn_number;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (co->supports_cs) {</span><br><span> cn_domain = OSMO_GSUP_CN_DOMAIN_CS;</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* We have not yet received a location update from this subscriber .*/</span><br><span style="color: hsl(120, 100%, 40%);">+ peer_compare = subscr->vlr_number;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We have not yet received a location update from this GSUP client.*/</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (peer_len < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ co && co->conn && co->conn->server? co->conn->server->addr : "unset",</span><br><span style="color: hsl(120, 100%, 40%);">+ co && co->conn && co->conn->server? co->conn->server->port : 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</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%);">+ peer_strlen = strnlen((const char*)peer, peer_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strlen(peer_compare) != peer_strlen || strncmp(peer_compare, (const char *)peer, peer_len)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Mismatch. The subscriber is not subscribed with this GSUP client. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* I hope peer is always nul terminated... */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (peer_strlen < peer_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "IMSI %s: subscriber change: skipping %s peer %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr->imsi, cn_domain == OSMO_GSUP_CN_DOMAIN_PS ? "PS" : "CS",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_quote_str((char*)peer, -1));</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</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%);">+ LOGP(DLGSUP, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "IMSI %s: subscriber change: notifying %s peer %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr->imsi, cn_domain == OSMO_GSUP_CN_DOMAIN_PS ? "PS" : "CS",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_quote_str(peer_compare, -1));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc,</span><br><span> sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_ERROR,</span><br><span> "IMSI='%s': Cannot notify GSUP client; could not create gsup message "</span><br><span> "for %s:%u\n", subscr->imsi,</span><br><span> co && co->conn && co->conn->server? co->conn->server->addr : "unset",</span><br><span>@@ -96,7 +125,7 @@</span><br><span> /* Send ISD to MSC/SGSN */</span><br><span> msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ISD UPDATE");</span><br><span> if (msg_out == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGSUP, LOGL_ERROR,</span><br><span> "IMSI='%s': Cannot notify GSUP client; could not allocate msg buffer "</span><br><span> "for %s:%u\n", subscr->imsi,</span><br><span> co && co->conn && co->conn->server? co->conn->server->addr : "unset",</span><br><span>@@ -105,15 +134,6 @@</span><br><span> }</span><br><span> osmo_gsup_encode(msg_out, &gsup);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR);</span><br><span style="color: hsl(0, 100%, 40%);">- if (peer_len < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- co && co->conn && co->conn->server? co->conn->server->addr : "unset",</span><br><span style="color: hsl(0, 100%, 40%);">- co && co->conn && co->conn->server? co->conn->server->port : 0);</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) {</span><br><span> LOGP(DMAIN, LOGL_ERROR,</span><br><span> "IMSI='%s': Cannot notify GSUP client; send operation failed "</span><br><span>@@ -123,7 +143,6 @@</span><br><span> continue;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> }</span><br><span> </span><br><span> /***********************************************************************</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11233">change 11233</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/11233"/><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: I7c317de8329d9a115d072fc61ddb9abc21b7e8d8 </div>
<div style="display:none"> Gerrit-Change-Number: 11233 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>