fixeria has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmocom-bb/+/14915 )
Change subject: trx_toolkit/trx_sniff.py: support sniffing on multiple ports
......................................................................
trx_toolkit/trx_sniff.py: support sniffing on multiple ports
Change-Id: I76b818c673b98c427b5621ddb852f947c74557d6
---
M src/target/trx_toolkit/trx_sniff.py
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/target/trx_toolkit/trx_sniff.py
b/src/target/trx_toolkit/trx_sniff.py
index 45a5cf4..7eea04c 100755
--- a/src/target/trx_toolkit/trx_sniff.py
+++ b/src/target/trx_toolkit/trx_sniff.py
@@ -57,14 +57,14 @@
self.ddf = DATADumpFile(self.argv.output_file)
def run(self):
- # Compose a packet filter
- pkt_filter = "udp and (port %d or port %d)" \
- % (self.argv.base_port + 2, self.argv.base_port + 102)
+ # Compose a list of permitted UDP ports
+ rx_port_list = ["port %d" % (port + 102) for port in
self.argv.base_ports]
+ tx_port_list = ["port %d" % (port + 2) for port in
self.argv.base_ports]
# Arguments to be passed to scapy.all.sniff()
sniff_args = {
+ "filter" : "udp and (%s)" % " or ".join(rx_port_list +
tx_port_list),
"prn" : self.pkt_handler,
- "filter" : pkt_filter,
"store" : 0,
}
@@ -208,8 +208,9 @@
self.app_reg_logging_options(parser)
trx_group = parser.add_argument_group("TRX interface")
- trx_group.add_argument("-p", "--base-port",
- dest = "base_port", type = int, default = 6700,
+ trx_group.add_argument("-p", "--base-port", "--base-ports",
+ dest = "base_ports", type = int, metavar = "PORT",
+ default = [5700, 6700], nargs = "*",
help = "Set base port number (default %(default)s)")
trx_group.add_argument("-o", "--output-file", metavar = "FILE",
dest = "output_file", type = str,
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/14915
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I76b818c673b98c427b5621ddb852f947c74557d6
Gerrit-Change-Number: 14915
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
