<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9473">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_lco: get rid of struct member "string"<br><br>struct mgcp_lco there contains a struct member "string", which is<br>a char pointer. This pointer is populated with a copy of the LCO<br>string that has been received via MGCP. However, this memory is<br>used only when parsing the LCO options and then never again. This<br>struct member requires handling using talloc and complicates things<br>unnecessarily, so lets remove it.<br><br>- Remove struct member "string" from struct mgcp_lco<br><br>Change-Id: I6715c7178033f1b94d6561ef0a6e97fe106f67bd<br>---<br>M include/osmocom/mgcp/mgcp_internal.h<br>M src/libosmo-mgcp/mgcp_endp.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>3 files changed, 2 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/73/9473/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index 7a00c98..382becb 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -149,7 +149,6 @@</span><br><span> };</span><br><span> </span><br><span> struct mgcp_lco {</span><br><span style="color: hsl(0, 100%, 40%);">-    char *string;</span><br><span>        char *codec;</span><br><span>         int pkt_period_min; /* time in ms */</span><br><span>         int pkt_period_max; /* time in ms */</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c</span><br><span>index fa2dd28..aebf19c 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_endp.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_endp.c</span><br><span>@@ -48,8 +48,6 @@</span><br><span>        /* Reset endpoint parameters and states */</span><br><span>   talloc_free(endp->callid);</span><br><span>        endp->callid = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(endp->local_options.string);</span><br><span style="color: hsl(0, 100%, 40%);">-     endp->local_options.string = NULL;</span><br><span>        talloc_free(endp->local_options.codec);</span><br><span>   endp->local_options.codec = NULL;</span><br><span>         endp->wildcarded_req = false;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index ded1552..9fdaf18 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -410,15 +410,12 @@</span><br><span>        if (strlen(options) == 0)</span><br><span>            return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   talloc_free(lco->string);</span><br><span style="color: hsl(0, 100%, 40%);">-    lco->string = talloc_strdup(ctx, options ? options : "");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  p_opt = strstr(lco->string, "p:");</span><br><span style="color: hsl(120, 100%, 40%);">+       p_opt = strstr(options, "p:");</span><br><span>     if (p_opt && sscanf(p_opt, "p:%d-%d",</span><br><span>                          &lco->pkt_period_min, &lco->pkt_period_max) == 1)</span><br><span>          lco->pkt_period_max = lco->pkt_period_min;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    a_opt = strstr(lco->string, "a:");</span><br><span style="color: hsl(120, 100%, 40%);">+       a_opt = strstr(options, "a:");</span><br><span>     if (a_opt && sscanf(a_opt, "a:%8[^,]", codec) == 1) {</span><br><span>              talloc_free(lco->codec);</span><br><span>          lco->codec = talloc_strdup(ctx, codec);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9473">change 9473</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/9473"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I6715c7178033f1b94d6561ef0a6e97fe106f67bd </div>
<div style="display:none"> Gerrit-Change-Number: 9473 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>