<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22368">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_bssgp_rim: add serving BSS NACC application<br><br>Answer an incoming RAN INFORMATION REQUEST RIM PDU with RAN INFORMATION<br>PDU that contains system information type 1, 3 and 13<br><br>Depends: osmo-bts I5138ab183793e7eee4dc494318d984e9f1f56932<br>Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41<br>Related: SYS#5103<br>---<br>M src/bts.h<br>M src/gprs_bssgp_rim.c<br>M src/pcu_l1_if.cpp<br>3 files changed, 131 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index ea15caf..e67668c 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -219,6 +219,10 @@</span><br><span> uint8_t n3105;</span><br><span> struct gprs_rlcmac_trx trx[8];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t si1[GSM_MACBLOCK_LEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool si1_is_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t si3[GSM_MACBLOCK_LEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool si3_is_set;</span><br><span> uint8_t si13[GSM_MACBLOCK_LEN];</span><br><span> bool si13_is_set;</span><br><span> </span><br><span>diff --git a/src/gprs_bssgp_rim.c b/src/gprs_bssgp_rim.c</span><br><span>index a191fff..5f6f750 100644</span><br><span>--- a/src/gprs_bssgp_rim.c</span><br><span>+++ b/src/gprs_bssgp_rim.c</span><br><span>@@ -23,6 +23,9 @@</span><br><span> #include <osmocom/gsm/tlv.h></span><br><span> #include <osmocom/gprs/gprs_ns.h></span><br><span> #include <osmocom/core/prim.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <pcu_l1_if.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <gprs_rlcmac.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <bts.h></span><br><span> </span><br><span> #include "gprs_debug.h"</span><br><span> #include "gprs_pcu.h"</span><br><span>@@ -54,6 +57,59 @@</span><br><span> memcpy(&to_pdu->routing_info_src, &from_pdu->routing_info_dest, sizeof(to_pdu->routing_info_src));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Fill NACC application container with data (cell identifier, sysinfo) */</span><br><span style="color: hsl(120, 100%, 40%);">+#define SI_HDR_LEN 2</span><br><span style="color: hsl(120, 100%, 40%);">+static void fill_app_cont_nacc(struct bssgp_ran_inf_app_cont_nacc *app_cont, const struct gprs_rlcmac_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp_bvc_ctx *bctx = the_pcu->bssgp.bctx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ra_id_ci_to_cgi_ps(&app_cont->reprt_cell, &bctx->ra_id, bctx->cell_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->num_si = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Note: The BTS struct stores the system information including its pseudo header. The RIM application</span><br><span style="color: hsl(120, 100%, 40%);">+ * container defines the system information without pseudo header, so we need to chop it off. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->si1_is_set) {</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->si[app_cont->num_si] = bts->si1 + SI_HDR_LEN;</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->num_si++;</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 (bts->si3_is_set) {</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->si[app_cont->num_si] = bts->si3 + SI_HDR_LEN;</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->num_si++;</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 (bts->si13_is_set) {</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->si[app_cont->num_si] = bts->si13 + SI_HDR_LEN;</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->num_si++;</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%);">+ /* Note: It is possible that the resulting PDU will not contain any system information, even if this is</span><br><span style="color: hsl(120, 100%, 40%);">+ * an unlikely case since the BTS immediately updates the system information after startup. The</span><br><span style="color: hsl(120, 100%, 40%);">+ * specification permits to send zero system information, see also: 3GPP TS 48.018 section 11.3.63.2.1 */</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%);">+/* Format a RAN INFORMATION PDU that contains the requested system information */</span><br><span style="color: hsl(120, 100%, 40%);">+static void format_response_pdu(struct bssgp_ran_information_pdu *resp_pdu, struct bssgp_ran_information_pdu *req_pdu,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gprs_rlcmac_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(resp_pdu, 0, sizeof(*resp_pdu));</span><br><span style="color: hsl(120, 100%, 40%);">+ mirror_rim_routing_info(resp_pdu, req_pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ resp_pdu->decoded.rim_cont = (struct bssgp_ran_inf_rim_cont) {</span><br><span style="color: hsl(120, 100%, 40%);">+ .app_id = BSSGP_RAN_INF_APP_ID_NACC,</span><br><span style="color: hsl(120, 100%, 40%);">+ .seq_num = 1, /* single report has only one message in response */</span><br><span style="color: hsl(120, 100%, 40%);">+ .pdu_ind = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .pdu_type_ext = RIM_PDU_TYPE_SING_REP,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ .prot_ver = 1,</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%);">+ fill_app_cont_nacc(&resp_pdu->decoded.rim_cont.u.app_cont_nacc, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ resp_pdu->decoded_present = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ resp_pdu->rim_cont_iei = BSSGP_IE_RI_RIM_CONTAINER;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Format a RAN INFORMATION ERROR PDU */</span><br><span> static void format_response_pdu_err(struct bssgp_ran_information_pdu *resp_pdu,</span><br><span> const struct bssgp_ran_information_pdu *req_pdu)</span><br><span>@@ -167,6 +223,7 @@</span><br><span> struct bssgp_ran_information_pdu resp_pdu;</span><br><span> struct osmo_cell_global_id_ps dst_addr;</span><br><span> struct gprs_rlcmac_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> OSMO_ASSERT (bp->oph.sap == SAP_BSSGP_RIM);</span><br><span> </span><br><span>@@ -210,7 +267,15 @@</span><br><span> /* Handle incoming RIM container */</span><br><span> switch (pdu->rim_cont_iei) {</span><br><span> case BSSGP_IE_RI_REQ_RIM_CONTAINER:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPRIM(nsei, LOGL_NOTICE, "Responding to RAN INFORMATION REQUEST not yet implemented!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_cgi_ps_cmp(&dst_addr, &pdu->decoded.req_rim_cont.u.app_cont_nacc.reprt_cell);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPRIM(nsei, LOGL_ERROR, "reporting cell in RIM application container does not match destination cell in RIM routing info -- rejected.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ format_response_pdu_err(&resp_pdu, pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPRIM(nsei, LOGL_INFO, "Responding to RAN INFORMATION REQUEST ...\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ format_response_pdu(&resp_pdu, pdu, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_tx_rim(&resp_pdu, nsei);</span><br><span> break;</span><br><span> case BSSGP_IE_RI_RIM_CONTAINER:</span><br><span> return handle_ran_info_response(pdu, bts);</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index d7590e1..9873469 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -42,6 +42,7 @@</span><br><span> #include <osmocom/gprs/gprs_ns2.h></span><br><span> #include <osmocom/gsm/l1sap.h></span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/sysinfo.h></span><br><span> }</span><br><span> </span><br><span> #include <gprs_rlcmac.h></span><br><span>@@ -290,21 +291,69 @@</span><br><span> </span><br><span> static int pcu_rx_data_ind_bcch(struct gprs_rlcmac_bts *bts, uint8_t *data, uint8_t len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (len == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Due to historical reasons also accept a completely empty message as</span><br><span style="color: hsl(120, 100%, 40%);">+ * revoke command for SI13. */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received PCU data indication that contains no data -- Revoked SI13.\n");</span><br><span> bts->si13_is_set = false;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_INFO, "Received PCU data indication with empty SI13: cache cleaned\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (len != GSM_MACBLOCK_LEN) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_ERROR, "Received PCU data indication with SI13 with unexpected length %u\n", len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Revoke SI, type is identified by a single byte which is coded after</span><br><span style="color: hsl(120, 100%, 40%);">+ * enum osmo_sysinfo_type. */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (data[0]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si1_is_set = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_3:</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si3_is_set = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_13:</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si13_is_set = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received PCU data indication that contains an unsupported system information identifier (%02x,OSMO) -- ignored.\n", data[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received PCU data indication: Revoked SI%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(osmo_sitype_strs, data[0]));</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_MACBLOCK_LEN:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Update SI, type is identified by the RR sysinfo type, which is the</span><br><span style="color: hsl(120, 100%, 40%);">+ * 3rd byte in the buffer. */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (data[2]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_MT_RR_SYSINFO_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(bts->si1, data, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si1_is_set = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_MT_RR_SYSINFO_3:</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(bts->si3, data, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si3_is_set = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_MT_RR_SYSINFO_13:</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(bts->si13, data, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si13_is_set = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received PCU data indication that contains an unsupported system information identifier (%02x,RR) -- ignored.\n", data[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received PCU data indication: Updated %s: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_pdisc_msgtype_name(data[1], data[2]),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump_nospc(data + 1, GSM_MACBLOCK_LEN));</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received PCU data indication with unexpected data length: %u -- ignored.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ len);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(bts->si13, data, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->si13_is_set = true;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span> }</span><br><span> </span><br><span> static int pcu_rx_data_ind(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data *data_ind)</span><br><span>@@ -782,7 +831,7 @@</span><br><span> </span><br><span> static int pcu_rx_susp_req(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_susp_req *susp_req)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct bssgp_bvc_ctx *bctx = bts->pcu->bssgp.bctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp_bvc_ctx *bctx = the_pcu->bssgp.bctx;</span><br><span> GprsMs *ms;</span><br><span> struct gprs_rlcmac_dl_tbf *dl_tbf;</span><br><span> struct gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22368">change 22368</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-pcu/+/22368"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 </div>
<div style="display:none"> Gerrit-Change-Number: 22368 </div>
<div style="display:none"> Gerrit-PatchSet: 11 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>