<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9407">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mobile: Make time spent in c7 configurable<br><br>When no cell was found during the PLMN search the camp on any cell<br>state will be entered. LUs are prevented in this state and it will be<br>left after the start_any_timer has timedout. Even if camping on the<br>home network the state will not be left before the expiry of the timer.<br><br>For systematic tests this is producing a too high upper bound. Make it<br>configurable so we can succeed with a UL more quickly.<br><br>Change-Id: I25bc985cd4360d5e37d05a7b16b39eefb75ce20f<br>---<br>M src/host/layer23/include/osmocom/bb/mobile/settings.h<br>M src/host/layer23/src/mobile/settings.c<br>M src/host/layer23/src/mobile/subscriber.c<br>M src/host/layer23/src/mobile/vty_interface.c<br>4 files changed, 26 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h</span><br><span>index cdf6323..a1bce06 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/mobile/settings.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h</span><br><span>@@ -1,6 +1,8 @@</span><br><span> #ifndef _settings_h</span><br><span> #define _settings_h</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define MOB_C7_DEFLT_ANY_TIMEOUT 30</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gsm_settings {</span><br><span> char layer2_socket_path[128];</span><br><span> char sap_socket_path[128];</span><br><span>@@ -100,6 +102,9 @@</span><br><span> uint8_t class_dtm;</span><br><span> uint8_t dtm_mac;</span><br><span> uint8_t dtm_egprs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Timeout for GSM 03.22 C7 state */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t any_timeout;</span><br><span> };</span><br><span> </span><br><span> struct gsm_settings_abbrev {</span><br><span>diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c</span><br><span>index 6d50c6b..f1c0cfc 100644</span><br><span>--- a/src/host/layer23/src/mobile/settings.c</span><br><span>+++ b/src/host/layer23/src/mobile/settings.c</span><br><span>@@ -90,6 +90,8 @@</span><br><span> /* software features */</span><br><span> set->cc_dtmf = 1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ set->any_timeout = MOB_C7_DEFLT_ANY_TIMEOUT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> INIT_LLIST_HEAD(&set->abbrev);</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c</span><br><span>index d332a07..6a30148 100644</span><br><span>--- a/src/host/layer23/src/mobile/subscriber.c</span><br><span>+++ b/src/host/layer23/src/mobile/subscriber.c</span><br><span>@@ -99,7 +99,7 @@</span><br><span> subscr->key_seq = 7;</span><br><span> </span><br><span> /* any cell selection timer timeout */</span><br><span style="color: hsl(0, 100%, 40%);">- subscr->any_timeout = 30;</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr->any_timeout = ms->settings.any_timeout;</span><br><span> </span><br><span> /* init lists */</span><br><span> INIT_LLIST_HEAD(&subscr->plmn_list);</span><br><span>diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c</span><br><span>index 37093ce..f8ecb28 100644</span><br><span>--- a/src/host/layer23/src/mobile/vty_interface.c</span><br><span>+++ b/src/host/layer23/src/mobile/vty_interface.c</span><br><span>@@ -1528,6 +1528,10 @@</span><br><span> vty_out(vty, " hplmn-search %s%s",</span><br><span> (set->test_always) ? "everywhere" : "foreign-country",</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!hide_default || set->any_timeout != MOB_C7_DEFLT_ANY_TIMEOUT)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " c7-any-timeout %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ set->any_timeout, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* no shutdown must be written to config, because shutdown is default */</span><br><span> vty_out(vty, " %sshutdown%s", (ms->shutdown != MS_SHUTDOWN_NONE) ? "" : "no ",</span><br><span> VTY_NEWLINE);</span><br><span>@@ -2170,6 +2174,19 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ms_any_timeout, cfg_ms_any_timeout_cmd, "c7-any-timeout <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Seconds to wait in C7 before doing a PLMN search")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmocom_ms *ms = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_settings *set = &ms->settings;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ set->any_timeout = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_restart_if_started(vty, ms);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int config_write_dummy(struct vty *vty)</span><br><span> {</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -2891,6 +2908,7 @@</span><br><span> install_element(MS_NODE, &cfg_ms_testsim_cmd);</span><br><span> install_element(MS_NODE, &cfg_ms_neighbour_cmd);</span><br><span> install_element(MS_NODE, &cfg_ms_no_neighbour_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MS_NODE, &cfg_ms_any_timeout_cmd);</span><br><span> install_element(MS_NODE, &cfg_ms_support_cmd);</span><br><span> install_node(&support_node, config_write_dummy);</span><br><span> install_element(SUPPORT_NODE, &cfg_ms_sup_dtmf_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9407">change 9407</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/9407"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I25bc985cd4360d5e37d05a7b16b39eefb75ce20f </div>
<div style="display:none"> Gerrit-Change-Number: 9407 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>