TFTP: Print protocol name and length keyword

Update the output of a test accordingly.

diff --git a/print-tftp.c b/print-tftp.c
index 2630e554caea64c8a0dc283bcca31a01c0230ce8..2d765822d70183dca543e3e6affa38b6c8163141 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -95,8 +95,11 @@ tftp_print(netdissect_options *ndo,
        u_int ui;
 
        ndo->ndo_protocol = "tftp";
+
+       /* Print protocol */
+       ND_PRINT("TFTP");
        /* Print length */
-       ND_PRINT(" %u", length);
+       ND_PRINT(", length %u", length);
 
        /* Print tftp request type */
        if (length < 2)
@@ -104,7 +107,7 @@ tftp_print(netdissect_options *ndo,
        ND_TCHECK_2(bp);
        opcode = EXTRACT_BE_U_2(bp);
        cp = tok2str(op2str, "tftp-#%u", opcode);
-       ND_PRINT(" %s", cp);
+       ND_PRINT(", %s", cp);
        /* Bail if bogus opcode */
        if (*cp == 't')
                return;

diff --git a/tests/tftp-heapoverflow.out b/tests/tftp-heapoverflow.out
index 07ec1c495ac805db9034e753e51169bf55364801..e0b78b47f75d0412ddef2b6b3ebf50e364c76960 100644 (file)
--- a/tests/tftp-heapoverflow.out
+++ b/tests/tftp-heapoverflow.out
@@ -1,2 +1,2 @@
     1  01:10:59.680304 IP (tos 0x30, ttl 48, id 12336, offset 0, flags [DF], proto UDP (17), length 12336, bad cksum 3030 (->299d)!)
-    48.48.48.48.69 > 48.48.48.48.12336:  12308 RRQ "00" [|tftp]
+    48.48.48.48.69 > 48.48.48.48.12336: TFTP, length 12308, RRQ "00" [|tftp]