diff options
author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-02-19 16:55:19 +0000 |
---|---|---|
committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-02-19 16:55:19 +0000 |
commit | cacebe0979ad6f1a1d3d138b3694ad170bfbf255 (patch) | |
tree | b76cff2343cb1a27531d14e50785f3b11bd5d7f7 /tools | |
parent | 383d56e5e4a80b20a0768119bae6e4abf077df05 (diff) |
From pizza_4u at qmx.net: Extend netscreen2dump.py to work with SSG520
Also: Add $ID$
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24391 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/netscreen2dump.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/netscreen2dump.py b/tools/netscreen2dump.py index c400cb4bdd..0d6f50370b 100755 --- a/tools/netscreen2dump.py +++ b/tools/netscreen2dump.py @@ -2,6 +2,8 @@ """ Converts netscreen snoop hex-dumps to a hex-dump that text2pcap can read. +$Id$ + Copyright (c) 2004 by Gilbert Ramirez <gram@alumni.rice.edu> This program is free software; you can redistribute it and/or @@ -76,7 +78,7 @@ class OutputFile: print >> self.fh # Find a timestamp line -re_timestamp = re.compile(r"^(?P<time>\d+\.\d): \d+\((?P<io>.)\)(:| len=)") +re_timestamp = re.compile(r"^(?P<time>\d+\.\d): [\w/]+\((?P<io>.)\)(:| len=)") # Find a hex dump line re_hex_line = re.compile(r"(?P<hex>([0-9a-f]{2} ){1,16})\s+(?P<ascii>.){1,16}") |