[MERGED] osmo-bsc[master]: Fix "CTRL GET msc_connection_status" response.

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Fix "CTRL GET msc_connection_status" response.
......................................................................


Fix "CTRL GET msc_connection_status" response.

Since 39f62bbcbf4309492a6d5bc07213cd74f650d41e the msc_connection_status
variable in osmo_bsc_ctrl.c is no longer updated. Query the connection's
status from the is_connected flag in struct bsc_msc_connection instead.

Makes test BSC_Tests.TC_ctrl_msc_connection_status in ttcn3-bsc-test pass.

However, we only query the connection status of the first MSC. Adapting
the control command to work with mulitple MSCs is left for future work.

Change-Id: I8ab8aac83ef6b7831b6136f7e9e3eddfbb43ecaa
Related: OS#2729
---
M src/osmo-bsc/osmo_bsc_ctrl.c
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c
index 8c9dfe7..4460288 100644
--- a/src/osmo-bsc/osmo_bsc_ctrl.c
+++ b/src/osmo-bsc/osmo_bsc_ctrl.c
@@ -62,7 +62,10 @@
 
 static int get_msc_connection_status(struct ctrl_cmd *cmd, void *data)
 {
-	if (msc_connection_status)
+	struct gsm_network *gsmnet = data;
+	struct bsc_msc_data *msc = osmo_msc_data_find(gsmnet, 0);
+
+	if (msc->msc_con->is_connected)
 		cmd->reply = "connected";
 	else
 		cmd->reply = "disconnected";

-- 
To view, visit https://gerrit.osmocom.org/5627
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ab8aac83ef6b7831b6136f7e9e3eddfbb43ecaa
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Stefan Sperling <ssperling at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>