NTP: Use tstr for truncation indicator.

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index a7c8da5f0aeb3f1bbda4ee2afea4a2b0a121c356..69bc601fdda4ed8be3ac4f5e2bb9e24098be8ce8 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -17,36 +17,24 @@
  * 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.39 2008-04-11 16:47:38 gianluca Exp $ (LBL)";
-#endif
+/* \summary: Trivial File Transfer Protocol (TFTP) printer */

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

-#include <tcpdump-stdinc.h>
-
-#ifdef SEGSIZE
-#undef SEGSIZE                                 /* SINIX sucks */
-#endif
+#include <netdissect-stdinc.h>

 
 

-#include <stdio.h>

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

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

 #include "extract.h"
 
 /*
  * Trivial File Transfer Protocol (IEN-133)
  */
 #include "extract.h"
 
 /*
  * Trivial File Transfer Protocol (IEN-133)
  */

-#define        SEGSIZE         512             /* data segment size */

 
 /*
  * Packet types.
 
 /*
  * Packet types.


@@ -115,23 +103,28 @@ static const 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,
+           register const u_char *bp, u_int length)

 {
        register const struct tftphdr *tp;
        register const char *cp;
        register const u_char *p;
 {
        register const struct tftphdr *tp;
        register const char *cp;
        register const u_char *p;

-       register int opcode, i;
+       register int opcode;
+       u_int ui;

 
        tp = (const struct tftphdr *)bp;
 
        /* Print length */
 
        tp = (const struct tftphdr *)bp;
 
        /* Print length */

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

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

-       TCHECK(tp->th_opcode);
+       if (length < 2)
+               goto trunc;
+       ND_TCHECK(tp->th_opcode);

        opcode = EXTRACT_16BITS(&tp->th_opcode);
        cp = tok2str(op2str, "tftp-#%d", opcode);
        opcode = EXTRACT_16BITS(&tp->th_opcode);
        cp = tok2str(op2str, "tftp-#%d", opcode);

-       printf(" %s", cp);
+       length -= 2;
+       ND_PRINT((ndo, " %s", cp));

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


@@ -140,56 +133,90 @@ tftp_print(register const u_char *bp, u_int length)
 
        case RRQ:
        case WRQ:
 
        case RRQ:
        case WRQ:

+               p = (const u_char *)tp->th_stuff;
+               if (length == 0)
+                       goto trunc;
+               ND_PRINT((ndo, " "));
+               /* Print filename */
+               ND_PRINT((ndo, "\""));
+               ui = fn_printztn(ndo, p, length, ndo->ndo_snapend);
+               ND_PRINT((ndo, "\""));
+               if (ui == 0)
+                       goto trunc;
+               p += ui;
+               length -= ui;
+
+               /* Print the mode - RRQ and WRQ only */
+               if (length == 0)
+                       goto trunc;     /* no mode */
+               ND_PRINT((ndo, " "));
+               ui = fn_printztn(ndo, p, length, ndo->ndo_snapend);
+               if (ui == 0)
+                       goto trunc;
+               p += ui;
+               length -= ui;
+
+               /* Print options, if any */
+               while (length != 0) {
+                       ND_TCHECK(*p);
+                       if (*p != '\0')
+                               ND_PRINT((ndo, " "));
+                       ui = fn_printztn(ndo, p, length, ndo->ndo_snapend);
+                       if (ui == 0)
+                               goto trunc;
+                       p += ui;
+                       length -= ui;
+               }
+               break;
+

        case OACK:
        case OACK:

-               p = (u_char *)tp->th_stuff;
-               putchar(' ');
-               /* Print filename or first option */
-               if (opcode != OACK)
-                       putchar('"');
-               i = fn_print(p, snapend);
-               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);
-                       }
+               p = (const u_char *)tp->th_stuff;
+               /* Print options */
+               while (length != 0) {
+                       ND_TCHECK(*p);
+                       if (*p != '\0')
+                               ND_PRINT((ndo, " "));
+                       ui = fn_printztn(ndo, p, length, ndo->ndo_snapend);
+                       if (ui == 0)
+                               goto trunc;
+                       p += ui;
+                       length -= ui;

                }
                }

-               
-               if (i)
-                       goto trunc;

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

-               TCHECK(tp->th_block);
-               printf(" block %d", EXTRACT_16BITS(&tp->th_block));
+               if (length < 2)
+                       goto trunc;     /* no block number */
+               ND_TCHECK(tp->th_block);
+               ND_PRINT((ndo, " block %d", EXTRACT_16BITS(&tp->th_block)));

                break;
 
        case TFTP_ERROR:
                /* Print error code string */
                break;
 
        case TFTP_ERROR:
                /* Print error code string */

-               TCHECK(tp->th_code);
-               printf(" %s \"", tok2str(err2str, "tftp-err-#%d \"",
-                                      EXTRACT_16BITS(&tp->th_code)));
+               if (length < 2)
+                       goto trunc;     /* no error code */
+               ND_TCHECK(tp->th_code);
+               ND_PRINT((ndo, " %s", tok2str(err2str, "tftp-err-#%d \"",
+                                      EXTRACT_16BITS(&tp->th_code))));
+               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((ndo, " \""));
+               ui = fn_printztn(ndo, (const u_char *)tp->th_data, length, ndo->ndo_snapend);
+               ND_PRINT((ndo, "\""));
+               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((ndo, "(unknown #%d)", opcode));

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

-       fputs(tstr, stdout);
+       ND_PRINT((ndo, "%s", tstr));

        return;
 }
        return;
 }