<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21826">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_om2000: make om2k_mo_name() an exported function<br><br>Change-Id: Idb05bcad8059ab2b2be6c7057495d0279a4b62c7<br>---<br>M include/osmocom/bsc/abis_om2000.h<br>M src/osmo-bsc/abis_om2000.c<br>2 files changed, 22 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/21826/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/abis_om2000.h b/include/osmocom/bsc/abis_om2000.h</span><br><span>index 0d48c0c..58c07c4 100644</span><br><span>--- a/include/osmocom/bsc/abis_om2000.h</span><br><span>+++ b/include/osmocom/bsc/abis_om2000.h</span><br><span>@@ -130,4 +130,6 @@</span><br><span> struct vty;</span><br><span> void abis_om2k_config_write_bts(struct vty *vty, struct gsm_bts *bts);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const char *abis_om2k_mo_name(const struct abis_om2k_mo *mo);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* OPENBCS_ABIS_OM2K_H */</span><br><span>diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c</span><br><span>index a1eed5b..151ecdf 100644</span><br><span>--- a/src/osmo-bsc/abis_om2000.c</span><br><span>+++ b/src/osmo-bsc/abis_om2000.c</span><br><span>@@ -849,7 +849,7 @@</span><br><span> return abis_om2k_msg_tlv_parse(&odm->tp, o2h);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static char *om2k_mo_name(const struct abis_om2k_mo *mo)</span><br><span style="color: hsl(120, 100%, 40%);">+const char *abis_om2k_mo_name(const struct abis_om2k_mo *mo)</span><br><span> {</span><br><span> static char mo_buf[64];</span><br><span> </span><br><span>@@ -1042,7 +1042,7 @@</span><br><span> trx = gsm_bts_trx_num(bts, o2h->mo.inst);</span><br><span> if (!trx) {</span><br><span> LOGP(DNM, LOGL_ERROR, "MO=%s Tx Dropping msg to "</span><br><span style="color: hsl(0, 100%, 40%);">- "non-existing TRX\n", om2k_mo_name(&o2h->mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ "non-existing TRX\n", abis_om2k_mo_name(&o2h->mo));</span><br><span> return -ENODEV;</span><br><span> }</span><br><span> msg->dst = trx->oml_link;</span><br><span>@@ -1052,7 +1052,7 @@</span><br><span> trx = gsm_bts_trx_num(bts, o2h->mo.assoc_so);</span><br><span> if (!trx) {</span><br><span> LOGP(DNM, LOGL_ERROR, "MO=%s Tx Dropping msg to "</span><br><span style="color: hsl(0, 100%, 40%);">- "non-existing TRX\n", om2k_mo_name(&o2h->mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ "non-existing TRX\n", abis_om2k_mo_name(&o2h->mo));</span><br><span> return -ENODEV;</span><br><span> }</span><br><span> msg->dst = trx->oml_link;</span><br><span>@@ -1111,7 +1111,7 @@</span><br><span> o2k = (struct abis_om2k_hdr *) msgb_put(msg, sizeof(*o2k));</span><br><span> fill_om2k_hdr(o2k, mo, msg_type);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DNM, "Tx MO=%s %s\n", om2k_mo_name(mo),</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DNM, "Tx MO=%s %s\n", abis_om2k_mo_name(mo),</span><br><span> get_value_string(om2k_msgcode_vals, msg_type));</span><br><span> </span><br><span> return abis_om2k_sendmsg(bts, msg);</span><br><span>@@ -1168,7 +1168,7 @@</span><br><span> </span><br><span> msgb_tv_put(msg, OM2K_DEI_OP_INFO, operational);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DNM, "Tx MO=%s %s\n", om2k_mo_name(mo),</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DNM, "Tx MO=%s %s\n", abis_om2k_mo_name(mo),</span><br><span> get_value_string(om2k_msgcode_vals, OM2K_MSGT_OP_INFO));</span><br><span> </span><br><span> /* we update the state here... and send the signal at ACK */</span><br><span>@@ -1240,7 +1240,7 @@</span><br><span> talloc_free(cg);</span><br><span> </span><br><span> DEBUGP(DNM, "Tx MO=%s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(&bts->rbs2000.is.om2k_mo.addr),</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(&bts->rbs2000.is.om2k_mo.addr),</span><br><span> get_value_string(om2k_msgcode_vals, OM2K_MSGT_IS_CONF_REQ));</span><br><span> </span><br><span> return abis_om2k_sendmsg(bts, msg);</span><br><span>@@ -1290,7 +1290,7 @@</span><br><span> OM2K_MSGT_CON_CONF_REQ);</span><br><span> </span><br><span> DEBUGP(DNM, "Tx MO=%s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(&bts->rbs2000.con.om2k_mo.addr),</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(&bts->rbs2000.con.om2k_mo.addr),</span><br><span> get_value_string(om2k_msgcode_vals, OM2K_MSGT_CON_CONF_REQ));</span><br><span> </span><br><span> return abis_om2k_sendmsg(bts, msg);</span><br><span>@@ -1319,7 +1319,7 @@</span><br><span> fill_om2k_hdr(o2k, &bts->rbs2000.mctr.om2k_mo.addr,</span><br><span> OM2K_MSGT_MCTR_CONF_REQ);</span><br><span> DEBUGP(DNM, "Tx MO=%s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(&bts->rbs2000.mctr.om2k_mo.addr),</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(&bts->rbs2000.mctr.om2k_mo.addr),</span><br><span> get_value_string(om2k_msgcode_vals, OM2K_MSGT_MCTR_CONF_REQ));</span><br><span> </span><br><span> return abis_om2k_sendmsg(bts, msg);</span><br><span>@@ -1409,7 +1409,7 @@</span><br><span> sizeof(fs_offset_undef), fs_offset_undef);</span><br><span> </span><br><span> DEBUGP(DNM, "Tx MO=%s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(&bts->rbs2000.tf.om2k_mo.addr),</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(&bts->rbs2000.tf.om2k_mo.addr),</span><br><span> get_value_string(om2k_msgcode_vals, OM2K_MSGT_TF_CONF_REQ));</span><br><span> </span><br><span> return abis_om2k_sendmsg(bts, msg);</span><br><span>@@ -1606,7 +1606,7 @@</span><br><span> }</span><br><span> </span><br><span> DEBUGP(DNM, "Tx MO=%s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(&mo),</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(&mo),</span><br><span> get_value_string(om2k_msgcode_vals, OM2K_MSGT_TS_CONF_REQ));</span><br><span> </span><br><span> return abis_om2k_sendmsg(ts->trx->bts, msg);</span><br><span>@@ -2598,7 +2598,7 @@</span><br><span> </span><br><span> msgb_tlv_put(msg, OM2K_DEI_NEGOT_REC2, len, data);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DNM, "Tx MO=%s %s\n", om2k_mo_name(mo),</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DNM, "Tx MO=%s %s\n", abis_om2k_mo_name(mo),</span><br><span> get_value_string(om2k_msgcode_vals, OM2K_MSGT_NEGOT_REQ_ACK));</span><br><span> </span><br><span> return abis_om2k_sendmsg(bts, msg);</span><br><span>@@ -2720,7 +2720,7 @@</span><br><span> uint16_t msg_type = ntohs(o2h->msg_type);</span><br><span> struct tlv_parsed tp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNM, LOGL_ERROR, "Rx MO=%s %s", om2k_mo_name(&o2h->mo),</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNM, LOGL_ERROR, "Rx MO=%s %s", abis_om2k_mo_name(&o2h->mo),</span><br><span> get_value_string(om2k_msgcode_vals, msg_type));</span><br><span> </span><br><span> abis_om2k_msg_tlv_parse(&tp, o2h);</span><br><span>@@ -2746,7 +2746,7 @@</span><br><span> mo_state = *TLVP_VAL(&odm->tp, OM2K_DEI_MO_STATE);</span><br><span> </span><br><span> LOGP(DNM, LOGL_DEBUG, "Rx MO=%s %s, MO State: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(&odm->o2h.mo),</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(&odm->o2h.mo),</span><br><span> get_value_string(om2k_msgcode_vals, odm->msg_type),</span><br><span> get_value_string(om2k_mostate_vals, mo_state));</span><br><span> </span><br><span>@@ -2756,7 +2756,7 @@</span><br><span> && mo_state != OM2K_MO_S_ENABLED) {</span><br><span> LOGP(DNM, LOGL_ERROR,</span><br><span> "Rx MO=%s %s Failed to enable MO State!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(&odm->o2h.mo),</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(&odm->o2h.mo),</span><br><span> get_value_string(om2k_msgcode_vals, odm->msg_type));</span><br><span> }</span><br><span> </span><br><span>@@ -2797,7 +2797,7 @@</span><br><span> }</span><br><span> </span><br><span> sprintf(string + strlen(string), ")\n");</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DNM, "Rx MO=%s %s", om2k_mo_name(mo), string);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DNM, "Rx MO=%s %s", abis_om2k_mo_name(mo), string);</span><br><span> </span><br><span> return true;</span><br><span> }</span><br><span>@@ -2828,7 +2828,7 @@</span><br><span> src_len--;</span><br><span> if (msg_code != OM2K_MSGT_FAULT_REP) {</span><br><span> LOGP(DNM, LOGL_ERROR, "Rx MO=%s Fault report: invalid message code!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(mo));</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -2844,7 +2844,7 @@</span><br><span> if (tlv_count >= 11) {</span><br><span> LOGP(DNM, LOGL_ERROR,</span><br><span> "Rx MO=%s Fault Report: too many tlv elements!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(mo));</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -2856,7 +2856,7 @@</span><br><span> else {</span><br><span> LOGP(DNM, LOGL_ERROR,</span><br><span> "Rx MO=%s Fault Report: invalid tlv element!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(mo));</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -2884,7 +2884,7 @@</span><br><span> </span><br><span> if (!faults_present) {</span><br><span> DEBUGP(DNM, "Rx MO=%s Fault Report: All faults ceased!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- om2k_mo_name(mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_om2k_mo_name(mo));</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -2920,7 +2920,7 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DNM, "Rx MO=%s %s (%s)\n", om2k_mo_name(&o2h->mo),</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DNM, "Rx MO=%s %s (%s)\n", abis_om2k_mo_name(&o2h->mo),</span><br><span> get_value_string(om2k_msgcode_vals, msg_type),</span><br><span> osmo_hexdump(msg->l2h, msgb_l2len(msg)));</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21826">change 21826</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/+/21826"/><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: Idb05bcad8059ab2b2be6c7057495d0279a4b62c7 </div>
<div style="display:none"> Gerrit-Change-Number: 21826 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>