<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20937">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: convert gprs_ns2_cause_str into an static inline<br><br>Be consistent with other implementation of get_value_string() in<br>libosomocore.<br><br>Change-Id: Ic79757df8683e0461c04f7ef9279e4fe645eb821<br>---<br>M include/osmocom/gprs/gprs_ns2.h<br>M src/gb/gprs_ns2.c<br>M src/gb/libosmogb.map<br>3 files changed, 9 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h</span><br><span>index 975ddcb..ffc2ad8 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns2.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns2.h</span><br><span>@@ -7,6 +7,7 @@</span><br><span> #include <netinet/in.h></span><br><span> </span><br><span> #include <osmocom/core/prim.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gprs/protocol/gsm_08_16.h></span><br><span> </span><br><span> struct osmo_sockaddr;</span><br><span> struct osmo_sockaddr_str;</span><br><span>@@ -74,6 +75,12 @@</span><br><span> NS_ENDPOINT_CONFIRM_CHANGE,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string gprs_ns2_cause_strs[];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Obtain a human-readable string for NS primitives */</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *gprs_ns2_cause_str(enum ns_cause val)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return get_value_string(gprs_ns2_cause_strs, val); }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_gprs_ns2_prim {</span><br><span> struct osmo_prim_hdr oph;</span><br><span> </span><br><span>@@ -185,7 +192,6 @@</span><br><span> struct gprs_ns2_nse *nse,</span><br><span> const struct osmo_sockaddr *sockaddr);</span><br><span> void gprs_ns2_start_alive_all_nsvcs(struct gprs_ns2_nse *nse);</span><br><span style="color: hsl(0, 100%, 40%);">-const char *gprs_ns2_cause_str(int cause);</span><br><span> const char *gprs_ns2_ll_str(struct gprs_ns2_vc *nsvc);</span><br><span> char *gprs_ns2_ll_str_buf(char *buf, size_t buf_len, struct gprs_ns2_vc *nsvc);</span><br><span> char *gprs_ns2_ll_str_c(const void *ctx, struct gprs_ns2_vc *nsvc);</span><br><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 6401d77..ffa3135 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -138,7 +138,7 @@</span><br><span> </span><br><span> </span><br><span> /* Section 10.3.2, Table 13 */</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string ns2_cause_str[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string gprs_ns2_cause_strs[] = {</span><br><span> { NS_CAUSE_TRANSIT_FAIL, "Transit network failure" },</span><br><span> { NS_CAUSE_OM_INTERVENTION, "O&M intervention" },</span><br><span> { NS_CAUSE_EQUIP_FAIL, "Equipment failure" },</span><br><span>@@ -160,13 +160,6 @@</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Obtain a human-readable string for NS cause value */</span><br><span style="color: hsl(0, 100%, 40%);">-const char *gprs_ns2_cause_str(int cause)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- enum ns_cause _cause = cause;</span><br><span style="color: hsl(0, 100%, 40%);">- return get_value_string(ns2_cause_str, _cause);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static const struct rate_ctr_desc nsvc_ctr_description[] = {</span><br><span> { "packets:in", "Packets at NS Level ( In)" },</span><br><span> { "packets:out","Packets at NS Level (Out)" },</span><br><span>diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map</span><br><span>index 9c8e685..3755b4f 100644</span><br><span>--- a/src/gb/libosmogb.map</span><br><span>+++ b/src/gb/libosmogb.map</span><br><span>@@ -74,7 +74,7 @@</span><br><span> </span><br><span> gprs_ns2_aff_cause_prim_strs;</span><br><span> gprs_ns2_bind_set_mode;</span><br><span style="color: hsl(0, 100%, 40%);">-gprs_ns2_cause_str;</span><br><span style="color: hsl(120, 100%, 40%);">+gprs_ns2_cause_strs;</span><br><span> gprs_ns2_create_nse;</span><br><span> gprs_ns2_dynamic_create_nse;</span><br><span> gprs_ns2_find_vc_by_sockaddr;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20937">change 20937</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/libosmocore/+/20937"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic79757df8683e0461c04f7ef9279e4fe645eb821 </div>
<div style="display:none"> Gerrit-Change-Number: 20937 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>