<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14176">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal<br><br>Let's not just pass around the raw msgb, but also all other metadata,<br>such as the decoded parts of the TS 12.21 message.<br><br>As there's no current consumer of that signal, this creates no<br>compatibility issues.<br><br>Change-Id: I5d4d9d422b4e23348ffbe69c6e87a31d5574f90d<br>---<br>M include/osmocom/bsc/signal.h<br>M src/osmo-bsc/abis_nm.c<br>2 files changed, 33 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/14176/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h</span><br><span>index 62a3d2c..10200d7 100644</span><br><span>--- a/include/osmocom/bsc/signal.h</span><br><span>+++ b/include/osmocom/bsc/signal.h</span><br><span>@@ -149,6 +149,20 @@</span><br><span> uint8_t mt;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct nm_fail_rep_signal_data {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* raw data */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tlv_parsed *tp;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* parsed data */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *event_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *severity;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *additional_text;</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *probable_cause;</span><br><span style="color: hsl(120, 100%, 40%);">+ } parsed;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct challoc_signal_data {</span><br><span> struct gsm_bts *bts;</span><br><span> struct gsm_lchan *lchan;</span><br><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index bff6c12..da41c70 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -358,6 +358,7 @@</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> struct e1inp_sign_link *sign_link = mb->dst;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nm_fail_rep_signal_data sd;</span><br><span> struct tlv_parsed tp;</span><br><span> int rc = 0;</span><br><span> const uint8_t *p_val = NULL;</span><br><span>@@ -398,6 +399,24 @@</span><br><span> rc = -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ sd.bts = mb->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ sd.msg = mb;</span><br><span style="color: hsl(120, 100%, 40%);">+ sd.tp = &tp;</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 = "<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 = "<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 = "<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%);">+ osmo_signal_dispatch(SS_NM, S_NM_FAIL_REP, &sd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (p_text)</span><br><span> talloc_free(p_text);</span><br><span> </span><br><span>@@ -419,7 +438,6 @@</span><br><span> break;</span><br><span> case NM_MT_FAILURE_EVENT_REP:</span><br><span> rx_fail_evt_rep(mb, bts);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_NM, S_NM_FAIL_REP, mb);</span><br><span> break;</span><br><span> case NM_MT_TEST_REP:</span><br><span> DEBUGPFOH(DNM, foh, "Test Report\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14176">change 14176</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/14176"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5d4d9d422b4e23348ffbe69c6e87a31d5574f90d </div>
<div style="display:none"> Gerrit-Change-Number: 14176 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>