<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23942">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lchan_fsm: mode modify: fix missing timeouts and error transitions<br><br>Change-Id: I6364cfb78f661f5f7473dcec488e361e6a1dc9e4<br>---<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/net_init.c<br>M tests/timer.vty<br>3 files changed, 10 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index d2b7172..4eb95ff 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -217,6 +217,8 @@</span><br><span> [LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = { .T=3111 },</span><br><span> [LCHAN_ST_WAIT_RF_RELEASE_ACK] = { .T=3111 },</span><br><span> [LCHAN_ST_WAIT_AFTER_ERROR] = { .T=-3111 },</span><br><span style="color: hsl(120, 100%, 40%);">+ [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = { .T=-13 },</span><br><span style="color: hsl(120, 100%, 40%);">+ [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = { .T=-14 },</span><br><span> };</span><br><span> </span><br><span> /* Transition to a state, using the T timer defined in lchan_fsm_timeouts.</span><br><span>@@ -261,8 +263,8 @@</span><br><span> [LCHAN_ST_WAIT_RF_RELEASE_ACK] = LCHAN_ST_BORKEN,</span><br><span> [LCHAN_ST_WAIT_AFTER_ERROR] = LCHAN_ST_UNUSED,</span><br><span> [LCHAN_ST_BORKEN] = LCHAN_ST_BORKEN,</span><br><span style="color: hsl(0, 100%, 40%);">- [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_BORKEN,</span><br><span style="color: hsl(0, 100%, 40%);">- [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_BORKEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_WAIT_RF_RELEASE_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_WAIT_RF_RELEASE_ACK,</span><br><span> };</span><br><span> </span><br><span> #define lchan_fail(fmt, args...) lchan_fail_to(lchan_fsm_on_error[fi->state], fmt, ## args)</span><br><span>diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c</span><br><span>index 478c62f..6d88adb 100644</span><br><span>--- a/src/osmo-bsc/net_init.c</span><br><span>+++ b/src/osmo-bsc/net_init.c</span><br><span>@@ -54,6 +54,8 @@</span><br><span> { .T=-10, .default_val=5, .desc="Timeout for fully configured MGW endpoint" },</span><br><span> { .T=-11, .default_val=5, .desc="Timeout for Perform Location Response from SMLC" },</span><br><span> { .T=-12, .default_val=5, .desc="Timeout for obtaining TA after BSSLAP TA Request" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .T=-13, .default_val=5, .desc="Timeout for RR Channel Mode Modify ACK (BSC <-> MS)" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .T=-14, .default_val=5, .desc="Timeout for RSL Channel Mode Modify ACK (BSC <-> BTS)" },</span><br><span> { .T=-3111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" },</span><br><span> { .T=-3210, .default_val=20, .desc="After L3 Complete, wait for MSC to confirm" },</span><br><span> {}</span><br><span>diff --git a/tests/timer.vty b/tests/timer.vty</span><br><span>index 4b9ddbb..71dd2c1 100644</span><br><span>--- a/tests/timer.vty</span><br><span>+++ b/tests/timer.vty</span><br><span>@@ -27,6 +27,8 @@</span><br><span> net: X10 = 5 s Timeout for fully configured MGW endpoint (default: 5 s)</span><br><span> net: X11 = 5 s Timeout for Perform Location Response from SMLC (default: 5 s)</span><br><span> net: X12 = 5 s Timeout for obtaining TA after BSSLAP TA Request (default: 5 s)</span><br><span style="color: hsl(120, 100%, 40%);">+net: X13 = 5 s Timeout for RR Channel Mode Modify ACK (BSC <-> MS) (default: 5 s)</span><br><span style="color: hsl(120, 100%, 40%);">+net: X14 = 5 s Timeout for RSL Channel Mode Modify ACK (BSC <-> BTS) (default: 5 s)</span><br><span> net: X3111 = 4 s Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)</span><br><span> net: X3210 = 20 s After L3 Complete, wait for MSC to confirm (default: 20 s)</span><br><span> mgw: X2427 = 5 s timeout for MGCP response from MGW (default: 5 s)</span><br><span>@@ -74,6 +76,8 @@</span><br><span> net: X10 = 5 s Timeout for fully configured MGW endpoint (default: 5 s)</span><br><span> net: X11 = 5 s Timeout for Perform Location Response from SMLC (default: 5 s)</span><br><span> net: X12 = 5 s Timeout for obtaining TA after BSSLAP TA Request (default: 5 s)</span><br><span style="color: hsl(120, 100%, 40%);">+net: X13 = 5 s Timeout for RR Channel Mode Modify ACK (BSC <-> MS) (default: 5 s)</span><br><span style="color: hsl(120, 100%, 40%);">+net: X14 = 5 s Timeout for RSL Channel Mode Modify ACK (BSC <-> BTS) (default: 5 s)</span><br><span> net: X3111 = 4 s Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)</span><br><span> net: X3210 = 20 s After L3 Complete, wait for MSC to confirm (default: 20 s)</span><br><span> mgw: X2427 = 5 s timeout for MGCP response from MGW (default: 5 s)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23942">change 23942</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/+/23942"/><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: I6364cfb78f661f5f7473dcec488e361e6a1dc9e4 </div>
<div style="display:none"> Gerrit-Change-Number: 23942 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>