<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9291">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">HO: introduce T7, T8, T101 timers<br><br>Will be used in upcoming inter-BSC handover.<br><br>Change-Id: If9ecccc793426d214019f299b19d6ffa5a186546<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/net_init.c<br>3 files changed, 20 insertions(+), 1 deletion(-)<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 56cca16..281f2d4 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1187,6 +1187,9 @@</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_T7_DEFAULT 10 /* inter-BSC MO Handover first timeout, in seconds */</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM_T8_DEFAULT 10 /* inter-BSC MO Handover second timeout, in seconds */</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM_T101_DEFAULT 10 /* inter-BSC MT Handover timeout, in seconds */</span><br><span> </span><br><span> struct gsm_tz {</span><br><span> int override; /* if 0, use system's time zone instead. */</span><br><span>@@ -1221,7 +1224,7 @@</span><br><span> </span><br><span> /* timer values */</span><br><span> int T3101;</span><br><span style="color: hsl(0, 100%, 40%);">- int T3103;</span><br><span style="color: hsl(120, 100%, 40%);">+ int T3103; /*< Handover timeout */</span><br><span> int T3105;</span><br><span> int T3107;</span><br><span> int T3109;</span><br><span>@@ -1232,6 +1235,9 @@</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 T7; /*< inter-BSC handover MO timeout from Handover Required to Handover Command */</span><br><span style="color: hsl(120, 100%, 40%);">+ int T8; /*< inter-BSC handover MO timeout from Handover Command to final Clear*/</span><br><span style="color: hsl(120, 100%, 40%);">+ int T101; /*< inter-BSC handover MT timeout from Handover Request to Handover Accept */</span><br><span> </span><br><span> enum gsm_chan_t ctype_by_chreq[_NUM_CHREQ_T];</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 5d0feb6..837f431 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,10 @@</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(7);</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_OUT_TIMER(8);</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_OUT_TIMER(101);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!gsmnet->dyn_ts_allow_tch_f)</span><br><span> vty_out(vty, " dyn_ts_allow_tch_f 0%s", VTY_NEWLINE);</span><br><span> if (gsmnet->tz.override != 0) {</span><br><span>@@ -1917,6 +1921,9 @@</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(7, "Set the outgoing inter-BSC Handover timeout, from Handover Required to Handover Command")</span><br><span style="color: hsl(120, 100%, 40%);">+DECLARE_TIMER(8, "Set the outgoing inter-BSC Handover timeout, from Handover Command to final Clear")</span><br><span style="color: hsl(120, 100%, 40%);">+DECLARE_TIMER(101, "Set the incoming inter-BSC Handover timeout, from Handover Request to Accept")</span><br><span> </span><br><span> DEFUN_DEPRECATED(cfg_net_dtx,</span><br><span> cfg_net_dtx_cmd,</span><br><span>@@ -4842,6 +4849,9 @@</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_T7_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GSMNET_NODE, &cfg_net_T8_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(GSMNET_NODE, &cfg_net_T101_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_dtx_cmd);</span><br><span> install_element(GSMNET_NODE, &cfg_net_pag_any_tch_cmd);</span><br><span> /* See also handover commands added on net level from handover_vty.c */</span><br><span>diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c</span><br><span>index db84e2a..5a48988 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,9 @@</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->T7 = GSM_T7_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->T8 = GSM_T8_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->T101 = GSM_T101_DEFAULT;</span><br><span> </span><br><span> return net;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9291">change 9291</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/9291"/><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: If9ecccc793426d214019f299b19d6ffa5a186546 </div>
<div style="display:none"> Gerrit-Change-Number: 9291 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>