<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22046">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_bssgp: add utilities to send and parse BSSGP rim PDUs<br><br>At the moment libosmogb offers no convinient way to send RIM PDUs. Also<br>parsing an incoming RIM messages into destination, source routing<br>info and RIM container is not available.<br><br>Change-Id: I18134fd9938040d2facb6beee3732628b167ce8c<br>Related: SYS#5103<br>---<br>M include/osmocom/gprs/gprs_bssgp.h<br>M src/gb/gprs_bssgp_util.c<br>M src/gb/libosmogb.map<br>3 files changed, 130 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/22046/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h</span><br><span>index d228c53..3caf91b 100644</span><br><span>--- a/include/osmocom/gprs/gprs_bssgp.h</span><br><span>+++ b/include/osmocom/gprs/gprs_bssgp.h</span><br><span>@@ -41,6 +41,19 @@</span><br><span> /* Chapter 10.4.14: Status */</span><br><span> int bssgp_tx_status(uint8_t cause, uint16_t *bvci, struct msgb *orig_msg);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Chapter 10.6.1: RAN-INFORMATION-REQUEST */</span><br><span style="color: hsl(120, 100%, 40%);">+struct bssgp_ran_information_pdu {</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *routing_info_dest;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int routing_info_dest_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *routing_info_src;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int routing_info_src_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rim_cont_iei;</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *rim_cont;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int rim_cont_len;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+int bssgp_tx_rim(struct bssgp_ran_information_pdu *pdu, uint16_t nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+int bssgp_parse_rim_pdu(struct bssgp_ran_information_pdu *pdu, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum bssgp_prim {</span><br><span> PRIM_BSSGP_DL_UD,</span><br><span> PRIM_BSSGP_UL_UD,</span><br><span>diff --git a/src/gb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c</span><br><span>index 92896c1..0cd59f0 100644</span><br><span>--- a/src/gb/gprs_bssgp_util.c</span><br><span>+++ b/src/gb/gprs_bssgp_util.c</span><br><span>@@ -588,3 +588,118 @@</span><br><span> </span><br><span> return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Chapter 10.6.1: RAN-INFORMATION-REQUEST */</span><br><span style="color: hsl(120, 100%, 40%);">+int bssgp_tx_rim(struct bssgp_ran_information_pdu *pdu, uint16_t nsei)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = bssgp_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp_normal_hdr *bgph =</span><br><span style="color: hsl(120, 100%, 40%);">+ (struct bssgp_normal_hdr *)msgb_put(msg, sizeof(*bgph));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Find a suitable PDU based on the RIM container type (IEI) */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pdu->rim_cont_iei) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_IE_RI_REQ_RIM_CONTAINER:</span><br><span style="color: hsl(120, 100%, 40%);">+ bgph->pdu_type = BSSGP_PDUT_RAN_INFO_REQ;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_IE_RI_RIM_CONTAINER:</span><br><span style="color: hsl(120, 100%, 40%);">+ bgph->pdu_type = BSSGP_PDUT_RAN_INFO;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_IE_RI_APP_ERROR_RIM_CONT:</span><br><span style="color: hsl(120, 100%, 40%);">+ bgph->pdu_type = BSSGP_PDUT_RAN_INFO_APP_ERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_IE_RI_ACK_RIM_CONTAINER:</span><br><span style="color: hsl(120, 100%, 40%);">+ bgph->pdu_type = BSSGP_PDUT_RAN_INFO_ACK;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_IE_RI_ERROR_RIM_COINTAINER:</span><br><span style="color: hsl(120, 100%, 40%);">+ bgph->pdu_type = BSSGP_PDUT_RAN_INFO_ERROR;</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%);">+ /* The caller must correctly specify the container type! */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(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%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP BVCI=0 Tx RIM-PDU:%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_pdu_str(bgph->pdu_type));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check if anything is missing, all those fields are mandatory. The</span><br><span style="color: hsl(120, 100%, 40%);">+ * caller must make sure that the fields are present. */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pdu->routing_info_dest_len > 0 && pdu->routing_info_dest);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pdu->routing_info_src_len > 0 && pdu->routing_info_src);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pdu->rim_cont_iei != 0 && pdu->rim_cont_len > 0</span><br><span style="color: hsl(120, 100%, 40%);">+ && pdu->rim_cont);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Encode BSSGP PDU */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_nsei(msg) = nsei;</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_bvci(msg) = 0; /* Signalling */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tvlv_put(msg, BSSGP_IE_RIM_ROUTING_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->routing_info_dest_len, pdu->routing_info_dest);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tvlv_put(msg, BSSGP_IE_RIM_ROUTING_INFO, pdu->routing_info_src_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->routing_info_src);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tvlv_put(msg, pdu->rim_cont_iei, pdu->rim_cont_len, pdu->rim_cont);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</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%);">+/* Parse a given message buffer into a rim-pdu struct */</span><br><span style="color: hsl(120, 100%, 40%);">+int bssgp_parse_rim_pdu(struct bssgp_ran_information_pdu *pdu, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tlv_parsed tp[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp_normal_hdr *bgph =</span><br><span style="color: hsl(120, 100%, 40%);">+ (struct bssgp_normal_hdr *)msgb_bssgph(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ int data_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t nsei = msgb_nsei(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ data_len = msgb_bssgp_len(msg) - sizeof(*bgph);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = tlv_parse2(tp, ARRAY_SIZE(tp), &tvlv_att_def, bgph->data, data_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 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%);">+ if (TLVP_PRESENT(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->routing_info_dest =</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->routing_info_dest_len =</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "BSSGP RIM (NSEI=%u) missing Destination Cell Identifier IE\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei);</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->routing_info_src =</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_VAL(&tp[1], BSSGP_IE_RIM_ROUTING_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->routing_info_src_len =</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_LEN(&tp[1], BSSGP_IE_RIM_ROUTING_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "BSSGP RIM (NSEI=%u) missing Source Cell Identifier IE\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei);</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(&tp[0], BSSGP_IE_RI_REQ_RIM_CONTAINER))</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->rim_cont_iei = BSSGP_IE_RI_REQ_RIM_CONTAINER;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (TLVP_PRESENT(&tp[0], BSSGP_IE_RI_RIM_CONTAINER))</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->rim_cont_iei = BSSGP_IE_RI_RIM_CONTAINER;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (TLVP_PRESENT(&tp[0], BSSGP_IE_RI_APP_ERROR_RIM_CONT))</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->rim_cont_iei = BSSGP_IE_RI_APP_ERROR_RIM_CONT;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (TLVP_PRESENT(&tp[0], BSSGP_IE_RI_ACK_RIM_CONTAINER))</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->rim_cont_iei = BSSGP_IE_RI_ACK_RIM_CONTAINER;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (TLVP_PRESENT(&tp[0], BSSGP_IE_RI_ERROR_RIM_COINTAINER))</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->rim_cont_iei = BSSGP_IE_RI_ERROR_RIM_COINTAINER;</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "BSSGP RIM (NSEI=%u) missing or wrong RIM Container IE -- rejected\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei);</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->rim_cont = TLVP_VAL(&tp[0], pdu->rim_cont_iei);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu->rim_cont_len = TLVP_LEN(&tp[0], pdu->rim_cont_iei);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map</span><br><span>index 5c029b0..f49f9bd 100644</span><br><span>--- a/src/gb/libosmogb.map</span><br><span>+++ b/src/gb/libosmogb.map</span><br><span>@@ -14,6 +14,7 @@</span><br><span> bssgp_msgb_tlli_put;</span><br><span> bssgp_msgb_ra_put;</span><br><span> bssgp_parse_cell_id;</span><br><span style="color: hsl(120, 100%, 40%);">+bssgp_parse_rim_pdu;</span><br><span> bssgp_parse_rim_ri;</span><br><span> bssgp_set_bssgp_callback;</span><br><span> bssgp_tx_bvc_block;</span><br><span>@@ -32,6 +33,7 @@</span><br><span> bssgp_tx_resume;</span><br><span> bssgp_tx_resume_ack;</span><br><span> bssgp_tx_resume_nack;</span><br><span style="color: hsl(120, 100%, 40%);">+bssgp_tx_rim;</span><br><span> bssgp_tx_simple_bvci;</span><br><span> bssgp_tx_status;</span><br><span> bssgp_tx_suspend;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22046">change 22046</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/libosmocore/+/22046"/><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-Change-Id: I18134fd9938040d2facb6beee3732628b167ce8c </div>
<div style="display:none"> Gerrit-Change-Number: 22046 </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>