Switch debug (-d) flag to a verbose (-v) flag

diff --git a/README b/README
index f811a857b54fa4a7ba91ee53ea8358067109115b..b771de8ff2ebf58fe1c69ba4d08caffb048207b1 100644 (file)
--- a/README
+++ b/README
@@ -16,8 +16,8 @@ from http://www.tcptrace.org and the version of xplot available from http://www.
 
 
 Usage is pretty simple:
 
 
 Usage is pretty simple:

-dccp2tcp dccp_file tcp_file [-d] [-V] [h] [-y] [-g] [-s]
-       -d is debug
+dccp2tcp dccp_file tcp_file [-v] [-V] [h] [-y] [-g] [-s]
+       -v is verbose. Repeat for additional verbosity.

        -V is Version information
        -h is help
        -y shifts the window line in tcptrace (yellow) to the highest received acknowledgment. Normally this line is just a constant amount more than the ack number(i.e. useless).
        -V is Version information
        -h is help
        -y shifts the window line in tcptrace (yellow) to the highest received acknowledgment. Normally this line is just a constant amount more than the ack number(i.e. useless).

diff --git a/dccp2tcp.c b/dccp2tcp.c
index afe462f3ff7731cc47285ac1fbb40c6dc0438b24..caa7d6ae97d8c0df98995a47dcdd72de4bca99e2 100644 (file)
--- a/dccp2tcp.c
+++ b/dccp2tcp.c
@@ -90,23 +90,20 @@ int main(int argc, char *argv[])
                                }
                        }
                }else{
                                }
                        }
                }else{

-                       if(argv[i][1]=='d' && strlen(argv[i])==2){ /* -d */
+                       if(argv[i][1]=='v' && strlen(argv[i])==2){ /* -v */

                                debug++;
                                debug++;

-                       }
-                       if(argv[i][1]=='y' && strlen(argv[i])==2){ /* -y */
+                       }else if(argv[i][1]=='y' && strlen(argv[i])==2){ /* -y */

                                yellow=1;
                                yellow=1;

-                       }
-                       if(argv[i][1]=='g' && strlen(argv[i])==2){ /* -g */
+                       }else if(argv[i][1]=='g' && strlen(argv[i])==2){ /* -g */

                                green=1;
                                green=1;

-                       }
-                       if(argv[i][1]=='s' && strlen(argv[i])==2){ /* -s */
+                       }else if(argv[i][1]=='s' && strlen(argv[i])==2){ /* -s */

                                sack++;
                                sack++;

-                       }
-                       if(argv[i][1]=='h' && strlen(argv[i])==2){ /* -h */
+                       }else if(argv[i][1]=='h' && strlen(argv[i])==2){ /* -h */

                                usage();
                                usage();

-                       }
-                       if(argv[i][1]=='V' && strlen(argv[i])==2){ /* -V */
+                       }else if(argv[i][1]=='V' && strlen(argv[i])==2){ /* -V */

                                version();
                                version();

+                       }else{
+                               usage();

                        }
                }
        }
                        }
                }
        }


@@ -118,7 +115,6 @@ int main(int argc, char *argv[])
        /*all options validated*/
 
        if(debug){
        /*all options validated*/
 
        if(debug){

-               dbgprintf(1,"Debug On\n");

                if(green){
                        dbgprintf(1,"Tcptrace green line at highest acknowledgment\n");
                }else{
                if(green){
                        dbgprintf(1,"Tcptrace green line at highest acknowledgment\n");
                }else{


@@ -1229,8 +1225,8 @@ void version()
 /*Usage information for program*/
 void usage()
 {
 /*Usage information for program*/
 void usage()
 {

-       dbgprintf(0,"Usage: dccp2tcp [-d] [-h] [-V] [-y] [-g] [-s] dccp_file tcp_file\n");
-       dbgprintf(0, "          -d   Debug. May be repeated for aditional verbosity.\n");
+       dbgprintf(0,"Usage: dccp2tcp [-v] [-h] [-V] [-y] [-g] [-s] dccp_file tcp_file\n");
+       dbgprintf(0, "          -v   verbose. May be repeated for additional verbosity.\n");

        dbgprintf(0, "          -V   Version information\n");
        dbgprintf(0, "          -h   Help\n");
        dbgprintf(0, "          -y   Yellow line is highest ACK\n");
        dbgprintf(0, "          -V   Version information\n");
        dbgprintf(0, "          -h   Help\n");
        dbgprintf(0, "          -y   Yellow line is highest ACK\n");

diff --git a/dccp2tcp.pod b/dccp2tcp.pod
index 51a891cacb624e2a27fc268e3fb924795c7ff0b0..034c9396395fafa6a43ee2d8339d189bd545c48d 100644 (file)
--- a/dccp2tcp.pod
+++ b/dccp2tcp.pod
@@ -4,7 +4,7 @@ dccp2tcp - convert DCCP packet captures to TCP captures for analysis with B<tcpt
 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 

-B<dccp2tcp> [-d] [-V] [-h] [-y] [-g] [-s] I<input_file> I<output_file> 
+B<dccp2tcp> [-v] [-V] [-h] [-y] [-g] [-s] I<input_file> I<output_file> 

 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 


@@ -22,9 +22,9 @@ if you attempt to process a connection with short sequence numbers.
 
 =over 5
 
 
 =over 5
 

-=item B<-d>
+=item B<-v>

        
        

-Debug, repeat for additional verbosity
+Verbose, repeat for additional verbosity

 
 =item B<-V>
        
 
 =item B<-V>