aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-05-25 18:23:30 +0200
committerHarald Welte <laforge@gnumonks.org>2018-05-25 20:59:13 +0200
commit7b897dfea5bdebba5ffba555c4ca29af96c35695 (patch)
treeb8d62673f5891e77e1951253ffc4e380776860bb
parent200a0e2d0a56312540270ba804c2327f45709c06 (diff)
bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case
In IPA/SCCPlite, the MSC is handling MGCP to the BSC-MGW directly and the BSC only takes care of the BTS-side MGCP connection. We achieve this by transitioning directly from WAIT_MDCX_BTS into ACTIVE in this case. Change-Id: I96179b4324b976bded36023a8ccbdc007b6b3e05 Related: OS#2544
-rw-r--r--src/libbsc/bsc_subscr_conn_fsm.c28
1 files changed, 19 insertions, 9 deletions
diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c
index 66d1ab95a..54224f75c 100644
--- a/src/libbsc/bsc_subscr_conn_fsm.c
+++ b/src/libbsc/bsc_subscr_conn_fsm.c
@@ -678,16 +678,26 @@ static void gscon_fsm_wait_mdcx_bts(struct osmo_fsm_inst *fi, uint32_t event, vo
* BTS connection. */
osmo_strlcpy(conn_peer.endpoint, conn->user_plane.mgw_endpoint, sizeof(conn_peer.endpoint));
- /* (Pre)Change state and create the connection */
- osmo_fsm_inst_state_chg(fi, ST_WAIT_CRCX_MSC, MGCP_MGW_TIMEOUT, MGCP_MGW_TIMEOUT_TIMER_NR);
- conn->user_plane.fi_msc =
- mgcp_conn_create(conn->network->mgw.client, fi, GSCON_EV_MGW_FAIL_MSC, GSCON_EV_MGW_CRCX_RESP_MSC,
- &conn_peer);
- if (!conn->user_plane.fi_msc) {
- resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL);
- sigtran_send(conn, resp, fi);
+ switch (conn->sccp.msc->a.asp_proto) {
+ case OSMO_SS7_ASP_PROT_IPA:
+ /* Send assignment complete message to the MSC */
+ send_ass_compl(conn->lchan, fi, true);
osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0);
- return;
+ break;
+ default:
+ /* (Pre)Change state and create the connection */
+ osmo_fsm_inst_state_chg(fi, ST_WAIT_CRCX_MSC, MGCP_MGW_TIMEOUT,
+ MGCP_MGW_TIMEOUT_TIMER_NR);
+ conn->user_plane.fi_msc = mgcp_conn_create(conn->network->mgw.client, fi,
+ GSCON_EV_MGW_FAIL_MSC,
+ GSCON_EV_MGW_CRCX_RESP_MSC, &conn_peer);
+ if (!conn->user_plane.fi_msc) {
+ resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL);
+ sigtran_send(conn, resp, fi);
+ osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0);
+ return;
+ }
+ break;
}
break;