From 40ae3ad744d9f71079b410a810acbc33ef39f8ba Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Thu, 10 May 2018 18:05:56 +0200 Subject: Add more nd_print_trunc() calls Update the output of some tests accordingly. Moreover: Add a ndo_protocol field assignment. --- print-llc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'print-llc.c') diff --git a/print-llc.c b/print-llc.c index 95668f92..e7c50196 100644 --- a/print-llc.c +++ b/print-llc.c @@ -157,12 +157,12 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen, ndo->ndo_protocol = "llc"; if (caplen < 3) { - ND_PRINT("[|llc]"); + nd_print_trunc(ndo); ND_DEFAULTPRINT((const u_char *)p, caplen); return (caplen); } if (length < 3) { - ND_PRINT("[|llc]"); + nd_print_trunc(ndo); ND_DEFAULTPRINT((const u_char *)p, caplen); return (length); } @@ -189,12 +189,12 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen, * 2 bytes... */ if (caplen < 4) { - ND_PRINT("[|llc]"); + nd_print_trunc(ndo); ND_DEFAULTPRINT((const u_char *)p, caplen); return (caplen); } if (length < 4) { - ND_PRINT("[|llc]"); + nd_print_trunc(ndo); ND_DEFAULTPRINT((const u_char *)p, caplen); return (length); } @@ -368,14 +368,14 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen, return (hdrlen); } if (caplen < 1) { - ND_PRINT("[|llc]"); + nd_print_trunc(ndo); if (caplen > 0) ND_DEFAULTPRINT((const u_char *)p, caplen); return (hdrlen); } if (EXTRACT_U_1(p) == LLC_XID_FI) { if (caplen < 3 || length < 3) { - ND_PRINT("[|llc]"); + nd_print_trunc(ndo); if (caplen > 0) ND_DEFAULTPRINT((const u_char *)p, caplen); } else @@ -605,6 +605,6 @@ snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen, return (0); trunc: - ND_PRINT("[|snap]"); + nd_print_trunc(ndo); return (1); } -- cgit v1.2.1