aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-11-24 09:46:28 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-11-24 09:46:28 +0000
commit554f0779db4983e5220970356ea198104b93d300 (patch)
tree4312fed4bf64d842ef8b9dd140af78df1a2703a6
parent2f5f279d87680a5831bb858b6805675a948d43ac (diff)
Fix to text2pcap to handle colons after offset field, from Gordon
McKinney. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4256 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--AUTHORS1
-rw-r--r--text2pcap-scanner.l4
2 files changed, 3 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 9d24db3db1..ff9c494832 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -851,6 +851,7 @@ Marc Milgram <mmilgram[AT]arrayinc.com> {
Gordon McKinney <gordon[AT]night-ray.com> {
Enhanced Ethereal icon for Windows
Support for time stamping packets in text2pcap
+ Fix to text2pcap to handle colons after offset field
}
Pavel Novotny <Pavel.Novotny[AT]icn.siemens.de> {
diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index 954c8dfae0..0f20ba70b3 100644
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -10,7 +10,7 @@
*
* (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: text2pcap-scanner.l,v 1.2 2001/11/24 02:13:34 guy Exp $
+ * $Id: text2pcap-scanner.l,v 1.3 2001/11/24 09:46:28 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -46,7 +46,7 @@ directive #TEXT2PCAP.*
comment #[^W].*
byte [0-9A-Fa-f][0-9A-Fa-f][ \t]
byte_eol [0-9A-Fa-f][0-9A-Fa-f]\n
-offset [0-9A-Fa-f]+[ \t]
+offset [0-9A-Fa-f]+[: \t]
offset_eol [0-9A-Fa-f]+\n
text [^ \n\t]+
mailfwd >