<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11327">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: Log endpoint nr consistently as hex<br><br>Change-Id: I281964935312161d1da49e8035c5bf3bb7bf9c5c<br>---<br>M openbsc/src/libmgcp/mgcp_network.c<br>M openbsc/src/libmgcp/mgcp_osmux.c<br>M openbsc/tests/mgcp/mgcp_test.c<br>3 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c</span><br><span>index 799d998..49500d9 100644</span><br><span>--- a/openbsc/src/libmgcp/mgcp_network.c</span><br><span>+++ b/openbsc/src/libmgcp/mgcp_network.c</span><br><span>@@ -763,7 +763,7 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint 0x%x\n",</span><br><span> endp->type, ENDPOINT_NUMBER(endp));</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -856,7 +856,7 @@</span><br><span> break; /* Should not happen */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMGCP, LOGL_ERROR, "Bad MGCP type %u on endpoint 0x%x\n",</span><br><span> endp->type, ENDPOINT_NUMBER(endp));</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>index 0a4441c..71e8eae 100644</span><br><span>--- a/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>+++ b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>@@ -340,12 +340,12 @@</span><br><span> </span><br><span> if (osmux_enable_endpoint(endp, &addr->sin_addr, addr->sin_port) < 0 ) {</span><br><span> LOGP(DMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Could not enable osmux in endpoint %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Could not enable osmux in endpoint 0x%x\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span> goto out;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint %d for %s:%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMGCP, LOGL_INFO, "Enabling osmux in endpoint 0x%x for %s:%u\n",</span><br><span> ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr),</span><br><span> ntohs(addr->sin_port));</span><br><span> out:</span><br><span>@@ -442,7 +442,7 @@</span><br><span> static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1);</span><br><span> </span><br><span> if (endp->osmux.state == OSMUX_STATE_DISABLED) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMGCP, LOGL_ERROR, "Endpoint %u didn't request Osmux\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMGCP, LOGL_ERROR, "Endpoint 0x%x didn't request Osmux\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -482,7 +482,7 @@</span><br><span> </span><br><span> void osmux_disable_endpoint(struct mgcp_endpoint *endp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMGCP, LOGL_INFO, "Releasing endpoint %u using Osmux CID %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMGCP, LOGL_INFO, "Releasing endpoint 0x%x using Osmux CID %u\n",</span><br><span> ENDPOINT_NUMBER(endp), endp->osmux.cid);</span><br><span> </span><br><span> /* We are closing, we don't need pending RTP packets to be transmitted */</span><br><span>@@ -528,7 +528,7 @@</span><br><span> if (osmux_enable_endpoint(endp, &endp->net_end.addr,</span><br><span> htons(endp->cfg->osmux_port)) < 0) {</span><br><span> LOGP(DMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Could not activate osmux in endpoint %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Could not activate osmux in endpoint 0x%x\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span> }</span><br><span> LOGP(DMGCP, LOGL_ERROR,</span><br><span>diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c</span><br><span>index 92099db..e7a582a 100644</span><br><span>--- a/openbsc/tests/mgcp/mgcp_test.c</span><br><span>+++ b/openbsc/tests/mgcp/mgcp_test.c</span><br><span>@@ -436,7 +436,7 @@</span><br><span> static int mgcp_test_policy_cb(struct mgcp_trunk_config *cfg, int endpoint,</span><br><span> int state, const char *transactio_id)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Policy CB got state %d on endpoint %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Policy CB got state %d on endpoint 0x%x\n",</span><br><span> state, endpoint);</span><br><span> last_endpoint = endpoint;</span><br><span> return MGCP_POLICY_CONT;</span><br><span>@@ -603,7 +603,7 @@</span><br><span> OSMO_ASSERT(last_endpoint != -1);</span><br><span> endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "endpoint %d: "</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "endpoint 0x%x: "</span><br><span> "payload type BTS %d (exp %d), NET %d (exp %d)\n",</span><br><span> last_endpoint,</span><br><span> endp->bts_end.codec.payload_type, t->exp_bts_ptype,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11327">change 11327</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/11327"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I281964935312161d1da49e8035c5bf3bb7bf9c5c </div>
<div style="display:none"> Gerrit-Change-Number: 11327 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>