aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/manuals/vty/bsc_vty_reference.xml7
-rw-r--r--include/osmocom/bsc/bsc_msc_data.h1
-rw-r--r--src/osmo-bsc/osmo_bsc_msc.c1
-rw-r--r--src/osmo-bsc/osmo_bsc_vty.c13
4 files changed, 3 insertions, 19 deletions
diff --git a/doc/manuals/vty/bsc_vty_reference.xml b/doc/manuals/vty/bsc_vty_reference.xml
index e87e0272d..4e2ce4673 100644
--- a/doc/manuals/vty/bsc_vty_reference.xml
+++ b/doc/manuals/vty/bsc_vty_reference.xml
@@ -4772,13 +4772,6 @@
<param name='&lt;0-65535&gt;' doc='CI value' />
</params>
</command>
- <command id='ip.access rtp-base &lt;1-65000&gt;'>
- <params>
- <param name='ip.access' doc='IP.ACCESS specific' />
- <param name='rtp-base' doc='Set the rtp-base port for the RTP stream' />
- <param name='&lt;1-65000&gt;' doc='Port number' />
- </params>
- </command>
<command id='codec-list .LIST'>
<params>
<param name='codec-list' doc='Set the allowed audio codecs' />
diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h
index fc816b4fd..a97616f8a 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -130,7 +130,6 @@ struct bsc_msc_data {
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 e58ff7faf..f766f75d6 100644
--- a/src/osmo-bsc/osmo_bsc_msc.c
+++ b/src/osmo-bsc/osmo_bsc_msc.c
@@ -194,7 +194,6 @@ struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *net, int nr)
};
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 c372b48ff..7174de1be 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 @@ static void write_msc(struct vty *vty, struct bsc_msc_data *msc)
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 @@ DEFUN(cfg_net_bsc_ci,
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;
}