<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13577">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSSMAP: tweaks<br><br>Change two instances of Speech Version values to enum gsm0808_permitted_speech.<br>It is often not trivial to find the right values for a uint8_t member, giving<br>the enum name makes it a lot easier/safer to use.<br><br>In gsm0808_create_handover_required(), use msgb_tv_put() so that the enum's<br>storage size doesn't matter. (Already used for handover_performed)<br><br>Fix typo in doc of gsm0808_create_handover_required().<br><br>Change-Id: I6387836bab76e1fa42daa0f42ab94fc14b70b112<br>---<br>M TODO-RELEASE<br>M include/osmocom/gsm/gsm0808.h<br>M src/gsm/gsm0808.c<br>3 files changed, 6 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/13577/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 7c81e32..db3be49 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -19,3 +19,5 @@</span><br><span> osmo_quote_str_buf() truncated string. This is no longer the case. e.g. a string 'truncated' in a</span><br><span> 9-char buffer used to print '"trunca"\0', which now becomes '"truncat\0'.</span><br><span> libosmocore osmo_quote_str_buf2() New function signature similar to snprintf(), for use with OSMO_STRBUF_APPEND().</span><br><span style="color: hsl(120, 100%, 40%);">+libosmogsm gsm0808_handover_required Storage size changed, speech_version_used now an enum.</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_handover_performed Storage size changed, speech_version_chosen now an enum.</span><br><span>diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h</span><br><span>index a1345c3..0f2bf1f 100644</span><br><span>--- a/include/osmocom/gsm/gsm0808.h</span><br><span>+++ b/include/osmocom/gsm/gsm0808.h</span><br><span>@@ -133,7 +133,7 @@</span><br><span> uint8_t current_channel_type_1;</span><br><span> </span><br><span> bool speech_version_used_present;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t speech_version_used;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm0808_permitted_speech speech_version_used;</span><br><span> </span><br><span> bool old_bss_to_new_bss_info_present;</span><br><span> struct gsm0808_old_bss_to_new_bss_info old_bss_to_new_bss_info;</span><br><span>@@ -196,7 +196,7 @@</span><br><span> uint8_t chosen_encr_alg;</span><br><span> </span><br><span> bool speech_version_chosen_present;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t speech_version_chosen;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm0808_permitted_speech speech_version_chosen;</span><br><span> </span><br><span> bool speech_codec_chosen_present;</span><br><span> struct gsm0808_speech_codec speech_codec_chosen;</span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 4873076..3307a5d 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -822,7 +822,7 @@</span><br><span> </span><br><span> /*! Create BSSMAP HANDOVER REQUIRED message.</span><br><span> * \param[in] params All information to be encoded.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns newly allocated msgb with BSSMAP REQUIRED message. */</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns newly allocated msgb with BSSMAP HANDOVER REQUIRED message. */</span><br><span> struct msgb *gsm0808_create_handover_required(const struct gsm0808_handover_required *params)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span>@@ -846,7 +846,7 @@</span><br><span> </span><br><span> /* Speech Version (Used), 3.2.2.51 */</span><br><span> if (params->speech_version_used_present)</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tv_fixed_put(msg, GSM0808_IE_SPEECH_VERSION, 1, ¶ms->speech_version_used);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, params->speech_version_used);</span><br><span> </span><br><span> if (params->old_bss_to_new_bss_info_present)</span><br><span> put_old_bss_to_new_bss_information(msg, ¶ms->old_bss_to_new_bss_info);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13577">change 13577</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/13577"/><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: I6387836bab76e1fa42daa0f42ab94fc14b70b112 </div>
<div style="display:none"> Gerrit-Change-Number: 13577 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>