Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index d0554b0ccf1fa0f16178012aad8866b052353038..39fc6964b8a26eac38b2a155ce892d0127a0de25 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -17,44 +17,59 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

- *
- * Format and print trivial file transfer protocol packets.

  */
 
  */
 

-#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)";
+/* \summary: Trivial File Transfer Protocol (TFTP) printer */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>

 #endif
 
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
+#include "netdissect-stdinc.h"

 
 

-#include <netinet/in.h>
+#include "netdissect.h"
+#include "extract.h"

 
 

-#ifdef SEGSIZE
-#undef SEGSIZE                                 /* SINIX sucks */
-#endif
-#include <arpa/tftp.h>
+/*
+ * Trivial File Transfer Protocol (IEN-133)
+ */
+
+/*
+ * Packet types.
+ */
+#define        RRQ     01                      /* read request */
+#define        WRQ     02                      /* write request */
+#define        DATA    03                      /* data packet */
+#define        ACK     04                      /* acknowledgement */
+#define        TFTP_ERROR      05                      /* error code */
+#define OACK   06                      /* option acknowledgement */

 
 

-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
+/*
+ * Error codes.
+ */
+#define        EUNDEF          0               /* not defined */
+#define        ENOTFOUND       1               /* file not found */
+#define        EACCESS         2               /* access violation */
+#define        ENOSPACE        3               /* disk full or allocation exceeded */
+#define        EBADOP          4               /* illegal TFTP operation */
+#define        EBADID          5               /* unknown transfer ID */
+#define        EEXISTS         6               /* file already exists */
+#define        ENOUSER         7               /* no such user */

 
 

-#include "interface.h"
-#include "addrtoname.h"

 
 /* op code to string mapping */
 
 /* op code to string mapping */

-static struct tok op2str[] = {
+static const struct tok op2str[] = {

        { RRQ,          "RRQ" },        /* read request */
        { WRQ,          "WRQ" },        /* write request */
        { DATA,         "DATA" },       /* data packet */
        { ACK,          "ACK" },        /* acknowledgement */
        { 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 }
 };
 
 /* error code to string mapping */
        { 0,            NULL }
 };
 
 /* error code to string mapping */

-static struct tok err2str[] = {
+static const struct tok err2str[] = {

        { EUNDEF,       "EUNDEF" },     /* not defined */
        { ENOTFOUND,    "ENOTFOUND" },  /* file not found */
        { EACCESS,      "EACCESS" },    /* access violation */
        { EUNDEF,       "EUNDEF" },     /* not defined */
        { ENOTFOUND,    "ENOTFOUND" },  /* file not found */
        { EACCESS,      "EACCESS" },    /* access violation */


@@ -70,73 +85,114 @@ static struct tok err2str[] = {
  * Print trivial file transfer program requests
  */
 void
  * Print trivial file transfer program requests
  */
 void

-tftp_print(register const u_char *bp, u_int length)
+tftp_print(netdissect_options *ndo,
+           const u_char *bp, u_int length)

 {
 {

-       register const struct tftphdr *tp;
-       register const char *cp;
-       register const u_char *p;
-       register int opcode, i;
-       static char tstr[] = " [|tftp]";
+       const char *cp;
+       u_int opcode;
+       u_int ui;

 
 

-       tp = (const struct tftphdr *)bp;
+       ndo->ndo_protocol = "tftp";

 
 

+       /* Print protocol */
+       nd_print_protocol_caps(ndo);

        /* Print length */
        /* Print length */

-       printf(" %d", length);
+       ND_PRINT(", length %u", length);

 
        /* Print tftp request type */
 
        /* Print tftp request type */

-       TCHECK(tp->th_opcode);
-       opcode = ntohs(tp->th_opcode);
-       cp = tok2str(op2str, "tftp-#%d", opcode);
-       printf(" %s", cp);
+       if (length < 2)
+               goto trunc;
+       opcode = GET_BE_U_2(bp);
+       cp = tok2str(op2str, "tftp-#%u", opcode);
+       ND_PRINT(", %s", cp);

        /* Bail if bogus opcode */
        if (*cp == 't')
                return;
        /* Bail if bogus opcode */
        if (*cp == 't')
                return;

+       bp += 2;
+       length -= 2;

 
        switch (opcode) {
 
        case RRQ:
        case WRQ:
 
        switch (opcode) {
 
        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
-               p = (u_char *)tp->th_stuff;
-#else
-               p = (u_char *)&tp->th_block;
-#endif
-               fputs(" \"", stdout);
-               i = fn_print(p, snapend);
-               putchar('"');
-               if (i)
+               if (length == 0)
+                       goto trunc;
+               ND_PRINT(" ");
+               /* Print filename */
+               ND_PRINT("\"");
+               ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
+               ND_PRINT("\"");
+               if (ui == 0)

                        goto trunc;
                        goto trunc;

+               bp += ui;
+               length -= ui;
+
+               /* Print the mode - RRQ and WRQ only */
+               if (length == 0)
+                       goto trunc;     /* no mode */
+               ND_PRINT(" ");
+               ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
+               if (ui == 0)
+                       goto trunc;
+               bp += ui;
+               length -= ui;
+
+               /* Print options, if any */
+               while (length != 0) {
+                       if (GET_U_1(bp) != '\0')
+                               ND_PRINT(" ");
+                       ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
+                       if (ui == 0)
+                               goto trunc;
+                       bp += ui;
+                       length -= ui;
+               }
+               break;
+
+       case OACK:
+               /* Print options */
+               while (length != 0) {
+                       if (GET_U_1(bp) != '\0')
+                               ND_PRINT(" ");
+                       ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
+                       if (ui == 0)
+                               goto trunc;
+                       bp += ui;
+                       length -= ui;
+               }

                break;
 
        case ACK:
        case DATA:
                break;
 
        case ACK:
        case DATA:

-               TCHECK(tp->th_block);
-               printf(" block %d", ntohs(tp->th_block));
+               if (length < 2)
+                       goto trunc;     /* no block number */
+               ND_PRINT(" block %u", GET_BE_U_2(bp));

                break;
 
                break;
 

-       case ERROR:
+       case TFTP_ERROR:

                /* Print error code string */
                /* Print error code string */

-               TCHECK(tp->th_code);
-               printf(" %s ", tok2str(err2str, "tftp-err-#%d \"",
-                                      ntohs(tp->th_code)));
+               if (length < 2)
+                       goto trunc;     /* no error code */
+               ND_PRINT(" %s", tok2str(err2str, "tftp-err-#%u \"",
+                                      GET_BE_U_2(bp)));
+               bp += 2;
+               length -= 2;

                /* Print error message string */
                /* Print error message string */

-               i = fn_print((const u_char *)tp->th_data, snapend);
-               putchar('"');
-               if (i)
+               if (length == 0)
+                       goto trunc;     /* no error message */
+               ND_PRINT(" \"");
+               ui = nd_printztn(ndo, bp, length, ndo->ndo_snapend);
+               ND_PRINT("\"");
+               if (ui == 0)

                        goto trunc;
                break;
 
        default:
                /* We shouldn't get here */
                        goto trunc;
                break;
 
        default:
                /* We shouldn't get here */

-               printf("(unknown #%d)", opcode);
+               ND_PRINT("(unknown #%u)", opcode);

                break;
        }
        return;
 trunc:
                break;
        }
        return;
 trunc:

-       fputs(tstr, stdout);
-       return;
+       nd_print_trunc(ndo);

 }
 }