Use nd_print_protocol_caps() to print the protocol name

diff --git a/print-ahcp.c b/print-ahcp.c
index 98150a6fbdba281a7f0e3123b0018adcffa70882..7a784bc2a70beabe6730fcc289240794c8e85c2b 100644 (file)
--- a/print-ahcp.c
+++ b/print-ahcp.c
@@ -352,7 +352,7 @@ ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len)
        uint8_t version;
 
        ndo->ndo_protocol = "ahcp";
-       ND_PRINT("AHCP");
+       nd_print_protocol_caps(ndo);
        if (len < 2)
                goto invalid;
        /* Magic */

diff --git a/print-dccp.c b/print-dccp.c
index ae25c00db32fb1046ce97829b62517e482eda9f7..b28db0aebab9a829b1f5ebbed3d3ac9c494aa314 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -327,7 +327,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                          ipaddr_string(ndo, ip->ip_dst), dport);
        }
 
-       ND_PRINT("DCCP");
+       nd_print_protocol_caps(ndo);
 
        if (ndo->ndo_qflag) {
                ND_PRINT(" %u", len - hlen);

diff --git a/print-mpls.c b/print-mpls.c
index bdc66c642360bc7710da437abd20a04f744509cc..62b79957281100a602cc2d0df0c338462b1cfdc1 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -66,7 +66,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
        ndo->ndo_protocol = "mpls";
        p = bp;
-       ND_PRINT("MPLS");
+       nd_print_protocol_caps(ndo);
        do {
                ND_TCHECK_LEN(p, sizeof(label_entry));
                if (length < sizeof(label_entry))

diff --git a/print-tftp.c b/print-tftp.c
index de9d4ebbca89188c021e25c19ae076b1578db92c..b6f9107e7c53c2348691ce71bb1883208915c36c 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -97,7 +97,7 @@ tftp_print(netdissect_options *ndo,
        ndo->ndo_protocol = "tftp";
 
        /* Print protocol */
-       ND_PRINT("TFTP");
+       nd_print_protocol_caps(ndo);
        /* Print length */
        ND_PRINT(", length %u", length);