-Tpdml and -Tps force -V. Thus, -V is no longer required when using -Tpdml.

Eventually, -Tps will not force -V, and will print summaries when -V is
not selected. However, work still has to be done there.

svn path=/trunk/; revision=9218

doc/README.xml-output

@@ -1,11 +1,11 @@
 Protocol Dissection in XML Format
 =================================
-$Id: README.xml-output,v 1.1 2003/12/06 06:09:12 gram Exp $
+$Id: README.xml-output,v 1.2 2003/12/09 05:56:30 gram Exp $
 Copyright (c) 2003 by Gilbert Ramirez <gram@alumni.rice.edu>
 
 
 Tethereal has the ability to print its protocol dissection in an
-XML format, by using the "-Tpdml -V" options. Similar functionality
+XML format, by using the "-Tpdml" options. Similar functionality
 could be put into the "Print" dialog of Ethereal, but that work has
 not been done yet.
 
@@ -19,7 +19,7 @@ A related XML format, the Packet Summary Markup Language (PSML), is
 also defined by the Analyzer group to provide packet summary information.
 The PSML format is not documented in a publicly-available HTML document,
 but its format is simple. Some day it may be added to tethereal so
-that "-Tpsml" (without "-V") would produce PSML.
+that "-Tpsml" would produce PSML.
 
 One wonders if the "-T" option should read "-Txml" instead of "-Tpdml"
 (and in the future, "-Tpsml"), but if tethereal was required to produce

doc/tethereal.pod

@@ -357,10 +357,8 @@ captured.  The default is relative.
 
 =item -T
 
-Set the format of the print-out when viewing packet data. The "text"
-format is the default format, and works in summary mode and in verbose
-mode (B<-V>). The postscript (ps) and pdml (XML) formats work only in
-verbose mode; thus, they require the use of the B<-V> option.
+Set the format of the print-out when viewing packet data.
+The PDML format always shows protocol tree data, as if (B<-V>) had been set.
 
 =item -v
 

tethereal.c

@@ -1,6 +1,6 @@
 /* tethereal.c
  *
- * $Id: tethereal.c,v 1.207 2003/12/06 06:09:10 gram Exp $
+ * $Id: tethereal.c,v 1.208 2003/12/09 05:56:30 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1233,13 +1233,9 @@ main(int argc, char *argv[])
     }
   }
 
-  /* If printing PDML or PostScript, for the time-being, we require -V */
-  if (print_format == PR_FMT_PDML || print_format == PR_FMT_PS) {
-	  if (! verbose) {
-		fprintf(stderr, "tethereal: Using -Tps or -Tpdml requires -V\n");
-		exit(1);
-	  }
-  }
+  /* If printing PDML or PS, force -V */
+  if (print_format == PR_FMT_PDML || PR_FMT_PS)
+	  verbose = TRUE;
 
   /* If no capture filter or read filter has been specified, and there are
      still command-line arguments, treat them as the tokens of a capture

tools/msnchat

@@ -214,7 +214,7 @@ class CaptureFile:
         self.conversations = []
         self.conversations_map = {}
 
-        pipe = os.popen(tethereal + " -Tpdml -V -n -R "
+        pipe = os.popen(tethereal + " -Tpdml -n -R "
             "'msnms contains \"X-MMS-IM-Format\"' "
             "-r " + capture_filename, "r")