<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19533">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">l1sap: radio_link_timeout(): clarify logging messages<br><br>Change-Id: Iafb190454c65cebe3de3c212fa8b10a86ec7eb67<br>---<br>M src/common/l1sap.c<br>1 file changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/19533/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index e05ec78..dc236aa 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -1178,20 +1178,19 @@</span><br><span> </span><br><span>    /* if link loss criterion already reached */</span><br><span>         if (lchan->s == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-         DEBUGP(DMEAS, "%s radio link counter S already 0.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+               DEBUGP(DMEAS, "%s radio link timeout counter S is already 0\n",</span><br><span>                    gsm_lchan_name(lchan));</span><br><span>              return;</span><br><span>      }</span><br><span> </span><br><span>        if (bad_frame) {</span><br><span style="color: hsl(0, 100%, 40%);">-                /* count down radio link counter S */</span><br><span style="color: hsl(0, 100%, 40%);">-           lchan->s--;</span><br><span style="color: hsl(0, 100%, 40%);">-          DEBUGP(DMEAS, "%s counting down radio link counter S=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                   gsm_lchan_name(lchan), lchan->s);</span><br><span style="color: hsl(120, 100%, 40%);">+          DEBUGP(DMEAS, "%s decreasing radio link timeout counter S=%d -> %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                   gsm_lchan_name(lchan), lchan->s, lchan->s - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+         lchan->s--; /* count down radio link counter S */</span><br><span>                 if (lchan->s == 0) {</span><br><span>                      LOGPLCHAN(lchan, DMEAS, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">-                              "radio link counter timeout S=%d, dropping conn\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                           lchan->s);</span><br><span style="color: hsl(120, 100%, 40%);">+                                 "radio link timeout counter S reached zero, "</span><br><span style="color: hsl(120, 100%, 40%);">+                               "dropping connection\n");</span><br><span>                        rsl_tx_conn_fail(lchan, RSL_ERR_RADIO_LINK_FAIL);</span><br><span>            }</span><br><span>            return;</span><br><span>@@ -1199,11 +1198,12 @@</span><br><span> </span><br><span>        if (lchan->s < bts->radio_link_timeout) {</span><br><span>           /* count up radio link counter S */</span><br><span style="color: hsl(0, 100%, 40%);">-             lchan->s += 2;</span><br><span style="color: hsl(0, 100%, 40%);">-               if (lchan->s > bts->radio_link_timeout)</span><br><span style="color: hsl(0, 100%, 40%);">-                        lchan->s = bts->radio_link_timeout;</span><br><span style="color: hsl(0, 100%, 40%);">-               DEBUGP(DMEAS, "%s counting up radio link counter S=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                     gsm_lchan_name(lchan), lchan->s);</span><br><span style="color: hsl(120, 100%, 40%);">+          int s = lchan->s + 2;</span><br><span style="color: hsl(120, 100%, 40%);">+              if (s > bts->radio_link_timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+                        s = bts->radio_link_timeout;</span><br><span style="color: hsl(120, 100%, 40%);">+               DEBUGP(DMEAS, "%s increasing radio link timeout counter S=%d -> %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                   gsm_lchan_name(lchan), lchan->s, s);</span><br><span style="color: hsl(120, 100%, 40%);">+               lchan->s = s;</span><br><span>     }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19533">change 19533</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-bts/+/19533"/><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-Change-Id: Iafb190454c65cebe3de3c212fa8b10a86ec7eb67 </div>
<div style="display:none"> Gerrit-Change-Number: 19533 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>