<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/16259">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce fields related to DTAP DLCI<br><br>Change-Id: Iec448af02d28e6c5c573e68a0b4a86067ec7e561<br>---<br>M include/osmocom/gsm/protocol/gsm_08_08.h<br>M src/gsm/gsm0808.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 36 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h</span><br><span>index a540609..e791b07 100644</span><br><span>--- a/include/osmocom/gsm/protocol/gsm_08_08.h</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_08_08.h</span><br><span>@@ -7,6 +7,7 @@</span><br><span> #include <stdint.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/endian.h></span><br><span> </span><br><span> /*</span><br><span> * this is from GSM 03.03 CGI but is copied in GSM 08.08</span><br><span>@@ -40,11 +41,37 @@</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span> struct dtap_header {</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t type;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t link_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ union {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t link_id; /* Backward compatibility */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t dlci_cc:2,</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci_spare:3,</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci_sapi:3; /* enum gsm0406_dlc_sapi */</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> uint8_t length;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t type;</span><br><span style="color: hsl(120, 100%, 40%);">+ union {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t link_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t dlci_sapi:3, dlci_spare:3, dlci_cc:2;</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%);">+ uint8_t length;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Data Link Control SAPI, GSM 08.06 § 6.3.2, GSM 04.06 § 3.3.3 */</span><br><span style="color: hsl(120, 100%, 40%);">+enum gsm0406_dlci_sapi {</span><br><span style="color: hsl(120, 100%, 40%);">+ DLCI_SAPI_RR_MM_CC = 0x0,</span><br><span style="color: hsl(120, 100%, 40%);">+ DLCI_SAPI_SMS = 0x3,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string gsm0406_dlci_sapi_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *gsm0406_dlci_sapi_name(enum gsm0406_dlci_sapi val)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return get_value_string(gsm0406_dlci_sapi_names, val); }</span><br><span> </span><br><span> enum BSS_MAP_MSG_TYPE {</span><br><span> BSS_MAP_MSG_RESERVED_0 = 0,</span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 514d7f2..f9f7b58 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -1399,6 +1399,12 @@</span><br><span> return &bss_att_tlvdef;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string gsm0406_dlci_sapi_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { DLCI_SAPI_RR_MM_CC, "RR/MM/CC" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { DLCI_SAPI_SMS, "SMS" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct value_string gsm0808_msgt_names[] = {</span><br><span> { BSS_MAP_MSG_ASSIGMENT_RQST, "ASSIGNMENT REQ" },</span><br><span> { BSS_MAP_MSG_ASSIGMENT_COMPLETE, "ASSIGNMENT COMPL" },</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index a0e3b32..efca0a5 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -86,6 +86,8 @@</span><br><span> </span><br><span> gsm0341_build_msg;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+gsm0406_dlci_sapi_names;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> gsm0480_create_notifySS;</span><br><span> gsm0480_create_unstructuredSS_Notify;</span><br><span> gsm0480_create_ussd_resp;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/16259">change 16259</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/+/16259"/><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: Iec448af02d28e6c5c573e68a0b4a86067ec7e561 </div>
<div style="display:none"> Gerrit-Change-Number: 16259 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>