X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/546558eabd81cfc36a81a4df728fdfea0d83b41a..ee68aa36460d7efeca48747f33b7f2adc0900bfb:/print-loopback.c diff --git a/print-loopback.c b/print-loopback.c index e0df6f26..a18bde2c 100644 --- a/print-loopback.c +++ b/print-loopback.c @@ -42,7 +42,6 @@ #include "extract.h" #include "addrtoname.h" -static const char tstr[] = " [|loopback]"; #define LOOPBACK_REPLY 1 #define LOOPBACK_FWDDATA 2 @@ -63,7 +62,7 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le goto invalid; /* function */ ND_TCHECK_2(cp); - function = EXTRACT_LE_U_2(cp); + function = GET_LE_U_2(cp); cp += 2; ND_PRINT(", %s", tok2str(fcode_str, " invalid (%u)", function)); @@ -73,7 +72,7 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le goto invalid; /* receipt number */ ND_TCHECK_2(cp); - ND_PRINT(", receipt number %u", EXTRACT_LE_U_2(cp)); + ND_PRINT(", receipt number %u", GET_LE_U_2(cp)); cp += 2; /* data */ ND_PRINT(", data (%u octets)", len - 4); @@ -97,11 +96,11 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le return; invalid: - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp, ep - cp); return; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); } void @@ -116,7 +115,7 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len) goto invalid; /* skipCount */ ND_TCHECK_2(cp); - skipCount = EXTRACT_LE_U_2(cp); + skipCount = GET_LE_U_2(cp); cp += 2; ND_PRINT(", skipCount %u", skipCount); if (skipCount % 8) @@ -127,10 +126,10 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len) return; invalid: - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp, ep - cp); return; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); }