Change in osmo-bsc[master]: bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9322 )

Change subject: bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case
......................................................................

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
---
M src/libbsc/bsc_subscr_conn_fsm.c
1 file changed, 19 insertions(+), 9 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c
index 66d1ab9..54224f7 100644
--- a/src/libbsc/bsc_subscr_conn_fsm.c
+++ b/src/libbsc/bsc_subscr_conn_fsm.c
@@ -678,16 +678,26 @@
 		 * 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;

-- 
To view, visit https://gerrit.osmocom.org/9322
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I96179b4324b976bded36023a8ccbdc007b6b3e05
Gerrit-Change-Number: 9322
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180525/2c26be56/attachment.htm>