<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14915">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/trx_sniff.py: support sniffing on multiple ports<br><br>Change-Id: I76b818c673b98c427b5621ddb852f947c74557d6<br>---<br>M src/target/trx_toolkit/trx_sniff.py<br>1 file changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/14915/1</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 45a5cf4..7eea04c 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>@@ -57,14 +57,14 @@</span><br><span>                      self.ddf = DATADumpFile(self.argv.output_file)</span><br><span> </span><br><span>   def run(self):</span><br><span style="color: hsl(0, 100%, 40%);">-          # Compose a packet filter</span><br><span style="color: hsl(0, 100%, 40%);">-               pkt_filter = "udp and (port %d or port %d)" \</span><br><span style="color: hsl(0, 100%, 40%);">-                 % (self.argv.base_port + 2, self.argv.base_port + 102)</span><br><span style="color: hsl(120, 100%, 40%);">+                # Compose a list of permitted UDP ports</span><br><span style="color: hsl(120, 100%, 40%);">+               rx_port_list = ["port %d" % (port + 102) for port in self.argv.base_ports]</span><br><span style="color: hsl(120, 100%, 40%);">+          tx_port_list = ["port %d" % (port +   2) for port in self.argv.base_ports]</span><br><span> </span><br><span>             # Arguments to be passed to scapy.all.sniff()</span><br><span>                sniff_args = {</span><br><span style="color: hsl(120, 100%, 40%);">+                        "filter" : "udp and (%s)" % " or ".join(rx_port_list + tx_port_list),</span><br><span>                  "prn" : self.pkt_handler,</span><br><span style="color: hsl(0, 100%, 40%);">-                     "filter" : pkt_filter,</span><br><span>                     "store" : 0,</span><br><span>               }</span><br><span> </span><br><span>@@ -208,8 +208,9 @@</span><br><span>          self.app_reg_logging_options(parser)</span><br><span> </span><br><span>             trx_group = parser.add_argument_group("TRX interface")</span><br><span style="color: hsl(0, 100%, 40%);">-                trx_group.add_argument("-p", "--base-port",</span><br><span style="color: hsl(0, 100%, 40%);">-                 dest = "base_port", type = int, default = 6700,</span><br><span style="color: hsl(120, 100%, 40%);">+             trx_group.add_argument("-p", "--base-port", "--base-ports",</span><br><span style="color: hsl(120, 100%, 40%);">+                     dest = "base_ports", type = int, metavar = "PORT",</span><br><span style="color: hsl(120, 100%, 40%);">+                        default = [5700, 6700], nargs = "*",</span><br><span>                       help = "Set base port number (default %(default)s)")</span><br><span>               trx_group.add_argument("-o", "--output-file", metavar = "FILE",</span><br><span>                        dest = "output_file", type = str,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14915">change 14915</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/+/14915"/><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: I76b818c673b98c427b5621ddb852f947c74557d6 </div>
<div style="display:none"> Gerrit-Change-Number: 14915 </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-MessageType: newchange </div>