<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12376">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LCLS: fix LCLS-CONNECT-CONTROL encoder<br><br>Previously it could encode both incorrect values as well as incorrect<br>message. Let's fix this by explicitly checking for invalid values and<br>ensuring that at least one of the parameters is valid.<br><br>This function have no external or internal users so it's better to fix<br>type signature as well to match the rest of gsm0808_create_lcls_*().<br><br>Change-Id: I7b33a771acbd391c5f9a494d6450edb18511433f<br>---<br>M TODO-RELEASE<br>M include/osmocom/gsm/gsm0808.h<br>M src/gsm/gsm0808.c<br>3 files changed, 16 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/12376/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 16d96ec..8b5f841 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -19,3 +19,4 @@</span><br><span> libosmogsm       osmo_gsup_message                       extended with SMS related fields</span><br><span> libosmogsm  osmo_gsup_sms_{en|de}code_sm_rp_da      GSUP SM-RP-DA coding helpers</span><br><span> libosmogsm      osmo_gsup_sms_{en|de}code_sm_rp_oa      GSUP SM-RP-OA coding helpers</span><br><span style="color: hsl(120, 100%, 40%);">+libosmogsm        gsm0808_create_lcls_conn_ctrl()         API/ABI break: change parameters from pointers to plain values</span><br><span>diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h</span><br><span>index 79d89e5..ac88748 100644</span><br><span>--- a/include/osmocom/gsm/gsm0808.h</span><br><span>+++ b/include/osmocom/gsm/gsm0808.h</span><br><span>@@ -92,8 +92,8 @@</span><br><span>                             const struct gsm0808_cell_id_list *cil,</span><br><span>                              const uint8_t *chan_needed)</span><br><span>                                  OSMO_DEPRECATED("use gsm0808_create_paging2 instead");</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config,</span><br><span style="color: hsl(0, 100%, 40%);">-                                    enum gsm0808_lcls_control *control);</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config config,</span><br><span style="color: hsl(120, 100%, 40%);">+                                     enum gsm0808_lcls_control control);</span><br><span> struct msgb *gsm0808_create_lcls_conn_ctrl_ack(enum gsm0808_lcls_status status);</span><br><span> struct msgb *gsm0808_create_lcls_notification(enum gsm0808_lcls_status status, bool break_req);</span><br><span> </span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 0f9e8df..6df3ba4 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -312,19 +312,24 @@</span><br><span>  *  \param[in] config LCLS Configuration</span><br><span>  *  \param[in] control LCLS Connection Status Control</span><br><span>  *  \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config,</span><br><span style="color: hsl(0, 100%, 40%);">-                                         enum gsm0808_lcls_control *control)</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config config,</span><br><span style="color: hsl(120, 100%, 40%);">+                                      enum gsm0808_lcls_control control)</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: LCLS CONN CTRL");</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%);">+   /* According to NOTE 1 in §3.2.1.91 at least one of the parameters is required */</span><br><span style="color: hsl(120, 100%, 40%);">+    if (config == GSM0808_LCLS_CFG_NA && control == GSM0808_LCLS_CSC_NA)</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%);">+        msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: LCLS CONN CTRL");</span><br><span>         if (!msg)</span><br><span>            return NULL;</span><br><span> </span><br><span>     msgb_v_put(msg, BSS_MAP_MSG_LCLS_CONNECT_CTRL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (config)</span><br><span style="color: hsl(0, 100%, 40%);">-             msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *config);</span><br><span style="color: hsl(0, 100%, 40%);">-      if (control)</span><br><span style="color: hsl(0, 100%, 40%);">-            msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *control);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (config != GSM0808_LCLS_CFG_NA)</span><br><span style="color: hsl(120, 100%, 40%);">+            msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, config);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (control != GSM0808_LCLS_CSC_NA)</span><br><span style="color: hsl(120, 100%, 40%);">+           msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, control);</span><br><span>   msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));</span><br><span> </span><br><span>     return msg;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12376">change 12376</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/12376"/><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: I7b33a771acbd391c5f9a494d6450edb18511433f </div>
<div style="display:none"> Gerrit-Change-Number: 12376 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>