<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13665">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-client: Sanitize implementation of mgcp_client_rtpbridge_wildcard<br><br>* Get rid of string define containing printf statements<br>* Split name from rest of checks to easily add new names later<br><br>Change-Id: I46e05a7a3432733976760bbf1c5deb4f7610db11<br>---<br>M src/libosmo-mgcp-client/mgcp_client.c<br>1 file changed, 9 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>index 17f40b9..2dcab62 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>@@ -828,16 +828,15 @@</span><br><span> return mgcp->actual.endpoint_domain_name[0] ? mgcp->actual.endpoint_domain_name : "mgw";</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp)</span><br><span style="color: hsl(120, 100%, 40%);">+static const char *_mgcp_client_name_append_domain(const struct mgcp_client *mgcp, char *name)</span><br><span> {</span><br><span> static char endpoint[MGCP_ENDPOINT_MAXLEN];</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define RTPBRIDGE_WILDCARD_FMT "rtpbridge/*@%s"</span><br><span style="color: hsl(0, 100%, 40%);">- rc = snprintf(endpoint, sizeof(endpoint), RTPBRIDGE_WILDCARD_FMT, mgcp_client_endpoint_domain(mgcp));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = snprintf(endpoint, sizeof(endpoint), "%s@%s", name, mgcp_client_endpoint_domain(mgcp));</span><br><span> if (rc > sizeof(endpoint) - 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR, "MGCP endpoint exceeds maximum length of %zu: '" RTPBRIDGE_WILDCARD_FMT "'\n",</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(endpoint) - 1, mgcp_client_endpoint_domain(mgcp));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR, "MGCP endpoint exceeds maximum length of %zu: '%s@%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(endpoint) - 1, name, mgcp_client_endpoint_domain(mgcp));</span><br><span> return NULL;</span><br><span> }</span><br><span> if (rc < 1) {</span><br><span>@@ -847,6 +846,11 @@</span><br><span> return endpoint;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return _mgcp_client_name_append_domain(mgcp, "rtpbridge/*");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct mgcp_response_pending * mgcp_client_pending_add(</span><br><span> struct mgcp_client *mgcp,</span><br><span> mgcp_trans_id_t trans_id,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13665">change 13665</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/13665"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I46e05a7a3432733976760bbf1c5deb4f7610db11 </div>
<div style="display:none"> Gerrit-Change-Number: 13665 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>