<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11375">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp: Log endpoint nr consistently as hex<br><br>Port from openbsc 078905a0603c91b227854abfa01c9e24143e39a1.<br>Change-Id: Idcb40e6fd561b24e111afe7463f44c43c530fac5<br>---<br>M src/libosmo-mgcp/mgcp_osmux.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>M tests/mgcp/mgcp_test.c<br>3 files changed, 5 insertions(+), 5 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/75/11375/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>index 9ae82cd..bc9eca2 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -407,12 +407,12 @@</span><br><span> </span><br><span>     if (osmux_enable_conn(endp, conn_net, &addr->sin_addr, addr->sin_port) < 0 ) {</span><br><span>          LOGP(DLMGCP, 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(DLMGCP, LOGL_INFO, "Enabling osmux in endpoint %d for %s:%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+        LOGP(DLMGCP, 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>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index bc191b5..e17bdae 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -691,7 +691,7 @@</span><br><span>           if (!strcmp(token, "C"))</span><br><span>                   endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID;</span><br><span>               else</span><br><span style="color: hsl(0, 100%, 40%);">-                    LOGP(DLMGCP, LOGL_ERROR, "endpoint %x: received unknown X-Osmo-IGN item '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                    LOGP(DLMGCP, LOGL_ERROR, "endpoint 0x%x: received unknown X-Osmo-IGN item '%s'\n",</span><br><span>                              ENDPOINT_NUMBER(endp), token);</span><br><span>  }</span><br><span> </span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 4cb16dd..a540056 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -550,7 +550,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>@@ -813,7 +813,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 %d (expected %d)\n",</span><br><span>                                 last_endpoint,</span><br><span>                               conn->end.codec->payload_type, t->ptype);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11375">change 11375</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/11375"/><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: Idcb40e6fd561b24e111afe7463f44c43c530fac5 </div>
<div style="display:none"> Gerrit-Change-Number: 11375 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>