X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c1b92ea1d4f508c72b1ffe8e08eb766ac39c7018..480af1cdceda69d49bbc8e6a9d88db8eb9dfae79:/print-ldp.c diff --git a/print-ldp.c b/print-ldp.c index 1e1f1b67..351c1f81 100644 --- a/print-ldp.c +++ b/print-ldp.c @@ -29,7 +29,6 @@ #include "l2vpn.h" #include "af.h" -static const char tstr[] = " [|ldp]"; /* * ldp common header @@ -443,7 +442,7 @@ ldp_tlv_print(netdissect_options *ndo, case LDP_FEC_MARTINI_IFPARM_DESC: ND_PRINT(": "); for (idx = 2; idx < vc_info_tlv_len; idx++) - safeputchar(ndo, EXTRACT_U_1(tptr + idx)); + fn_print_char(ndo, EXTRACT_U_1(tptr + idx)); break; case LDP_FEC_MARTINI_IFPARM_VCCV: @@ -536,7 +535,7 @@ ldp_tlv_print(netdissect_options *ndo, return(tlv_len+4); /* Type & Length fields not included */ trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return 0; badtlv: @@ -549,6 +548,8 @@ ldp_print(netdissect_options *ndo, const u_char *pptr, u_int len) { int processed; + + ndo->ndo_protocol = "ldp"; while (len > (sizeof(struct ldp_common_header) + sizeof(struct ldp_msg_header))) { processed = ldp_pdu_print(ndo, pptr); if (processed == 0) @@ -688,13 +689,6 @@ ldp_pdu_print(netdissect_options *ndo, } return pdu_len+4; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return 0; } - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */