<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20350">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LCS: add paging reason, return in paging_request_stop()<br><br>To distinguish between the CN requiring a Complete Layer 3 response, or just<br>the BSC requiring a TA, allow recording a separate for-LCS paging reason.<br><br>Change-Id: Ib28d1599ae4e483727398859d07de4490fbc31f0<br>---<br>M include/osmocom/bsc/paging.h<br>M src/osmo-bsc/gsm_08_08.c<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>M src/osmo-bsc/paging.c<br>4 files changed, 63 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/20350/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h</span><br><span>index 88027f3..ad99f90 100644</span><br><span>--- a/include/osmocom/bsc/paging.h</span><br><span>+++ b/include/osmocom/bsc/paging.h</span><br><span>@@ -33,7 +33,8 @@</span><br><span> struct bsc_msc_data;</span><br><span> </span><br><span> #define LOG_PAGING(PARAMS, SUBSYS, LEVEL, fmt, args...) \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(SUBSYS, LEVEL, "Paging: msc%d %s: " fmt, \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(SUBSYS, LEVEL, "Paging%s: msc%d %s: " fmt, \</span><br><span style="color: hsl(120, 100%, 40%);">+ (PARAMS)->reason == BSC_PAGING_FOR_LCS ? " for LCS" : "", \</span><br><span> (PARAMS)->msc ? (PARAMS)->msc->nr : -1, \</span><br><span> bsc_subscr_name((PARAMS)->bsub), \</span><br><span> ##args)</span><br><span>@@ -41,7 +42,16 @@</span><br><span> #define LOG_PAGING_BTS(PARAMS, BTS, SUBSYS, LEVEL, fmt, args...) \</span><br><span> LOG_PAGING(PARAMS, SUBSYS, LEVEL, "(bts%u) " fmt, (BTS) ? (BTS)->nr : 255, ##args)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Bitmask of reasons for Paging. Each individual Paging via bsc_paging_start() typically has only one of these reasons</span><br><span style="color: hsl(120, 100%, 40%);">+ * set, but when a subscriber responds, we need to aggregate all pending Paging reasons (by bitwise-OR). */</span><br><span style="color: hsl(120, 100%, 40%);">+enum bsc_paging_reason {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_PAGING_NONE = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_PAGING_FROM_CN = 0x1,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_PAGING_FOR_LCS = 0x2,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct bsc_paging_params {</span><br><span style="color: hsl(120, 100%, 40%);">+ enum bsc_paging_reason reason;</span><br><span> struct bsc_msc_data *msc;</span><br><span> struct bsc_subscr *bsub;</span><br><span> uint32_t tmsi;</span><br><span>@@ -72,12 +82,15 @@</span><br><span> </span><br><span> /* MSC that has issued this paging */</span><br><span> struct bsc_msc_data *msc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ enum bsc_paging_reason reason;</span><br><span> };</span><br><span> </span><br><span> /* schedule paging request */</span><br><span> int paging_request_bts(const struct bsc_paging_params *params, struct gsm_bts *bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct bsc_msc_data *paging_request_stop(struct gsm_bts *bts, struct bsc_subscr *bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+int paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reasons_p,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts, struct bsc_subscr *bsub);</span><br><span> </span><br><span> /* update paging load */</span><br><span> void paging_update_buffer_space(struct gsm_bts *bts, uint16_t);</span><br><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index 3af0f52..2d3a0d4 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -366,6 +366,7 @@</span><br><span> struct gsm_subscriber_connection *conn;</span><br><span> struct bsc_subscr *bsub = NULL;</span><br><span> struct bsc_msc_data *paged_from_msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum bsc_paging_reason paging_reasons;</span><br><span> struct bsc_msc_data *msc;</span><br><span> struct msgb *create_l3;</span><br><span> struct gsm0808_speech_codec_list scl;</span><br><span>@@ -424,8 +425,9 @@</span><br><span> /* When receiving a Paging Response, stop Paging for this subscriber on all cells, and figure out which MSC</span><br><span> * sent the Paging Request, if any. */</span><br><span> paged_from_msc = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ paging_reasons = BSC_PAGING_NONE;</span><br><span> if (pdisc == GSM48_PDISC_RR && mtype == GSM48_MT_RR_PAG_RESP) {</span><br><span style="color: hsl(0, 100%, 40%);">- paged_from_msc = paging_request_stop(bts, conn->bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ paging_request_stop(&paged_from_msc, &paging_reasons, bts, conn->bsub);</span><br><span> if (!paged_from_msc) {</span><br><span> /* This looks like an unsolicited Paging Response. It is required to pick any MSC, because any</span><br><span> * MT-CSFB calls were Paged by the MSC via SGs, and hence are not listed in the BSC. */</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 2665a9b..023929c 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -272,6 +272,7 @@</span><br><span> int remain;</span><br><span> const uint8_t *data;</span><br><span> struct bsc_paging_params paging = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .reason = BSC_PAGING_FROM_CN,</span><br><span> .msc = msc,</span><br><span> .tmsi = GSM_RESERVED_TMSI,</span><br><span> };</span><br><span>diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c</span><br><span>index d026a20..54a5fd7 100644</span><br><span>--- a/src/osmo-bsc/paging.c</span><br><span>+++ b/src/osmo-bsc/paging.c</span><br><span>@@ -342,6 +342,7 @@</span><br><span> LOG_PAGING_BTS(params, bts, DPAG, LOGL_DEBUG, "Start paging\n");</span><br><span> req = talloc_zero(tall_paging_ctx, struct gsm_paging_request);</span><br><span> OSMO_ASSERT(req);</span><br><span style="color: hsl(120, 100%, 40%);">+ req->reason = params->reason;</span><br><span> req->bsub = bsc_subscr_get(params->bsub);</span><br><span> req->bts = bts;</span><br><span> req->chan_type = params->chan_needed;</span><br><span>@@ -380,61 +381,79 @@</span><br><span> }</span><br><span> </span><br><span> /*! Stop paging a given subscriber on a given BTS.</span><br><span style="color: hsl(0, 100%, 40%);">- * If \a conn is non-NULL, we also call the paging call-back function</span><br><span style="color: hsl(0, 100%, 40%);">- * to notify the paging originator that paging has completed.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] bts BTS on which we shall stop paging</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] bsub subscriber which we shall stop paging</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns the MSC that paged the subscriber, if there was a pending request.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] returns the MSC that paged the subscriber, if any.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] returns the reason for a pending paging, if any.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] bts BTS which has received a paging response.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] bsub subscriber.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns number of pending pagings.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct bsc_msc_data *paging_request_stop_bts(struct gsm_bts *bts, struct bsc_subscr *bsub)</span><br><span style="color: hsl(120, 100%, 40%);">+static int paging_request_stop_bts(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reason_p,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts, struct bsc_subscr *bsub)</span><br><span> {</span><br><span> struct gsm_bts_paging_state *bts_entry = &bts->paging;</span><br><span> struct gsm_paging_request *req, *req2;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ *msc_p = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ *reason_p = BSC_PAGING_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> paging_init_if_needed(bts);</span><br><span> </span><br><span> llist_for_each_entry_safe(req, req2, &bts_entry->pending_requests,</span><br><span> entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (req->bsub == bsub) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_msc_data *from_msc = req->msc;</span><br><span style="color: hsl(0, 100%, 40%);">- /* now give up the data structure */</span><br><span style="color: hsl(0, 100%, 40%);">- paging_remove_request(&bts->paging, req);</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_BTS(bts, DPAG, LOGL_DEBUG, "Stop paging %s\n", bsc_subscr_name(bsub));</span><br><span style="color: hsl(0, 100%, 40%);">- return from_msc;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req->bsub != bsub)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ *msc_p = req->msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ *reason_p = req->reason;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_BTS(bts, DPAG, LOGL_DEBUG, "Stop paging %s\n", bsc_subscr_name(bsub));</span><br><span style="color: hsl(120, 100%, 40%);">+ paging_remove_request(&bts->paging, req);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Stop paging on all other bts'</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Stop paging on all cells and return the MSC that paged (if any) and all pending paging reasons.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] returns the MSC that paged the subscriber, if there was a pending request.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] returns the ORed bitmask of all reasons of pending pagings.</span><br><span> * \param[in] bts BTS which has received a paging response</span><br><span> * \param[in] bsub subscriber</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns the MSC that paged the subscriber, if there was a pending request.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns number of pending pagings.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-struct bsc_msc_data *paging_request_stop(struct gsm_bts *bts, struct bsc_subscr *bsub)</span><br><span style="color: hsl(120, 100%, 40%);">+int paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reasons_p,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts, struct bsc_subscr *bsub)</span><br><span> {</span><br><span> struct gsm_bts *bts_i;</span><br><span> struct bsc_msc_data *paged_from_msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int count;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum bsc_paging_reason reasons;</span><br><span> OSMO_ASSERT(bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- paged_from_msc = paging_request_stop_bts(bts, bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ count = paging_request_stop_bts(&paged_from_msc, &reasons, bts, bsub);</span><br><span> if (paged_from_msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ count++;</span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_PAGING_RESPONDED]);</span><br><span> rate_ctr_inc(&bts->network->bsc_ctrs->ctr[BSC_CTR_PAGING_RESPONDED]);</span><br><span> }</span><br><span> </span><br><span> llist_for_each_entry(bts_i, &bsc_gsmnet->bts_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_msc_data *paged_from_msc2 = paging_request_stop_bts(bts_i, bsub);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!paged_from_msc && paged_from_msc2) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* If this happened, it would be a bit weird: it means there was no Paging Request</span><br><span style="color: hsl(0, 100%, 40%);">- * pending on the BTS that sent the Paging Reponse, but there *is* a Paging Request</span><br><span style="color: hsl(0, 100%, 40%);">- * pending on a different BTS. But why not return an MSC when we found one. */</span><br><span style="color: hsl(0, 100%, 40%);">- paged_from_msc = paged_from_msc2;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *paged_from_msc2;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum bsc_paging_reason reason2;</span><br><span style="color: hsl(120, 100%, 40%);">+ count += paging_request_stop_bts(&paged_from_msc2, &reason2, bts_i, bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (paged_from_msc2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ reasons |= reason2;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!paged_from_msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If this happened, it would be a bit weird: it means there was no Paging Request</span><br><span style="color: hsl(120, 100%, 40%);">+ * pending on the BTS that sent the Paging Reponse, but there *is* a Paging Request</span><br><span style="color: hsl(120, 100%, 40%);">+ * pending on a different BTS. But why not return an MSC when we found one. */</span><br><span style="color: hsl(120, 100%, 40%);">+ paged_from_msc = paged_from_msc2;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return paged_from_msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ *msc_p = paged_from_msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ *reasons_p = reasons;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return count;</span><br><span> }</span><br><span> </span><br><span> /*! Update the BTS paging buffer slots on given BTS */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20350">change 20350</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/c/osmo-bsc/+/20350"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib28d1599ae4e483727398859d07de4490fbc31f0 </div>
<div style="display:none"> Gerrit-Change-Number: 20350 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>