diff options
| author | Vadim Yanitskiy <axilirator@gmail.com> | 2019-06-16 15:34:28 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <axilirator@gmail.com> | 2019-06-17 21:08:14 +0700 |
| commit | f177590488f8ff96fccb3b6de14bf9a9889a9114 (patch) | |
| tree | 4cf7bcd3075024fb2ce7b724dc0facd68b26c105 | |
| parent | 7480852eea47657f551171bcb439109d7228ca5c (diff) | |
libmsc/gsm_09_11.c: properly handle OSMO_GSUP_MSGT_PROC_SS_ERROR
This message can be used by the HLR/EUSE to indicate that something
went wrong, e.g. the connection with EUSE is lost, EUSE or the MS
did not respond in time, etc. OsmoMSC needs to release the SS/USSD
transaction, and send GSM 04.80 RELEASE COMPLETE message to the MS
if there is an active RAN connection.
Change-Id: I076d12ef24d7320eda1df1ee4588da7375ef3d9e
Related: (TTCN-3) I5586a88136c936441a842f49248824680603672e
Related: OS#2931
| -rw-r--r-- | src/libmsc/gsm_09_11.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index f58c106aa..7e1f5801c 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -436,14 +436,36 @@ int gsm0911_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct osmo_g /* Associate logging messages with this subscriber */ log_set_context(LOG_CTX_VLR_SUBSCR, vsub); + /* Attempt to find DTAP-transaction */ + trans = trans_find_by_callref(net, gsup_msg->session_id); + /* Handle errors */ if (OSMO_GSUP_IS_MSGT_ERROR(gsup_msg->message_type)) { - /* FIXME: handle this error somehow! */ + LOGP(DSS, LOGL_NOTICE, "Rx %s from HLR/EUSE (cause=0x%02x, sid=0x%x)\n", + osmo_gsup_message_type_name(gsup_msg->message_type), + gsup_msg->cause, gsup_msg->session_id); + + if (!trans) { + LOGP(DSS, LOGL_ERROR, "No transaction found for " + "sid=0x%x, nothing to abort\n", gsup_msg->session_id); + return -ENODEV; + } + + LOG_TRANS(trans, LOGL_NOTICE, "Aborting the session: sending RELEASE COMPLETE\n"); + + /* Indicate connection release to subscriber (if active) */ + if (trans->msc_a != NULL) { + /* TODO: implement GSUP - GSM 04.80 cause mapping */ + msc_send_ussd_release_complete_cause(trans->msc_a, trans->transaction_id, + GSM48_CAUSE_LOC_PUN_S_LU, GSM48_CC_CAUSE_TEMP_FAILURE); + } + + /* Terminate transaction */ + trans_free(trans); + return 0; } - /* Attempt to find DTAP-transaction */ - trans = trans_find_by_callref(net, gsup_msg->session_id); if (!trans) { /* Count network-initiated attempts to establish a NC SS/USSD session */ rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_NC_SS_MT_REQUESTS]); |