<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18754">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">endp: move endpoint name generation into mgcp_endp.c<br><br>When the trunk allocates its endpoints by using mgcp_endp_alloc()<br>ist passes the name for each endpoint as a parameter. In order to<br>generate the name endpoint specific knowlege is required.<br><br>This process can be simplified, since all what<br>mgcp_trunk_alloc_endpts() does is calling mgcp_endp_alloc() in a loop in<br>order to generate a consecuitve series of endpoints. The endpoint names<br>are generated from the index of the for loop.<br><br>When we just pass the index instead of the endpoint name to<br>mgcp_endp_alloc(), then we can greatly simplify the code since all the<br>knowledge about the name generation can go into mgcp_endp.c. The<br>endpoint will name itsself by the trunk properties and the index number<br>we pass with the allocator function.<br><br>Change-Id: I8dee07f1c63037d1f73113f69c612d1f2703cee5<br>Related: OS#2659<br>---<br>M include/osmocom/mgcp/mgcp_endp.h<br>M src/libosmo-mgcp/mgcp_endp.c<br>M src/libosmo-mgcp/mgcp_trunk.c<br>3 files changed, 18 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h</span><br><span>index 5737cd2..8fb8d2c 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_endp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_endp.h</span><br><span>@@ -103,7 +103,7 @@</span><br><span> uint32_t x_osmo_ign;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk, char *name);</span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk, unsigned int index);</span><br><span> void mgcp_endp_release(struct mgcp_endpoint *endp);</span><br><span> struct mgcp_endpoint *mgcp_endp_by_name_trunk(int *cause, const char *epname,</span><br><span> const struct mgcp_trunk *trunk);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c</span><br><span>index 6c78de2..3f1213b 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_endp.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_endp.c</span><br><span>@@ -33,11 +33,20 @@</span><br><span> .rtp.cleanup_cb = mgcp_cleanup_rtp_bridge_cb</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Generate virtual endpoint name from given parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+static char *gen_virtual_epname(void *ctx, const char *domain,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int index)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return talloc_asprintf(ctx, "%s%x@%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK, index, domain);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! allocate an endpoint and set default values.</span><br><span> * \param[in] trunk configuration.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] name endpoint name.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] name endpoint index.</span><br><span> * \returns endpoint on success, NULL on failure. */</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk, char *name)</span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int index)</span><br><span> {</span><br><span> struct mgcp_endpoint *endp;</span><br><span> </span><br><span>@@ -48,15 +57,18 @@</span><br><span> INIT_LLIST_HEAD(&endp->conns);</span><br><span> endp->cfg = trunk->cfg;</span><br><span> endp->trunk = trunk;</span><br><span style="color: hsl(0, 100%, 40%);">- endp->name = talloc_strdup(endp, name);</span><br><span> </span><br><span> switch (trunk->trunk_type) {</span><br><span> case MGCP_TRUNK_VIRTUAL:</span><br><span> endp->type = &ep_typeset.rtp;</span><br><span style="color: hsl(120, 100%, 40%);">+ endp->name = gen_virtual_epname(endp, trunk->cfg->domain, index);</span><br><span> break;</span><br><span> case MGCP_TRUNK_E1:</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: Implement E1 allocation */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: E1 trunk implementation is work in progress, this endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+ * name is incomplete (subslots) */</span><br><span style="color: hsl(120, 100%, 40%);">+ endp->name = talloc_asprintf(endp, "%s-1/%x", MGCP_ENDPOINT_PREFIX_E1_TRUNK, index);</span><br><span> LOGP(DLMGCP, LOGL_FATAL, "E1 trunks not implemented!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ endp->type = &ep_typeset.rtp;</span><br><span> break;</span><br><span> default:</span><br><span> osmo_panic("Cannot allocate unimplemented trunk type %d! %s:%d\n",</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c</span><br><span>index 6736145..3692351 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_trunk.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_trunk.c</span><br><span>@@ -66,7 +66,6 @@</span><br><span> int mgcp_trunk_alloc_endpts(struct mgcp_trunk *trunk)</span><br><span> {</span><br><span> int i;</span><br><span style="color: hsl(0, 100%, 40%);">- char ep_name_buf[MGCP_ENDPOINT_MAXLEN];</span><br><span> struct mgcp_endpoint *endp;</span><br><span> </span><br><span> /* Make sure the amount of requested endpoints does not execeed</span><br><span>@@ -90,22 +89,7 @@</span><br><span> </span><br><span> /* create endpoints */</span><br><span> for (i = 0; i < trunk->vty_number_endpoints; ++i) {</span><br><span style="color: hsl(0, 100%, 40%);">- switch (trunk->trunk_type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_TRUNK_VIRTUAL:</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(ep_name_buf, sizeof(ep_name_buf), "%s%x@%s", MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK, i,</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->cfg->domain);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_TRUNK_E1:</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: E1 trunk implementation is work in progress, this endpoint</span><br><span style="color: hsl(0, 100%, 40%);">- * name is incomplete (subslots) */</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(ep_name_buf, sizeof(ep_name_buf), "%s-1/%x", MGCP_ENDPOINT_PREFIX_E1_TRUNK, i);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_panic("Cannot allocate unimplemented trunk type %d! %s:%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->trunk_type, __FILE__, __LINE__);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- endp = mgcp_endp_alloc(trunk, ep_name_buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_alloc(trunk, i);</span><br><span> if (!endp) {</span><br><span> talloc_free(trunk->endpoints);</span><br><span> return -1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18754">change 18754</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/+/18754"/><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: I8dee07f1c63037d1f73113f69c612d1f2703cee5 </div>
<div style="display:none"> Gerrit-Change-Number: 18754 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: 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>