cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
8
0
Fork 0
Code Issues Releases Wiki Activity

send MNCC REL only if MNCC has actually started 

Change-Id: I07b2b6c0ee33f5d3e0a060c10cf36d5c7c9f0d9b
changes/49/15849/3
Neels Hofmeyr 2019-10-01 19:47:26 +02:00
parent 0c1ed15336
commit cf90bdb07d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osmocom/msc/transaction.h
View File

@ -103,6 +103,7 @@ struct gsm_trans {
struct osmo_timer_list timer;
struct osmo_timer_list timer_guard;
struct gsm_mncc msg; /* stores setup/disconnect/release message */
bool mncc_initiated; /* Whether an MNCC Release is necessary on failure */
} cc;
struct {
struct gsm411_smc_inst smc_inst;

11
src/libmsc/gsm_04_08_cc.c
View File

@ -244,6 +244,9 @@ static int mncc_recvmsg(struct gsm_network *net, struct gsm_trans *trans,
memcpy(data, mncc, sizeof(struct gsm_mncc));
cc_tx_to_mncc(net, msg);
/* trans may be NULL when sending an MNCC error reply upon an invalid MNCC request */
if (trans)
trans->cc.mncc_initiated = true;
return 0;
}
@ -278,9 +281,10 @@ void _gsm48_cc_trans_free(struct gsm_trans *trans)
gsm48_cc_tx_release(trans, &rel);
}
/* Ressource unavailable */
mncc_release_ind(trans->net, trans, trans->callref,
GSM48_CAUSE_LOC_PRN_S_LU,
GSM48_CC_CAUSE_RESOURCE_UNAVAIL);
if (trans->cc.mncc_initiated)
mncc_release_ind(trans->net, trans, trans->callref,
GSM48_CAUSE_LOC_PRN_S_LU,
GSM48_CC_CAUSE_RESOURCE_UNAVAIL);
/* This is a final freeing of the transaction. The MNCC release may have triggered the
* T308 release timer, but we don't have the luxury of graceful CC Release here. */
gsm48_stop_cc_timer(trans);
@ -1981,6 +1985,7 @@ static int mncc_tx_to_gsm_cc(struct gsm_network *net, const union mncc_msg *msg)
LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s\n", get_mncc_name(msg->msg_type));
gsm48_start_guard_timer(trans);
trans->cc.mncc_initiated = true;
if (trans->msc_a)
msc_a = trans->msc_a;