<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19121">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_vty: fix endpoint number configuration<br><br>At the moment the number of possible E1 endpoints (depends on the number<br>of E1 timeslots that should be used) is hardcoded and the configuration<br>of the number of virtual endpoints has an off-by-one problem.<br><br>For the E1 timeslots one might choose not to occupy all E1 timeslots of<br>once. A one TRX E1 BTS usually requires 3 E1 timeslots. One as D-Channel<br>timeslot and two to cover the voice channels. The voice channels<br>timeslots need to be set up in osmo-mgw, while the D-Channel timeslot<br>must not be touched. The VTY config needs to be able to reflect that.<br><br>Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77<br>Related: OS#2547<br>---<br>M src/libosmo-mgcp/mgcp_trunk.c<br>M src/libosmo-mgcp/mgcp_vty.c<br>M tests/mgcp/mgcp_test.c<br>3 files changed, 37 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c</span><br><span>index f3785cd..55a8953 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_trunk.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_trunk.c</span><br><span>@@ -47,7 +47,7 @@</span><br><span> </span><br><span> trunk->audio_send_ptime = 1;</span><br><span> trunk->audio_send_name = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->vty_number_endpoints = 33;</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->vty_number_endpoints = 32;</span><br><span> trunk->omit_rtcp = 0;</span><br><span> </span><br><span> mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE);</span><br><span>@@ -67,13 +67,8 @@</span><br><span> {</span><br><span> int i;</span><br><span> struct mgcp_endpoint *endp;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Make sure the amount of requested endpoints does not execeed</span><br><span style="color: hsl(0, 100%, 40%);">- * sane limits. The VTY already limits the possible amount,</span><br><span style="color: hsl(0, 100%, 40%);">- * however miss-initalation of the struct or memory corruption</span><br><span style="color: hsl(0, 100%, 40%);">- * could still lead to an excessive allocation of endpoints, so</span><br><span style="color: hsl(0, 100%, 40%);">- * better stop early if that is the case. */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(trunk->vty_number_endpoints < 65534);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int number_endpoints;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int first_endpoint_nr;</span><br><span> </span><br><span> /* This function is called once on startup by the VTY to allocate the</span><br><span> * endpoints. The number of endpoints must not change througout the</span><br><span>@@ -81,15 +76,39 @@</span><br><span> OSMO_ASSERT(trunk->number_endpoints == 0);</span><br><span> OSMO_ASSERT(trunk->endpoints == NULL);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ switch (trunk->trunk_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case MGCP_TRUNK_VIRTUAL:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Due to historical reasons the endpoints on the virtual</span><br><span style="color: hsl(120, 100%, 40%);">+ * trunk start counting at 1. */</span><br><span style="color: hsl(120, 100%, 40%);">+ first_endpoint_nr = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ number_endpoints = trunk->vty_number_endpoints;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case MGCP_TRUNK_E1:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The first timeslot on an E1 line is reserved for framing</span><br><span style="color: hsl(120, 100%, 40%);">+ * and alignment and can not be used for audio transport */</span><br><span style="color: hsl(120, 100%, 40%);">+ first_endpoint_nr = 1 * MGCP_ENDP_E1_SUBSLOTS;</span><br><span style="color: hsl(120, 100%, 40%);">+ number_endpoints = 31 * MGCP_ENDP_E1_SUBSLOTS;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure the amount of requested endpoints does not execeed</span><br><span style="color: hsl(120, 100%, 40%);">+ * sane limits. The VTY already limits the possible amount,</span><br><span style="color: hsl(120, 100%, 40%);">+ * however miss-initialization of the struct or memory corruption</span><br><span style="color: hsl(120, 100%, 40%);">+ * could still lead to an excessive allocation of endpoints, so</span><br><span style="color: hsl(120, 100%, 40%);">+ * better stop early if that is the case. */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(number_endpoints < 65534);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* allocate pointer array for the endpoints */</span><br><span> trunk->endpoints = _talloc_zero_array(trunk->cfg,</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(struct mgcp_endpoint *), trunk->vty_number_endpoints, "endpoints");</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(struct mgcp_endpoint *), number_endpoints, "endpoints");</span><br><span> if (!trunk->endpoints)</span><br><span> return -1;</span><br><span> </span><br><span> /* create endpoints */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < trunk->vty_number_endpoints; ++i) {</span><br><span style="color: hsl(0, 100%, 40%);">- endp = mgcp_endp_alloc(trunk, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < number_endpoints; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_alloc(trunk, i + first_endpoint_nr);</span><br><span> if (!endp) {</span><br><span> talloc_free(trunk->endpoints);</span><br><span> return -1;</span><br><span>@@ -98,7 +117,7 @@</span><br><span> }</span><br><span> </span><br><span> /* make the endpoints we just created available to the MGW code */</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->number_endpoints = trunk->vty_number_endpoints;</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->number_endpoints = number_endpoints;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index 2f862f1..35b75fb 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -112,7 +112,7 @@</span><br><span> trunk->audio_send_name ? "" : "no ", VTY_NEWLINE);</span><br><span> vty_out(vty, " loop %u%s", ! !trunk->audio_loop, VTY_NEWLINE);</span><br><span> vty_out(vty, " number endpoints %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->vty_number_endpoints - 1, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->vty_number_endpoints, VTY_NEWLINE);</span><br><span> vty_out(vty, " %sallow-transcoding%s",</span><br><span> trunk->no_audio_transcoding ? "no " : "", VTY_NEWLINE);</span><br><span> if (g_cfg->call_agent_addr)</span><br><span>@@ -289,7 +289,7 @@</span><br><span> </span><br><span> vty_out(vty, "%s trunk %d with %d endpoints:%s",</span><br><span> trunk->trunk_type == MGCP_TRUNK_VIRTUAL ? "Virtual" : "E1",</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->trunk_nr, trunk->number_endpoints - 1, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->trunk_nr, trunk->number_endpoints, VTY_NEWLINE);</span><br><span> </span><br><span> if (!trunk->endpoints) {</span><br><span> vty_out(vty, "No endpoints allocated yet.%s", VTY_NEWLINE);</span><br><span>@@ -710,13 +710,12 @@</span><br><span> </span><br><span> DEFUN(cfg_mgcp_number_endp,</span><br><span> cfg_mgcp_number_endp_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "number endpoints <0-65534>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "number endpoints <1-65534>",</span><br><span> "Number options\n" "Endpoints available\n" "Number endpoints\n")</span><br><span> {</span><br><span> struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID);</span><br><span> OSMO_ASSERT(trunk);</span><br><span style="color: hsl(0, 100%, 40%);">- /* + 1 as we start counting at one */</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->vty_number_endpoints = atoi(argv[0]) + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->vty_number_endpoints = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 9cafcf7..792ae1f 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -605,7 +605,7 @@</span><br><span> </span><br><span> trunk = endp->trunk;</span><br><span> last_endpoint[0] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < trunk->vty_number_endpoints; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < trunk->number_endpoints; i++) {</span><br><span> if (strcmp(endp->name, trunk->endpoints[i]->name) == 0)</span><br><span> osmo_strlcpy(last_endpoint, trunk->endpoints[i]->name,</span><br><span> sizeof(last_endpoint));</span><br><span>@@ -656,7 +656,7 @@</span><br><span> static void mgcp_endpoints_release(struct mgcp_trunk *trunk)</span><br><span> {</span><br><span> int i;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 1; i < trunk->number_endpoints; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < trunk->number_endpoints; i++)</span><br><span> mgcp_endp_release(trunk->endpoints[i]);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19121">change 19121</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-mgw/+/19121"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 </div>
<div style="display:none"> Gerrit-Change-Number: 19121 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </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>