Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 6baf82efc9a372c5de1f36517461e7480b31d74f..84cde3969d08bfd8f898da610f0606cf6fc4ad07 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.38 2007-09-14 01:02:07 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.39 2008-04-11 16:47:38 gianluca Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -50,7 +50,7 @@ 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 }
 };
@@ -99,15 +99,7 @@ tftp_print(register const u_char *bp, u_int length)
        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
-                */
-#ifdef notdef
                p = (u_char *)tp->th_stuff;
-#else
-               p = (u_char *)&tp->th_block;
-#endif
                putchar(' ');
                /* Print filename or first option */
                if (opcode != OACK)
@@ -137,7 +129,7 @@ tftp_print(register const u_char *bp, u_int length)
                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 \"",