<p>ipse has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/18229">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm0808: Make a function to extract Cause IE publicly available.<br><br>Function gsm0808_get_cipher_reject_cause() was previously available<br>in private gsm0808_utils.h. In practice, the exact same code is useful<br>to extract Cause IE value from any of the many other BSSMAP messages<br>which use it.<br><br>So let's rename it to gsm0808_get_cause() and make it avilable<br>to everyone to use.<br><br>Change-Id: Idf2b99e9ef014eba26e3d4f0f38c2714d3a0520a<br>---<br>M include/osmocom/gsm/gsm0808.h<br>M include/osmocom/gsm/gsm0808_utils.h<br>M src/gsm/gsm0808.c<br>M src/gsm/gsm0808_utils.c<br>M src/gsm/libosmogsm.map<br>M tests/gsm0808/gsm0808_test.c<br>6 files changed, 22 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/29/18229/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h</span><br><span>index 373b434..5a33f60 100644</span><br><span>--- a/include/osmocom/gsm/gsm0808.h</span><br><span>+++ b/include/osmocom/gsm/gsm0808.h</span><br><span>@@ -315,6 +315,10 @@</span><br><span> const char *gsm0808_cause_name(enum gsm0808_cause cause);</span><br><span> const char *gsm0808_cause_class_name(enum gsm0808_cause_class class);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Parse Cause TLV 3GPP TS 08.08 §3.2.2.5</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns Cause value */</span><br><span style="color: hsl(120, 100%, 40%);">+enum gsm0808_cause gsm0808_get_cause(const struct tlv_parsed *tp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> extern const struct value_string gsm0808_lcls_config_names[];</span><br><span> extern const struct value_string gsm0808_lcls_control_names[];</span><br><span> extern const struct value_string gsm0808_lcls_status_names[];</span><br><span>diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h</span><br><span>index ccdf5ed..1cdca8c 100644</span><br><span>--- a/include/osmocom/gsm/gsm0808_utils.h</span><br><span>+++ b/include/osmocom/gsm/gsm0808_utils.h</span><br><span>@@ -155,8 +155,6 @@</span><br><span>         return (cause & 0x80) && !(cause & 0x0F);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! \returns 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */</span><br><span> static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type)</span><br><span> {</span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 02288e6..788f6c3 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -1654,6 +1654,22 @@</span><br><span>     return get_value_string(gsm0808_cause_names, cause);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum gsm0808_cause gsm0808_get_cause(const struct tlv_parsed *tp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+   const uint8_t *buf = TLVP_VAL_MINLEN(tp, GSM0808_IE_CAUSE, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      if (!buf)</span><br><span style="color: hsl(120, 100%, 40%);">+             return -EBADMSG;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    if (TLVP_LEN(tp, GSM0808_IE_CAUSE) > 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+          if (!gsm0808_cause_ext(buf[0]))</span><br><span style="color: hsl(120, 100%, 40%);">+                       return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+               return buf[1];</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%);">+   return buf[0];</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const struct value_string gsm0808_lcls_config_names[] = {</span><br><span>     { GSM0808_LCLS_CFG_BOTH_WAY, "Connect both-way" },</span><br><span>         { GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL,</span><br><span>diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c</span><br><span>index 7416d8f..6f3c07a 100644</span><br><span>--- a/src/gsm/gsm0808_utils.c</span><br><span>+++ b/src/gsm/gsm0808_utils.c</span><br><span>@@ -1563,22 +1563,6 @@</span><br><span>         return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-     const uint8_t *buf = TLVP_VAL_MINLEN(tp, GSM0808_IE_CAUSE, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  if (!buf)</span><br><span style="color: hsl(0, 100%, 40%);">-               return -EBADMSG;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        if (TLVP_LEN(tp, GSM0808_IE_CAUSE) > 1) {</span><br><span style="color: hsl(0, 100%, 40%);">-            if (!gsm0808_cause_ext(buf[0]))</span><br><span style="color: hsl(0, 100%, 40%);">-                 return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-         return buf[1];</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%);">-       return buf[0];</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! Print a human readable name of the cell identifier to the char buffer.</span><br><span>  * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2.</span><br><span>  * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name().</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index a518b28..1ff1286 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -157,6 +157,7 @@</span><br><span> gsm0808_bssmap_name;</span><br><span> gsm0808_cause_name;</span><br><span> gsm0808_cause_class_name;</span><br><span style="color: hsl(120, 100%, 40%);">+gsm0808_get_cause;</span><br><span> gsm0808_create_ass;</span><br><span> gsm0808_create_ass2;</span><br><span> gsm0808_create_assignment_completed;</span><br><span>diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c</span><br><span>index ec24914..ce73390 100644</span><br><span>--- a/tests/gsm0808/gsm0808_test.c</span><br><span>+++ b/tests/gsm0808/gsm0808_test.c</span><br><span>@@ -306,7 +306,7 @@</span><br><span>     if (rc < 0)</span><br><span>               printf("FIXME: failed (%d) to parse created message %s\n", rc, msgb_hexdump(msg));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        rc = gsm0808_get_cipher_reject_cause(&tp);</span><br><span style="color: hsl(120, 100%, 40%);">+        rc = gsm0808_get_cause(&tp);</span><br><span>     if (rc < 0)</span><br><span>               printf("FIXME: failed (%s) to extract Cause from created message %s\n",</span><br><span>                   strerror(-rc), msgb_hexdump(msg));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/18229">change 18229</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/+/18229"/><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: Idf2b99e9ef014eba26e3d4f0f38c2714d3a0520a </div>
<div style="display:none"> Gerrit-Change-Number: 18229 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: ipse <Alexander.Chemeris@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>