<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11489">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/VTY: fix prompt matching in f_vty_wait_for_prompt()<br><br>Matching the prompt by a sequence of any alphanumeric characters<br>(i.e. '\w+') is a bad idea, because it can led to false-positive<br>matching results, for example:<br><br> - '\w+> ' matches the following:<br> * 'OsmoBlaBla> ',<br> * 'Switching default route from <none> to foobar'.<br><br>Let's avoid using such implicit patterns, and replace the '\w+'<br>by mp_prompt_prefix, that basically contains the process name.<br><br>Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73<br>Related: OS#3675<br>---<br>M library/Osmocom_VTY_Functions.ttcn<br>1 file changed, 6 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/11489/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn</span><br><span>index b822645..b56b792 100644</span><br><span>--- a/library/Osmocom_VTY_Functions.ttcn</span><br><span>+++ b/library/Osmocom_VTY_Functions.ttcn</span><br><span>@@ -9,6 +9,9 @@</span><br><span> const charstring VTY_ENABLE_SUFFIX := "# ";</span><br><span> const charstring VTY_CFG_SUFFIX := "(*)";</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ template charstring t_vty_prompt_view := pattern mp_prompt_prefix & "> ";</span><br><span style="color: hsl(120, 100%, 40%);">+ template charstring t_vty_prompt_enable := pattern mp_prompt_prefix & "\# ";</span><br><span style="color: hsl(120, 100%, 40%);">+ template charstring t_vty_prompt_config := pattern mp_prompt_prefix & "(*)\# ";</span><br><span> template charstring t_vty_unknown := pattern "*% Unknown command.";</span><br><span> </span><br><span> /* configure prompts in TELNETasp module */</span><br><span>@@ -51,9 +54,9 @@</span><br><span> </span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(pattern "\w+" & VTY_VIEW_SUFFIX) { };</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(pattern "\w+\# ") { };</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(pattern "\w+" & VTY_CFG_SUFFIX) { };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(t_vty_prompt_view) { };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(t_vty_prompt_enable) { };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(t_vty_prompt_config) { };</span><br><span> [] pt.receive(t_vty_unknown) {</span><br><span> testcase.stop(fail, "VTY: Unknown Command");</span><br><span> };</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11489">change 11489</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/11489"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8a0e3fcfb0c4e5854b7b1e39296052e679c63c73 </div>
<div style="display:none"> Gerrit-Change-Number: 11489 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>