provide multiline output for PIM Joins/Grafts/Graft-Acks

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 17b34b57a4811c652302f84308b0e1956dc7eb00..3ab61bc65ad80cfe57a08fadc8eeee6fb8cae255 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -22,30 +22,27 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.31 1999-11-21 09:37:03 fenner Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.37 2003-11-16 09:36:40 guy Exp $ (LBL)";

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

-#include <sys/param.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

 
 #ifdef SEGSIZE
 #undef SEGSIZE                                 /* SINIX sucks */
 #endif
 #include <arpa/tftp.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 <stdio.h>
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"

 
 /* op code to string mapping */
 static struct tok op2str[] = {
 
 /* op code to string mapping */
 static struct tok op2str[] = {


@@ -89,7 +86,7 @@ tftp_print(register const u_char *bp, u_int length)
 
        /* Print tftp request type */
        TCHECK(tp->th_opcode);
 
        /* 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 */
        cp = tok2str(op2str, "tftp-#%d", opcode);
        printf(" %s", cp);
        /* Bail if bogus opcode */


@@ -112,6 +109,18 @@ tftp_print(register const u_char *bp, u_int length)
                fputs(" \"", stdout);
                i = fn_print(p, snapend);
                putchar('"');
                fputs(" \"", stdout);
                i = fn_print(p, snapend);
                putchar('"');

+
+               /* Print the mode 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;
                if (i)
                        goto trunc;
                break;


@@ -119,14 +128,14 @@ tftp_print(register const u_char *bp, u_int length)
        case ACK:
        case DATA:
                TCHECK(tp->th_block);
        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:
                /* Print error code string */
                TCHECK(tp->th_code);
                printf(" %s ", tok2str(err2str, "tftp-err-#%d \"",
                break;
 
        case ERROR:
                /* Print error code string */
                TCHECK(tp->th_code);
                printf(" %s ", tok2str(err2str, "tftp-err-#%d \"",

-                                      ntohs(tp->th_code)));
+                                      EXTRACT_16BITS(&tp->th_code)));

                /* Print error message string */
                i = fn_print((const u_char *)tp->th_data, snapend);
                putchar('"');
                /* Print error message string */
                i = fn_print((const u_char *)tp->th_data, snapend);
                putchar('"');