From dc2514b22062af04354c0331f0f5819051c3fdee Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 9 Apr 2018 23:29:14 +0200 Subject: CC: intentionally release T308 on BSSMAP Clear Request from BSC So far we hit a running T308 during CC release when caused by a BSSMAP Clear Request, and we loudly log that as error. However, now I understand that T308 is a direct cause of the dispatch of a REL IND towards MNCC, which is used to indicate teardown to MNCC. So during _gsm48_cc_trans_free(), we first clear all timers, then invoke mncc_release_ind() which starts another timer (useful for graceful CC Release, but in this code path the intention is immediate release). Simply immediately cancel the timer again and release the conn. A separate question is whether a BSSMAP Clear Request should be less aggressive in releasing the connections; i.e. instead of calling trans_free() all around, to rather ask each transaction to "please stop soon", somehow. Related: OS#3062 Change-Id: I231fdb574a086a206321148474cbdc7ca9cf39f0 --- src/libmsc/transaction.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/libmsc/transaction.c') diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 66b929afa..147099ed7 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -122,15 +122,6 @@ void trans_free(struct gsm_trans *trans) switch (trans->protocol) { case GSM48_PDISC_CC: _gsm48_cc_trans_free(trans); - if (osmo_timer_pending(&trans->cc.timer)) { - LOGP(DCC, LOGL_ERROR, - "%s Timer 0x%x is still running while discarding transaction" - " -- this is a bug: we were still expecting a response but" - " are freeing the transaction anyway\n", - vlr_subscr_name(trans->conn->vsub), trans->cc.Tcurrent); - osmo_timer_del(&trans->cc.timer); - trans->cc.Tcurrent = 0; - } conn_usage_token = MSC_CONN_USE_TRANS_CC; break; case GSM48_PDISC_SMS: -- cgit v1.2.3