diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-12-19 17:05:13 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2019-01-04 16:24:59 +0000 |
| commit | f383d411e628e46a77f28e2dbfbecf07a17f8a39 (patch) | |
| tree | a2f844d84702762312a6b2907cd804707b8b326a /src | |
| parent | fcf49d3f4eac2c35c291f24b488ff912827f804f (diff) | |
abort assignment on Assignment Failure
If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx
FSM instance, so that the call gets torn down immediately. Before this, the
non-call would idle around without anything happening.
Related: OS#3236
Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore)
Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmsc/msc_mgcp.c | 19 | ||||
| -rw-r--r-- | src/libmsc/osmo_msc.c | 5 |
2 files changed, 23 insertions, 1 deletions
diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 4c177680a..5b4ee26fe 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -1094,6 +1094,25 @@ int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr) return 0; } +/* Notify the MGCP context that Assignment failed. + * This will end the "ringing" on the other call leg, and will usually result in L3 and conn release (i.e. when no other + * transactions are still pending, which is usually the case). */ +int msc_mgcp_ass_fail(struct ran_conn *conn) +{ + struct mgcp_ctx *mgcp_ctx; + + OSMO_ASSERT(conn); + + mgcp_ctx = conn->rtp.mgcp_ctx; + if (!mgcp_ctx) + return -EINVAL; + + LOGPFSMSL(conn->fi, DMGCP, LOGL_ERROR, "Assignment failed\n"); + + osmo_fsm_inst_dispatch(mgcp_ctx->fsm, EV_TEARDOWN_ERROR, mgcp_ctx); + return 0; +} + /* Make the connection of a previously assigned call complete * Parameter: * trans: transaction context. diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 37c1d15a4..1a1ba3ce4 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -28,6 +28,7 @@ #include <osmocom/msc/a_iface.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/gsm_04_11.h> +#include <osmocom/msc/msc_mgcp.h> #include "../../bscconfig.h" #ifdef BUILD_IU @@ -123,7 +124,9 @@ void msc_assign_compl(struct ran_conn *conn, /* Receive an ASSIGNMENT FAILURE from BSC */ void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause) { - LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n"); + LOGPFSMSL(conn->fi, DRR, LOGL_ERROR, "Assignment Failure: cause=%u rr_cause=%u.\n", + cause, rr_cause ? *rr_cause : 0); + msc_mgcp_ass_fail(conn); } /* Receive a CLASSMARK CHANGE from BSC */ |