<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12924">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix BSSMAP length generated by gsm0808_create_clear_command2()<br><br>In Change-Id Id8a75e1da2d5f520064666e4ee413d1c91da6ae3 we recently<br>introduced adding the "CSFB INDICATOR" IE to the CLEAR COMMAND,<br>but we did so with a wrong length value.<br><br>Change-Id: I4d07d25fb03ca0f89fd7b94226c54309c77a010a<br>Closes: OS#3805<br>Related: OS#2778<br>---<br>M src/gsm/gsm0808.c<br>1 file changed, 8 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/12924/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 2907255..d44560c 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -183,16 +183,7 @@</span><br><span>  *  \returns callee-allocated msgb with BSSMAP Clear Command message */</span><br><span> struct msgb *gsm0808_create_clear_command(uint8_t cause)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM,</span><br><span style="color: hsl(0, 100%, 40%);">-                                           "bssmap: clear command");</span><br><span style="color: hsl(0, 100%, 40%);">-      if (!msg)</span><br><span style="color: hsl(0, 100%, 40%);">-               return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    msg->l3h = msgb_tv_put(msg, BSSAP_MSG_BSS_MANAGEMENT, 4);</span><br><span style="color: hsl(0, 100%, 40%);">-    msgb_v_put(msg, BSS_MAP_MSG_CLEAR_CMD);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm0808_enc_cause(msg, cause);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  return msg;</span><br><span style="color: hsl(120, 100%, 40%);">+   return gsm0808_create_clear_command2(cause, false);</span><br><span> }</span><br><span> </span><br><span> /*! Create BSSMAP Clear Command message.</span><br><span>@@ -201,13 +192,19 @@</span><br><span>  *  \returns callee-allocated msgb with BSSMAP Clear Command message. */</span><br><span> struct msgb *gsm0808_create_clear_command2(uint8_t cause, bool csfb_ind)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   struct msgb *msg = gsm0808_create_clear_command(cause);</span><br><span style="color: hsl(120, 100%, 40%);">+       struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM,</span><br><span style="color: hsl(120, 100%, 40%);">+                                         "bssmap: clear command");</span><br><span>   if (!msg)</span><br><span>            return NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+      msgb_v_put(msg, BSS_MAP_MSG_CLEAR_CMD);</span><br><span style="color: hsl(120, 100%, 40%);">+       gsm0808_enc_cause(msg, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     if (csfb_ind)</span><br><span>                msgb_v_put(msg, GSM0808_IE_CSFB_INDICATION);</span><br><span> </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>       return msg;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12924">change 12924</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/12924"/><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: I4d07d25fb03ca0f89fd7b94226c54309c77a010a </div>
<div style="display:none"> Gerrit-Change-Number: 12924 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>