Use more the EXTRACT_U_1() macro to fetch a one-byte value (25/n)

[tcpdump] / print-loopback.c

diff --git a/print-loopback.c b/print-loopback.c
index 1708033a211b1c53b3d4f7fd1dcb3619175e2859..ac7b17795986e9297fc8109800d4ac9d7a3dc58a 100644 (file)
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -1,9 +1,4 @@
 /*
 /*

- * This module implements decoding of the the Loopback Protocol, originally
- * defined as the Configuration Testing Protocol. It is based on the following
- * specification:
- * http://www.mit.edu/people/jhawk/ctp.pdf
- *

  * Copyright (c) 2014 The TCPDUMP project
  * All rights reserved.
  *
  * Copyright (c) 2014 The TCPDUMP project
  * All rights reserved.
  *


@@ -30,11 +25,18 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

+/* \summary: Loopback Protocol printer */
+
+/*
+ * originally defined as the Ethernet Configuration Testing Protocol.
+ * specification: http://www.mit.edu/people/jhawk/ctp.pdf
+ */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"


@@ -42,7 +44,6 @@
 #include "addrtoname.h"
 
 static const char tstr[] = " [|loopback]";
 #include "addrtoname.h"
 
 static const char tstr[] = " [|loopback]";

-static const char cstr[] = " (corrupt)";

 
 #define LOOPBACK_REPLY   1
 #define LOOPBACK_FWDDATA 2
 
 #define LOOPBACK_REPLY   1
 #define LOOPBACK_FWDDATA 2


@@ -60,20 +61,20 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
        uint16_t function;
 
        if (len < 2)
        uint16_t function;
 
        if (len < 2)

-               goto corrupt;
+               goto invalid;

        /* function */
        ND_TCHECK2(*cp, 2);
        /* function */
        ND_TCHECK2(*cp, 2);

-       function = EXTRACT_LE_16BITS(cp);
+       function = EXTRACT_LE_U_2(cp);

        cp += 2;
        ND_PRINT((ndo, ", %s", tok2str(fcode_str, " invalid (%u)", function)));
 
        switch (function) {
                case LOOPBACK_REPLY:
                        if (len < 4)
        cp += 2;
        ND_PRINT((ndo, ", %s", tok2str(fcode_str, " invalid (%u)", function)));
 
        switch (function) {
                case LOOPBACK_REPLY:
                        if (len < 4)

-                               goto corrupt;
+                               goto invalid;

                        /* receipt number */
                        ND_TCHECK2(*cp, 2);
                        /* receipt number */
                        ND_TCHECK2(*cp, 2);

-                       ND_PRINT((ndo, ", receipt number %u", EXTRACT_LE_16BITS(cp)));
+                       ND_PRINT((ndo, ", receipt number %u", EXTRACT_LE_U_2(cp)));

                        cp += 2;
                        /* data */
                        ND_PRINT((ndo, ", data (%u octets)", len - 4));
                        cp += 2;
                        /* data */
                        ND_PRINT((ndo, ", data (%u octets)", len - 4));


@@ -81,10 +82,10 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
                        break;
                case LOOPBACK_FWDDATA:
                        if (len < 8)
                        break;
                case LOOPBACK_FWDDATA:
                        if (len < 8)

-                               goto corrupt;
+                               goto invalid;

                        /* forwarding address */
                        ND_TCHECK2(*cp, ETHER_ADDR_LEN);
                        /* forwarding address */
                        ND_TCHECK2(*cp, ETHER_ADDR_LEN);

-                       ND_PRINT((ndo, ", forwarding address %s", etheraddr_string(cp)));
+                       ND_PRINT((ndo, ", forwarding address %s", etheraddr_string(ndo, cp)));

                        cp += ETHER_ADDR_LEN;
                        /* data */
                        ND_PRINT((ndo, ", data (%u octets)", len - 8));
                        cp += ETHER_ADDR_LEN;
                        /* data */
                        ND_PRINT((ndo, ", data (%u octets)", len - 8));


@@ -96,8 +97,8 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
        }
        return;
 
        }
        return;
 

-corrupt:
-       ND_PRINT((ndo, "%s", cstr));
+invalid:
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc:
        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc:


@@ -112,21 +113,21 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 
        ND_PRINT((ndo, "Loopback"));
        if (len < 2)
 
        ND_PRINT((ndo, "Loopback"));
        if (len < 2)

-               goto corrupt;
+               goto invalid;

        /* skipCount */
        ND_TCHECK2(*cp, 2);
        /* skipCount */
        ND_TCHECK2(*cp, 2);

-       skipCount = EXTRACT_LE_16BITS(cp);
+       skipCount = EXTRACT_LE_U_2(cp);

        cp += 2;
        ND_PRINT((ndo, ", skipCount %u", skipCount));
        if (skipCount % 8)
                ND_PRINT((ndo, " (bogus)"));
        if (skipCount > len - 2)
        cp += 2;
        ND_PRINT((ndo, ", skipCount %u", skipCount));
        if (skipCount % 8)
                ND_PRINT((ndo, " (bogus)"));
        if (skipCount > len - 2)

-               goto corrupt;
+               goto invalid;

        loopback_message_print(ndo, cp + skipCount, len - 2 - skipCount);
        return;
 
        loopback_message_print(ndo, cp + skipCount, len - 2 - skipCount);
        return;
 

-corrupt:
-       ND_PRINT((ndo, "%s", cstr));
+invalid:
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc:
        ND_TCHECK2(*cp, ep - cp);
        return;
 trunc: