<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11694">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_nm: Add support to parse OML IP and Unit Id in Get Attributes<br><br>Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa<br>---<br>M include/osmocom/bsc/abis_nm.h<br>M src/osmo-bsc/abis_nm.c<br>2 files changed, 49 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h</span><br><span>index ef9e4f5..45bbe2c 100644</span><br><span>--- a/include/osmocom/bsc/abis_nm.h</span><br><span>+++ b/include/osmocom/bsc/abis_nm.h</span><br><span>@@ -67,6 +67,8 @@</span><br><span> extern int abis_nm_rcvmsg(struct msgb *msg);</span><br><span> </span><br><span> int abis_nm_tlv_parse(struct tlv_parsed *tp, struct gsm_bts *bts, const uint8_t *buf, int len);</span><br><span style="color: hsl(120, 100%, 40%);">+int abis_nm_tlv_attr_primary_oml(struct tlv_parsed *tp, struct in_addr *ia, uint16_t *oml_port);</span><br><span style="color: hsl(120, 100%, 40%);">+int abis_nm_tlv_attr_unit_id(struct tlv_parsed *tp, char* unit_id, size_t buf_len);</span><br><span> int abis_nm_rx(struct msgb *msg);</span><br><span> int abis_nm_opstart(struct gsm_bts *bts, uint8_t obj_class, uint8_t i0, uint8_t i1, uint8_t i2);</span><br><span> int abis_nm_chg_adm_state(struct gsm_bts *bts, uint8_t obj_class, uint8_t i0,</span><br><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index 005c417..89a6d82 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -64,6 +64,39 @@</span><br><span> return tlv_parse(tp, &bts->model->nm_att_tlvdef, buf, len, 0, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Parse OML Primary IP and port from tlv_parsed containing list of Reported Attributes */</span><br><span style="color: hsl(120, 100%, 40%);">+int abis_nm_tlv_attr_primary_oml(struct tlv_parsed *tp, struct in_addr *ia, uint16_t *oml_port)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t* data;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST, 7)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ data = TLVP_VAL(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (NM_ATT_IPACC_PRIM_OML_CFG == *data) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ia->s_addr = htonl(osmo_load32be(data+1));</span><br><span style="color: hsl(120, 100%, 40%);">+ *oml_port = osmo_load16be(data+5);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNM, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Get Attributes Response: PRIM_OML_CFG_LIST has unexpected format: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump(data, TLVP_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST)));</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%);">+ return -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%);">+/* Parse OML Primary IP and port from tlv_parsed containing list of Reported Attributes */</span><br><span style="color: hsl(120, 100%, 40%);">+int abis_nm_tlv_attr_unit_id(struct tlv_parsed *tp, char* unit_id, size_t buf_len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t* data;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t len;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_UNIT_ID, 1)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ data = TLVP_VAL(tp, NM_ATT_IPACC_UNIT_ID);</span><br><span style="color: hsl(120, 100%, 40%);">+ len = TLVP_LEN(tp, NM_ATT_IPACC_UNIT_ID);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(unit_id, (char*)data, OSMO_MIN(len, buf_len));</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int is_in_arr(enum abis_nm_msgtype mt, const enum abis_nm_msgtype *arr, int size)</span><br><span> {</span><br><span> int i;</span><br><span>@@ -473,6 +506,9 @@</span><br><span> uint16_t len;</span><br><span> int i;</span><br><span> int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t port;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct in_addr ia = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+ char unit_id[40];</span><br><span> struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR];</span><br><span> </span><br><span> /* Parse Attribute Response Info content for 3GPP TS 52.021 ยง9.4.30 Manufacturer Id */</span><br><span>@@ -528,6 +564,17 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (abis_nm_tlv_attr_primary_oml(tp, &ia, &port) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DNM, LOGL_NOTICE, foh,</span><br><span style="color: hsl(120, 100%, 40%);">+ "BTS%u Get Attributes Response: Primary OML IP is %s:%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, inet_ntoa(ia), port);</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 (abis_nm_tlv_attr_unit_id(tp, unit_id, sizeof(unit_id)) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DNM, LOGL_NOTICE, foh, "BTS%u Get Attributes Response: Unit ID is %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, unit_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11694">change 11694</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/11694"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa </div>
<div style="display:none"> Gerrit-Change-Number: 11694 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>