<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/25429">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename strip_epname and find_specific_endpoint and make them available<br><br>Change-Id: I4f76676640a308ab84da3848e1c1ec22bd5d9566<br>---<br>M include/osmocom/mgcp/mgcp_endp.h<br>M src/libosmo-mgcp/mgcp_endp.c<br>2 files changed, 20 insertions(+), 10 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 b8796c1..91c4551 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_endp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_endp.h</span><br><span>@@ -136,3 +136,7 @@</span><br><span> bool mgcp_endp_avail(struct mgcp_endpoint *endp);</span><br><span> void mgcp_endp_add_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn);</span><br><span> void mgcp_endp_remove_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_endp_strip_name(char *epname_stripped, const char *epname,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_trunk *trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_endpoint *mgcp_endp_find_specific(const char *epname,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 19446ce..247baac 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_endp.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_endp.c</span><br><span>@@ -187,12 +187,16 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Convert all characters in epname to lowercase and strip trunk prefix and</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Convert all characters in epname to lowercase and strip trunk prefix and</span><br><span> * endpoint name suffix (domain name) from epname. The result is written to</span><br><span> * to the memory pointed at by epname_stripped. The expected size of the</span><br><span> * result is either equal or lower then the length of the input string</span><br><span style="color: hsl(0, 100%, 40%);">- * (epname) */</span><br><span style="color: hsl(0, 100%, 40%);">-static void strip_epname(char *epname_stripped, const char *epname,</span><br><span style="color: hsl(120, 100%, 40%);">+ * (epname)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] epname_stripped pointer to store the stripped ep name.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] epname endpoint name to lookup.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] trunk where the endpoint is located. */</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_endp_strip_name(char *epname_stripped, const char *epname,</span><br><span> const struct mgcp_trunk *trunk)</span><br><span> {</span><br><span> osmo_str_tolower_buf(epname_stripped, MGCP_ENDPOINT_MAXLEN, epname);</span><br><span>@@ -219,9 +223,11 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Find an endpoint specified by its name. If the endpoint can not be found,</span><br><span style="color: hsl(0, 100%, 40%);">- * return NULL */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct mgcp_endpoint *find_specific_endpoint(const char *epname,</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Find an endpoint of a trunk specified by its name.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] epname endpoint name to check</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] trunk mgcp_trunk that might have this endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns NULL if no ep found, else endpoint */</span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_endpoint *mgcp_endp_find_specific(const char *epname,</span><br><span> const struct mgcp_trunk *trunk)</span><br><span> {</span><br><span> char epname_stripped[MGCP_ENDPOINT_MAXLEN];</span><br><span>@@ -230,11 +236,11 @@</span><br><span> unsigned int i;</span><br><span> </span><br><span> /* Strip irrelevant information from the endpoint name */</span><br><span style="color: hsl(0, 100%, 40%);">- strip_epname(epname_stripped, epname, trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endp_strip_name(epname_stripped, epname, trunk);</span><br><span> </span><br><span> for (i = 0; i < trunk->number_endpoints; i++) {</span><br><span> endp = trunk->endpoints[i];</span><br><span style="color: hsl(0, 100%, 40%);">- strip_epname(epname_stripped_endp, endp->name, trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endp_strip_name(epname_stripped_endp, endp->name, trunk);</span><br><span> if (strcmp(epname_stripped_endp, epname_stripped) == 0)</span><br><span> return endp;</span><br><span> }</span><br><span>@@ -289,7 +295,7 @@</span><br><span> </span><br><span> /* Find an endpoint by its name (if wildcarded request is not</span><br><span> * applicable) */</span><br><span style="color: hsl(0, 100%, 40%);">- endp = find_specific_endpoint(epname, trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = mgcp_endp_find_specific(epname, trunk);</span><br><span> if (endp) {</span><br><span> LOGPENDP(endp, DLMGCP, LOGL_DEBUG,</span><br><span> "(trunk:%d) found endpoint: %s\n",</span><br><span>@@ -540,7 +546,7 @@</span><br><span> epname_check = gen_e1_epname(endp, endp->trunk->cfg->domain,</span><br><span> endp->trunk->trunk_nr, ts_nr,</span><br><span> interlock[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- endp_check = find_specific_endpoint(epname_check, endp->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp_check = mgcp_endp_find_specific(epname_check, endp->trunk);</span><br><span> if (!endp_check) {</span><br><span> LOGPENDP(endp, DLMGCP, LOGL_ERROR,</span><br><span> "cannot check endpoint availability, overlapping endpoint:%s not found!\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/25429">change 25429</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/+/25429"/><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: I4f76676640a308ab84da3848e1c1ec22bd5d9566 </div>
<div style="display:none"> Gerrit-Change-Number: 25429 </div>
<div style="display:none"> Gerrit-PatchSet: 18 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>