<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12270">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_client: logging tweaks<br><br>Fix typos, use osmo_sock_get_name2() to show the tx source and target IP:port,<br>shorten some wording.<br><br>Depends: I8ad89ac447c9c582742e70d082072bdd40a5a398 (libosmocore)<br>Change-Id: Iae728192f499330d16836d9435648f6b8ed213b6<br>---<br>M src/libosmo-mgcp-client/mgcp_client.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/70/12270/1</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 fc9c5d3..f5eee95 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>@@ -717,11 +717,13 @@</span><br><span> </span><br><span> ret = read(fd->fd, msg->data, 4096 - 128);</span><br><span> if (ret <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR, "Failed to read: %d/%s\n", errno, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR, "Failed to read: %s: %d='%s'\n", osmo_sock_get_name2(fd->fd),</span><br><span style="color: hsl(120, 100%, 40%);">+ errno, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msgb_free(msg);</span><br><span> return -1;</span><br><span> } else if (ret > 4096 - 128) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR, "Too much data: %d\n", ret);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR, "Too much data: %s: %d\n", osmo_sock_get_name2(fd->fd), ret);</span><br><span> msgb_free(msg);</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -736,13 +738,13 @@</span><br><span> {</span><br><span> int ret;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_DEBUG, "Sending msg to MGCP GW size: len=%u '%s'...\n",</span><br><span style="color: hsl(0, 100%, 40%);">- msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len)));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_DEBUG, "Tx MGCP: %s: len=%u '%s'...\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sock_get_name2(fd->fd), msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len)));</span><br><span> </span><br><span> ret = write(fd->fd, msg->data, msg->len);</span><br><span> if (ret != msg->len)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR, "Failed to Tx MGCP: %d='%s'; msg: len=%u '%s'...\n",</span><br><span style="color: hsl(0, 100%, 40%);">- errno, strerror(errno),</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR, "Failed to Tx MGCP: %s: %d='%s'; msg: len=%u '%s'...\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sock_get_name2(fd->fd), errno, strerror(errno),</span><br><span> msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len)));</span><br><span> return ret;</span><br><span> }</span><br><span>@@ -803,12 +805,12 @@</span><br><span> </span><br><span> /* Choose a new port number to try next */</span><br><span> LOGP(DLMGCP, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "MGCPGW faild to bind to port %u, retrying with port %u -- check configuration!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp->actual.local_port, mgcp->actual.local_port + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ "MGCPGW failed to bind to %s:%u, retrying with port %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp->actual.local_addr, mgcp->actual.local_port, mgcp->actual.local_port + 1);</span><br><span> mgcp->actual.local_port++;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_FATAL, "MGCPGW faild to find a port to bind on %i times.\n", i);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_FATAL, "MGCPGW failed to find a port to bind on %i times.\n", i);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -846,9 +848,7 @@</span><br><span> wq->read_cb = mgcp_do_read;</span><br><span> wq->write_cb = mgcp_do_write;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s:%u -> %s:%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp->actual.local_addr, mgcp->actual.local_port,</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp->actual.remote_addr, mgcp->actual.remote_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s\n", osmo_sock_get_name2(wq->bfd.fd));</span><br><span> </span><br><span> return 0;</span><br><span> error_close_fd:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12270">change 12270</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/12270"/><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: Iae728192f499330d16836d9435648f6b8ed213b6 </div>
<div style="display:none"> Gerrit-Change-Number: 12270 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>