<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9504">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make T10 configurable like the rest of them<br><br>Change-Id: I112c0db17d355d57eb08bc67121ccf49fbf53943<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/net_init.c<br>4 files changed, 9 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 8f245c9..5794617 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1185,6 +1185,7 @@</span><br><span> #define GSM_T3119_DEFAULT 10</span><br><span> #define GSM_T3122_DEFAULT 10</span><br><span> #define GSM_T3141_DEFAULT 10</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM_T10_DEFAULT 6 /* RR Assignment timeout, in seconds */</span><br><span> #define GSM_T7_DEFAULT 10 /* inter-BSC MO Handover first timeout, in seconds */</span><br><span> #define GSM_T8_DEFAULT 10 /* inter-BSC MO Handover second timeout, in seconds */</span><br><span> #define GSM_T101_DEFAULT 10 /* inter-BSC MT Handover timeout, in seconds */</span><br><span>@@ -1233,6 +1234,7 @@</span><br><span> int T3119;</span><br><span> int T3122;</span><br><span> int T3141;</span><br><span style="color: hsl(120, 100%, 40%);">+ int T10; /*< RR Assignment timeout, in seconds */</span><br><span> int T7; /*< inter-BSC handover MO timeout from Handover Required to Handover Command */</span><br><span> int T8; /*< inter-BSC handover MO timeout from Handover Command to final Clear*/</span><br><span> int T101; /*< inter-BSC handover MT timeout from Handover Request to Handover Accept */</span><br><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index d2d2095..9c8dbda 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -45,9 +45,6 @@</span><br><span> #define MGCP_MGW_HO_TIMEOUT 4 /* in seconds */</span><br><span> #define MGCP_MGW_HO_TIMEOUT_TIMER_NR 2</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define GSM0808_T10_TIMER_NR 10</span><br><span style="color: hsl(0, 100%, 40%);">-#define GSM0808_T10_VALUE 6</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #define ENDPOINT_ID "rtpbridge/*@mgw"</span><br><span> </span><br><span> enum gscon_fsm_states {</span><br><span>@@ -447,7 +444,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_state_chg(fi, ST_WAIT_ASS_CMPL, GSM0808_T10_VALUE, GSM0808_T10_TIMER_NR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, ST_WAIT_ASS_CMPL, conn->network->T10, 10);</span><br><span> break;</span><br><span> default:</span><br><span> /* An unsupported channel is requested, so we have to</span><br><span>@@ -534,7 +531,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_state_chg(fi, ST_WAIT_ASS_CMPL, GSM0808_T10_VALUE, GSM0808_T10_TIMER_NR);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, ST_WAIT_ASS_CMPL, conn->network->T10, 10);</span><br><span> break;</span><br><span> case GSCON_EV_MO_DTAP:</span><br><span> forward_dtap(conn, (struct msgb *)data, fi);</span><br><span>@@ -1050,7 +1047,7 @@</span><br><span> * gscon_cleanup() above) */</span><br><span> osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM0808_T10_TIMER_NR: /* Assignment Failed */</span><br><span style="color: hsl(120, 100%, 40%);">+ case 10: /* Assignment Failed */</span><br><span> assignment_failed(fi, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE);</span><br><span> break;</span><br><span> case MGCP_MGW_TIMEOUT_TIMER_NR: /* Assignment failed (no response from MGW) */</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 837f431..57c5363 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1001,6 +1001,7 @@</span><br><span> VTY_OUT_TIMER(3119);</span><br><span> VTY_OUT_TIMER(3122);</span><br><span> VTY_OUT_TIMER(3141);</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_OUT_TIMER(10);</span><br><span> VTY_OUT_TIMER(7);</span><br><span> VTY_OUT_TIMER(8);</span><br><span> VTY_OUT_TIMER(101);</span><br><span>@@ -1921,6 +1922,7 @@</span><br><span> DECLARE_TIMER(3119, "Currently not used")</span><br><span> DECLARE_TIMER(3122, "Default waiting time (seconds) after IMM ASS REJECT")</span><br><span> DECLARE_TIMER(3141, "Currently not used")</span><br><span style="color: hsl(120, 100%, 40%);">+DECLARE_TIMER(10, "Assignment Command timeout in seconds")</span><br><span> DECLARE_TIMER(7, "Set the outgoing inter-BSC Handover timeout, from Handover Required to Handover Command")</span><br><span> DECLARE_TIMER(8, "Set the outgoing inter-BSC Handover timeout, from Handover Command to final Clear")</span><br><span> DECLARE_TIMER(101, "Set the incoming inter-BSC Handover timeout, from Handover Request to Accept")</span><br><span>@@ -4849,6 +4851,7 @@</span><br><span> install_element(GSMNET_NODE, &cfg_net_T3119_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_T3122_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_T3141_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GSMNET_NODE, &cfg_net_T10_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_T7_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_T8_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_T101_cmd);</span><br><span>diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c</span><br><span>index 5a48988..3ee35fe 100644</span><br><span>--- a/src/osmo-bsc/net_init.c</span><br><span>+++ b/src/osmo-bsc/net_init.c</span><br><span>@@ -64,6 +64,7 @@</span><br><span> net->T3119 = GSM_T3119_DEFAULT;</span><br><span> net->T3122 = GSM_T3122_DEFAULT;</span><br><span> net->T3141 = GSM_T3141_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->T10 = GSM_T10_DEFAULT;</span><br><span> net->T7 = GSM_T7_DEFAULT;</span><br><span> net->T8 = GSM_T8_DEFAULT;</span><br><span> net->T101 = GSM_T101_DEFAULT;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9504">change 9504</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/9504"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I112c0db17d355d57eb08bc67121ccf49fbf53943 </div>
<div style="display:none"> Gerrit-Change-Number: 9504 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>