<p>fixeria <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/15297">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/trx_sniff.py: print exact message parsing error<br><br>For sure, the following message is much more informative:<br><br>  Ignoring an incorrect message: Unhandled version 12<br><br>than:<br><br>  Failed to parse message, dropping...<br><br>NOTE: since the way of printing exceptions is different in both<br>Python versions, I had to drop Python 2 support.<br><br>Change-Id: I5fb02ce508c58ff94e47accc0ed655939eb53062<br>---<br>M src/target/trx_toolkit/trx_sniff.py<br>1 file changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py</span><br><span>index 0323e85..72976f7 100755</span><br><span>--- a/src/target/trx_toolkit/trx_sniff.py</span><br><span>+++ b/src/target/trx_toolkit/trx_sniff.py</span><br><span>@@ -1,10 +1,10 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> # -*- coding: utf-8 -*-</span><br><span> </span><br><span> # TRX Toolkit</span><br><span> # Scapy-based TRX interface sniffer</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# (C) 2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+# (C) 2018-2019 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> #</span><br><span> # All Rights Reserved</span><br><span> #</span><br><span>@@ -22,7 +22,7 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-APP_CR_HOLDERS = [("2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2018-2019", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import argparse</span><br><span>@@ -109,8 +109,8 @@</span><br><span>                 # Attempt to parse the payload as a DATA message</span><br><span>             try:</span><br><span>                         msg.parse_msg(msg_raw)</span><br><span style="color: hsl(0, 100%, 40%);">-          except:</span><br><span style="color: hsl(0, 100%, 40%);">-                 log.warning("Failed to parse message, dropping...")</span><br><span style="color: hsl(120, 100%, 40%);">+         except ValueError as e:</span><br><span style="color: hsl(120, 100%, 40%);">+                       log.warning("Ignoring an incorrect message: %s" % e)</span><br><span>                       self.cnt_burst_dropped_num += 1</span><br><span>                      return</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/15297">change 15297</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/c/osmocom-bb/+/15297"/><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-Change-Id: I5fb02ce508c58ff94e47accc0ed655939eb53062 </div>
<div style="display:none"> Gerrit-Change-Number: 15297 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>