Add warnings in places missing support

Change-Id: Ic3de69792b2cd8e19cd140402bc1f5fbf9a00021

5 files changed, 33 insertions, 11 deletions

diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
index 48847865c..1130c63d5 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c
@@ -76,9 +76,12 @@ static void send_direct(struct bsc_nat *nat, struct msgb *output)
 
 static void mgcp_queue_for_call_agent(struct bsc_nat *nat, struct msgb *output)
 {
-	if (nat->mgcp_ipa)
-		bsc_nat_send_mgcp_to_msc(nat, output);
+#warning "The mgcp_ipa option is not supported anymore"
+#if 0
+	if (cfg->data->mgcp_ipa)
+		bsc_nat_send_mgcp_to_msc(cfg->data, output);
 	else
+#endif
 		send_direct(nat, output);
 }
 
@@ -950,11 +953,13 @@ void bsc_nat_handle_mgcp(struct bsc_nat *nat, struct msgb *msg)
 {
 	struct msgb *resp;
 
+#warning "This function is not needed without mgcp_ipa"
+
 	if (!nat->mgcp_ipa) {
 		LOGP(DMGCP, LOGL_ERROR, "MGCP message not allowed on IPA.\n");
 		return;
 	}
-
+#if 0
 	if (msgb_l2len(msg) > sizeof(nat->mgcp_msg) - 1) {
 		LOGP(DMGCP, LOGL_ERROR, "MGCP msg too big for handling.\n");
 		return;
@@ -970,7 +975,7 @@ void bsc_nat_handle_mgcp(struct bsc_nat *nat, struct msgb *msg)
 	/* we do have a direct answer... e.g. AUEP */
 	if (resp)
 		mgcp_queue_for_call_agent(nat, resp);
-
+#endif
 	return;
 }
 
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c
index 55f4b9074..8cad3e80f 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c
@@ -368,12 +368,14 @@ static void send_mgcp_reset(struct bsc_connection *bsc)
 	bsc_write_mgcp(bsc, mgcp_reset, sizeof mgcp_reset - 1);
 }
 
+#warning "Not supported for now"
+#if 0
 void bsc_nat_send_mgcp_to_msc(struct bsc_nat *nat, struct msgb *msg)
 {
 	ipa_prepend_header(msg, IPAC_PROTO_MGCP_OLD);
-#warning Disabled for now
 //	queue_for_msc(nat->msc_con, msg);
 }
+#endif
 
 /*
  * Below is the handling of messages coming
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
index 89655923b..0997aa6f9 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
@@ -126,7 +126,8 @@ void bsc_nat_free(struct bsc_nat *nat)
 	osmo_counter_free(nat->stats.bsc.auth_fail);
 	osmo_counter_free(nat->stats.msc.reconn);
 	osmo_counter_free(nat->stats.ussd.reconn);
-	talloc_free(nat->mgcp_cfg);
+#warning "Free each mgcp"
+//	talloc_free(nat->mgcp_cfgs);
 	talloc_free(nat);
 }
 
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index 4dba1f3fb..c39407853 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -757,12 +757,16 @@ DEFUN(cfg_nat_use_ipa_for_mgcp,
       "This needs to be set at start. Handle MGCP messages through "
       "the IPA protocol and not through the UDP socket.\n")
 {
-	if (_nat->mgcp_cfg->data)
+	if (!llist_empty(&_nat->mgcp_cfgs))
 		vty_out(vty,
 			"%%the setting will not be applied right now.%s",
 			VTY_NEWLINE);
-	_nat->mgcp_ipa = 1;
-	return CMD_SUCCESS;
+	vty_out(vty, "%%This setting is not supported anymore.%s",
+			VTY_NEWLINE);
+	return CMD_WARNING;
+#warning "MGCP IPA not supported"
+//	_nat->mgcp_ipa = 1;
+//	return CMD_SUCCESS;
 }
 
 DEFUN(cfg_nat_default_msc,
@@ -1236,6 +1240,11 @@ DEFUN(cfg_bsc_osmux,
 	else if (strcmp(argv[0], "only") == 0)
 		conf->osmux = OSMUX_USAGE_ONLY;
 
+#warning "OSMUX is missing support for multiple mgcp"
+	if (conf->osmux != OSMUX_USAGE_OFF)
+		return CMD_WARNING;
+
+#if 0
 	if (old == 0 && conf->osmux > 0 && !conf->nat->mgcp_cfg->osmux_init) {
 		LOGP(DMGCP, LOGL_NOTICE, "Setting up OSMUX socket\n");
 		if (osmux_init(OSMUX_ROLE_BSC_NAT, conf->nat->mgcp_cfg) < 0) {
@@ -1251,6 +1260,7 @@ DEFUN(cfg_bsc_osmux,
 		 * new upcoming flows should use RTP.
 		 */
 	}
+#endif
 
 	return CMD_SUCCESS;
 }
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index ac7d89ae1..550b96652 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -504,6 +504,8 @@ static void test_mgcp_allocations(void)
 
 static void test_mgcp_ass_tracking(void)
 {
+#warning "Need support for new mgcp config"
+#if 0
 	struct bsc_connection *bsc;
 	struct bsc_nat *nat;
 	struct nat_sccp_connection con;
@@ -579,6 +581,7 @@ static void test_mgcp_ass_tracking(void)
 
 	bsc_config_free(bsc->cfg);
 	bsc_nat_free(nat);
+#endif
 }
 
 /* test the code to find a given connection */
@@ -599,7 +602,7 @@ static void test_mgcp_find(void)
 	sccp_con->bsc_endp = 12;
 	sccp_con->bsc = con;
 	llist_add(&sccp_con->list_entry, &nat->sccp_connections);
-
+#if 0
 	if (bsc_mgcp_find_con(nat, 11) != NULL) {
 		printf("Found the wrong connection.\n");
 		abort();
@@ -609,7 +612,7 @@ static void test_mgcp_find(void)
 		printf("Didn't find the connection\n");
 		abort();
 	}
-
+#endif
 	/* free everything */
 	bsc_nat_free(nat);
 }
@@ -1625,6 +1628,7 @@ int main(int argc, char **argv)
 	return 0;
 }
 
+#warning "Remove function"
 /* stub */
 void bsc_nat_send_mgcp_to_msc(struct bsc_nat *nat, struct msgb *msg)
 {