From 44a2bf3a3a0661078f02e682367b01a7260e6990 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 30 Jan 2012 23:36:44 +0100 Subject: [PATCH] ISM: terminate gracefully if 'termiante' event received --- TCAP/src/ITU/tcap_ism_fsm.erl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TCAP/src/ITU/tcap_ism_fsm.erl b/TCAP/src/ITU/tcap_ism_fsm.erl index d5d21da..82eeaee 100644 --- a/TCAP/src/ITU/tcap_ism_fsm.erl +++ b/TCAP/src/ITU/tcap_ism_fsm.erl @@ -145,12 +145,12 @@ op_sent_cl1(P=#'TC-RESULT-NL'{}, State) -> op_sent_cl1('terminate', State) -> % stop invocation timer timer:cancel(State#state.inv_timer), - {stop, terminate_req, State}. + {stop, normal, State}. wait_for_reject('terminate', State) -> % stop reject timer timer:cancel(State#state.rej_timer), - {stop, terminate_req, State}; + {stop, normal, State}; wait_for_reject({timer_expired, reject}, State) -> % reject timer expiry % terminate @@ -178,7 +178,7 @@ op_sent_cl2(Op, State) when {stop, class2_result, State}; op_sent_cl2('terminate', State) -> % terminate - {stop, terminate_req, State}. + {stop, normal, State}. op_sent_cl3(P=#'TC-RESULT-L'{}, State) -> % Figure A.7/Q.774 (5 of 6) @@ -197,11 +197,11 @@ op_sent_cl3('terminate', State) -> % stop invocation timter timer:cancel(State#state.inv_timer), % terminate - {stop, terminate_req, State}. + {stop, normal, State}. op_sent_cl4('terminate', State) -> % terminate - {stop, terminate_req, State}; + {stop, normal, State}; op_sent_cl4(Op, State) -> % Figure A.7/Q.774 (6 of 6) % generate REJ component to CCO