<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11909">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_ctrl.py: properly ignore out-of-order traps<br><br>Sometimes when we set variable we might receive arbitrary number of TRAP<br>messages before we get SET_REPLY. Those could be either separate<br>messages or combined together with SET_REPLY depending on tcp buffering<br>at server side. Let's handle this gracefully by skipping over all TRAP<br>messages.<br><br>An example command which often triggers this behavior:<br>./osmo_ctrl.py -s -d 127.0.0.1 -p 4249 bts.0.location (date +%s)",fix2d,1,2,3"<br><br>Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f<br>Related: SYS#4399<br>---<br>M scripts/osmo_ctrl.py<br>1 file changed, 11 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/09/11909/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/osmo_ctrl.py b/scripts/osmo_ctrl.py</span><br><span>index ac20050..5f5f209 100755</span><br><span>--- a/scripts/osmo_ctrl.py</span><br><span>+++ b/scripts/osmo_ctrl.py</span><br><span>@@ -40,8 +40,17 @@</span><br><span> def do_set_get(sck, var, value = None):</span><br><span>         (r, c) = Ctrl().cmd(var, value)</span><br><span>         sck.send(c)</span><br><span style="color: hsl(0, 100%, 40%);">-        ret = sck.recv(4096)</span><br><span style="color: hsl(0, 100%, 40%);">-        return (Ctrl().rem_header(ret),) + Ctrl().verify(ret, r, var, value)</span><br><span style="color: hsl(120, 100%, 40%);">+        tail = sck.recv(4096)</span><br><span style="color: hsl(120, 100%, 40%);">+        while True:</span><br><span style="color: hsl(120, 100%, 40%);">+                # handle multiple messages</span><br><span style="color: hsl(120, 100%, 40%);">+                (head, tail) = Ctrl().split_combined(tail)</span><br><span style="color: hsl(120, 100%, 40%);">+                (i, k, v) = Ctrl().parse(head)</span><br><span style="color: hsl(120, 100%, 40%);">+                # ignore all traps</span><br><span style="color: hsl(120, 100%, 40%);">+                if int(i) != 0:</span><br><span style="color: hsl(120, 100%, 40%);">+                        break;</span><br><span style="color: hsl(120, 100%, 40%);">+                if len(tail) == 0:</span><br><span style="color: hsl(120, 100%, 40%);">+                        tail = sck.recv(4096)</span><br><span style="color: hsl(120, 100%, 40%);">+        return (Ctrl().rem_header(head),) + Ctrl().verify(head, r, var, value)</span><br><span> </span><br><span> def set_var(sck, var, val):</span><br><span>         (a, _, _) = do_set_get(sck, var, val)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11909">change 11909</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/11909"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: python/osmo-python-tests </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f </div>
<div style="display:none"> Gerrit-Change-Number: 11909 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>