<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11495">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use local variable for rate counters in handle_create_con()<br><br>Use a local variable to shorten the length of rate counter names.<br>Cosmetic only; no functional change.<br><br>Change-Id: If4f097c5e441914eaa24c7657813ebb3f9a49916<br>Related: OS#2660<br>---<br>M src/libosmo-mgcp/mgcp_protocol.c<br>1 file changed, 12 insertions(+), 12 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/95/11495/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index bc35e5c..24c8e54 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -726,8 +726,8 @@</span><br><span> {</span><br><span> struct mgcp_trunk_config *tcfg = p->endp->tcfg;</span><br><span> struct mgcp_endpoint *endp = p->endp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *rate_ctrs = tcfg->mgcp_crcx_ctr_group;</span><br><span> int error_code = 400;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> const char *local_options = NULL;</span><br><span> const char *callid = NULL;</span><br><span> const char *mode = NULL;</span><br><span>@@ -756,7 +756,7 @@</span><br><span> /* It is illegal to send a connection identifier</span><br><span> * together with a CRCX, the MGW will assign the</span><br><span> * connection identifier by itself on CRCX */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_BAD_ACTION]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_BAD_ACTION]);</span><br><span> return create_err_response(NULL, 523, "CRCX", p->trans);</span><br><span> break;</span><br><span> case 'M':</span><br><span>@@ -783,7 +783,7 @@</span><br><span> LOGP(DLMGCP, LOGL_NOTICE,</span><br><span> "CRCX: endpoint:%x unhandled option: '%c'/%d\n",</span><br><span> ENDPOINT_NUMBER(endp), *line, *line);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNHANDLED_PARAM]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_UNHANDLED_PARAM]);</span><br><span> return create_err_response(NULL, 539, "CRCX", p->trans);</span><br><span> break;</span><br><span> }</span><br><span>@@ -795,7 +795,7 @@</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "CRCX: endpoint:%x insufficient parameters, missing callid\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_MISSING_CALLID]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_MISSING_CALLID]);</span><br><span> return create_err_response(endp, 516, "CRCX", p->trans);</span><br><span> }</span><br><span> </span><br><span>@@ -803,7 +803,7 @@</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "CRCX: endpoint:%x insufficient parameters, missing mode\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_INVALID_MODE]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_MODE]);</span><br><span> return create_err_response(endp, 517, "CRCX", p->trans);</span><br><span> }</span><br><span> </span><br><span>@@ -820,7 +820,7 @@</span><br><span> } else {</span><br><span> /* There is no more room for a connection, leave</span><br><span> * everything as it is and return with an error */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_LIMIT_EXCEEDED]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_LIMIT_EXCEEDED]);</span><br><span> return create_err_response(endp, 540, "CRCX", p->trans);</span><br><span> }</span><br><span> }</span><br><span>@@ -838,7 +838,7 @@</span><br><span> else {</span><br><span> /* This is not our call, leave everything as it is and</span><br><span> * return with an error. */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_UNKNOWN_CALLID]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_UNKNOWN_CALLID]);</span><br><span> return create_err_response(endp, 400, "CRCX", p->trans);</span><br><span> }</span><br><span> }</span><br><span>@@ -854,7 +854,7 @@</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "CRCX: endpoint:0x%x unable to allocate RTP connection\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_ALLOC_CONN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_ALLOC_CONN]);</span><br><span> goto error2;</span><br><span> </span><br><span> }</span><br><span>@@ -918,7 +918,7 @@</span><br><span> "CRCX: endpoint:%x selected connection mode type requires an opposite end!\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span> error_code = 527;</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC]);</span><br><span> goto error2;</span><br><span> }</span><br><span> </span><br><span>@@ -930,7 +930,7 @@</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "CRCX: endpoint:0x%x could not start RTP processing!\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_START_RTP]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_START_RTP]);</span><br><span> goto error2;</span><br><span> }</span><br><span> </span><br><span>@@ -945,7 +945,7 @@</span><br><span> "CRCX: endpoint:0x%x CRCX rejected by policy\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span> mgcp_endp_release(endp);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_FAIL_REJECTED_BY_POLICY]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_REJECTED_BY_POLICY]);</span><br><span> return create_err_response(endp, 400, "CRCX", p->trans);</span><br><span> break;</span><br><span> case MGCP_POLICY_DEFER:</span><br><span>@@ -973,7 +973,7 @@</span><br><span> LOGP(DLMGCP, LOGL_NOTICE,</span><br><span> "CRCX: endpoint:0x%x connection successfully created\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&tcfg->mgcp_crcx_ctr_group->ctr[MGCP_CRCX_SUCCESS]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_SUCCESS]);</span><br><span> return create_response_with_sdp(endp, conn, "CRCX", p->trans, true);</span><br><span> error2:</span><br><span> mgcp_endp_release(endp);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11495">change 11495</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/11495"/><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: If4f097c5e441914eaa24c7657813ebb3f9a49916 </div>
<div style="display:none"> Gerrit-Change-Number: 11495 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>