Skip to content

Commit dc1de45

Browse files
author
Stefan Lekov
committed
all filters are now quoted
renamed fragmented to fragmentedFilter
1 parent 00ca0fd commit dc1de45

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

remoteShark.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class AppConfig:
6060
compression = None
6161

6262
debug = 0
63-
fragmented = False
63+
fragmentedFilter = False
6464

6565
def __init__(self, argv):
6666
""" Construct the application's configuration """
@@ -164,7 +164,7 @@ def __init__(self, argv):
164164
continue
165165

166166
if argv[i] == '--fragmented' or argv[i] == '-F':
167-
self.fragmented = True
167+
self.fragmentedFilter = True
168168
i = i + 1
169169
continue
170170

@@ -246,7 +246,7 @@ def __postCfgPostprocess(self):
246246
if self.debug > 0:
247247
printf("Detected remote file instead of a live capture. Enabling --compression by default. You can disable this behavior by --no-compression\n")
248248
self.compression = True
249-
if len(self.dumpFilter) > 0 and self.fragmented:
249+
if len(self.dumpFilter) > 0 and self.fragmentedFilter:
250250
self.dumpFilter = sprintf('(%s) or ( ip[6:2] & 0x3fff != 0x0000 )', self.dumpFilter)
251251

252252
return
@@ -521,11 +521,11 @@ def runWireshark(self):
521521
tcpdumpCMD = sprintf('%s -U -ni "%s" -s 0 -q -w - "%s" 2>/dev/null', tcpdumpCMD, cfg.interface, cfg.dumpFilter)
522522
else:
523523
if (cfg.remotePcapFile.endswith('.gz')):
524-
tcpdumpCMD = sprintf('zcat %s | %s -U -n -r - -s 0 -q -w - %s 2>/dev/null', cfg.remotePcapFile, tcpdumpCMD, cfg.dumpFilter)
524+
tcpdumpCMD = sprintf('zcat %s | %s -U -n -r - -s 0 -q -w - "%s" 2>/dev/null', cfg.remotePcapFile, tcpdumpCMD, cfg.dumpFilter)
525525
elif (cfg.remotePcapFile.endswith('.bz2')):
526-
tcpdumpCMD = sprintf('bzcat %s | %s -U -n -r - -s 0 -q -w - %s 2>/dev/null', cfg.remotePcapFile, tcpdumpCMD, cfg.dumpFilter)
526+
tcpdumpCMD = sprintf('bzcat %s | %s -U -n -r - -s 0 -q -w - "%s" 2>/dev/null', cfg.remotePcapFile, tcpdumpCMD, cfg.dumpFilter)
527527
else:
528-
tcpdumpCMD = sprintf('cat %s | %s -U -n -r - -s 0 -q -w - %s 2>/dev/null', cfg.remotePcapFile, tcpdumpCMD, cfg.dumpFilter)
528+
tcpdumpCMD = sprintf('cat %s | %s -U -n -r - -s 0 -q -w - "%s" 2>/dev/null', cfg.remotePcapFile, tcpdumpCMD, cfg.dumpFilter)
529529

530530
if self.cfg.debug >= 3:
531531
printf('Running command remote "%s"\n', tcpdumpCMD)

0 commit comments

Comments
 (0)