<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18236">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">deprecate 'msc' / 'ip.access rtp-base <port>'<br><br>The bsc_msc_data->rtp_base has been unused ever since we introduced the exernal<br>MGW in osmo-bsc [1]. The vty command also still exists. Deprecate the vty<br>command, remove the member.<br><br>[1] "mgcp: use osmo-mgw to switch RTP streams"<br> commit 39c609b7c924524172ad311bdf89f92b7ccf175a<br> Change-Id Ia2882b7ca31a3219c676986e85045fa08a425d7a<br><br>Change-Id: Id14fa3066ca5d472a817593074a6222f159168a8<br>---<br>M doc/manuals/vty/bsc_vty_reference.xml<br>M include/osmocom/bsc/bsc_msc_data.h<br>M src/osmo-bsc/osmo_bsc_msc.c<br>M src/osmo-bsc/osmo_bsc_vty.c<br>4 files changed, 3 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/vty/bsc_vty_reference.xml b/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>index e87e027..4e2ce46 100644</span><br><span>--- a/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>@@ -4772,13 +4772,6 @@</span><br><span> <param name='<0-65535>' doc='CI value' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='ip.access rtp-base <1-65000>'></span><br><span style="color: hsl(0, 100%, 40%);">- <params></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='ip.access' doc='IP.ACCESS specific' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='rtp-base' doc='Set the rtp-base port for the RTP stream' /></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='<1-65000>' doc='Port number' /></span><br><span style="color: hsl(0, 100%, 40%);">- </params></span><br><span style="color: hsl(0, 100%, 40%);">- </command></span><br><span> <command id='codec-list .LIST'></span><br><span> <params></span><br><span> <param name='codec-list' doc='Set the allowed audio codecs' /></span><br><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index fc816b4..a97616f 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -130,7 +130,6 @@</span><br><span> struct osmo_plmn_id core_plmn;</span><br><span> int core_lac;</span><br><span> int core_ci;</span><br><span style="color: hsl(0, 100%, 40%);">- int rtp_base;</span><br><span> </span><br><span> /* audio codecs */</span><br><span> struct gsm48_multi_rate_conf amr_conf;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>index e58ff7f..f766f75 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>@@ -194,7 +194,6 @@</span><br><span> };</span><br><span> msc_data->core_ci = -1;</span><br><span> msc_data->core_lac = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- msc_data->rtp_base = 4000;</span><br><span> </span><br><span> msc_data->nr = nr;</span><br><span> msc_data->allow_emerg = 1;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>index c372b48..7174de1 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>@@ -36,9 +36,6 @@</span><br><span> </span><br><span> #include <time.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define IPA_STR "IP.ACCESS specific\n"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty)</span><br><span> {</span><br><span> return bsc_gsmnet->bsc_data;</span><br><span>@@ -123,7 +120,6 @@</span><br><span> if (msc->core_ci != -1)</span><br><span> vty_out(vty, " core-cell-identity %d%s",</span><br><span> msc->core_ci, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " ip.access rtp-base %d%s", msc->rtp_base, VTY_NEWLINE);</span><br><span> </span><br><span> if (msc->ussd_welcome_txt)</span><br><span> vty_out(vty, " bsc-welcome-text %s%s", msc->ussd_welcome_txt, VTY_NEWLINE);</span><br><span>@@ -297,15 +293,12 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_net_bsc_rtp_base,</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_net_bsc_rtp_base,</span><br><span> cfg_net_bsc_rtp_base_cmd,</span><br><span> "ip.access rtp-base <1-65000>",</span><br><span style="color: hsl(0, 100%, 40%);">- IPA_STR</span><br><span style="color: hsl(0, 100%, 40%);">- "Set the rtp-base port for the RTP stream\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Port number\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "deprecated\n" "deprecated, RTP is handled by the MGW\n" "deprecated\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_msc_data *data = bsc_msc_data(vty);</span><br><span style="color: hsl(0, 100%, 40%);">- data->rtp_base = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% deprecated: 'ip.access rtp-base' has no effect, RTP is handled by the MGW%s", VTY_NEWLINE);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18236">change 18236</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/18236"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id14fa3066ca5d472a817593074a6222f159168a8 </div>
<div style="display:none"> Gerrit-Change-Number: 18236 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>