<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13259">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add gsm0808_create_handover_request_ack2 to add AoIP RTP addr<br><br>osmo-bsc so far omits the AoIP Transport Layer Address from its Handover<br>Request Acknowledge message, which breaks inter-BSC Handover for AoIP.<br>Allow fixing that.<br><br>One quirk I really don't like about this: I would prefer to directly use struct<br>sockaddr_storage as a member of the struct gsm0808_handover_request_ack. Even<br>though struct sockaddr_storage appears in various function signatures, the<br>gsm0808.c actually also gets built on embedded systems that lack arpa/inet.h<br>(for me indicated by the ARM build job on jenkins). Compiling gsm0808.c works<br>only because the actual coding of struct sockaddr_storage is implemented in<br>gsm0808_util.c, which (apparently) does not get built on embedded and hence,<br>even though there are undefined references to e.g.<br>gsm0808_enc_aoip_trasp_addr() it works.<br><br>Related: I4a5acdb2d4a0b947cc0c62067a67be88a3d467ff (osmo-bsc)<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, 60 insertions(+), 12 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 5b05dbc..93195b5 100644</span><br><span>--- a/include/osmocom/gsm/gsm0808.h</span><br><span>+++ b/include/osmocom/gsm/gsm0808.h</span><br><span>@@ -194,9 +194,29 @@</span><br><span> };</span><br><span> struct msgb *gsm0808_create_handover_request(const struct gsm0808_handover_request *params);</span><br><span> </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 gsm0808_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%);">+ enum gsm0808_permitted_speech chosen_speech_version;</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%);">+ const 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_handover_request_ack *params);</span><br><span> </span><br><span> struct gsm0808_handover_command {</span><br><span> const uint8_t *l3_info;</span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 4406043..3c77c77 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -983,9 +983,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_handover_request_ack *params)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> </span><br><span>@@ -996,13 +994,25 @@</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)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_enc_aoip_trasp_addr(msg, params->aoip_transport_layer);</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> </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>@@ -1010,6 +1020,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_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 COMMAND message, 3GPP TS 48.008 3.2.1.11.</span><br><span> * Sent from the MSC to the old BSS to transmit the RR Handover Command received from the new BSS. */</span><br><span> struct msgb *gsm0808_create_handover_command(const struct gsm0808_handover_command *params)</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 9c5123e..adfa096 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -187,6 +187,7 @@</span><br><span> gsm0808_create_handover_required_reject;</span><br><span> gsm0808_create_handover_request;</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_command;</span><br><span> gsm0808_create_handover_detect;</span><br><span> gsm0808_create_handover_succeeded;</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: merged </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: 13 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>