<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10548">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp: add VTY Option to force-realloc endpoints<br><br>Currently the force_realloc feature is turnd on and of in a<br>hardcoded way. This patch makes the option available via VTY.<br><br>Backport from osmo-mgw.git.<br><br>Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f<br>---<br>M openbsc/src/libmgcp/mgcp_vty.c<br>M openbsc/src/osmo-bsc_mgcp/mgcp_main.c<br>M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c<br>M openbsc/src/osmo-bsc_nat/bsc_nat.c<br>4 files changed, 18 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c</span><br><span>index d5908f3..23207df 100644</span><br><span>--- a/openbsc/src/libmgcp/mgcp_vty.c</span><br><span>+++ b/openbsc/src/libmgcp/mgcp_vty.c</span><br><span>@@ -604,6 +604,16 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mgcp_force_realloc,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_force_realloc_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "force-realloc (0|1)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Force endpoint reallocation when the endpoint is still seized\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Don't force reallocation\n" "force reallocation\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->trunk.force_realloc = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_mgcp_number_endp,</span><br><span> cfg_mgcp_number_endp_cmd,</span><br><span> "number endpoints <0-65534>",</span><br><span>@@ -816,9 +826,10 @@</span><br><span> trunk->keepalive_interval, VTY_NEWLINE);</span><br><span> else</span><br><span> vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> vty_out(vty, " loop %d%s",</span><br><span> trunk->audio_loop, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " force-realloc %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->force_realloc, VTY_NEWLINE);</span><br><span> if (trunk->omit_rtcp)</span><br><span> vty_out(vty, " rtcp-omit%s", VTY_NEWLINE);</span><br><span> else</span><br><span>@@ -1448,6 +1459,7 @@</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_number_cmd_old);</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_name_cmd_old);</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_loop_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MGCP_NODE, &cfg_mgcp_force_realloc_cmd);</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_number_endp_cmd);</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_omit_rtcp_cmd);</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_no_omit_rtcp_cmd);</span><br><span>diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c</span><br><span>index 4ea0700..6cf9ab7 100644</span><br><span>--- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c</span><br><span>+++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c</span><br><span>@@ -218,6 +218,8 @@</span><br><span> cfg->get_net_downlink_format_cb = &mgcp_transcoding_net_downlink_format;</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->trunk.force_realloc = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vty_info.copyright = openbsc_copyright;</span><br><span> vty_init(&vty_info);</span><br><span> logging_vty_add_cmds(NULL);</span><br><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>index 8cf4e94..986306c 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>@@ -1111,7 +1111,6 @@</span><br><span> /* some more MGCP config handling */</span><br><span> cfg->data = nat;</span><br><span> cfg->policy_cb = bsc_mgcp_policy_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.force_realloc = 1;</span><br><span> </span><br><span> if (cfg->bts_ip)</span><br><span> talloc_free(cfg->bts_ip);</span><br><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>index 0559758..45f53bc 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>@@ -1652,6 +1652,9 @@</span><br><span> rate_ctr_init(tall_bsc_ctx);</span><br><span> osmo_stats_init(tall_bsc_ctx);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Ensure that forced enpoint allocation is turned on by default */</span><br><span style="color: hsl(120, 100%, 40%);">+ nat->mgcp_cfg->trunk.force_realloc = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* init vty and parse */</span><br><span> if (mgcp_parse_config(config_file, nat->mgcp_cfg, MGCP_BSC_NAT) < 0) {</span><br><span> fprintf(stderr, "Failed to parse the config file: '%s'\n", config_file);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10548">change 10548</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/10548"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f </div>
<div style="display:none"> Gerrit-Change-Number: 10548 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>