Disables "Follow TCP Stream" if compiled with wiretap.

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

diff --git a/README b/README
index 27d02db1965d4130e148ad9ab92795a93f26a428..a47d0ff6bab6026adc6b4cdf46f89ba32949e841 100644 (file)
--- a/README
+++ b/README
@@ -51,15 +51,17 @@ development parallel to ethereal.  In the future it is hoped that
 wiretap will have more features than libpcap, but wiretap is still in
 its infancy.  You can compile ethereal with the wiretap library by using
 './configure --with-wiretap'.  Using wiretap will allow you to read
-pcap, Sniffer, Sun "snoop", LANalyzer, Microsoft Network Monitor, and
-AIX "iptrace" 2.0 trace files, but it disables display filters.  You can
-still capture packets from within ethereal using libpcap, and therefore
+libpcap, Sniffer, NetXray (and Sniffer Pro), Sun "snoop", LANalyzer,
+Microsoft Network Monitor, and AIX "iptrace" 2.0 trace files. Some minimal
+display filters now work. But because "Follow TCP Stream" relies on IP and TCP
+display filtering, and those aren't yet available in wiretap's display filter
+system, "Follow TCP Stream" is turned off when you compile --with-wiretap.
+
+You can still capture packets from within ethereal using libpcap, and therefore
 use libpcap-style capture filters, however.
 
-If you can live without display filters and would like to read non-pcap
-capture files, give wiretap a try. If you want to add support for other
-packet-capture file formats, please look at the wiretap source code in the
-wiretap directory.
+If you want to add support for other packet-capture file formats, please
+look at the wiretap source code in the wiretap directory.
 
 Please report any problems that are wiretap related to
 Gilbert Ramirez <gram@verdict.uthscsa.edu>. He uses token-ring at work, so he

diff --git a/menu.c b/menu.c
index b90aaff27929bbb4d5834509b23ced2ab2475add..68d34e2dcc952f95e561ddfe792a5c20acda0366 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.14 1999/03/01 18:57:01 gram Exp $
+ * $Id: menu.c,v 1.15 1999/03/01 20:32:54 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -179,6 +179,9 @@ menus_init(void) {
     set_menu_sensitivity("/Edit/Paste", FALSE);
     set_menu_sensitivity("/Edit/Find", FALSE);
     set_menu_sensitivity("/Tools/Graph", FALSE);
+#ifdef WITH_WIRETAP
+       set_menu_sensitivity("/Tools/Follow TCP Stream", FALSE);
+#endif
     
 #else
     factory = gtk_menu_factory_new(GTK_MENU_FACTORY_MENU_BAR);
@@ -196,6 +199,9 @@ menus_init(void) {
     set_menu_sensitivity("<Main>/Edit/Paste", FALSE);
     set_menu_sensitivity("<Main>/Edit/Find", FALSE);
     set_menu_sensitivity("<Main>/Tools/Graph", FALSE);
+#ifdef WITH_WIRETAP
+       set_menu_sensitivity("<Main>/Tools/Follow TCP Stream", FALSE);
+#endif
     if ((mp = gtk_menu_factory_find(factory, "<Main>/Help")) != NULL) {
       gtk_menu_item_right_justify((GtkMenuItem *) mp->widget);
     }