<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/26347">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ss7: Use sctp value_string from libosmo-netif<br><br>Depends: libosmo-netif Change-Id Ica6f01851fb94e31f4ef097494bb1b8a95597ba6<br>Change-Id: I42323eb5d02d4f67daac7b0a4365f5f6f6057666<br>---<br>M TODO-RELEASE<br>M src/osmo_ss7.c<br>2 files changed, 4 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/47/26347/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_ss7.c b/src/osmo_ss7.c</span><br><span>index b4c0b51..649e3f7 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -45,6 +45,7 @@</span><br><span> </span><br><span> #include <osmocom/netif/stream.h></span><br><span> #include <osmocom/netif/ipa.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/netif/sctp.h></span><br><span> </span><br><span> #include "sccp_internal.h"</span><br><span> #include "xua_internal.h"</span><br><span>@@ -1663,32 +1664,6 @@</span><br><span> * libosmo-netif integration for SCTP stream server/client</span><br><span> ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string sctp_assoc_chg_vals[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_COMM_UP, "COMM_UP" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_COMM_LOST, "COMM_LOST" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_RESTART, "RESTART" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_SHUTDOWN_COMP, "SHUTDOWN_COMP" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_CANT_STR_ASSOC, "CANT_STR_ASSOC" },</span><br><span style="color: hsl(0, 100%, 40%);">- { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string sctp_sn_type_vals[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_ASSOC_CHANGE, "ASSOC_CHANGE" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_PEER_ADDR_CHANGE, "PEER_ADDR_CHANGE" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_SHUTDOWN_EVENT, "SHUTDOWN_EVENT" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_SEND_FAILED, "SEND_FAILED" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_REMOTE_ERROR, "REMOTE_ERROR" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_PARTIAL_DELIVERY_EVENT, "PARTIAL_DELIVERY_EVENT" },</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_ADAPTATION_INDICATION, "ADAPTATION_INDICATION" },</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef SCTP_AUTHENTICATION_INDICATION</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_AUTHENTICATION_INDICATION, "AUTHENTICATION_INDICATION" },</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef SCTP_SENDER_DRY_EVENT</span><br><span style="color: hsl(0, 100%, 40%);">- { SCTP_SENDER_DRY_EVENT, "SENDER_DRY_EVENT" },</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">- { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int get_logevel_by_sn_type(int sn_type)</span><br><span> {</span><br><span> switch (sn_type) {</span><br><span>@@ -1728,13 +1703,11 @@</span><br><span> switch (notif->sn_header.sn_type) {</span><br><span> case SCTP_ASSOC_CHANGE:</span><br><span> LOGPASP(asp, DLSS7, log_level, "%s SCTP_ASSOC_CHANGE: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pfx, get_value_string(sctp_assoc_chg_vals,</span><br><span style="color: hsl(0, 100%, 40%);">- notif->sn_assoc_change.sac_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ pfx, osmo_sctp_assoc_chg_str(notif->sn_assoc_change.sac_state));</span><br><span> break;</span><br><span> default:</span><br><span> LOGPASP(asp, DLSS7, log_level, "%s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pfx, get_value_string(sctp_sn_type_vals,</span><br><span style="color: hsl(0, 100%, 40%);">- notif->sn_header.sn_type));</span><br><span style="color: hsl(120, 100%, 40%);">+ pfx, osmo_sctp_sn_type_str(notif->sn_header.sn_type));</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/26347">change 26347</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/libosmo-sccp/+/26347"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I42323eb5d02d4f67daac7b0a4365f5f6f6057666 </div>
<div style="display:none"> Gerrit-Change-Number: 26347 </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>