<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12870">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, but someone else must approve
Max: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OML: Use 'const struct abis_oml_mo *' whenever users only read<br><br>Try to constrain the code a bit further by making all read-only<br>accesses use 'const *'.<br><br>Change-Id: I5a61e6d1b4e5e083bb24017166186dc87d035cd0<br>---<br>M include/osmo-bts/oml.h<br>M src/common/oml.c<br>2 files changed, 22 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/oml.h b/include/osmo-bts/oml.h</span><br><span>index 139464e..4dca2f8 100644</span><br><span>--- a/include/osmo-bts/oml.h</span><br><span>+++ b/include/osmo-bts/oml.h</span><br><span>@@ -14,11 +14,11 @@</span><br><span> </span><br><span> struct msgb *oml_msgb_alloc(void);</span><br><span> int oml_send_msg(struct msgb *msg, int is_mauf);</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_send_msg(struct gsm_abis_mo *mo, struct msgb *msg, uint8_t msg_type);</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_opstart_ack(struct gsm_abis_mo *mo);</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_opstart_nack(struct gsm_abis_mo *mo, uint8_t nack_cause);</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_statechg_ack(struct gsm_abis_mo *mo);</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_statechg_nack(struct gsm_abis_mo *mo, uint8_t nack_cause);</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_send_msg(const struct gsm_abis_mo *mo, struct msgb *msg, uint8_t msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_opstart_ack(const struct gsm_abis_mo *mo);</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_opstart_nack(const struct gsm_abis_mo *mo, uint8_t nack_cause);</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_statechg_ack(const struct gsm_abis_mo *mo);</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_statechg_nack(const struct gsm_abis_mo *mo, uint8_t nack_cause);</span><br><span> </span><br><span> /* Change the state and send STATE CHG REP */</span><br><span> int oml_mo_state_chg(struct gsm_abis_mo *mo, int op_state, int avail_state);</span><br><span>@@ -31,13 +31,13 @@</span><br><span> int success);</span><br><span> </span><br><span> /* Transmit STATE CHG REP even if there was no state change */</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_tx_state_changed(struct gsm_abis_mo *mo);</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_tx_state_changed(const struct gsm_abis_mo *mo);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_tx_sw_act_rep(struct gsm_abis_mo *mo);</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_tx_sw_act_rep(const struct gsm_abis_mo *mo);</span><br><span> </span><br><span> int oml_fom_ack_nack(struct msgb *old_msg, uint8_t cause);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_fom_ack_nack(struct gsm_abis_mo *mo, uint8_t orig_msg_type,</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_fom_ack_nack(const struct gsm_abis_mo *mo, uint8_t orig_msg_type,</span><br><span> uint8_t cause);</span><br><span> </span><br><span> /* Configure LAPDm T200 timers for this lchan according to OML */</span><br><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 96d9dd6..c98ba9c 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -67,7 +67,7 @@</span><br><span> }</span><br><span> </span><br><span> /* 3GPP TS 12.21 ยง 8.8.2 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int oml_tx_failure_event_rep(struct gsm_abis_mo *mo, uint16_t cause_value,</span><br><span style="color: hsl(120, 100%, 40%);">+static 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> {</span><br><span> struct msgb *nmsg;</span><br><span>@@ -129,7 +129,7 @@</span><br><span> return abis_oml_sendmsg(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_send_msg(struct gsm_abis_mo *mo, struct msgb *msg, uint8_t msg_type)</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_send_msg(const struct gsm_abis_mo *mo, struct msgb *msg, uint8_t msg_type)</span><br><span> {</span><br><span> struct abis_om_fom_hdr *foh;</span><br><span> </span><br><span>@@ -307,7 +307,7 @@</span><br><span> }</span><br><span> </span><br><span> /* 8.8.1 sending State Changed Event Report */</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_tx_state_changed(struct gsm_abis_mo *mo)</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_tx_state_changed(const struct gsm_abis_mo *mo)</span><br><span> {</span><br><span> struct msgb *nmsg;</span><br><span> </span><br><span>@@ -366,7 +366,7 @@</span><br><span> </span><br><span> /* Send an ACK or NACK response from 'mo' to BSC, deriving message</span><br><span> * type from 'orig_msg_type'. ACK is sent if cause == 0; NACK otherwise */</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_fom_ack_nack(struct gsm_abis_mo *mo, uint8_t orig_msg_type,</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_fom_ack_nack(const struct gsm_abis_mo *mo, uint8_t orig_msg_type,</span><br><span> uint8_t cause)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span>@@ -386,7 +386,7 @@</span><br><span> return oml_mo_send_msg(mo, msg, new_msg_type);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_statechg_ack(struct gsm_abis_mo *mo)</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_statechg_ack(const struct gsm_abis_mo *mo)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> int rc = 0;</span><br><span>@@ -405,17 +405,17 @@</span><br><span> return oml_tx_state_changed(mo);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_statechg_nack(struct gsm_abis_mo *mo, uint8_t nack_cause)</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_statechg_nack(const struct gsm_abis_mo *mo, uint8_t nack_cause)</span><br><span> {</span><br><span> return oml_mo_fom_ack_nack(mo, NM_MT_CHG_ADM_STATE, nack_cause);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_opstart_ack(struct gsm_abis_mo *mo)</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_opstart_ack(const struct gsm_abis_mo *mo)</span><br><span> {</span><br><span> return oml_mo_fom_ack_nack(mo, NM_MT_OPSTART, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_opstart_nack(struct gsm_abis_mo *mo, uint8_t nack_cause)</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_opstart_nack(const struct gsm_abis_mo *mo, uint8_t nack_cause)</span><br><span> {</span><br><span> return oml_mo_fom_ack_nack(mo, NM_MT_OPSTART, nack_cause);</span><br><span> }</span><br><span>@@ -463,7 +463,7 @@</span><br><span> */</span><br><span> </span><br><span> /* 8.3.7 sending SW Activated Report */</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_mo_tx_sw_act_rep(struct gsm_abis_mo *mo)</span><br><span style="color: hsl(120, 100%, 40%);">+int oml_mo_tx_sw_act_rep(const struct gsm_abis_mo *mo)</span><br><span> {</span><br><span> struct msgb *nmsg;</span><br><span> </span><br><span>@@ -1067,7 +1067,7 @@</span><br><span> static inline bool report_bts_number_incorrect(struct gsm_bts *bts, const struct abis_om_fom_hdr *foh, bool is_formatted)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_abis_mo *mo = &bts->mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_abis_mo *mo = &bts->mo;</span><br><span> const char *form = is_formatted ?</span><br><span> "Unexpected BTS %d in formatted O&M %s (exp. 0 or 0xFF)" :</span><br><span> "Unexpected BTS %d in manufacturer O&M %s (exp. 0 or 0xFF)";</span><br><span>@@ -1089,7 +1089,7 @@</span><br><span> {</span><br><span> struct abis_om_fom_hdr *foh = msgb_l3(msg);</span><br><span> struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_abis_mo *mo = &bts->mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_abis_mo *mo = &bts->mo;</span><br><span> int ret;</span><br><span> </span><br><span> if (msgb_l2len(msg) < sizeof(*foh)) {</span><br><span>@@ -1268,7 +1268,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int oml_ipa_mo_set_attr(struct gsm_bts *bts, struct gsm_abis_mo *mo,</span><br><span style="color: hsl(120, 100%, 40%);">+static int oml_ipa_mo_set_attr(struct gsm_bts *bts, const struct gsm_abis_mo *mo,</span><br><span> void *obj, struct tlv_parsed *tp)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -1293,7 +1293,7 @@</span><br><span> static int oml_ipa_set_attr(struct gsm_bts *bts, struct msgb *msg)</span><br><span> {</span><br><span> struct abis_om_fom_hdr *foh = msgb_l3(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_abis_mo *mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_abis_mo *mo;</span><br><span> struct tlv_parsed tp;</span><br><span> void *obj;</span><br><span> int rc;</span><br><span>@@ -1364,7 +1364,7 @@</span><br><span> static int down_mom(struct gsm_bts *bts, struct msgb *msg)</span><br><span> {</span><br><span> struct abis_om_hdr *oh = msgb_l2(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_abis_mo *mo = &bts->mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_abis_mo *mo = &bts->mo;</span><br><span> struct abis_om_fom_hdr *foh;</span><br><span> struct gsm_bts_trx *trx;</span><br><span> uint8_t idstrlen = oh->data[0];</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12870">change 12870</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/12870"/><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: I5a61e6d1b4e5e083bb24017166186dc87d035cd0 </div>
<div style="display:none"> Gerrit-Change-Number: 12870 </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: Max <msuraev@sysmocom.de> </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>