<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26342">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce iuh log category<br><br>Change-Id: I2c9cb54958807bd68c04a4c0d3a0f355dd641282<br>---<br>M include/osmocom/hnodeb/hnodeb.h<br>M src/osmo-hnodeb/debug.c<br>M src/osmo-hnodeb/iuh.c<br>3 files changed, 14 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/42/26342/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h</span><br><span>index 4cc0831..ed389c1 100644</span><br><span>--- a/include/osmocom/hnodeb/hnodeb.h</span><br><span>+++ b/include/osmocom/hnodeb/hnodeb.h</span><br><span>@@ -32,6 +32,7 @@</span><br><span> DHNBAP,</span><br><span> DRUA,</span><br><span> DRANAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ DIUH,</span><br><span> DNAS,</span><br><span> };</span><br><span> extern const struct log_info hnb_log_info;</span><br><span>diff --git a/src/osmo-hnodeb/debug.c b/src/osmo-hnodeb/debug.c</span><br><span>index f50d8b0..92f76c4 100644</span><br><span>--- a/src/osmo-hnodeb/debug.c</span><br><span>+++ b/src/osmo-hnodeb/debug.c</span><br><span>@@ -42,6 +42,11 @@</span><br><span> .color = "\033[1;35m",</span><br><span> .description = "RANAP User Adaptation",</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DIUH] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DIUH", .loglevel = LOGL_NOTICE, .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;36m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Iuh protocol",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> [DNAS] = {</span><br><span> .name = "NAS", .loglevel = LOGL_NOTICE, .enabled = 1,</span><br><span> .color = "\033[1;32m",</span><br><span>diff --git a/src/osmo-hnodeb/iuh.c b/src/osmo-hnodeb/iuh.c</span><br><span>index 481c841..595181b 100644</span><br><span>--- a/src/osmo-hnodeb/iuh.c</span><br><span>+++ b/src/osmo-hnodeb/iuh.c</span><br><span>@@ -52,12 +52,12 @@</span><br><span> rc = sctp_recvmsg(fd->fd, msgb_data(msg), msgb_tailroom(msg),</span><br><span> NULL, NULL, &sinfo, &flags);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, LOGL_ERROR, "Error during sctp_recvmsg()\n");</span><br><span> /* FIXME: clean up after disappeared HNB */</span><br><span> osmo_stream_cli_close(conn);</span><br><span> goto free_ret;</span><br><span> } else if (rc == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_INFO, "Connection to HNBGW closed\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, LOGL_INFO, "Connection to HNBGW closed\n");</span><br><span> osmo_stream_cli_close(conn);</span><br><span> rc = -1;</span><br><span> goto free_ret;</span><br><span>@@ -66,7 +66,7 @@</span><br><span> }</span><br><span> </span><br><span> if (flags & MSG_NOTIFICATION) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_DEBUG, "Ignoring SCTP notification\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, LOGL_DEBUG, "Ignoring SCTP notification\n");</span><br><span> rc = 0;</span><br><span> goto free_ret;</span><br><span> }</span><br><span>@@ -85,12 +85,12 @@</span><br><span> case IUH_PPI_SABP:</span><br><span> case IUH_PPI_RNA:</span><br><span> case IUH_PPI_PUA:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%u received\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, LOGL_ERROR, "Unimplemented SCTP PPID=%u received\n",</span><br><span> sinfo.sinfo_ppid);</span><br><span> rc = 0;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%u received\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, LOGL_ERROR, "Unknown SCTP PPID=%u received\n",</span><br><span> sinfo.sinfo_ppid);</span><br><span> rc = 0;</span><br><span> break;</span><br><span>@@ -103,7 +103,7 @@</span><br><span> </span><br><span> static int hnb_iuh_connect_cb(struct osmo_stream_cli *conn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_NOTICE, "Iuh connected to HNBGW\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, LOGL_NOTICE, "Iuh connected to HNBGW\n");</span><br><span> struct hnb *hnb = osmo_stream_cli_get_data(conn);</span><br><span> </span><br><span> hnb_send_register_req(hnb);</span><br><span>@@ -142,7 +142,7 @@</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_INFO, "Iuh Connect: %s[:%u] => %s[:%u]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, LOGL_INFO, "Iuh Connect: %s[:%u] => %s[:%u]\n",</span><br><span> hnb->iuh.local_addr, hnb->iuh.local_port, hnb->iuh.remote_addr, hnb->iuh.remote_port);</span><br><span> </span><br><span> osmo_stream_cli_set_addrs(hnb->iuh.client, (const char**)&hnb->iuh.remote_addr, 1);</span><br><span>@@ -151,7 +151,7 @@</span><br><span> osmo_stream_cli_set_local_port(hnb->iuh.client, hnb->iuh.local_port);</span><br><span> rc = osmo_stream_cli_open(hnb->iuh.client);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Unable to open stream client for Iuh %s[:%u] => %s[:%u]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, LOGL_ERROR, "Unable to open stream client for Iuh %s[:%u] => %s[:%u]\n",</span><br><span> hnb->iuh.local_addr, hnb->iuh.local_port, hnb->iuh.remote_addr, hnb->iuh.remote_port);</span><br><span> /* we don't return error in here because osmo_stream_cli_open()</span><br><span> will continue to retry (due to timeout being explicitly set with</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26342">change 26342</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/c/osmo-hnodeb/+/26342"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hnodeb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2c9cb54958807bd68c04a4c0d3a0f355dd641282 </div>
<div style="display:none"> Gerrit-Change-Number: 26342 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>