<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16960">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sccp_scoc: Deliver correct disconnect cause and importance to user on timer expiration<br><br>Change-Id: I87b84e9c3c4cb35135efdb4ba155c684917fbab7<br>---<br>M src/sccp_scoc.c<br>1 file changed, 17 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c</span><br><span>index b5b6547..d2fb8d1 100644</span><br><span>--- a/src/sccp_scoc.c</span><br><span>+++ b/src/sccp_scoc.c</span><br><span>@@ -734,6 +734,7 @@</span><br><span> udisp = &scu_prim->u.disconnect;</span><br><span> udisp->conn_id = conn->conn_id;</span><br><span> udisp->responding_addr = conn->called_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ udisp->importance = conn->importance;</span><br><span> udisp->originator = OSMO_SCCP_ORIG_UNDEFINED;</span><br><span> //udisp->in_sequence_control;</span><br><span> if (xua) {</span><br><span>@@ -1080,9 +1081,14 @@</span><br><span> osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);</span><br><span> break;</span><br><span> case SCOC_E_T_IAR_EXP:</span><br><span style="color: hsl(120, 100%, 40%);">+ xua = xua_msg_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ xua_msg_add_u32(xua, SUA_IEI_CAUSE,</span><br><span style="color: hsl(120, 100%, 40%);">+ SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE);</span><br><span style="color: hsl(120, 100%, 40%);">+ xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance);</span><br><span> /* Send N-DISCONNECT.ind to local user */</span><br><span style="color: hsl(0, 100%, 40%);">- scu_gen_encode_and_send(conn, event, NULL, OSMO_SCU_PRIM_N_DISCONNECT,</span><br><span style="color: hsl(120, 100%, 40%);">+ scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT,</span><br><span> PRIM_OP_INDICATION);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(xua);</span><br><span> /* Send RLSD to peer */</span><br><span> xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE, NULL);</span><br><span> conn_start_rel_timer(conn);</span><br><span>@@ -1120,14 +1126,20 @@</span><br><span> if (xua_msg_get_u32(xua, SUA_IEI_SRC_REF) != conn->remote_ref ||</span><br><span> xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) != conn->sccp_class) {</span><br><span> /* Release connection */</span><br><span style="color: hsl(0, 100%, 40%);">- /* send N-DISCONNECT.ind to user */</span><br><span style="color: hsl(0, 100%, 40%);">- scu_gen_encode_and_send(conn, event, NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_SCU_PRIM_N_DISCONNECT,</span><br><span style="color: hsl(0, 100%, 40%);">- PRIM_OP_INDICATION);</span><br><span> /* Stop inactivity Timers */</span><br><span> conn_stop_inact_timers(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ xua = xua_msg_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ xua_msg_add_u32(xua, SUA_IEI_CAUSE,</span><br><span style="color: hsl(120, 100%, 40%);">+ SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA);</span><br><span style="color: hsl(120, 100%, 40%);">+ xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* send N-DISCONNECT.ind to user */</span><br><span style="color: hsl(120, 100%, 40%);">+ scu_gen_encode_and_send(conn, event, xua,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SCU_PRIM_N_DISCONNECT,</span><br><span style="color: hsl(120, 100%, 40%);">+ PRIM_OP_INDICATION);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(xua);</span><br><span> /* Send RLSD to SCRC */</span><br><span> xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(xua);</span><br><span> /* Start release timer */</span><br><span> conn_start_rel_timer(conn);</span><br><span> osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16960">change 16960</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/libosmo-sccp/+/16960"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I87b84e9c3c4cb35135efdb4ba155c684917fbab7 </div>
<div style="display:none"> Gerrit-Change-Number: 16960 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>