<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12483">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LCLS: add status parameter to Assignment Completed message<br><br>* add gsm0808_create_ass_compl2() with additional gsm0808_lcls_status<br> parameter and make gsm0808_create_ass_compl() into trivial wrapper<br> around it<br>* update tests accordingly<br><br>Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4<br>Related: OS#2487<br>---<br>M include/osmocom/gsm/gsm0808.h<br>M src/gsm/gsm0808.c<br>M src/gsm/libosmogsm.map<br>M tests/gsm0808/gsm0808_test.c<br>4 files changed, 42 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/12483/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 ac88748..3c6896e 100644</span><br><span>--- a/include/osmocom/gsm/gsm0808.h</span><br><span>+++ b/include/osmocom/gsm/gsm0808.h</span><br><span>@@ -76,6 +76,12 @@</span><br><span> const struct gsm0808_speech_codec *sc,</span><br><span> const struct gsm0808_speech_codec_list</span><br><span> *scl);</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_ass_compl2(uint8_t rr_cause, uint8_t chosen_channel,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t encr_alg_id, uint8_t speech_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sockaddr_storage *ss,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm0808_speech_codec *sc,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm0808_speech_codec_list *scl,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm0808_lcls_status lcls_bss_status);</span><br><span> struct msgb *gsm0808_create_assignment_completed(uint8_t rr_cause,</span><br><span> uint8_t chosen_channel,</span><br><span> uint8_t encr_alg_id,</span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 59b1657..ebb453a 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -519,7 +519,7 @@</span><br><span> return gsm0808_create_ass2(ct, cic, ss, scl, ci, NULL, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Create BSSMAP Assignment Completed message</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Create BSSMAP Assignment Completed message as per 3GPP TS 48.008 §3.2.1.2</span><br><span> * \param[in] rr_cause GSM 04.08 RR Cause value</span><br><span> * \param[in] chosen_channel Chosen Channel</span><br><span> * \param[in] encr_alg_id Encryption Algorithm ID</span><br><span>@@ -527,13 +527,14 @@</span><br><span> * \param[in] ss Socket Address of BSS-side RTP socket</span><br><span> * \param[in] sc Speech Codec (current)</span><br><span> * \param[in] scl Speech Codec List (permitted)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] lcls_bss_status §3.2.2.119 LCLS-BSS-Status, optional</span><br><span> * \returns callee-allocated msgb with BSSMAP Assignment Complete message */</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsm0808_create_ass_compl(uint8_t rr_cause, uint8_t chosen_channel,</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_ass_compl2(uint8_t rr_cause, uint8_t chosen_channel,</span><br><span> uint8_t encr_alg_id, uint8_t speech_mode,</span><br><span> const struct sockaddr_storage *ss,</span><br><span> const struct gsm0808_speech_codec *sc,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_speech_codec_list</span><br><span style="color: hsl(0, 100%, 40%);">- *scl)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm0808_speech_codec_list *scl,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm0808_lcls_status lcls_bss_status)</span><br><span> {</span><br><span> struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM,</span><br><span> "bssmap: ass compl");</span><br><span>@@ -570,7 +571,11 @@</span><br><span> if (scl)</span><br><span> gsm0808_enc_speech_codec_list(msg, scl);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* write LSA identifier 3.2.2.15 */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: write LSA identifier 3.2.2.15 - see 3GPP TS 43.073 */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* LCLS-BSS-Status 3.2.2.119 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lcls_bss_status < GSM0808_LCLS_STS_NA)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, lcls_bss_status);</span><br><span> </span><br><span> msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));</span><br><span> </span><br><span>@@ -582,14 +587,33 @@</span><br><span> * \param[in] chosen_channel Chosen Channel</span><br><span> * \param[in] encr_alg_id Encryption Algorithm ID</span><br><span> * \param[in] speech_mode Speech Mode</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ss Socket Address of BSS-side RTP socket</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] sc Speech Codec (current)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] scl Speech Codec List (permitted)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns callee-allocated msgb with BSSMAP Assignment Complete message */</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_ass_compl(uint8_t rr_cause, uint8_t chosen_channel,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t encr_alg_id, uint8_t speech_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct sockaddr_storage *ss,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm0808_speech_codec *sc,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm0808_speech_codec_list *scl)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm0808_create_ass_compl2(rr_cause, chosen_channel, encr_alg_id, speech_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ ss, sc, scl, GSM0808_LCLS_STS_NA);</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%);">+/*! Create BSSMAP Assignment Completed message</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] rr_cause GSM 04.08 RR Cause value</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] chosen_channel Chosen Channel</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] encr_alg_id Encryption Algorithm ID</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] speech_mode Speech Mode</span><br><span> * \returns callee-allocated msgb with BSSMAP Assignment Complete message */</span><br><span> struct msgb *gsm0808_create_assignment_completed(uint8_t rr_cause,</span><br><span> uint8_t chosen_channel,</span><br><span> uint8_t encr_alg_id,</span><br><span> uint8_t speech_mode)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return gsm0808_create_ass_compl(rr_cause, chosen_channel, encr_alg_id,</span><br><span style="color: hsl(0, 100%, 40%);">- speech_mode, NULL, NULL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm0808_create_ass_compl2(rr_cause, chosen_channel, encr_alg_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ speech_mode, NULL, NULL, NULL, GSM0808_LCLS_STS_NA);</span><br><span> }</span><br><span> </span><br><span> /*! Create BSSMAP Assignment Failure message</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index bb97878..bed66d9 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -153,6 +153,7 @@</span><br><span> gsm0808_create_ass2;</span><br><span> gsm0808_create_assignment_completed;</span><br><span> gsm0808_create_ass_compl;</span><br><span style="color: hsl(120, 100%, 40%);">+gsm0808_create_ass_compl2;</span><br><span> gsm0808_create_assignment_failure;</span><br><span> gsm0808_create_ass_fail;</span><br><span> gsm0808_create_cipher;</span><br><span>diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c</span><br><span>index 40e2b87..79f7145 100644</span><br><span>--- a/tests/gsm0808/gsm0808_test.c</span><br><span>+++ b/tests/gsm0808/gsm0808_test.c</span><br><span>@@ -514,7 +514,8 @@</span><br><span> GSM0808_IE_AOIP_TRASP_ADDR, 0x06, 0xc0, 0xa8, 0x64, 0x17, 0x04,</span><br><span> 0xd2, GSM0808_IE_SPEECH_CODEC, 0x01, GSM0808_SCT_HR1 | 0x90,</span><br><span> GSM0808_IE_SPEECH_CODEC_LIST, 0x07, GSM0808_SCT_FR3 | 0x50, 0xef,</span><br><span style="color: hsl(0, 100%, 40%);">- 0xcd, GSM0808_SCT_FR2 | 0xa0, 0x9f, GSM0808_SCT_CSD | 0x90, 0xc0 };</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xcd, GSM0808_SCT_FR2 | 0xa0, 0x9f, GSM0808_SCT_CSD | 0x90, 0xc0,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM0808_IE_LCLS_BSS_STATUS, GSM0808_LCLS_STS_LOCALLY_SWITCHED };</span><br><span> struct msgb *msg;</span><br><span> </span><br><span> memset(&sin, 0, sizeof(sin));</span><br><span>@@ -533,8 +534,8 @@</span><br><span> setup_codec_list(&sc_list);</span><br><span> </span><br><span> printf("Testing creating Assignment Complete (AoIP)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- msg = gsm0808_create_ass_compl(0x23, 0x42, 0x11, 0x22,</span><br><span style="color: hsl(0, 100%, 40%);">- &ss, &sc, &sc_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = gsm0808_create_ass_compl2(0x23, 0x42, 0x11, 0x22,</span><br><span style="color: hsl(120, 100%, 40%);">+ &ss, &sc, &sc_list, GSM0808_LCLS_STS_LOCALLY_SWITCHED);</span><br><span> VERIFY(msg, res, ARRAY_SIZE(res));</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12483">change 12483</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/12483"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I547c6b8707123aa8c1ef636db88908df112d90a4 </div>
<div style="display:none"> Gerrit-Change-Number: 12483 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>