Fix handling of IPv4 prefixes.

[tcpdump] / print-tftp.c

diff --git a/print-tftp.c b/print-tftp.c
index 5f47d4768915fdd56d1771049ba72ca2bfcd130f..5519c686a416daf3bbc94243443cd8f3f74b01d8 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -17,20 +17,19 @@
  * 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.

  */
 
  */
 

-#define NETDISSECT_REWORKED
+/* \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>
+#include <netdissect-stdinc.h>

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

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

 #include "extract.h"
 
 /*
 #include "extract.h"
 
 /*


@@ -131,12 +130,12 @@ tftp_print(netdissect_options *ndo,
        case RRQ:
        case WRQ:
        case OACK:
        case RRQ:
        case WRQ:
        case OACK:

-               p = (u_char *)tp->th_stuff;
+               p = (const u_char *)tp->th_stuff;

                ND_PRINT((ndo, " "));
                /* Print filename or first option */
                if (opcode != OACK)
                        ND_PRINT((ndo, "\""));
                ND_PRINT((ndo, " "));
                /* Print filename or first option */
                if (opcode != OACK)
                        ND_PRINT((ndo, "\""));

-               i = fn_print(p, ndo->ndo_snapend);
+               i = fn_print(ndo, p, ndo->ndo_snapend);

                if (opcode != OACK)
                        ND_PRINT((ndo, "\""));
 
                if (opcode != OACK)
                        ND_PRINT((ndo, "\""));
 


@@ -147,7 +146,7 @@ tftp_print(netdissect_options *ndo,
                        p++;
                        if (*p != '\0') {
                                ND_PRINT((ndo, " "));
                        p++;
                        if (*p != '\0') {
                                ND_PRINT((ndo, " "));

-                               fn_print(p, ndo->ndo_snapend);
+                               fn_print(ndo, p, ndo->ndo_snapend);

                        }
                }
 
                        }
                }
 


@@ -167,7 +166,7 @@ tftp_print(netdissect_options *ndo,
                ND_PRINT((ndo, " %s \"", tok2str(err2str, "tftp-err-#%d \"",
                                       EXTRACT_16BITS(&tp->th_code))));
                /* Print error message string */
                ND_PRINT((ndo, " %s \"", tok2str(err2str, "tftp-err-#%d \"",
                                       EXTRACT_16BITS(&tp->th_code))));
                /* Print error message string */

-               i = fn_print((const u_char *)tp->th_data, ndo->ndo_snapend);
+               i = fn_print(ndo, (const u_char *)tp->th_data, ndo->ndo_snapend);

                ND_PRINT((ndo, "\""));
                if (i)
                        goto trunc;
                ND_PRINT((ndo, "\""));
                if (i)
                        goto trunc;