<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14161">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">oml: Print more context from FOM Header or using MO<br><br>Some of our OML log lines were missing any context. Try making more<br>sense by printing any context information about the given managed<br>object, TRX, ... as we have it.<br><br>Change-Id: I60d1660c6d574f206d7b8cc10082b413142365dd<br>---<br>M src/common/oml.c<br>1 file changed, 31 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 186c2a2..63643c5 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -70,6 +70,16 @@</span><br><span> return msgb_alloc_headroom(1024, 128, "OML");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* FIXME: move to gsm_data_shared */</span><br><span style="color: hsl(120, 100%, 40%);">+static char mo_buf[128];</span><br><span style="color: hsl(120, 100%, 40%);">+char *gsm_abis_mo_name(const struct gsm_abis_mo *mo)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(mo_buf, sizeof(mo_buf), "OC=%s INST=(%02x,%02x,%02x)",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(abis_nm_obj_class_names, mo->obj_class),</span><br><span style="color: hsl(120, 100%, 40%);">+ mo->obj_inst.bts_nr, mo->obj_inst.trx_nr, mo->obj_inst.ts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mo_buf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* 3GPP TS 12.21 ยง 8.8.2 */</span><br><span> int oml_tx_failure_event_rep(const struct gsm_abis_mo *mo, uint16_t cause_value,</span><br><span> const char *fmt, ...)</span><br><span>@@ -77,7 +87,8 @@</span><br><span> struct msgb *nmsg;</span><br><span> va_list ap;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_NOTICE, "Sending %s to BSC: ", get_value_string(abis_mm_event_cause_names, cause_value));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DOML, LOGL_NOTICE, "%s: Sending %s to BSC: ", gsm_abis_mo_name(mo),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(abis_mm_event_cause_names, cause_value));</span><br><span> va_start(ap, fmt);</span><br><span> osmo_vlogp(DOML, LOGL_NOTICE, __FILE__, __LINE__, 1, fmt, ap);</span><br><span> nmsg = abis_nm_fail_evt_vrep(NM_EVT_PROC_FAIL, NM_SEVER_CRITICAL,</span><br><span>@@ -133,16 +144,6 @@</span><br><span> return oml_send_msg(msg, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* FIXME: move to gsm_data_shared */</span><br><span style="color: hsl(0, 100%, 40%);">-static char mo_buf[128];</span><br><span style="color: hsl(0, 100%, 40%);">-char *gsm_abis_mo_name(const struct gsm_abis_mo *mo)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(mo_buf, sizeof(mo_buf), "OC=%s INST=(%02x,%02x,%02x)",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(abis_nm_obj_class_names, mo->obj_class),</span><br><span style="color: hsl(0, 100%, 40%);">- mo->obj_inst.bts_nr, mo->obj_inst.trx_nr, mo->obj_inst.ts_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- return mo_buf;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static inline void add_bts_attrs(struct msgb *msg, const struct gsm_bts *bts)</span><br><span> {</span><br><span> uint16_t total_len = 0;</span><br><span>@@ -203,7 +204,7 @@</span><br><span> int i;</span><br><span> </span><br><span> if (!trx) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_ERROR, "O&M Get Attributes for unknown TRX\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DOML, LOGL_ERROR, "%s: O&M Get Attributes for unknown TRX\n", gsm_trx_name(trx));</span><br><span> return -NM_NACK_TRXNR_UNKN;</span><br><span> }</span><br><span> </span><br><span>@@ -213,8 +214,8 @@</span><br><span> add_trx_attr(out_msg, trx);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_ERROR, "O&M Get Attributes [%u], %s is unsupported by TRX.\n", i,</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(abis_nm_att_names, attr[i]));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DOML, LOGL_ERROR, "%s: O&M Get Attributes [%u], %s is unsupported by TRX.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_trx_name(trx), i, get_value_string(abis_nm_att_names, attr[i]));</span><br><span> /* Push this tag to the list of unsupported attributes */</span><br><span> buf = msgb_push(out_msg, 1);</span><br><span> *buf = attr[i];</span><br><span>@@ -273,10 +274,10 @@</span><br><span> const uint8_t *attr, uint16_t attr_len)</span><br><span> {</span><br><span> struct msgb *nmsg = oml_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *mo_name = gsm_abis_mo_name(mo);</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_INFO, "%s Tx Get Attribute Response\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(abis_nm_obj_class_names, mo->obj_class));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DOML, LOGL_INFO, "%s Tx Get Attribute Response\n", mo_name);</span><br><span> </span><br><span> if (!nmsg)</span><br><span> return -NM_NACK_CANT_PERFORM;</span><br><span>@@ -289,13 +290,14 @@</span><br><span> rc = handle_attrs_trx(nmsg, gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr), attr, attr_len);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_ERROR, "Unsupported MO class %s in Get Attribute Response\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(abis_nm_obj_class_names, mo->obj_class));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DOML, LOGL_ERROR, "%s: Unsupported MO class in Get Attribute Response\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ mo_name);</span><br><span> rc = -NM_NACK_OBJCLASS_NOTSUPP;</span><br><span> }</span><br><span> </span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_ERROR, "Tx Get Attribute Response FAILED with rc=%d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DOML, LOGL_ERROR, "%s: Tx Get Attribute Response FAILED with rc=%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ mo_name, rc);</span><br><span> msgb_free(nmsg);</span><br><span> return rc;</span><br><span> }</span><br><span>@@ -442,7 +444,7 @@</span><br><span> </span><br><span> /* alter message type */</span><br><span> if (cause) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_NOTICE, "Sending FOM NACK with cause %s.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DOML, LOGL_NOTICE, foh, "Sending FOM NACK with cause %s.\n",</span><br><span> abis_nm_nack_cause_name(cause));</span><br><span> foh->msg_type += 2; /* nack */</span><br><span> /* add cause */</span><br><span>@@ -451,7 +453,7 @@</span><br><span> struct abis_om_hdr *omh = (struct abis_om_hdr *) msgb_l2(msg);</span><br><span> omh->length = msgb_l3len(msg);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_DEBUG, "Sending FOM ACK.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DOML, LOGL_DEBUG, foh, "Sending FOM ACK.\n");</span><br><span> foh->msg_type++; /* ack */</span><br><span> }</span><br><span> </span><br><span>@@ -561,18 +563,18 @@</span><br><span> rc = oml_tlv_parse(&tp, foh->data, msgb_l3len(msg) - sizeof(*foh));</span><br><span> if (rc < 0) {</span><br><span> oml_tx_failure_event_rep(mo, OSMO_EVT_MAJ_UNSUP_ATTR, "Get Attribute parsing failure");</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_fom_ack_nack(msg, NM_NACK_INCORR_STRUCT);</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_mo_fom_ack_nack(mo, NM_MT_GET_ATTR, NM_NACK_INCORR_STRUCT);</span><br><span> }</span><br><span> </span><br><span> if (!TLVP_PRES_LEN(&tp, NM_ATT_LIST_REQ_ATTR, 1)) {</span><br><span> oml_tx_failure_event_rep(mo, OSMO_EVT_MAJ_UNSUP_ATTR, "Get Attribute without Attribute List");</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_fom_ack_nack(msg, NM_NACK_INCORR_STRUCT);</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_mo_fom_ack_nack(mo, NM_MT_GET_ATTR, NM_NACK_INCORR_STRUCT);</span><br><span> }</span><br><span> </span><br><span> rc = oml_tx_attr_resp(mo, TLVP_VAL(&tp, NM_ATT_LIST_REQ_ATTR), TLVP_LEN(&tp, NM_ATT_LIST_REQ_ATTR));</span><br><span> if (rc < 0) {</span><br><span> LOGPFOH(DOML, LOGL_ERROR, foh, "Responding to O&M Get Attributes message with NACK 0%x\n", -rc);</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_fom_ack_nack(msg, -rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_mo_fom_ack_nack(mo, NM_MT_GET_ATTR, -rc);</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>@@ -1350,6 +1352,7 @@</span><br><span> struct e1inp_sign_link *oml_link = trx->bts->oml_link;</span><br><span> uint16_t port = IPA_TCP_PORT_RSL;</span><br><span> uint32_t ip = get_signlink_remote_ip(oml_link);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *trx_name = gsm_trx_name(trx);</span><br><span> struct in_addr in;</span><br><span> int rc;</span><br><span> </span><br><span>@@ -1366,16 +1369,16 @@</span><br><span> }</span><br><span> </span><br><span> in.s_addr = htonl(ip);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_INFO, "Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", </span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntoa(in), port, stream_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", </span><br><span style="color: hsl(120, 100%, 40%);">+ trx_name, inet_ntoa(in), port, stream_id);</span><br><span> </span><br><span> if (trx->bts->variant == BTS_OSMO_OMLDUMMY) {</span><br><span> rc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_NOTICE, "Not connecting RSL in OML-DUMMY!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DOML, LOGL_NOTICE, "%s: Not connecting RSL in OML-DUMMY!\n", trx_name);</span><br><span> } else</span><br><span> rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, inet_ntoa(in), port, trx->nr);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_ERROR, "Error in abis_open(RSL): %d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DOML, LOGL_ERROR, "%s: Error in abis_open(RSL): %d\n", trx_name, rc);</span><br><span> return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14161">change 14161</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/14161"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I60d1660c6d574f206d7b8cc10082b413142365dd </div>
<div style="display:none"> Gerrit-Change-Number: 14161 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>