ICMPv6: Add the IPv6-Only flag

[tcpdump] / print-medsa.c

diff --git a/print-medsa.c b/print-medsa.c
index 1e6fa92aed1762b82894aa0453e2ef38426f13e4..655cd01c084169e61750e1c19dc59cb9ab021a33 100644 (file)
--- a/print-medsa.c
+++ b/print-medsa.c
@@ -22,22 +22,21 @@
 /* \summary: Marvell Extended Distributed Switch Architecture (MEDSA) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "ethertype.h"
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = "[|MEDSA]";
 
 /*
  * Marvell Extended Distributed Switch Archiecture.
  *
- * A Marvell propriatary header used for passing packets to/from
+ * A Marvell proprietary header used for passing packets to/from
  * specific ports of a switch. There is no open specification of this
  * header, but is documented in the Marvell Switch data sheets. For
  * background, see:
@@ -69,8 +68,8 @@ struct        medsa_pkthdr {
 #define CODE_ARP_MIRROR        4
 #define CFI(medsa)     (EXTRACT_U_1(medsa->port_trunc_codehi_cfi) & 0x01)
 #define PRI(medsa)     (EXTRACT_U_1(medsa->pri_vidhi_codelo) >> 5)
-#define VID(medsa)     (((u_short)(EXTRACT_U_1(medsa->pri_vidhi_codelo) & 0xf) << 8 |  \
-                         EXTRACT_U_1(medsa->vidlo)))
+#define VID(medsa)     ((u_short)(EXTRACT_U_1(medsa->pri_vidhi_codelo) & 0xf) << 8 |   \
+                         EXTRACT_U_1(medsa->vidlo))
 
 static const struct tok tag_values[] = {
        { TAG_TO_CPU, "To_CPU" },
@@ -93,45 +92,45 @@ medsa_print_full(netdissect_options *ndo,
 {
        u_char tag = TAG(medsa);
 
-       ND_PRINT((ndo, "%s",
-                 tok2str(tag_values, "Unknown (%u)", tag)));
+       ND_PRINT("%s",
+                 tok2str(tag_values, "Unknown (%u)", tag));
 
        switch (tag) {
        case TAG_TO_CPU:
-               ND_PRINT((ndo, ", %stagged", SRC_TAG(medsa) ? "" : "un"));
-               ND_PRINT((ndo, ", dev.port:vlan %d.%d:%d",
-                         SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa)));
+               ND_PRINT(", %stagged", SRC_TAG(medsa) ? "" : "un");
+               ND_PRINT(", dev.port:vlan %u.%u:%u",
+                         SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
 
-               ND_PRINT((ndo, ", %s",
-                         tok2str(code_values, "Unknown (%u)", CODE(medsa))));
+               ND_PRINT(", %s",
+                         tok2str(code_values, "Unknown (%u)", CODE(medsa)));
                if (CFI(medsa))
-                       ND_PRINT((ndo, ", CFI"));
+                       ND_PRINT(", CFI");
 
-               ND_PRINT((ndo, ", pri %d: ", PRI(medsa)));
+               ND_PRINT(", pri %u: ", PRI(medsa));
                break;
        case TAG_FROM_CPU:
-               ND_PRINT((ndo, ", %stagged", SRC_TAG(medsa) ? "" : "un"));
-               ND_PRINT((ndo, ", dev.port:vlan %d.%d:%d",
-                         SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa)));
+               ND_PRINT(", %stagged", SRC_TAG(medsa) ? "" : "un");
+               ND_PRINT(", dev.port:vlan %u.%u:%u",
+                         SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
 
                if (CFI(medsa))
-                       ND_PRINT((ndo, ", CFI"));
+                       ND_PRINT(", CFI");
 
-               ND_PRINT((ndo, ", pri %d: ", PRI(medsa)));
+               ND_PRINT(", pri %u: ", PRI(medsa));
                break;
        case TAG_FORWARD:
-               ND_PRINT((ndo, ", %stagged", SRC_TAG(medsa) ? "" : "un"));
+               ND_PRINT(", %stagged", SRC_TAG(medsa) ? "" : "un");
                if (TRUNK(medsa))
-                       ND_PRINT((ndo, ", dev.trunk:vlan %d.%d:%d",
-                                 SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa)));
+                       ND_PRINT(", dev.trunk:vlan %u.%u:%u",
+                                 SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
                else
-                       ND_PRINT((ndo, ", dev.port:vlan %d.%d:%d",
-                                 SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa)));
+                       ND_PRINT(", dev.port:vlan %u.%u:%u",
+                                 SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
 
                if (CFI(medsa))
-                       ND_PRINT((ndo, ", CFI"));
+                       ND_PRINT(", CFI");
 
-               ND_PRINT((ndo, ", pri %d: ", PRI(medsa)));
+               ND_PRINT(", pri %u: ", PRI(medsa));
                break;
        default:
                ND_DEFAULTPRINT((const u_char *)medsa, caplen);
@@ -147,12 +146,13 @@ medsa_print(netdissect_options *ndo,
        const struct medsa_pkthdr *medsa;
        u_short ether_type;
 
+       ndo->ndo_protocol = "medsa";
        medsa = (const struct medsa_pkthdr *)bp;
-       ND_TCHECK(*medsa);
+       ND_TCHECK_SIZE(medsa);
 
        if (!ndo->ndo_eflag)
-               ND_PRINT((ndo, "MEDSA %d.%d:%d: ",
-                         SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa)));
+               ND_PRINT("MEDSA %u.%u:%u: ",
+                         SRC_DEV(medsa), SRC_PORT(medsa), VID(medsa));
        else
                medsa_print_full(ndo, medsa, caplen);
 
@@ -160,7 +160,7 @@ medsa_print(netdissect_options *ndo,
        length -= 8;
        caplen -= 8;
 
-       ether_type = EXTRACT_BE_U_2(&medsa->ether_type);
+       ether_type = EXTRACT_BE_U_2(medsa->ether_type);
        if (ether_type <= MAX_ETHERNET_LENGTH_VAL) {
                /* Try to print the LLC-layer header & higher layers */
                if (llc_print(ndo, bp, length, caplen, src, dst) < 0) {
@@ -170,17 +170,17 @@ medsa_print(netdissect_options *ndo,
                }
        } else {
                if (ndo->ndo_eflag)
-                       ND_PRINT((ndo, "ethertype %s (0x%04x) ",
+                       ND_PRINT("ethertype %s (0x%04x) ",
                                  tok2str(ethertype_values, "Unknown",
                                          ether_type),
-                                 ether_type));
+                                 ether_type);
                if (ethertype_print(ndo, ether_type, bp, length, caplen, src, dst) == 0) {
                        /* ether_type not known, print raw packet */
                        if (!ndo->ndo_eflag)
-                               ND_PRINT((ndo, "ethertype %s (0x%04x) ",
+                               ND_PRINT("ethertype %s (0x%04x) ",
                                          tok2str(ethertype_values, "Unknown",
                                                  ether_type),
-                                         ether_type));
+                                         ether_type);
 
                        if (!ndo->ndo_suppress_default_print)
                                ND_DEFAULTPRINT(bp, caplen);
@@ -188,12 +188,5 @@ medsa_print(netdissect_options *ndo,
        }
        return;
 trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);
 }
-
-/*
- * Local Variables:
- * c-style: bsd
- * End:
- */
-