<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9776">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc-nat: forward paging to all BSC when CELL_IDENT_BSS is received<br><br>Previous to this commit, an error message was printed and the paging<br>message was dropped:<br>openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c:618 Could not parse paging message: -3<br><br>Related: OS#3325<br>Change-Id: I3125ba0e67d2965c0be3089748dd113b1bf615af<br>---<br>M openbsc/src/osmo-bsc_nat/bsc_nat.c<br>M openbsc/src/osmo-bsc_nat/bsc_nat_utils.c<br>2 files changed, 34 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/76/9776/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>index ba7f542..2c6c644 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>@@ -611,11 +611,21 @@</span><br><span> {</span><br><span> struct bsc_connection *bsc;</span><br><span> const uint8_t *paging_start;</span><br><span style="color: hsl(0, 100%, 40%);">- int paging_length, i, ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ int paging_length, i, discrim;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ret = bsc_nat_find_paging(msg, &paging_start, &paging_length);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAT, LOGL_ERROR, "Could not parse paging message: %d\n", ret);</span><br><span style="color: hsl(120, 100%, 40%);">+ discrim = bsc_nat_find_paging(msg, &paging_start, &paging_length);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (discrim < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAT, LOGL_ERROR, "Could not parse paging message: %d\n", discrim);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</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%);">+ if (discrim == CELL_IDENT_BSS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* All cells on the BSS are identified. */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bsc, &nat->bsc_connections, list_entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bsc->authenticated)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_nat_send_paging(bsc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c</span><br><span>index 85fc7ed..223ef34 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c</span><br><span>@@ -324,7 +324,16 @@</span><br><span> talloc_free(conn);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Parse paging message and provide pointer to first Cell identification item</span><br><span style="color: hsl(120, 100%, 40%);">+ * in Cell Identifier List IE.</span><br><span style="color: hsl(120, 100%, 40%);">+ * See e.g. GSM 08.08 Section 3.2.2.27 for Cell Identifier List.</span><br><span style="color: hsl(120, 100%, 40%);">+ * For multiple occurences, use tlv_parse2().</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] msg msgbcontaining the paging cmd message to be decoded</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] out_data pointer to first Cell identification item in Cell Identifier List IE.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] out_leng length of \ref out_data in bytes (the size of the array of items)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns Field "Cell identification discriminator" of the "Cell Identifier</span><br><span style="color: hsl(120, 100%, 40%);">+ * List" IE (>=0) on success. Negative value on error.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> int bsc_nat_find_paging(struct msgb *msg,</span><br><span> const uint8_t **out_data, int *out_leng)</span><br><span> {</span><br><span>@@ -352,17 +361,18 @@</span><br><span> data_length = TLVP_LEN(&tp, GSM0808_IE_CELL_IDENTIFIER_LIST);</span><br><span> data = TLVP_VAL(&tp, GSM0808_IE_CELL_IDENTIFIER_LIST);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* No need to try a different BSS */</span><br><span style="color: hsl(0, 100%, 40%);">- if (data[0] == CELL_IDENT_BSS) {</span><br><span style="color: hsl(0, 100%, 40%);">- return -3;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (data[0] != CELL_IDENT_LAC) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNAT, LOGL_ERROR, "Unhandled cell ident discrminator: %d\n", data[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (data[0]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_LAC:</span><br><span style="color: hsl(120, 100%, 40%);">+ *out_data = &data[1];</span><br><span style="color: hsl(120, 100%, 40%);">+ *out_leng = data_length - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* fall through */</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_BSS:</span><br><span style="color: hsl(120, 100%, 40%);">+ return data[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNAT, LOGL_ERROR, "Unhandled cell ident discrminator: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_cell_id_discr_name(data[0]));</span><br><span> return -4;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *out_data = &data[1];</span><br><span style="color: hsl(0, 100%, 40%);">- *out_leng = data_length - 1;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span> </span><br><span> int bsc_write_mgcp(struct bsc_connection *bsc, const uint8_t *data, unsigned int length)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9776">change 9776</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/9776"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3125ba0e67d2965c0be3089748dd113b1bf615af </div>
<div style="display:none"> Gerrit-Change-Number: 9776 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>