<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11458">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;">msc_vlr_tests: tweak conn_exists()<br><br>* constify function parameter<br>* internalize parameter check<br><br>Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92<br>---<br>M tests/msc_vlr/msc_vlr_tests.c<br>M tests/msc_vlr/msc_vlr_tests.h<br>2 files changed, 10 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>index 1192cf2..fd196c8 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_tests.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>@@ -161,13 +161,18 @@</span><br><span>               OSMO_ASSERT(gsup_tx_confirmed);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool conn_exists(struct gsm_subscriber_connection *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+bool conn_exists(const struct gsm_subscriber_connection *conn)</span><br><span> {</span><br><span>        struct gsm_subscriber_connection *c;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!conn)</span><br><span style="color: hsl(120, 100%, 40%);">+            return false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      llist_for_each_entry(c, &net->subscr_conns, entry) {</span><br><span>          if (c == conn)</span><br><span>                       return true;</span><br><span>         }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  return false;</span><br><span> }</span><br><span> </span><br><span>@@ -212,7 +217,7 @@</span><br><span>             ran_type_name(rx_from_ran),</span><br><span>          gh_type_name(gh));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      if (g_conn && !conn_exists(g_conn))</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!conn_exists(g_conn))</span><br><span>            g_conn = NULL;</span><br><span> </span><br><span>   if (!g_conn) {</span><br><span>@@ -230,7 +235,7 @@</span><br><span>                         msc_dtap(g_conn, 23, msg);</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (g_conn && !conn_exists(g_conn))</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!conn_exists(g_conn))</span><br><span>            g_conn = NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -258,7 +263,7 @@</span><br><span>        bh->type = BSSAP_MSG_BSS_MANAGEMENT;</span><br><span>      bh->length = msgb_l3len(msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    if (g_conn && !conn_exists(g_conn))</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!conn_exists(g_conn))</span><br><span>            g_conn = NULL;</span><br><span> </span><br><span>   OSMO_ASSERT(g_conn);</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h</span><br><span>index cc200bd..40377c1 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_tests.h</span><br><span>+++ b/tests/msc_vlr/msc_vlr_tests.h</span><br><span>@@ -152,7 +152,7 @@</span><br><span> struct msgb *msgb_from_hex(const char *label, uint16_t size, const char *hex);</span><br><span> </span><br><span> void clear_vlr();</span><br><span style="color: hsl(0, 100%, 40%);">-bool conn_exists(struct gsm_subscriber_connection *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+bool conn_exists(const struct gsm_subscriber_connection *conn);</span><br><span> void conn_conclude_cm_service_req(struct gsm_subscriber_connection *conn,</span><br><span>                                  enum ran_type via_ran);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11458">change 11458</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/11458"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 </div>
<div style="display:none"> Gerrit-Change-Number: 11458 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@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>