<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11728">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm0808: add message generator for BSSMAP HANDOVER PERFORMED<br><br>We currently have no generator function that can generate BSSMAP<br>HANDOVER PERFORMED messages. Lets add function for this.<br><br>Change-Id: I825106858bd89afc9837811b8fed2e8accc82441<br>Related: OS#3645<br>---<br>M include/osmocom/gsm/gsm0808.h<br>M src/gsm/gsm0808.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 71 insertions(+), 0 deletions(-)<br><br></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 298b3e4..e3fb6ad 100644</span><br><span>--- a/include/osmocom/gsm/gsm0808.h</span><br><span>+++ b/include/osmocom/gsm/gsm0808.h</span><br><span>@@ -172,6 +172,30 @@</span><br><span> };</span><br><span> struct msgb *gsm0808_create_handover_failure(const struct gsm0808_handover_failure *params);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm0808_handover_performed {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t cause;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id cell_id;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bool chosen_channel_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chosen_channel;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bool chosen_encr_alg_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chosen_encr_alg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bool speech_version_chosen_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t speech_version_chosen;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bool speech_codec_chosen_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_speech_codec speech_codec_chosen;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bool lcls_bss_status_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm0808_lcls_status lcls_bss_status;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* more items are defined in the spec and may be added later */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool more_items; /*< always set this to false */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_performed *params);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct msgb *gsm0808_create_dtap(struct msgb *msg, uint8_t link_id);</span><br><span> void gsm0808_prepend_dtap_header(struct msgb *msg, uint8_t link_id);</span><br><span> </span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 2566ad5..c0d5f39 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -892,6 +892,52 @@</span><br><span> return msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Create BSSMAP HANDOVER PERFORMED message, 3GPP TS 48.008 3.2.1.25.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] params All information to be encoded.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns callee-allocated msgb with BSSMAP HANDOVER PERFORMED message */</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_performed *params)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-HANDOVER-PERFORMED");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Message Type, 3.2.2.1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_PERFORMED);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Cause, 3.2.2.5 */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv_put(msg, GSM0808_IE_CAUSE, gsm0808_cause_ext(params->cause) ? 2 : 1, (const uint8_t *)¶ms->cause);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Cell Identifier, 3.2.2.17 */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_enc_cell_id(msg, ¶ms->cell_id);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Chosen Channel 3.2.2.33 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (params->chosen_channel_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, GSM0808_IE_CHOSEN_CHANNEL, params->chosen_channel);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Chosen Encryption Algorithm 3.2.2.44 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (params->chosen_encr_alg_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, params->chosen_encr_alg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Speech Version (chosen) 3.2.2.51 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (params->speech_version_chosen_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, params->speech_version_chosen);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* AoIP: Speech Codec (chosen) 3.2.2.104 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (params->speech_codec_chosen_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_enc_speech_codec(msg, ¶ms->speech_codec_chosen);</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 (params->lcls_bss_status_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, params->lcls_bss_status);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* prepend header with final length */</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return msg;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Prepend a DTAP header to given Message Buffer</span><br><span> * \param[in] msgb Message Buffer</span><br><span> * \param[in] link_id Link Identifier */</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 3fe9dfc..04a9826 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -181,6 +181,7 @@</span><br><span> gsm0808_create_handover_detect;</span><br><span> gsm0808_create_handover_complete;</span><br><span> gsm0808_create_handover_failure;</span><br><span style="color: hsl(120, 100%, 40%);">+gsm0808_create_handover_performed;</span><br><span> gsm0808_prepend_dtap_header;</span><br><span> gsm0808_enc_aoip_trasp_addr;</span><br><span> gsm0808_dec_aoip_trasp_addr;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11728">change 11728</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/11728"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 </div>
<div style="display:none"> Gerrit-Change-Number: 11728 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>