<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17673">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/trx_sniff.py: pass the whole msg to burst_pass_filter()<br><br>Change-Id: I3da62249a4d62078b79ce5e79c86923e59c1e457<br>---<br>M src/target/trx_toolkit/trx_sniff.py<br>1 file changed, 13 insertions(+), 12 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 6671c35..5667df2 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>@@ -4,7 +4,7 @@</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-2019 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+# (C) 2018-2020 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-2019", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2018-2020", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import argparse</span><br><span>@@ -119,8 +119,7 @@</span><br><span> return</span><br><span> </span><br><span> # Poke burst pass filter</span><br><span style="color: hsl(0, 100%, 40%);">- rc = self.burst_pass_filter(l12trx, msg.fn, msg.tn)</span><br><span style="color: hsl(0, 100%, 40%);">- if rc is False:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.burst_pass_filter(msg):</span><br><span> self.cnt_burst_dropped_num += 1</span><br><span> return</span><br><span> </span><br><span>@@ -136,25 +135,27 @@</span><br><span> if rc is True:</span><br><span> self.shutdown()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def burst_pass_filter(self, l12trx, fn, tn):</span><br><span style="color: hsl(120, 100%, 40%);">+ def burst_pass_filter(self, msg):</span><br><span> # Direction filter</span><br><span> if self.argv.direction is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- if self.argv.direction == "TRX" and not l12trx:</span><br><span style="color: hsl(0, 100%, 40%);">- return False</span><br><span style="color: hsl(0, 100%, 40%);">- elif self.argv.direction == "L1" and l12trx:</span><br><span style="color: hsl(0, 100%, 40%);">- return False</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.argv.direction == "TRX": # L1 -> TRX</span><br><span style="color: hsl(120, 100%, 40%);">+ if not isinstance(msg, DATAMSG_L12TRX):</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self.argv.direction == "L1": # TRX -> L1</span><br><span style="color: hsl(120, 100%, 40%);">+ if not isinstance(msg, DATAMSG_TRX2L1):</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span> </span><br><span> # Timeslot filter</span><br><span> if self.argv.pf_tn is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- if tn != self.argv.pf_tn:</span><br><span style="color: hsl(120, 100%, 40%);">+ if msg.tn != self.argv.pf_tn:</span><br><span> return False</span><br><span> </span><br><span> # Frame number filter</span><br><span> if self.argv.pf_fn_lt is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- if fn > self.argv.pf_fn_lt:</span><br><span style="color: hsl(120, 100%, 40%);">+ if msg.fn > self.argv.pf_fn_lt:</span><br><span> return False</span><br><span> if self.argv.pf_fn_gt is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- if fn < self.argv.pf_fn_gt:</span><br><span style="color: hsl(120, 100%, 40%);">+ if msg.fn < self.argv.pf_fn_gt:</span><br><span> return False</span><br><span> </span><br><span> # Burst passed ;)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17673">change 17673</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/+/17673"/><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: I3da62249a4d62078b79ce5e79c86923e59c1e457 </div>
<div style="display:none"> Gerrit-Change-Number: 17673 </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>