Make the default snapshot length the maximum; add a #define for the

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 31f24e8a60265b75726e207d84b58040aa7fbd5e..0caff42843235d5aeaa4821fd99ad91edc7568a9 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -21,6 +21,10 @@
  * Format and print trivial file transfer protocol packets.
  */
 
  * Format and print trivial file transfer protocol packets.
  */
 

+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.39 2008-04-11 16:47:38 gianluca Exp $ (LBL)";
+#endif

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"


@@ -31,7 +35,6 @@
 #ifdef SEGSIZE
 #undef SEGSIZE                                 /* SINIX sucks */
 #endif
 #ifdef SEGSIZE
 #undef SEGSIZE                                 /* SINIX sucks */
 #endif

-#include <arpa/tftp.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -39,18 +42,16 @@
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"

+#include "tftp.h"

 
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.36 2003-11-15 00:39:42 guy Exp $ (LBL)";
-#endif

 /* op code to string mapping */
 static struct tok op2str[] = {
        { RRQ,          "RRQ" },        /* read request */
        { WRQ,          "WRQ" },        /* write request */
        { DATA,         "DATA" },       /* data packet */
        { ACK,          "ACK" },        /* acknowledgement */
 /* op code to string mapping */
 static struct tok op2str[] = {
        { RRQ,          "RRQ" },        /* read request */
        { WRQ,          "WRQ" },        /* write request */
        { DATA,         "DATA" },       /* data packet */
        { ACK,          "ACK" },        /* acknowledgement */

-       { ERROR,        "ERROR" },      /* error code */
+       { TFTP_ERROR,   "ERROR" },      /* error code */
+       { OACK,         "OACK" },       /* option acknowledgement */

        { 0,            NULL }
 };
 
        { 0,            NULL }
 };
 


@@ -97,6 +98,7 @@ tftp_print(register const u_char *bp, u_int length)
 
        case RRQ:
        case WRQ:
 
        case RRQ:
        case WRQ:

+       case OACK:

                /*
                 * XXX Not all arpa/tftp.h's specify th_stuff as any
                 * array; use address of th_block instead
                /*
                 * XXX Not all arpa/tftp.h's specify th_stuff as any
                 * array; use address of th_block instead


@@ -106,11 +108,15 @@ tftp_print(register const u_char *bp, u_int length)
 #else
                p = (u_char *)&tp->th_block;
 #endif
 #else
                p = (u_char *)&tp->th_block;
 #endif

-               fputs(" \"", stdout);
+               putchar(' ');
+               /* Print filename or first option */
+               if (opcode != OACK)
+                       putchar('"');

                i = fn_print(p, snapend);
                i = fn_print(p, snapend);

-               putchar('"');
+               if (opcode != OACK)
+                       putchar('"');

 
 

-               /* Print the mode and any options */
+               /* Print the mode (RRQ and WRQ only) and any options */

                while ((p = (const u_char *)strchr((const char *)p, '\0')) != NULL) {
                        if (length <= (u_int)(p - (const u_char *)&tp->th_block))
                                break;
                while ((p = (const u_char *)strchr((const char *)p, '\0')) != NULL) {
                        if (length <= (u_int)(p - (const u_char *)&tp->th_block))
                                break;


@@ -131,10 +137,10 @@ tftp_print(register const u_char *bp, u_int length)
                printf(" block %d", EXTRACT_16BITS(&tp->th_block));
                break;
 
                printf(" block %d", EXTRACT_16BITS(&tp->th_block));
                break;
 

-       case ERROR:
+       case TFTP_ERROR:

                /* Print error code string */
                TCHECK(tp->th_code);
                /* Print error code string */
                TCHECK(tp->th_code);

-               printf(" %s ", tok2str(err2str, "tftp-err-#%d \"",
+               printf(" %s \"", tok2str(err2str, "tftp-err-#%d \"",

                                       EXTRACT_16BITS(&tp->th_code)));
                /* Print error message string */
                i = fn_print((const u_char *)tp->th_data, snapend);
                                       EXTRACT_16BITS(&tp->th_code)));
                /* Print error message string */
                i = fn_print((const u_char *)tp->th_data, snapend);