Change in libosmo-sccp[master]: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16961 )

Change subject: sccp: Disarm inactivity timer upon T(iar) active->disconn_pend
......................................................................

sccp: Disarm inactivity timer upon T(iar) active->disconn_pend

All other code paths moving to state DISCONN_PEND seem to stop them, and
anyway that state doesn't permit event SCOC_E_T_IAS_EXP:

DLSCCP DEBUG SCCP-SCOC(0){ACTIVE}: Received Event T(iar)_expired (sccp_scoc.c:346)
...
DLSCCP DEBUG SCCP-SCOC(0){ACTIVE}: state_chg to DISCONN_PEND (sccp_scoc.c:1095)
...
DLSCCP DEBUG SCCP-SCOC(0){DISCONN_PEND}: Received Event T(ias)_expired (sccp_scoc.c:339)
DLSCCP ERROR SCCP-SCOC(0){DISCONN_PEND}: Event T(ias)_expired not permitted (sccp_scoc.c:339)

Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74
---
M src/sccp_scoc.c
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index d2fb8d1..015850e 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -1081,6 +1081,8 @@
 		osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
 		break;
 	case SCOC_E_T_IAR_EXP:
+		/* stop inact timers */
+		conn_stop_inact_timers(conn);
 		xua = xua_msg_alloc();
 		xua_msg_add_u32(xua, SUA_IEI_CAUSE,
 				SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE);
@@ -1091,6 +1093,7 @@
 		talloc_free(xua);
 		/* Send RLSD to peer */
 		xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE, NULL);
+		/* start release timer */
 		conn_start_rel_timer(conn);
 		osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
 		break;

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16961
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ieb02dedba312ab76890e943934ce6a1e2fe61f74
Gerrit-Change-Number: 16961
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200121/f332c4d2/attachment.htm>