Revert partially the commit 21b1273

[tcpdump] / print-loopback.c

diff --git a/print-loopback.c b/print-loopback.c
index e47e404d9e414474eb6800b527a9a734a5109f38..5b8f65a919a3e72f5d61120e37153632b613fdb8 100644 (file)
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -29,7 +29,7 @@
 
 /*
  * originally defined as the Ethernet Configuration Testing Protocol.
- * specification: http://www.mit.edu/people/jhawk/ctp.pdf
+ * specification: https://www.mit.edu/people/jhawk/ctp.pdf
  */
 
 #ifdef HAVE_CONFIG_H
@@ -61,8 +61,7 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
        if (len < 2)
                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));
 
@@ -71,8 +70,7 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
                        if (len < 4)
                                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);
@@ -82,8 +80,7 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
                        if (len < 8)
                                goto invalid;
                        /* forwarding address */
-                       ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
-                       ND_PRINT(", forwarding address %s", etheraddr_string(ndo, cp));
+                       ND_PRINT(", forwarding address %s", GET_ETHERADDR_STRING(cp));
                        cp += MAC_ADDR_LEN;
                        /* data */
                        ND_PRINT(", data (%u octets)", len - 8);
@@ -96,7 +93,7 @@ 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:
@@ -114,8 +111,7 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len)
        if (len < 2)
                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)
@@ -126,7 +122,7 @@ 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: