Address Michael's comments.

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index d0554b0ccf1fa0f16178012aad8866b052353038..84cde3969d08bfd8f898da610f0606cf6fc4ad07 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -22,26 +22,27 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.30 1999-10-07 23:47:12 mcr Exp $ (LBL)";
+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
 
-#include <sys/param.h>
-#include <sys/time.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>
 
 #ifdef SEGSIZE
 #undef SEGSIZE                                 /* SINIX sucks */
 #endif
-#include <arpa/tftp.h>
 
-#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"
+#include "extract.h"
+#include "tftp.h"
 
 /* op code to string mapping */
 static struct tok op2str[] = {
@@ -49,7 +50,8 @@ static struct tok op2str[] = {
        { 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 }
 };
 
@@ -85,7 +87,7 @@ tftp_print(register const u_char *bp, u_int length)
 
        /* Print tftp request type */
        TCHECK(tp->th_opcode);
-       opcode = ntohs(tp->th_opcode);
+       opcode = EXTRACT_16BITS(&tp->th_opcode);
        cp = tok2str(op2str, "tftp-#%d", opcode);
        printf(" %s", cp);
        /* Bail if bogus opcode */
@@ -96,18 +98,27 @@ tftp_print(register const u_char *bp, u_int length)
 
        case RRQ:
        case WRQ:
-               /*
-                * XXX Not all arpa/tftp.h's specify th_stuff as any
-                * array; use address of th_block instead
-                */
-#ifdef notdef
+       case OACK:
                p = (u_char *)tp->th_stuff;
-#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);
-               putchar('"');
+               if (opcode != OACK)
+                       putchar('"');
+
+               /* 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;
+                       p++;
+                       if (*p != '\0') {
+                               putchar(' ');
+                               fn_print(p, snapend);
+                       }
+               }
+               
                if (i)
                        goto trunc;
                break;
@@ -115,14 +126,14 @@ tftp_print(register const u_char *bp, u_int length)
        case ACK:
        case DATA:
                TCHECK(tp->th_block);
-               printf(" block %d", ntohs(tp->th_block));
+               printf(" block %d", EXTRACT_16BITS(&tp->th_block));
                break;
 
-       case ERROR:
+       case TFTP_ERROR:
                /* Print error code string */
                TCHECK(tp->th_code);
-               printf(" %s ", tok2str(err2str, "tftp-err-#%d \"",
-                                      ntohs(tp->th_code)));
+               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);
                putchar('"');