Change in osmo-bsc[master]: deprecate 'msc' / 'ip.access rtp-base <port>'

[neels]

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18236 )


Change subject: deprecate 'msc' / 'ip.access rtp-base <port>'
......................................................................

deprecate 'msc' / 'ip.access rtp-base <port>'

The bsc_msc_data->rtp_base has been unused ever since we introduced the exernal
MGW in osmo-bsc [1]. The vty command also still exists. Deprecate the vty
command, remove the member.

[1] "mgcp: use osmo-mgw to switch RTP streams"
    commit 39c609b7c924524172ad311bdf89f92b7ccf175a
    Change-Id Ia2882b7ca31a3219c676986e85045fa08a425d7a

Change-Id: Id14fa3066ca5d472a817593074a6222f159168a8
---
M include/osmocom/bsc/bsc_msc_data.h
M src/osmo-bsc/osmo_bsc_msc.c
M src/osmo-bsc/osmo_bsc_vty.c
3 files changed, 3 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/18236/1

diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h
index dc9628b..6de48c4 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -99,7 +99,6 @@
 	struct osmo_plmn_id core_plmn;
 	int core_lac;
 	int core_ci;
-	int rtp_base;
 
 	/* audio codecs */
 	struct gsm48_multi_rate_conf amr_conf;
diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c
index 544341b..60d41b0 100644
--- a/src/osmo-bsc/osmo_bsc_msc.c
+++ b/src/osmo-bsc/osmo_bsc_msc.c
@@ -152,7 +152,6 @@
 	};
 	msc_data->core_ci = -1;
 	msc_data->core_lac = -1;
-	msc_data->rtp_base = 4000;
 
 	msc_data->nr = nr;
 	msc_data->allow_emerg = 1;
diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c
index c372b48..7174de1 100644
--- a/src/osmo-bsc/osmo_bsc_vty.c
+++ b/src/osmo-bsc/osmo_bsc_vty.c
@@ -36,9 +36,6 @@
 
 #include <time.h>
 
-
-#define IPA_STR "IP.ACCESS specific\n"
-
 static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty)
 {
 	return bsc_gsmnet->bsc_data;
@@ -123,7 +120,6 @@
 	if (msc->core_ci != -1)
 		vty_out(vty, " core-cell-identity %d%s",
 			msc->core_ci, VTY_NEWLINE);
-	vty_out(vty, " ip.access rtp-base %d%s", msc->rtp_base, VTY_NEWLINE);
 
 	if (msc->ussd_welcome_txt)
 		vty_out(vty, " bsc-welcome-text %s%s", msc->ussd_welcome_txt, VTY_NEWLINE);
@@ -297,15 +293,12 @@
 	return CMD_SUCCESS;
 }
 
-DEFUN(cfg_net_bsc_rtp_base,
+DEFUN_DEPRECATED(cfg_net_bsc_rtp_base,
       cfg_net_bsc_rtp_base_cmd,
       "ip.access rtp-base <1-65000>",
-      IPA_STR
-      "Set the rtp-base port for the RTP stream\n"
-      "Port number\n")
+      "deprecated\n" "deprecated, RTP is handled by the MGW\n" "deprecated\n")
 {
-	struct bsc_msc_data *data = bsc_msc_data(vty);
-	data->rtp_base = atoi(argv[0]);
+	vty_out(vty, "%% deprecated: 'ip.access rtp-base' has no effect, RTP is handled by the MGW%s", VTY_NEWLINE);
 	return CMD_SUCCESS;
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18236
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id14fa3066ca5d472a817593074a6222f159168a8
Gerrit-Change-Number: 18236
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200513/59e486a9/attachment.htm>