<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22368">View Change</a></p><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-pcu TODO!!!!!!!!!!!!!!!<br>Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41<br>Related: SYS#5103<br>---<br>M include/osmocom/pcu/pcuif_proto.h<br>M src/bts.h<br>M src/gprs_bssgp_rim.c<br>M src/pcu_l1_if.cpp<br>4 files changed, 100 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/68/22368/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h</span><br><span>index cdd73d9..6ac9a02 100644</span><br><span>--- a/include/osmocom/pcu/pcuif_proto.h</span><br><span>+++ b/include/osmocom/pcu/pcuif_proto.h</span><br><span>@@ -1,12 +1,13 @@</span><br><span> #ifndef _PCUIF_PROTO_H</span><br><span> #define _PCUIF_PROTO_H</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span> #include <osmocom/gsm/l1sap.h></span><br><span> #include <arpa/inet.h></span><br><span> </span><br><span> #define PCU_SOCK_DEFAULT "/tmp/pcu_bts"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define PCU_IF_VERSION 0x0a</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCU_IF_VERSION 0x0b</span><br><span> #define TXT_MAX_LEN 128</span><br><span> </span><br><span> /* msg_type */</span><br><span>@@ -177,6 +178,13 @@</span><br><span> struct in_addr v4;</span><br><span> struct in6_addr v6;</span><br><span> } remote_ip[PCU_IF_NUM_NSVC];</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RIM */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t si1[GSM_MACBLOCK_LEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t 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%);">+ uint8_t si3_is_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t si13[GSM_MACBLOCK_LEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t si13_is_set;</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> struct gsm_pcu_if_act_req {</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 7f437e3..195c44f 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -215,6 +215,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 8cb330f..3d4b7a9 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>@@ -48,6 +51,60 @@</span><br><span> memcpy(&resp_pdu->routing_info_src, &req_pdu->routing_info_dest, sizeof(resp_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%);">+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 = gprs_bssgp_pcu_current_bctx();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->reprt_cell.rai.lac.plmn.mcc = bctx->ra_id.mcc;</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->reprt_cell.rai.lac.plmn.mnc = bctx->ra_id.mnc;</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->reprt_cell.rai.lac.plmn.mnc_3_digits = bctx->ra_id.mnc_3_digits;</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->reprt_cell.rai.lac.lac = bctx->ra_id.lac;</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->reprt_cell.rai.rac = bctx->ra_id.rac;</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->reprt_cell.cell_identity = 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%);">+ if (bts->si1_is_set) {</span><br><span style="color: hsl(120, 100%, 40%);">+ app_cont->si[app_cont->num_si] = bts->si1 + 2;</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 + 2;</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 + 2;</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> struct bssgp_ran_information_pdu *req_pdu)</span><br><span>@@ -148,7 +205,9 @@</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%);">- LOGP(DRIM, LOGL_NOTICE, "BSSGP RIM (NSEI=%u) responding to RAN INFORMATION REQUEST not yet implemented!\n", nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRIM, LOGL_NOTICE, "BSSGP RIM (NSEI=%u) responding to RAN INFORMATION REQUEST ...\n", nsei);</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%);">+ bssgp_tx_rim(&resp_pdu, nsei);</span><br><span> break;</span><br><span> case BSSGP_IE_RI_RIM_CONTAINER:</span><br><span> LOGP(DRIM, LOGL_NOTICE, "BSSGP RIM (NSEI=%u) responding to RAN INFORMATION not yet implemented!\n", nsei);</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 8ae74d5..7054d1b 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -656,6 +656,33 @@</span><br><span> goto bssgp_failed;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (info_ind->si1_is_set) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " si1=%s\n", osmo_hexdump_nospc(info_ind->si1, GSM_MACBLOCK_LEN));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(bts->si1, info_ind->si1, 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%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " si1=(not set)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si1_is_set = false;</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 (info_ind->si3_is_set) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " si3=%s\n", osmo_hexdump_nospc(info_ind->si3, GSM_MACBLOCK_LEN));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(bts->si3, info_ind->si3, 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%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " si3=(not set)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si3_is_set = false;</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 (info_ind->si13_is_set) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " si13=%s\n", osmo_hexdump_nospc(info_ind->si13, GSM_MACBLOCK_LEN));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(bts->si13, info_ind->si13, 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%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, " si13=(not set)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si13_is_set = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (info_ind->t3142) { /* if timer values are set */</span><br><span> osmo_tdef_set(bts->T_defs_bts, 3142, info_ind->t3142, OSMO_TDEF_S);</span><br><span> osmo_tdef_set(bts->T_defs_bts, 3169, info_ind->t3169, OSMO_TDEF_S);</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: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>