Remove no longer used option 'R'

diff --git a/netdissect.h b/netdissect.h
index 458732b8d7cdb9d3b050c3bc6622432fc046fd63..a1a8779e553795cfaaa2645e430a1d7e5f222893 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -94,7 +94,6 @@ struct netdissect_options {
   int ndo_nflag;               /* leave addresses as numbers */
   int ndo_Nflag;               /* remove domains from printed host names */
   int ndo_qflag;               /* quick (shorter) output */
-  int ndo_Rflag;               /* print sequence # field in AH/ESP*/
   int ndo_sflag;               /* use the libsmi to translate OIDs */
   int ndo_Sflag;               /* print raw TCP sequence numbers */
   int ndo_tflag;               /* print packet arrival time */

diff --git a/tcpdump.1.in b/tcpdump.1.in
index ebf50ab63d1e4cfc5202a0c970852179fc996b72..3f16d89defe88c407fa26063671adbd737f49c0e 100644 (file)
--- a/tcpdump.1.in
+++ b/tcpdump.1.in
@@ -27,7 +27,7 @@ tcpdump \- dump traffic on a network
 .na
 .B tcpdump
 [
-.B \-AbdDefhHIJKlLnNOpqRStuUvxX#
+.B \-AbdDefhHIJKlLnNOpqStuUvxX#
 ] [
 .B \-B
 .I buffer_size
@@ -593,12 +593,6 @@ Quick (quiet?) output.
 Print less protocol information so output
 lines are shorter.
 .TP
-.B \-R
-Assume ESP/AH packets to be based on old specification (RFC1825 to RFC1829).
-If specified, \fItcpdump\fP will not print replay prevention field.
-Since there is no protocol version field in ESP/AH specification,
-\fItcpdump\fP cannot deduce the version of ESP/AH protocol.
-.TP
 .BI \-r " file"
 Read packets from \fIfile\fR (which was created with the
 .B \-w

diff --git a/tcpdump.c b/tcpdump.c
index 28ad53f8291fd6e3b55351e0b25622e51ee87a63..063ac7b40839ffa8535d3f030109b146f0ba0dda 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -403,7 +403,7 @@ show_devices_and_exit (void)
 #define Q_FLAG
 #endif
 
-#define SHORTOPTS "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:Rs:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:#"
+#define SHORTOPTS "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:s:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:#"
 
 /*
  * Long options.
@@ -745,7 +745,6 @@ main(int argc, char **argv)
 #endif /* _WIN32 */
 
        memset(ndo, 0, sizeof(*ndo));
-       ndo->ndo_Rflag=1;
        ndo->ndo_dlt=-1;
        ndo_set_function_pointers(ndo);
        ndo->ndo_snaplen = DEFAULT_SNAPLEN;
@@ -1013,10 +1012,6 @@ main(int argc, char **argv)
                        RFileName = optarg;
                        break;
 
-               case 'R':
-                       ndo->ndo_Rflag = 0;
-                       break;
-
                case 's':
                        ndo->ndo_snaplen = strtol(optarg, &end, 0);
                        if (optarg == end || *end != '\0'
@@ -2269,7 +2264,7 @@ print_usage(void)
 {
        print_version();
        (void)fprintf(stderr,
-"Usage: %s [-aAbd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqRStu" U_FLAG "vxX#]" B_FLAG_USAGE " [ -c count ]\n", program_name);
+"Usage: %s [-aAbd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqStu" U_FLAG "vxX#]" B_FLAG_USAGE " [ -c count ]\n", program_name);
        (void)fprintf(stderr,
 "\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");
        (void)fprintf(stderr,