<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17588">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_nm: move fail report parsing to extra func<br><br>Separate raw input parsing from handling the failure report. A follow-up<br>patch will use the new parsing function to print saved failure reports<br>to the VTY.<br><br>While at it, put struct tlv_parsed inside struct nm_fail_rep_signal_data<br>instead of a pointer, so we don't need an additional alloc. Also add<br>error handling to the abis_nm_tlv_parse() call.<br><br>Related: OS#1605<br>Change-Id: Ia51004faf620aa4d40435d58c70d758c9d0054d8<br>---<br>M include/osmocom/bsc/abis_nm.h<br>M include/osmocom/bsc/signal.h<br>M src/osmo-bsc/abis_nm.c<br>3 files changed, 64 insertions(+), 41 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 45bbe2c..83bc2f8 100644</span><br><span>--- a/include/osmocom/bsc/abis_nm.h</span><br><span>+++ b/include/osmocom/bsc/abis_nm.h</span><br><span>@@ -27,6 +27,7 @@</span><br><span> #include <osmocom/gsm/protocol/gsm_12_21.h></span><br><span> </span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/signal.h></span><br><span> </span><br><span> /* max number of attributes represented as 3GPP TS 52.021 ยง9.4.62 SW Description array */</span><br><span> #define MAX_BTS_ATTR 5</span><br><span>@@ -170,6 +171,8 @@</span><br><span> </span><br><span> int abis_nm_select_newest_sw(const struct abis_nm_sw_desc *sw, const size_t len);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct nm_fail_rep_signal_data *abis_nm_fail_evt_rep_parse(struct msgb *mb, struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Helper functions for updating attributes */</span><br><span> int abis_nm_update_max_power_red(struct gsm_bts_trx *trx);</span><br><span> </span><br><span>diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h</span><br><span>index 10200d7..952e03c 100644</span><br><span>--- a/include/osmocom/bsc/signal.h</span><br><span>+++ b/include/osmocom/bsc/signal.h</span><br><span>@@ -153,7 +153,7 @@</span><br><span> struct gsm_bts *bts;</span><br><span> /* raw data */</span><br><span> struct msgb *msg;</span><br><span style="color: hsl(0, 100%, 40%);">- struct tlv_parsed *tp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tlv_parsed tp;</span><br><span> /* parsed data */</span><br><span> struct {</span><br><span> const char *event_type;</span><br><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index 2d181e8..07effd3 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -353,38 +353,77 @@</span><br><span> };</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int rx_fail_evt_rep(struct msgb *mb, struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+/* Parse into newly allocated struct abis_nm_fail_evt_rep, caller must free it. */</span><br><span style="color: hsl(120, 100%, 40%);">+struct nm_fail_rep_signal_data *abis_nm_fail_evt_rep_parse(struct msgb *mb, struct gsm_bts *bts)</span><br><span> {</span><br><span> struct abis_om_hdr *oh = msgb_l2(mb);</span><br><span> struct abis_om_fom_hdr *foh = msgb_l3(mb);</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1inp_sign_link *sign_link = mb->dst;</span><br><span style="color: hsl(0, 100%, 40%);">- struct nm_fail_rep_signal_data sd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct tlv_parsed tp;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_fail_rep_signal_data *sd;</span><br><span> const uint8_t *p_val = NULL;</span><br><span> char *p_text = NULL;</span><br><span> const char *e_type = NULL, *severity = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data,</span><br><span style="color: hsl(0, 100%, 40%);">- oh->length-sizeof(*foh));</span><br><span style="color: hsl(120, 100%, 40%);">+ sd = talloc_zero(tall_bsc_ctx, struct nm_fail_rep_signal_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(sd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(&tp, NM_ATT_ADD_TEXT)) {</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *val = TLVP_VAL(&tp, NM_ATT_ADD_TEXT);</span><br><span style="color: hsl(0, 100%, 40%);">- p_text = talloc_strndup(tall_bsc_ctx, (const char *) val,</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_LEN(&tp, NM_ATT_ADD_TEXT));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (abis_nm_tlv_parse(&sd->tp, bts, foh->data, oh->length-sizeof(*foh)) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto fail;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(&sd->tp, NM_ATT_ADD_TEXT)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *val = TLVP_VAL(&sd->tp, NM_ATT_ADD_TEXT);</span><br><span style="color: hsl(120, 100%, 40%);">+ p_text = talloc_strndup(sd, (const char *) val, TLVP_LEN(&sd->tp, NM_ATT_ADD_TEXT));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(&tp, NM_ATT_EVENT_TYPE))</span><br><span style="color: hsl(0, 100%, 40%);">- e_type = abis_nm_event_type_name(*TLVP_VAL(&tp,</span><br><span style="color: hsl(0, 100%, 40%);">- NM_ATT_EVENT_TYPE));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(&sd->tp, NM_ATT_EVENT_TYPE))</span><br><span style="color: hsl(120, 100%, 40%);">+ e_type = abis_nm_event_type_name(*TLVP_VAL(&sd->tp, NM_ATT_EVENT_TYPE));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(&tp, NM_ATT_SEVERITY))</span><br><span style="color: hsl(0, 100%, 40%);">- severity = abis_nm_severity_name(*TLVP_VAL(&tp,</span><br><span style="color: hsl(0, 100%, 40%);">- NM_ATT_SEVERITY));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(&sd->tp, NM_ATT_SEVERITY))</span><br><span style="color: hsl(120, 100%, 40%);">+ severity = abis_nm_severity_name(*TLVP_VAL(&sd->tp, NM_ATT_SEVERITY));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(&tp, NM_ATT_PROB_CAUSE)) {</span><br><span style="color: hsl(0, 100%, 40%);">- p_val = TLVP_VAL(&tp, NM_ATT_PROB_CAUSE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(&sd->tp, NM_ATT_PROB_CAUSE))</span><br><span style="color: hsl(120, 100%, 40%);">+ p_val = TLVP_VAL(&sd->tp, NM_ATT_PROB_CAUSE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ sd->bts = bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ sd->msg = mb;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (e_type)</span><br><span style="color: hsl(120, 100%, 40%);">+ sd->parsed.event_type = e_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ sd->parsed.event_type = talloc_strdup(sd, "<none>");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (severity)</span><br><span style="color: hsl(120, 100%, 40%);">+ sd->parsed.severity = severity;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ sd->parsed.severity = talloc_strdup(sd, "<none>");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (p_text)</span><br><span style="color: hsl(120, 100%, 40%);">+ sd->parsed.additional_text = p_text;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ sd->parsed.additional_text = talloc_strdup(sd, "<none>");</span><br><span style="color: hsl(120, 100%, 40%);">+ sd->parsed.probable_cause = p_val;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return sd;</span><br><span style="color: hsl(120, 100%, 40%);">+fail:</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(sd);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</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%);">+static int rx_fail_evt_rep(struct msgb *mb, struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct abis_om_fom_hdr *foh = msgb_l3(mb);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_fail_rep_signal_data *sd;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *p_val;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *e_type, *severity, *p_text;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sd = abis_nm_fail_evt_rep_parse(mb, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sd) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse Failure Event Report\n", bts->nr);</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%);">+ e_type = sd->parsed.event_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ severity = sd->parsed.severity;</span><br><span style="color: hsl(120, 100%, 40%);">+ p_text = sd->parsed.additional_text;</span><br><span style="color: hsl(120, 100%, 40%);">+ p_val = sd->parsed.probable_cause;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (p_val) {</span><br><span> switch (p_val[0]) {</span><br><span> case NM_PCAUSE_T_MANUF:</span><br><span> handle_manufact_report(bts, p_val, e_type, severity,</span><br><span>@@ -399,27 +438,8 @@</span><br><span> rc = -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sd.bts = bts;</span><br><span style="color: hsl(0, 100%, 40%);">- sd.msg = mb;</span><br><span style="color: hsl(0, 100%, 40%);">- sd.tp = &tp;</span><br><span style="color: hsl(0, 100%, 40%);">- if (e_type)</span><br><span style="color: hsl(0, 100%, 40%);">- sd.parsed.event_type = e_type;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- sd.parsed.event_type = "<none>";</span><br><span style="color: hsl(0, 100%, 40%);">- if (severity)</span><br><span style="color: hsl(0, 100%, 40%);">- sd.parsed.severity = severity;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- sd.parsed.severity = "<none>";</span><br><span style="color: hsl(0, 100%, 40%);">- if (p_text)</span><br><span style="color: hsl(0, 100%, 40%);">- sd.parsed.additional_text = p_text;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- sd.parsed.additional_text = "<none>";</span><br><span style="color: hsl(0, 100%, 40%);">- sd.parsed.probable_cause = p_val;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_NM, S_NM_FAIL_REP, &sd);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (p_text)</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(p_text);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_signal_dispatch(SS_NM, S_NM_FAIL_REP, sd);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(sd);</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17588">change 17588</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/+/17588"/><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: Ia51004faf620aa4d40435d58c70d758c9d0054d8 </div>
<div style="display:none"> Gerrit-Change-Number: 17588 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>