<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/15490">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vlr: gmm_cause_to_fsm_and_mm_cause() drop fsm_cause_p argument<br><br>It's always set to OSMO_TERM_ERROR. Move the assignment to the caller.<br>In prepartion to use gmm_cause_to_fsm_and_mm_cause() in vlr_auth_fsm.<br><br>Change-Id: Ie4720ad40ef7bcfc528d8d63bfc606c9c0545fb2<br>---<br>M src/libvlr/vlr.c<br>1 file changed, 6 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index ea160b1..a227240 100644</span><br><span>--- a/src/libvlr/vlr.c</span><br><span>+++ b/src/libvlr/vlr.c</span><br><span>@@ -917,11 +917,9 @@</span><br><span>  return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gmm_cause_to_fsm_and_mm_cause(enum gsm48_gmm_cause gmm_cause,</span><br><span style="color: hsl(0, 100%, 40%);">-                                       enum osmo_fsm_term_cause *fsm_cause_p,</span><br><span style="color: hsl(0, 100%, 40%);">-                                          enum gsm48_reject_value *gsm48_rej_p)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gmm_cause_to_mm_cause(enum gsm48_gmm_cause gmm_cause,</span><br><span style="color: hsl(120, 100%, 40%);">+                              enum gsm48_reject_value *gsm48_rej_p)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    enum osmo_fsm_term_cause fsm_cause = OSMO_FSM_TERM_ERROR;</span><br><span>    enum gsm48_reject_value gsm48_rej = GSM48_REJECT_NETWORK_FAILURE;</span><br><span>    switch (gmm_cause) {</span><br><span>         case GMM_CAUSE_IMSI_UNKNOWN:</span><br><span>@@ -1004,16 +1002,8 @@</span><br><span>                gsm48_rej = GSM48_REJECT_NETWORK_FAILURE;</span><br><span>            break;</span><br><span>       }</span><br><span style="color: hsl(0, 100%, 40%);">-       switch (gmm_cause) {</span><br><span style="color: hsl(0, 100%, 40%);">-            /* refine any error causes here? */</span><br><span style="color: hsl(0, 100%, 40%);">-     default:</span><br><span style="color: hsl(0, 100%, 40%);">-                fsm_cause = OSMO_FSM_TERM_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">-                break;</span><br><span style="color: hsl(0, 100%, 40%);">-  }</span><br><span style="color: hsl(0, 100%, 40%);">-       if (fsm_cause_p)</span><br><span style="color: hsl(0, 100%, 40%);">-                *fsm_cause_p = fsm_cause;</span><br><span style="color: hsl(0, 100%, 40%);">-       if (gsm48_rej_p)</span><br><span style="color: hsl(0, 100%, 40%);">-                *gsm48_rej_p = gsm48_rej;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   *gsm48_rej_p = gsm48_rej;</span><br><span> }</span><br><span> </span><br><span> /* Handle LOCATION CANCEL request from HLR */</span><br><span>@@ -1021,7 +1011,7 @@</span><br><span>                                  const struct osmo_gsup_message *gsup_msg)</span><br><span> {</span><br><span>       enum gsm48_reject_value gsm48_rej;</span><br><span style="color: hsl(0, 100%, 40%);">-      enum osmo_fsm_term_cause fsm_cause;</span><br><span style="color: hsl(120, 100%, 40%);">+   enum osmo_fsm_term_cause fsm_cause = OSMO_FSM_TERM_ERROR;</span><br><span>    struct osmo_gsup_message gsup_reply = {0};</span><br><span>   int rc, is_update_procedure = !gsup_msg->cancel_type ||</span><br><span>           gsup_msg->cancel_type == OSMO_GSUP_CANCEL_TYPE_UPDATE;</span><br><span>@@ -1033,7 +1023,7 @@</span><br><span>    gsup_reply.message_type = OSMO_GSUP_MSGT_LOCATION_CANCEL_RESULT;</span><br><span>     rc = vlr_subscr_tx_gsup_message(vsub, &gsup_reply);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     gmm_cause_to_fsm_and_mm_cause(gsup_msg->cause, &fsm_cause, &gsm48_rej);</span><br><span style="color: hsl(120, 100%, 40%);">+    gmm_cause_to_mm_cause(gsup_msg->cause, &gsm48_rej);</span><br><span>   vlr_subscr_cancel_attach_fsm(vsub, fsm_cause, gsm48_rej);</span><br><span> </span><br><span>        vlr_subscr_rx_imsi_detach(vsub);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/15490">change 15490</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/c/osmo-msc/+/15490"/><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-Change-Id: Ie4720ad40ef7bcfc528d8d63bfc606c9c0545fb2 </div>
<div style="display:none"> Gerrit-Change-Number: 15490 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>