Updated 802.15.4 code

[tcpdump] / print-loopback.c

diff --git a/print-loopback.c b/print-loopback.c
index e0c6efbdfc295a100aa75d0d836b4f0a256b0cf7..ea7d728023ff60e919f950f203e860286eb1e7d4 100644 (file)
--- 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
@@ -56,7 +55,7 @@ static const struct tok fcode_str[] = {
 static void
 loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 {
-       const u_char *ep = cp + len;
+       const u_char *ep = ndo->ndo_snapend;
        uint16_t function;
 
        if (len < 2)
@@ -97,19 +96,20 @@ 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
 loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 {
-       const u_char *ep = cp + len;
+       const u_char *ep = ndo->ndo_snapend;
        uint16_t skipCount;
 
+       ndo->ndo_protocol = "loopback";
        ND_PRINT("Loopback");
        if (len < 2)
                goto invalid;
@@ -126,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);
 }