<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/15507">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rspro_dec_msg: Simplify msgb ownership handling<br><br>Initially it seemed like a good idea that rspro_dec_msg() takes care<br>of freeing the input msgb when generating a new decoded output<br>structure. However, in reality this made the implementation of<br>every caller more complicated, as it had to treat messages going into<br>rspro_dec_msg() differently than messages going elsewhere.<br><br>Adding to that, not every caller got it right, and the comments were<br>disagreeing about what happens to msgb ownership in erroneous cases.<br><br>Change-Id: I55d5d61922053fd94e2b5a8cdf0d799b29feec98<br>---<br>M src/remsim_client.c<br>M src/rspro_client_fsm.c<br>M src/rspro_util.c<br>M src/simtrace2-remsim_client.c<br>4 files changed, 6 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/remsim_client.c b/src/remsim_client.c</span><br><span>index e73fcc4..0bfc0a4 100644</span><br><span>--- a/src/remsim_client.c</span><br><span>+++ b/src/remsim_client.c</span><br><span>@@ -90,7 +90,6 @@</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span> break;</span><br><span> case IPAC_PROTO_OSMO:</span><br><span> if (!he || msgb_l2len(msg) < sizeof(*he))</span><br><span>@@ -109,6 +108,7 @@</span><br><span> goto invalid;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span> return rc;</span><br><span> </span><br><span> invalid:</span><br><span>diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c</span><br><span>index d487f32..45cd08e 100644</span><br><span>--- a/src/rspro_client_fsm.c</span><br><span>+++ b/src/rspro_client_fsm.c</span><br><span>@@ -133,7 +133,6 @@</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span> break;</span><br><span> case IPAC_PROTO_OSMO:</span><br><span> if (!he || msgb_l2len(msg) < sizeof(*he))</span><br><span>@@ -146,7 +145,7 @@</span><br><span> * and unsuccessful cases */</span><br><span> pdu = rspro_dec_msg(msg);</span><br><span> if (!pdu)</span><br><span style="color: hsl(0, 100%, 40%);">- goto invalid;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> rc = srvc->handle_rx(srvc, pdu);</span><br><span> ASN_STRUCT_FREE(asn_DEF_RsproPDU, pdu);</span><br><span> break;</span><br><span>@@ -157,6 +156,8 @@</span><br><span> default:</span><br><span> goto invalid;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span> return rc;</span><br><span> </span><br><span> invalid:</span><br><span>diff --git a/src/rspro_util.c b/src/rspro_util.c</span><br><span>index 1e5ce99..5c78b60 100644</span><br><span>--- a/src/rspro_util.c</span><br><span>+++ b/src/rspro_util.c</span><br><span>@@ -80,7 +80,7 @@</span><br><span> return msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* consumes 'msg' _if_ it is successful */</span><br><span style="color: hsl(120, 100%, 40%);">+/* caller must make sure to free msg */</span><br><span> RsproPDU_t *rspro_dec_msg(struct msgb *msg)</span><br><span> {</span><br><span> RsproPDU_t *pdu = NULL;</span><br><span>@@ -91,12 +91,9 @@</span><br><span> if (rval.code != RC_OK) {</span><br><span> fprintf(stderr, "Failed to decode: %d. Consumed %lu of %u bytes\n",</span><br><span> rval.code, rval.consumed, msgb_length(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return pdu;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c</span><br><span>index 094773f..04aa0c6 100644</span><br><span>--- a/src/simtrace2-remsim_client.c</span><br><span>+++ b/src/simtrace2-remsim_client.c</span><br><span>@@ -578,7 +578,6 @@</span><br><span> </span><br><span> static int bankd_handle_msg(struct bankd_client *bc, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* rspro_dec_msg takes ownership of msgb and talloc_free()s it in successful and unsuccessful case */</span><br><span> RsproPDU_t *pdu = rspro_dec_msg(msg);</span><br><span> if (!pdu) {</span><br><span> LOGPFSML(bc->bankd_fi, LOGL_ERROR, "Error decoding PDU\n");</span><br><span>@@ -628,6 +627,7 @@</span><br><span> LOGPFSML(bc->bankd_fi, LOGL_DEBUG, "Received RSPRO %s\n", msgb_hexdump(msg));</span><br><span> </span><br><span> rc = bankd_handle_msg(bc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span> return rc;</span><br><span> </span><br><span> invalid:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/15507">change 15507</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-remsim/+/15507"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I55d5d61922053fd94e2b5a8cdf0d799b29feec98 </div>
<div style="display:none"> Gerrit-Change-Number: 15507 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>