In the Find dialog add periods or dashes to the list of allowed hex

separator characters.  Update the Ethereal man page accordingly.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8420 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 8e3362c888a7373b5dcf30f20891aededf4f235b..fe282a57f04abe4b6db2bb932d43fd9271936ad8 100644 (file)
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -452,8 +452,13 @@ Exit the application.
 =item Edit:Find Frame
 
 Search forward or backward, starting with the currently selected packet
-(or the most recently selected packet, if no packet is selected), for a
-packet matching a given display filter expression.
+(or the most recently selected packet, if no packet is selected).  Search
+criteria can be a display filter expression, a string of hexadecimal 
+digits, or a text string.
+
+Hexadecimal digits can be separated by colons, periods, or dashes.
+Text string searches can be ASCII or Unicode (or both), and may be
+case insensitive.
 
 =item Edit:Find Next
 

diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 5472b78482988767eea15e8119cbd4335b4f52ad..1978f31c8e1d4ebd12afb2c65237477ab73972ee 100644 (file)
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -1,7 +1,7 @@
 /* find_dlg.c
  * Routines for "find frame" window
  *
- * $Id: find_dlg.c,v 1.36 2003/09/05 06:16:10 sahlberg Exp $
+ * $Id: find_dlg.c,v 1.37 2003/09/09 02:41:00 gerald Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -486,8 +486,8 @@ convert_string_to_hex(const char *string, size_t *nbytes)
       break;
     if (isspace(c))
       continue;        /* allow white space */
-    if (c==':')
-      continue; /* skip any ':' between bytes */
+    if (c==':' || c=='.' || c=='-')
+      continue; /* skip any ':', '.', or '-' between bytes */
     if (!isxdigit(c)) {
       /* Not a valid hex digit - fail */
       return NULL;
@@ -526,8 +526,8 @@ convert_string_to_hex(const char *string, size_t *nbytes)
       break;
     if (isspace(c))
       continue;        /* allow white space */
-    if (c==':')
-      continue; /* skip any ':' between bytes */
+    if (c==':' || c=='.' || c=='-')
+      continue; /* skip any ':', '.', or '-' between bytes */
     /* From the loop above, we know this is a hex digit */
     if (isdigit(c))
       byte_val = c - '0';