Remove the -D option.

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

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index a679746e62d5d3b2973c2c9679d6c618fe28434b..d3ac4ad76b95950b7c4533b0ed11e5704a537e20 100644 (file)
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -8,7 +8,6 @@ Ethereal - Interactively browse network traffic
 B<ethereal>
 S<[ B<-B> byte view height ]>
 S<[ B<-c> count ]>
-S<[ B<-D> ]>
 S<[ B<-f> filter expression ]>
 S<[ B<-h> ]>
 S<[ B<-i> interface ]> 
@@ -81,11 +80,6 @@ Sets the initial height of the byte view (bottom) pane.
 Sets the default number of packets to read when capturing live
 data.
 
-=item -D
-
-Turns off treating the original IPv4 TOS field as the Differentiated
-Services Field. The structure of the DS Field is defined in RFC 2474.
-
 =item -f
 
 Sets the capture filter expression.

diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template
index f5b80f865d7d6e2d35be77fcd272670d705ca35f..b2c941f590fbbb57816b8e17bf4ab88b33eb915c 100644 (file)
--- a/doc/tethereal.pod.template
+++ b/doc/tethereal.pod.template
@@ -7,7 +7,6 @@ Tethereal - Dump and analyze network traffic
 
 B<tethereal>
 S<[ B<-c> count ]>
-S<[ B<-D> ]>
 S<[ B<-f> filter expression ]>
 S<[ B<-F> file format ]>
 S<[ B<-h> ]>
@@ -103,11 +102,6 @@ filter arguments are treated as a filter expression.
 Sets the default number of packets to read when capturing live
 data.
 
-=item -D
-
-Turns off treating the original IPv4 TOS field as the Differentiated
-Services Field. The structure of the DS Field is defined in RFC 2474.
-
 =item -f
 
 Sets the capture filter expression.

diff --git a/gtk/main.c b/gtk/main.c
index ffc07043f6c2c377b3e344c279ca062e5af032a9..02ef88e439625e581978c7f94285064cdbea635b 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.151 2000/08/22 20:17:27 deniel Exp $
+ * $Id: main.c,v 1.152 2000/08/23 18:21:44 deniel Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -791,7 +791,7 @@ print_usage(void) {
 #ifdef HAVE_LIBPCAP
   fprintf(stderr, "%s [ -vh ] [ -kQS ] [ -B <byte view height> ] [ -c count ]\n",
          PACKAGE);
-  fprintf(stderr, "\t[ -D ] [ -f <capture filter> ] [ -i interface ] [ -m <medium font> ] \n");
+  fprintf(stderr, "\t[ -f <capture filter> ] [ -i interface ] [ -m <medium font> ] \n");
   fprintf(stderr, "\t[ -n ] [ -o <preference setting> ] ... [ -P <packet list height> ]\n");
   fprintf(stderr, "\t[ -r infile ] [ -R <read filter> ] [ -s snaplen ] \n");
   fprintf(stderr, "\t[ -t <time stamp format> ] [ -T <tree view height> ] [ -w savefile ]\n");
@@ -977,9 +977,6 @@ main(int argc, char *argv[])
         arg_error = TRUE;
 #endif
         break;
-      case 'D':        /* Turn off DSCP printing */
-       g_ip_dscp_actif = FALSE;
-       break;
       case 'f':
 #ifdef HAVE_LIBPCAP
        if (cfile.cfilter)

diff --git a/tethereal.c b/tethereal.c
index c25bcf9d93e39f2a39eeb214739db89a1d994f63..e72e163103e70a353cedea6b76bf7d254994a41f 100644 (file)
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
 /* tethereal.c
  *
- * $Id: tethereal.c,v 1.43 2000/08/22 03:33:41 guy Exp $
+ * $Id: tethereal.c,v 1.44 2000/08/23 18:21:57 deniel Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -135,12 +135,12 @@ print_usage(void)
   fprintf(stderr, "This is GNU t%s %s, compiled with %s\n", PACKAGE,
          VERSION, comp_info_str);
 #ifdef HAVE_LIBPCAP
-  fprintf(stderr, "t%s [ -vVh ] [ -c count ] [ -D ] [ -f <capture filter> ]\n", PACKAGE);
+  fprintf(stderr, "t%s [ -vVh ] [ -c count ] [ -f <capture filter> ]\n", PACKAGE);
   fprintf(stderr, "\t[ -F <capture file type> ] [ -i interface ] [ -n ]\n");
   fprintf(stderr, "\t[ -o <preference setting> ] ... [ -r infile ] [ -R <read filter> ]\n");
   fprintf(stderr, "\t[ -s snaplen ] [ -t <time stamp format> ] [ -w savefile ] [ -x ]\n");
 #else
-  fprintf(stderr, "t%s [ -vVh ] [ -D ] [ -F <capture file type> ] [ -n ]\n", PACKAGE);
+  fprintf(stderr, "t%s [ -vVh ] [ -F <capture file type> ] [ -n ]\n", PACKAGE);
   fprintf(stderr, "\t[ -o <preference setting> ] ... [ -r infile ] [ -R <read filter> ]\n");
   fprintf(stderr, "\t[ -t <time stamp format> ] [ -w savefile ] [ -x ]\n");
 #endif
@@ -294,9 +294,6 @@ main(int argc, char *argv[])
         arg_error = TRUE;
 #endif
         break;
-      case 'D':        /* Turn off DSCP printing */
-       g_ip_dscp_actif = FALSE;
-       break;
       case 'f':
 #ifdef HAVE_LIBPCAP
         capture_filter_specified = TRUE;