<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25748">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  dexter: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL<br><br>Let's only release PDCH ULC entry if it was indeed what we expected.<br>In other case, time it out.<br><br>Move the case in the switch statement to the start to easy function<br>readibility (early return style).<br><br>Change-Id: I3d8749acca8e7859295d73cce556b2083169f726<br>---<br>M src/pdch.cpp<br>1 file changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 807ce45..a503a55 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -638,6 +638,14 @@</span><br><span>           }</span><br><span> </span><br><span>                switch (item->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+              case PDCH_ULC_NODE_TBF_USF:</span><br><span style="color: hsl(120, 100%, 40%);">+                   /* Is it actually valid for an MS to send a PKT Res Req during USF? */</span><br><span style="color: hsl(120, 100%, 40%);">+                        ul_tbf = item->tbf_usf.ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+                     LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: "</span><br><span style="color: hsl(120, 100%, 40%);">+                              "Unexpectedly received, waiting USF of %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                               fn, tbf_name(item->tbf_usf.ul_tbf));</span><br><span style="color: hsl(120, 100%, 40%);">+                        /* Ignore it, let common path expire related ULC entry */</span><br><span style="color: hsl(120, 100%, 40%);">+                    goto return_unref;</span><br><span>           case PDCH_ULC_NODE_SBA:</span><br><span>                      sba = item->sba.sba;</span><br><span>                      LOGPDCH(this, DRLCMAC, LOGL_DEBUG, "FN=%u PKT RESOURCE REQ: "</span><br><span>@@ -675,14 +683,6 @@</span><br><span>                       ul_tbf->n_reset(N3103);</span><br><span>                   pdch_ulc_release_node(ulc, item);</span><br><span>                    break;</span><br><span style="color: hsl(0, 100%, 40%);">-          case PDCH_ULC_NODE_TBF_USF:</span><br><span style="color: hsl(0, 100%, 40%);">-                     /* Is it actually valid for an MS to send a PKT Res Req during USF? */</span><br><span style="color: hsl(0, 100%, 40%);">-                  ul_tbf = item->tbf_usf.ul_tbf;</span><br><span style="color: hsl(0, 100%, 40%);">-                       LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: "</span><br><span style="color: hsl(0, 100%, 40%);">-                                "Unexpectedly received, waiting USF of %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                         fn, tbf_name(item->tbf_usf.ul_tbf));</span><br><span style="color: hsl(0, 100%, 40%);">-                 pdch_ulc_release_node(ulc, item);</span><br><span style="color: hsl(0, 100%, 40%);">-                       break;</span><br><span>               default:</span><br><span>                     OSMO_ASSERT(0);</span><br><span>              }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25748">change 25748</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-pcu/+/25748"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 </div>
<div style="display:none"> Gerrit-Change-Number: 25748 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>