<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13259">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add gsm0808_create_handover_request_ack2 to add AoIP RTP addr<br><br>Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576<br>---<br>M include/osmocom/gsm/gsm0808.h<br>M src/gsm/gsm0808.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 54 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/13259/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 a1345c3..b31a698 100644</span><br><span>--- a/include/osmocom/gsm/gsm0808.h</span><br><span>+++ b/include/osmocom/gsm/gsm0808.h</span><br><span>@@ -143,6 +143,26 @@</span><br><span> };</span><br><span> struct msgb *gsm0808_create_handover_required(const struct gsm0808_handover_required *params);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm0808_create_handover_request_ack {</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *l3_info;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t l3_info_len;</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%);">+ /*! For A5/N set chosen_encr_alg = N+1, e.g. chosen_encr_alg = 1 means A5/0 (no encryption), 2 means A5/1, 4</span><br><span style="color: hsl(120, 100%, 40%);">+ * means A5/3. Set chosen_encr_alg = 0 to omit the Chosen Encryption Algorithm IE. */</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%);">+ /* chosen_speech_version == 0 omits the IE */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chosen_speech_version;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr_storage aoip_transport_layer;</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_request_ack2(const struct gsm0808_create_handover_request_ack *params);</span><br><span> struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, uint8_t l3_info_len,</span><br><span> uint8_t chosen_channel, uint8_t chosen_encr_alg,</span><br><span> uint8_t chosen_speech_version);</span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 4873076..ad51b5f 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -860,9 +860,7 @@</span><br><span> /*! Create BSSMAP HANDOVER REQUEST ACKNOWLEDGE message, 3GPP TS 48.008 3.2.1.10.</span><br><span> * Sent from the MT BSC back to the MSC when it has allocated an lchan to handover to.</span><br><span> * l3_info is the RR Handover Command that the MO BSC sends to the MS to move over. */</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, uint8_t l3_info_len,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chosen_channel, uint8_t chosen_encr_alg,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chosen_speech_version)</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_handover_request_ack2(const struct gsm0808_create_handover_request_ack *params)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> </span><br><span>@@ -873,13 +871,22 @@</span><br><span> /* Message Type, 3.2.2.1 */</span><br><span> msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_RQST_ACKNOWLEDGE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Layer 3 Information, 3.2.2.24 */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tlv_put(msg, GSM0808_IE_LAYER_3_INFORMATION, l3_info_len, l3_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Layer 3 Information, 3.2.2.24 -- it is actually mandatory, but rather compose a nonstandard message than</span><br><span style="color: hsl(120, 100%, 40%);">+ * segfault or return NULL without a log message. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (params->l3_info && params->l3_info_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv_put(msg, GSM0808_IE_LAYER_3_INFORMATION, params->l3_info_len, params->l3_info);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tv_put(msg, GSM0808_IE_CHOSEN_CHANNEL, chosen_channel);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, chosen_encr_alg);</span><br><span style="color: hsl(0, 100%, 40%);">- if (chosen_speech_version != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, chosen_speech_version);</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%);">+ if (params->chosen_encr_alg)</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%);">+ if (params->chosen_speech_version != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, params->chosen_speech_version);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (params->aoip_transport_layer.ss_family == AF_INET</span><br><span style="color: hsl(120, 100%, 40%);">+ || params->aoip_transport_layer.ss_family == AF_INET6)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_enc_aoip_trasp_addr(msg, ¶ms->aoip_transport_layer);</span><br><span> </span><br><span> /* prepend header with final length */</span><br><span> msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));</span><br><span>@@ -887,6 +894,23 @@</span><br><span> return msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Same as gsm0808_create_handover_request_ack2() but with less parameters.</span><br><span style="color: hsl(120, 100%, 40%);">+ * In particular, this lacks the AoIP Transport Layer address. */</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, uint8_t l3_info_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chosen_channel, uint8_t chosen_encr_alg,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chosen_speech_version)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_create_handover_request_ack params = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .l3_info = l3_info,</span><br><span style="color: hsl(120, 100%, 40%);">+ .l3_info_len = l3_info_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ .chosen_channel = chosen_channel,</span><br><span style="color: hsl(120, 100%, 40%);">+ .chosen_encr_alg = chosen_encr_alg,</span><br><span style="color: hsl(120, 100%, 40%);">+ .chosen_speech_version = chosen_speech_version,</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 gsm0808_create_handover_request_ack2(¶ms);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Create BSSMAP HANDOVER DETECT message, 3GPP TS 48.008 3.2.1.40.</span><br><span> * Sent from the MT BSC back to the MSC when the MS has sent a handover RACH request and the MT BSC has</span><br><span> * received the Handover Detect message. */</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 3fadc5a..12ca1fa 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -183,6 +183,7 @@</span><br><span> gsm0808_create_sapi_reject;</span><br><span> gsm0808_create_handover_required;</span><br><span> gsm0808_create_handover_request_ack;</span><br><span style="color: hsl(120, 100%, 40%);">+gsm0808_create_handover_request_ack2;</span><br><span> gsm0808_create_handover_detect;</span><br><span> gsm0808_create_handover_complete;</span><br><span> gsm0808_create_handover_failure;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13259">change 13259</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/13259"/><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: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576 </div>
<div style="display:none"> Gerrit-Change-Number: 13259 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>