<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26343">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">iuh: Improve logging of SCTP notifications<br><br>Change-Id: I08842665effec6e70a3c7f6b93ea62c45549d69d<br>---<br>M TODO-RELEASE<br>M src/osmo-hnodeb/iuh.c<br>2 files changed, 50 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/43/26343/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index d0852fc..9e75c9a 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -7,3 +7,4 @@</span><br><span> # If any interfaces have been added since the last public release: c:r:a + 1.</span><br><span> # If any interfaces have been removed or changed since the last public release: c:r:0.</span><br><span> #library what description / commit summary line</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo-netif >1.1.0 use of netif/sctp.h</span><br><span>diff --git a/src/osmo-hnodeb/iuh.c b/src/osmo-hnodeb/iuh.c</span><br><span>index 595181b..71d805d 100644</span><br><span>--- a/src/osmo-hnodeb/iuh.c</span><br><span>+++ b/src/osmo-hnodeb/iuh.c</span><br><span>@@ -31,12 +31,59 @@</span><br><span> #include <osmocom/core/socket.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/netif/stream.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/netif/sctp.h></span><br><span> </span><br><span> #include <osmocom/hnodeb/iuh.h></span><br><span> #include <osmocom/hnodeb/hnbap.h></span><br><span> #include <osmocom/hnodeb/rua.h></span><br><span> #include <osmocom/hnodeb/hnodeb.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int get_logevel_by_sn_type(int sn_type)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (sn_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_ADAPTATION_INDICATION:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_PEER_ADDR_CHANGE:</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef SCTP_AUTHENTICATION_INDICATION</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_AUTHENTICATION_INDICATION:</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef SCTP_SENDER_DRY_EVENT</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_SENDER_DRY_EVENT:</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ return LOGL_INFO;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_ASSOC_CHANGE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return LOGL_NOTICE;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_SHUTDOWN_EVENT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_PARTIAL_DELIVERY_EVENT:</span><br><span style="color: hsl(120, 100%, 40%);">+ return LOGL_NOTICE;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_SEND_FAILED:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_REMOTE_ERROR:</span><br><span style="color: hsl(120, 100%, 40%);">+ return LOGL_ERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return LOGL_NOTICE;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void log_sctp_notification(union sctp_notification *notif)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int log_level;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, LOGL_INFO, "Iuh SCTP NOTIFICATION %u flags=0x%0x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ notif->sn_header.sn_type, notif->sn_header.sn_flags);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log_level = get_logevel_by_sn_type(notif->sn_header.sn_type);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (notif->sn_header.sn_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCTP_ASSOC_CHANGE:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, log_level, "Iuh SCTP_ASSOC_CHANGE: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sctp_assoc_chg_str(notif->sn_assoc_change.sac_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DIUH, log_level, "Iuh %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sctp_sn_type_str(notif->sn_header.sn_type));</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int hnb_iuh_read_cb(struct osmo_stream_cli *conn)</span><br><span> {</span><br><span> struct osmo_fd *fd = osmo_stream_cli_get_ofd(conn);</span><br><span>@@ -66,7 +113,8 @@</span><br><span> }</span><br><span> </span><br><span> if (flags & MSG_NOTIFICATION) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DIUH, LOGL_DEBUG, "Ignoring SCTP notification\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ union sctp_notification *notif = (union sctp_notification *) msgb_data(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_sctp_notification(notif);</span><br><span> rc = 0;</span><br><span> goto free_ret;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26343">change 26343</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/+/26343"/><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: I08842665effec6e70a3c7f6b93ea62c45549d69d </div>
<div style="display:none"> Gerrit-Change-Number: 26343 </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>