<p>fixeria <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14914">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: add support for reading from PCAP file<br><br>Change-Id: I8a3481fbea5f6c917ae5684d0b5b806f4a76ff78<br>---<br>M src/target/trx_toolkit/trx_sniff.py<br>1 file changed, 23 insertions(+), 7 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 6592455..45a5cf4 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>@@ -61,18 +61,29 @@</span><br><span> pkt_filter = "udp and (port %d or port %d)" \</span><br><span> % (self.argv.base_port + 2, self.argv.base_port + 102)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log.info("Listening on interface '%s'..." % self.argv.sniff_if)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Arguments to be passed to scapy.all.sniff()</span><br><span style="color: hsl(120, 100%, 40%);">+ sniff_args = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "prn" : self.pkt_handler,</span><br><span style="color: hsl(120, 100%, 40%);">+ "filter" : pkt_filter,</span><br><span style="color: hsl(120, 100%, 40%);">+ "store" : 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.argv.cap_file is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info("Reading packets from '%s'..." % self.argv.cap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ sniff_args["offline"] = self.argv.cap_file</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info("Listening on interface '%s'..." % self.argv.sniff_if)</span><br><span style="color: hsl(120, 100%, 40%);">+ sniff_args["iface"] = self.argv.sniff_if</span><br><span> </span><br><span> # Start sniffing...</span><br><span style="color: hsl(0, 100%, 40%);">- scapy.all.sniff(iface = self.argv.sniff_if, store = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- filter = pkt_filter, prn = self.pkt_handler)</span><br><span style="color: hsl(120, 100%, 40%);">+ scapy.all.sniff(**sniff_args)</span><br><span> </span><br><span> # Scapy registers its own signal handler</span><br><span> self.shutdown()</span><br><span> </span><br><span> def pkt_handler(self, ether):</span><br><span> # Prevent loopback packet duplication</span><br><span style="color: hsl(0, 100%, 40%);">- if self.argv.sniff_if == "lo":</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.argv.sniff_if == "lo" and self.argv.cap_file is None:</span><br><span> self.lo_trigger = not self.lo_trigger</span><br><span> if not self.lo_trigger:</span><br><span> return</span><br><span>@@ -197,9 +208,6 @@</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("-i", "--sniff-interface",</span><br><span style="color: hsl(0, 100%, 40%);">- dest = "sniff_if", type = str, default = "lo", metavar = "IF",</span><br><span style="color: hsl(0, 100%, 40%);">- help = "Set network interface (default '%(default)s')")</span><br><span> trx_group.add_argument("-p", "--base-port",</span><br><span> dest = "base_port", type = int, default = 6700,</span><br><span> help = "Set base port number (default %(default)s)")</span><br><span>@@ -207,6 +215,14 @@</span><br><span> dest = "output_file", type = str,</span><br><span> help = "Write bursts to a capture file")</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ input_group = trx_group.add_mutually_exclusive_group()</span><br><span style="color: hsl(120, 100%, 40%);">+ input_group.add_argument("-i", "--sniff-interface",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "sniff_if", type = str, default = "lo", metavar = "IF",</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set network interface (default '%(default)s')")</span><br><span style="color: hsl(120, 100%, 40%);">+ input_group.add_argument("-r", "--capture-file",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "cap_file", type = str, metavar = "FILE",</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Read packets from a PCAP file")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> cnt_group = parser.add_argument_group("Count limitations (optional)")</span><br><span> cnt_group.add_argument("--frame-count", metavar = "N",</span><br><span> dest = "frame_count", type = int,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14914">change 14914</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/+/14914"/><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: I8a3481fbea5f6c917ae5684d0b5b806f4a76ff78 </div>
<div style="display:none"> Gerrit-Change-Number: 14914 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>