aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2019-10-01 19:47:26 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2019-10-29 16:46:32 +0100
commitcf90bdb07d2dab75716204a4dacf8f09abc256d9 (patch)
treeab3972dbf43d4f45c8c720d1e5ad1a051005c02b
parent0c1ed15336ac3e24307940f97d43764419d1b8d7 (diff)
send MNCC REL only if MNCC has actually started
-rw-r--r--include/osmocom/msc/transaction.h1
-rw-r--r--src/libmsc/gsm_04_08_cc.c11
2 files changed, 9 insertions, 3 deletions
diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h
index cab00308a..61d8c1a28 100644
--- a/include/osmocom/msc/transaction.h
+++ b/include/osmocom/msc/transaction.h
@@ -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;
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index a90ddce4c..792ab6170 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -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;