CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10

[tcpdump] / print-slow.c

diff --git a/print-slow.c b/print-slow.c
index 7d57537477c588f88c77a176852f0a06ab76cd18..649e2a0fcb79cda19ce8e9de6834761e85043c02 100644 (file)
--- a/print-slow.c
+++ b/print-slow.c
@@ -20,17 +20,17 @@
 
 /* \summary: IEEE "slow protocols" (802.3ad/802.3ah) printer */
 
 
 /* \summary: IEEE "slow protocols" (802.3ad/802.3ah) printer */
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

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

 
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "oui.h"
 
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "oui.h"
 

+

 #define        SLOW_PROTO_LACP                     1
 #define        SLOW_PROTO_MARKER                   2
 #define SLOW_PROTO_OAM                      3
 #define        SLOW_PROTO_LACP                     1
 #define        SLOW_PROTO_MARKER                   2
 #define SLOW_PROTO_OAM                      3


@@ -201,7 +201,7 @@ static const struct tok slow_tlv_values[] = {
 
 struct lacp_tlv_actor_partner_info_t {
     nd_uint16_t sys_pri;
 
 struct lacp_tlv_actor_partner_info_t {
     nd_uint16_t sys_pri;

-    nd_mac_addr sys;
+    nd_mac48 sys;

     nd_uint16_t key;
     nd_uint16_t port_pri;
     nd_uint16_t port;
     nd_uint16_t key;
     nd_uint16_t port_pri;
     nd_uint16_t port;


@@ -228,7 +228,7 @@ struct lacp_tlv_collector_info_t {
 
 struct marker_tlv_marker_info_t {
     nd_uint16_t req_port;
 
 struct marker_tlv_marker_info_t {
     nd_uint16_t req_port;

-    nd_mac_addr req_sys;
+    nd_mac48 req_sys;

     nd_uint32_t req_trans_id;
     nd_byte     pad[2];
 };
     nd_uint32_t req_trans_id;
     nd_byte     pad[2];
 };


@@ -247,10 +247,10 @@ slow_print(netdissect_options *ndo,
     int print_version;
     u_int subtype;
 
     int print_version;
     u_int subtype;
 

+    ndo->ndo_protocol = "slow";

     if (len < 1)
         goto tooshort;
     if (len < 1)
         goto tooshort;

-    ND_TCHECK_1(pptr);
-    subtype = EXTRACT_U_1(pptr);
+    subtype = GET_U_1(pptr);

 
     /*
      * Sanity checking of the header.
 
     /*
      * Sanity checking of the header.


@@ -259,9 +259,9 @@ slow_print(netdissect_options *ndo,
     case SLOW_PROTO_LACP:
         if (len < 2)
             goto tooshort;
     case SLOW_PROTO_LACP:
         if (len < 2)
             goto tooshort;

-        ND_TCHECK_1(pptr + 1);
-        if (EXTRACT_U_1(pptr + 1) != LACP_VERSION) {
-            ND_PRINT((ndo, "LACP version %u packet not supported", EXTRACT_U_1(pptr + 1)));
+        if (GET_U_1(pptr + 1) != LACP_VERSION) {
+            ND_PRINT("LACP version %u packet not supported",
+                     GET_U_1(pptr + 1));

             return;
         }
         print_version = 1;
             return;
         }
         print_version = 1;


@@ -270,9 +270,9 @@ slow_print(netdissect_options *ndo,
     case SLOW_PROTO_MARKER:
         if (len < 2)
             goto tooshort;
     case SLOW_PROTO_MARKER:
         if (len < 2)
             goto tooshort;

-        ND_TCHECK_1(pptr + 1);
-        if (EXTRACT_U_1(pptr + 1) != MARKER_VERSION) {
-            ND_PRINT((ndo, "MARKER version %u packet not supported", EXTRACT_U_1(pptr + 1)));
+        if (GET_U_1(pptr + 1) != MARKER_VERSION) {
+            ND_PRINT("MARKER version %u packet not supported",
+                     GET_U_1(pptr + 1));

             return;
         }
         print_version = 1;
             return;
         }
         print_version = 1;


@@ -289,15 +289,15 @@ slow_print(netdissect_options *ndo,
     }
 
     if (print_version == 1) {
     }
 
     if (print_version == 1) {

-        ND_PRINT((ndo, "%sv%u, length %u",
+        ND_PRINT("%sv%u, length %u",

                tok2str(slow_proto_values, "unknown (%u)", subtype),
                tok2str(slow_proto_values, "unknown (%u)", subtype),

-               EXTRACT_U_1((pptr + 1)),
-               len));
+               GET_U_1((pptr + 1)),
+               len);

     } else {
         /* some slow protos don't have a version number in the header */
     } else {
         /* some slow protos don't have a version number in the header */

-        ND_PRINT((ndo, "%s, length %u",
+        ND_PRINT("%s, length %u",

                tok2str(slow_proto_values, "unknown (%u)", subtype),
                tok2str(slow_proto_values, "unknown (%u)", subtype),

-               len));
+               len);

     }
 
     /* unrecognized subtype */
     }
 
     /* unrecognized subtype */


@@ -332,16 +332,9 @@ slow_print(netdissect_options *ndo,
 
 tooshort:
     if (!ndo->ndo_vflag)
 
 tooshort:
     if (!ndo->ndo_vflag)

-        ND_PRINT((ndo, " (packet is too short)"));
-    else
-        ND_PRINT((ndo, "\n\t\t packet is too short"));
-    return;
-
-trunc:
-    if (!ndo->ndo_vflag)
-        ND_PRINT((ndo, " (packet exceeded snapshot)"));
+        ND_PRINT(" (packet is too short)");

     else
     else

-        ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));
+        ND_PRINT("\n\t\t packet is too short");

 }
 
 static void
 }
 
 static void


@@ -360,22 +353,21 @@ slow_marker_lacp_print(netdissect_options *ndo,
         const struct marker_tlv_marker_info_t *marker_tlv_marker_info;
     } tlv_ptr;
 
         const struct marker_tlv_marker_info_t *marker_tlv_marker_info;
     } tlv_ptr;
 

-    while(tlen>0) {
+    while(tlen != 0) {

         /* is the packet big enough to include the tlv header ? */
         if (tlen < sizeof(struct tlv_header_t))
             goto tooshort;
         /* did we capture enough for fully decoding the tlv header ? */
         /* is the packet big enough to include the tlv header ? */
         if (tlen < sizeof(struct tlv_header_t))
             goto tooshort;
         /* did we capture enough for fully decoding the tlv header ? */

-        ND_TCHECK_LEN(tptr, sizeof(struct tlv_header_t));

         tlv_header = (const struct tlv_header_t *)tptr;
         tlv_header = (const struct tlv_header_t *)tptr;

-        tlv_type = EXTRACT_U_1(tlv_header->type);
-        tlv_len = EXTRACT_U_1(tlv_header->length);
+        tlv_type = GET_U_1(tlv_header->type);
+        tlv_len = GET_U_1(tlv_header->length);

 
 

-        ND_PRINT((ndo, "\n\t%s TLV (0x%02x), length %u",
+        ND_PRINT("\n\t%s TLV (0x%02x), length %u",

                tok2str(slow_tlv_values,
                        "Unknown",
                        (proto_subtype << 8) + tlv_type),
                tlv_type,
                tok2str(slow_tlv_values,
                        "Unknown",
                        (proto_subtype << 8) + tlv_type),
                tlv_type,

-               tlv_len));
+               tlv_len);

 
         if (tlv_type == LACP_MARKER_TLV_TERMINATOR) {
             /*
 
         if (tlv_type == LACP_MARKER_TLV_TERMINATOR) {
             /*


@@ -387,8 +379,8 @@ slow_marker_lacp_print(netdissect_options *ndo,
 
         /* length includes the type and length fields */
         if (tlv_len < sizeof(struct tlv_header_t)) {
 
         /* length includes the type and length fields */
         if (tlv_len < sizeof(struct tlv_header_t)) {

-            ND_PRINT((ndo, "\n\t    ERROR: illegal length - should be >= %lu",
-                   (unsigned long) sizeof(struct tlv_header_t)));
+            ND_PRINT("\n\t    ERROR: illegal length - should be >= %zu",
+                     sizeof(struct tlv_header_t));

             return;
         }
 
             return;
         }
 


@@ -408,55 +400,55 @@ slow_marker_lacp_print(netdissect_options *ndo,
         case ((SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO):
             if (tlv_tlen !=
                 sizeof(struct lacp_tlv_actor_partner_info_t)) {
         case ((SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO):
             if (tlv_tlen !=
                 sizeof(struct lacp_tlv_actor_partner_info_t)) {

-                ND_PRINT((ndo, "\n\t    ERROR: illegal length - should be %lu",
-                       (unsigned long) (sizeof(struct tlv_header_t) + sizeof(struct lacp_tlv_actor_partner_info_t))));
+                ND_PRINT("\n\t    ERROR: illegal length - should be %zu",
+                         sizeof(struct tlv_header_t) + sizeof(struct lacp_tlv_actor_partner_info_t));

                 goto badlength;
             }
 
             tlv_ptr.lacp_tlv_actor_partner_info = (const struct lacp_tlv_actor_partner_info_t *)tlv_tptr;
 
                 goto badlength;
             }
 
             tlv_ptr.lacp_tlv_actor_partner_info = (const struct lacp_tlv_actor_partner_info_t *)tlv_tptr;
 

-            ND_PRINT((ndo, "\n\t  System %s, System Priority %u, Key %u" \
+            ND_PRINT("\n\t  System %s, System Priority %u, Key %u"

                    ", Port %u, Port Priority %u\n\t  State Flags [%s]",
                    ", Port %u, Port Priority %u\n\t  State Flags [%s]",

-                   etheraddr_string(ndo, tlv_ptr.lacp_tlv_actor_partner_info->sys),
-                   EXTRACT_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->sys_pri),
-                   EXTRACT_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->key),
-                   EXTRACT_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->port),
-                   EXTRACT_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->port_pri),
+                   GET_MAC48_STRING(tlv_ptr.lacp_tlv_actor_partner_info->sys),
+                   GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->sys_pri),
+                   GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->key),
+                   GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->port),
+                   GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->port_pri),

                    bittok2str(lacp_tlv_actor_partner_info_state_values,
                               "none",
                    bittok2str(lacp_tlv_actor_partner_info_state_values,
                               "none",

-                              EXTRACT_U_1(tlv_ptr.lacp_tlv_actor_partner_info->state))));
+                              GET_U_1(tlv_ptr.lacp_tlv_actor_partner_info->state)));

 
             break;
 
         case ((SLOW_PROTO_LACP << 8) + LACP_TLV_COLLECTOR_INFO):
             if (tlv_tlen !=
                 sizeof(struct lacp_tlv_collector_info_t)) {
 
             break;
 
         case ((SLOW_PROTO_LACP << 8) + LACP_TLV_COLLECTOR_INFO):
             if (tlv_tlen !=
                 sizeof(struct lacp_tlv_collector_info_t)) {

-                ND_PRINT((ndo, "\n\t    ERROR: illegal length - should be %lu",
-                       (unsigned long) (sizeof(struct tlv_header_t) + sizeof(struct lacp_tlv_collector_info_t))));
+                ND_PRINT("\n\t    ERROR: illegal length - should be %zu",
+                         sizeof(struct tlv_header_t) + sizeof(struct lacp_tlv_collector_info_t));

                 goto badlength;
             }
 
             tlv_ptr.lacp_tlv_collector_info = (const struct lacp_tlv_collector_info_t *)tlv_tptr;
 
                 goto badlength;
             }
 
             tlv_ptr.lacp_tlv_collector_info = (const struct lacp_tlv_collector_info_t *)tlv_tptr;
 

-            ND_PRINT((ndo, "\n\t  Max Delay %u",
-                   EXTRACT_BE_U_2(tlv_ptr.lacp_tlv_collector_info->max_delay)));
+            ND_PRINT("\n\t  Max Delay %u",
+                   GET_BE_U_2(tlv_ptr.lacp_tlv_collector_info->max_delay));

 
             break;
 
         case ((SLOW_PROTO_MARKER << 8) + MARKER_TLV_MARKER_INFO):
             if (tlv_tlen !=
                 sizeof(struct marker_tlv_marker_info_t)) {
 
             break;
 
         case ((SLOW_PROTO_MARKER << 8) + MARKER_TLV_MARKER_INFO):
             if (tlv_tlen !=
                 sizeof(struct marker_tlv_marker_info_t)) {

-                ND_PRINT((ndo, "\n\t    ERROR: illegal length - should be %lu",
-                       (unsigned long) (sizeof(struct tlv_header_t) + sizeof(struct marker_tlv_marker_info_t))));
+                ND_PRINT("\n\t    ERROR: illegal length - should be %zu",
+                         sizeof(struct tlv_header_t) + sizeof(struct marker_tlv_marker_info_t));

                 goto badlength;
             }
 
             tlv_ptr.marker_tlv_marker_info = (const struct marker_tlv_marker_info_t *)tlv_tptr;
 
                 goto badlength;
             }
 
             tlv_ptr.marker_tlv_marker_info = (const struct marker_tlv_marker_info_t *)tlv_tptr;
 

-            ND_PRINT((ndo, "\n\t  Request System %s, Request Port %u, Request Transaction ID 0x%08x",
-                   etheraddr_string(ndo, tlv_ptr.marker_tlv_marker_info->req_sys),
-                   EXTRACT_BE_U_2(tlv_ptr.marker_tlv_marker_info->req_port),
-                   EXTRACT_BE_U_4(tlv_ptr.marker_tlv_marker_info->req_trans_id)));
+            ND_PRINT("\n\t  Request System %s, Request Port %u, Request Transaction ID 0x%08x",
+                   GET_MAC48_STRING(tlv_ptr.marker_tlv_marker_info->req_sys),
+                   GET_BE_U_2(tlv_ptr.marker_tlv_marker_info->req_port),
+                   GET_BE_U_4(tlv_ptr.marker_tlv_marker_info->req_trans_id));

 
             break;
 
 
             break;
 


@@ -479,11 +471,7 @@ slow_marker_lacp_print(netdissect_options *ndo,
     return;
 
 tooshort:
     return;
 
 tooshort:

-    ND_PRINT((ndo, "\n\t\t packet is too short"));
-    return;
-
-trunc:
-    ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));
+    ND_PRINT("\n\t\t packet is too short");

 }
 
 static void
 }
 
 static void


@@ -512,7 +500,7 @@ slow_oam_print(netdissect_options *ndo,
     } ptr;
 
     union {
     } ptr;
 
     union {

-       const struct slow_oam_info_t *slow_oam_info;
+        const struct slow_oam_info_t *slow_oam_info;

         const struct slow_oam_link_event_t *slow_oam_link_event;
         const struct slow_oam_variablerequest_t *slow_oam_variablerequest;
         const struct slow_oam_variableresponse_t *slow_oam_variableresponse;
         const struct slow_oam_link_event_t *slow_oam_link_event;
         const struct slow_oam_variablerequest_t *slow_oam_variablerequest;
         const struct slow_oam_variableresponse_t *slow_oam_variableresponse;


@@ -526,26 +514,26 @@ slow_oam_print(netdissect_options *ndo,
     tptr += sizeof(struct slow_oam_common_header_t);
     tlen -= sizeof(struct slow_oam_common_header_t);
 
     tptr += sizeof(struct slow_oam_common_header_t);
     tlen -= sizeof(struct slow_oam_common_header_t);
 

-    code = EXTRACT_U_1(ptr.slow_oam_common_header->code);
-    ND_PRINT((ndo, "\n\tCode %s OAM PDU, Flags [%s]",
+    code = GET_U_1(ptr.slow_oam_common_header->code);
+    ND_PRINT("\n\tCode %s OAM PDU, Flags [%s]",

            tok2str(slow_oam_code_values, "Unknown (%u)", code),
            bittok2str(slow_oam_flag_values,
                       "none",
            tok2str(slow_oam_code_values, "Unknown (%u)", code),
            bittok2str(slow_oam_flag_values,
                       "none",

-                      EXTRACT_BE_U_2(ptr.slow_oam_common_header->flags))));
+                      GET_BE_U_2(ptr.slow_oam_common_header->flags)));

 
     switch (code) {
     case SLOW_OAM_CODE_INFO:
 
     switch (code) {
     case SLOW_OAM_CODE_INFO:

-        while (tlen > 0) {
+        while (tlen != 0) {

             ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;
             if (tlen < sizeof(*ptr.slow_oam_tlv_header))
                 goto tooshort;
             ND_TCHECK_SIZE(ptr.slow_oam_tlv_header);
             ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;
             if (tlen < sizeof(*ptr.slow_oam_tlv_header))
                 goto tooshort;
             ND_TCHECK_SIZE(ptr.slow_oam_tlv_header);

-            type = EXTRACT_U_1(ptr.slow_oam_tlv_header->type);
-            length = EXTRACT_U_1(ptr.slow_oam_tlv_header->length);
-            ND_PRINT((ndo, "\n\t  %s Information Type (%u), length %u",
+            type = GET_U_1(ptr.slow_oam_tlv_header->type);
+            length = GET_U_1(ptr.slow_oam_tlv_header->length);
+            ND_PRINT("\n\t  %s Information Type (%u), length %u",

                    tok2str(slow_oam_info_type_values, "Reserved", type),
                    type,
                    tok2str(slow_oam_info_type_values, "Reserved", type),
                    type,

-                   length));
+                   length);

 
             if (type == SLOW_OAM_INFO_TYPE_END_OF_TLV) {
                 /*
 
             if (type == SLOW_OAM_INFO_TYPE_END_OF_TLV) {
                 /*


@@ -557,8 +545,8 @@ slow_oam_print(netdissect_options *ndo,
 
             /* length includes the type and length fields */
             if (length < sizeof(struct slow_oam_tlv_header_t)) {
 
             /* length includes the type and length fields */
             if (length < sizeof(struct slow_oam_tlv_header_t)) {

-                ND_PRINT((ndo, "\n\t    ERROR: illegal length - should be >= %u",
-                       (u_int)sizeof(struct slow_oam_tlv_header_t)));
+                ND_PRINT("\n\t    ERROR: illegal length - should be >= %zu",
+                         sizeof(struct slow_oam_tlv_header_t));

                 return;
             }
 
                 return;
             }
 


@@ -572,34 +560,34 @@ slow_oam_print(netdissect_options *ndo,
             case SLOW_OAM_INFO_TYPE_REMOTE:
                 tlv.slow_oam_info = (const struct slow_oam_info_t *)tptr;
 
             case SLOW_OAM_INFO_TYPE_REMOTE:
                 tlv.slow_oam_info = (const struct slow_oam_info_t *)tptr;
 

-                if (EXTRACT_U_1(tlv.slow_oam_info->info_length) !=
+                if (GET_U_1(tlv.slow_oam_info->info_length) !=

                     sizeof(struct slow_oam_info_t)) {
                     sizeof(struct slow_oam_info_t)) {

-                    ND_PRINT((ndo, "\n\t    ERROR: illegal length - should be %lu",
-                           (unsigned long) sizeof(struct slow_oam_info_t)));
+                    ND_PRINT("\n\t    ERROR: illegal length - should be %zu",
+                           sizeof(struct slow_oam_info_t));

                     hexdump = TRUE;
                     goto badlength_code_info;
                 }
 
                     hexdump = TRUE;
                     goto badlength_code_info;
                 }
 

-                ND_PRINT((ndo, "\n\t    OAM-Version %u, Revision %u",
-                       EXTRACT_U_1(tlv.slow_oam_info->oam_version),
-                       EXTRACT_BE_U_2(tlv.slow_oam_info->revision)));
+                ND_PRINT("\n\t    OAM-Version %u, Revision %u",
+                       GET_U_1(tlv.slow_oam_info->oam_version),
+                       GET_BE_U_2(tlv.slow_oam_info->revision));

 
 

-                state = EXTRACT_U_1(tlv.slow_oam_info->state);
-                ND_PRINT((ndo, "\n\t    State-Parser-Action %s, State-MUX-Action %s",
+                state = GET_U_1(tlv.slow_oam_info->state);
+                ND_PRINT("\n\t    State-Parser-Action %s, State-MUX-Action %s",

                        tok2str(slow_oam_info_type_state_parser_values, "Reserved",
                                state & OAM_INFO_TYPE_PARSER_MASK),
                        tok2str(slow_oam_info_type_state_mux_values, "Reserved",
                        tok2str(slow_oam_info_type_state_parser_values, "Reserved",
                                state & OAM_INFO_TYPE_PARSER_MASK),
                        tok2str(slow_oam_info_type_state_mux_values, "Reserved",

-                               state & OAM_INFO_TYPE_MUX_MASK)));
-                ND_PRINT((ndo, "\n\t    OAM-Config Flags [%s], OAM-PDU-Config max-PDU size %u",
+                               state & OAM_INFO_TYPE_MUX_MASK));
+                ND_PRINT("\n\t    OAM-Config Flags [%s], OAM-PDU-Config max-PDU size %u",

                        bittok2str(slow_oam_info_type_oam_config_values, "none",
                        bittok2str(slow_oam_info_type_oam_config_values, "none",

-                                  EXTRACT_U_1(tlv.slow_oam_info->oam_config)),
-                       EXTRACT_BE_U_2(tlv.slow_oam_info->oam_pdu_config) &
-                       OAM_INFO_TYPE_PDU_SIZE_MASK));
-                ND_PRINT((ndo, "\n\t    OUI %s (0x%06x), Vendor-Private 0x%08x",
+                                  GET_U_1(tlv.slow_oam_info->oam_config)),
+                       GET_BE_U_2(tlv.slow_oam_info->oam_pdu_config) &
+                       OAM_INFO_TYPE_PDU_SIZE_MASK);
+                ND_PRINT("\n\t    OUI %s (0x%06x), Vendor-Private 0x%08x",

                        tok2str(oui_values, "Unknown",
                        tok2str(oui_values, "Unknown",

-                               EXTRACT_BE_U_3(tlv.slow_oam_info->oui)),
-                       EXTRACT_BE_U_3(tlv.slow_oam_info->oui),
-                       EXTRACT_BE_U_4(tlv.slow_oam_info->vendor_private)));
+                               GET_BE_U_3(tlv.slow_oam_info->oui)),
+                       GET_BE_U_3(tlv.slow_oam_info->oui),
+                       GET_BE_U_4(tlv.slow_oam_info->vendor_private));

                 break;
 
             case SLOW_OAM_INFO_TYPE_ORG_SPECIFIC:
                 break;
 
             case SLOW_OAM_INFO_TYPE_ORG_SPECIFIC:


@@ -627,24 +615,22 @@ slow_oam_print(netdissect_options *ndo,
         /* Sequence number */
         if (tlen < 2)
             goto tooshort;
         /* Sequence number */
         if (tlen < 2)
             goto tooshort;

-        ND_TCHECK_2(tptr);
-        ND_PRINT((ndo, "\n\t  Sequence Number %u", EXTRACT_BE_U_2(tptr)));
+        ND_PRINT("\n\t  Sequence Number %u", GET_BE_U_2(tptr));

         tlen -= 2;
         tptr += 2;
 
         /* TLVs */
         tlen -= 2;
         tptr += 2;
 
         /* TLVs */

-        while (tlen > 0) {
+        while (tlen != 0) {

             ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;
             if (tlen < sizeof(*ptr.slow_oam_tlv_header))
                 goto tooshort;
             ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;
             if (tlen < sizeof(*ptr.slow_oam_tlv_header))
                 goto tooshort;

-            ND_TCHECK_SIZE(ptr.slow_oam_tlv_header);
-            type = EXTRACT_U_1(ptr.slow_oam_tlv_header->type);
-            length = EXTRACT_U_1(ptr.slow_oam_tlv_header->length);
-            ND_PRINT((ndo, "\n\t  %s Link Event Type (%u), length %u",
+            type = GET_U_1(ptr.slow_oam_tlv_header->type);
+            length = GET_U_1(ptr.slow_oam_tlv_header->length);
+            ND_PRINT("\n\t  %s Link Event Type (%u), length %u",

                    tok2str(slow_oam_link_event_values, "Reserved",
                            type),
                    type,
                    tok2str(slow_oam_link_event_values, "Reserved",
                            type),
                    type,

-                   length));
+                   length);

 
             if (type == SLOW_OAM_INFO_TYPE_END_OF_TLV) {
                 /*
 
             if (type == SLOW_OAM_INFO_TYPE_END_OF_TLV) {
                 /*


@@ -656,8 +642,8 @@ slow_oam_print(netdissect_options *ndo,
 
             /* length includes the type and length fields */
             if (length < sizeof(struct slow_oam_tlv_header_t)) {
 
             /* length includes the type and length fields */
             if (length < sizeof(struct slow_oam_tlv_header_t)) {

-                ND_PRINT((ndo, "\n\t    ERROR: illegal length - should be >= %u",
-                       (u_int)sizeof(struct slow_oam_tlv_header_t)));
+                ND_PRINT("\n\t    ERROR: illegal length - should be >= %zu",
+                         sizeof(struct slow_oam_tlv_header_t));

                 return;
             }
 
                 return;
             }
 


@@ -673,25 +659,25 @@ slow_oam_print(netdissect_options *ndo,
             case SLOW_OAM_LINK_EVENT_ERR_FRM_SUMM:
                 tlv.slow_oam_link_event = (const struct slow_oam_link_event_t *)tptr;
 
             case SLOW_OAM_LINK_EVENT_ERR_FRM_SUMM:
                 tlv.slow_oam_link_event = (const struct slow_oam_link_event_t *)tptr;
 

-                if (EXTRACT_U_1(tlv.slow_oam_link_event->event_length) !=
+                if (GET_U_1(tlv.slow_oam_link_event->event_length) !=

                     sizeof(struct slow_oam_link_event_t)) {
                     sizeof(struct slow_oam_link_event_t)) {

-                    ND_PRINT((ndo, "\n\t    ERROR: illegal length - should be %lu",
-                           (unsigned long) sizeof(struct slow_oam_link_event_t)));
+                    ND_PRINT("\n\t    ERROR: illegal length - should be %zu",
+                             sizeof(struct slow_oam_link_event_t));

                     hexdump = TRUE;
                     goto badlength_event_notif;
                 }
 
                     hexdump = TRUE;
                     goto badlength_event_notif;
                 }
 

-                ND_PRINT((ndo, "\n\t    Timestamp %u ms, Errored Window %" PRIu64
+                ND_PRINT("\n\t    Timestamp %u ms, Errored Window %" PRIu64

                        "\n\t    Errored Threshold %" PRIu64
                        "\n\t    Errors %" PRIu64
                        "\n\t    Error Running Total %" PRIu64
                        "\n\t    Event Running Total %u",
                        "\n\t    Errored Threshold %" PRIu64
                        "\n\t    Errors %" PRIu64
                        "\n\t    Error Running Total %" PRIu64
                        "\n\t    Event Running Total %u",

-                       EXTRACT_BE_U_2(tlv.slow_oam_link_event->time_stamp)*100,
-                       EXTRACT_BE_U_8(tlv.slow_oam_link_event->window),
-                       EXTRACT_BE_U_8(tlv.slow_oam_link_event->threshold),
-                       EXTRACT_BE_U_8(tlv.slow_oam_link_event->errors),
-                       EXTRACT_BE_U_8(tlv.slow_oam_link_event->errors_running_total),
-                       EXTRACT_BE_U_4(tlv.slow_oam_link_event->event_running_total)));
+                       GET_BE_U_2(tlv.slow_oam_link_event->time_stamp)*100,
+                       GET_BE_U_8(tlv.slow_oam_link_event->window),
+                       GET_BE_U_8(tlv.slow_oam_link_event->threshold),
+                       GET_BE_U_8(tlv.slow_oam_link_event->errors),
+                       GET_BE_U_8(tlv.slow_oam_link_event->errors_running_total),
+                       GET_BE_U_4(tlv.slow_oam_link_event->event_running_total));

                 break;
 
             case SLOW_OAM_LINK_EVENT_ORG_SPECIFIC:
                 break;
 
             case SLOW_OAM_LINK_EVENT_ORG_SPECIFIC:


@@ -719,13 +705,12 @@ slow_oam_print(netdissect_options *ndo,
         tlv.slow_oam_loopbackctrl = (const struct slow_oam_loopbackctrl_t *)tptr;
         if (tlen < sizeof(*tlv.slow_oam_loopbackctrl))
             goto tooshort;
         tlv.slow_oam_loopbackctrl = (const struct slow_oam_loopbackctrl_t *)tptr;
         if (tlen < sizeof(*tlv.slow_oam_loopbackctrl))
             goto tooshort;

-        ND_TCHECK_SIZE(tlv.slow_oam_loopbackctrl);
-        command = EXTRACT_U_1(tlv.slow_oam_loopbackctrl->command);
-        ND_PRINT((ndo, "\n\t  Command %s (%u)",
+        command = GET_U_1(tlv.slow_oam_loopbackctrl->command);
+        ND_PRINT("\n\t  Command %s (%u)",

                tok2str(slow_oam_loopbackctrl_cmd_values,
                        "Unknown",
                        command),
                tok2str(slow_oam_loopbackctrl_cmd_values,
                        "Unknown",
                        command),

-               command));
+               command);

         tptr ++;
         tlen --;
         break;
         tptr ++;
         tlen --;
         break;


@@ -746,9 +731,5 @@ slow_oam_print(netdissect_options *ndo,
     return;
 
 tooshort:
     return;
 
 tooshort:

-    ND_PRINT((ndo, "\n\t\t packet is too short"));
-    return;
-
-trunc:
-    ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));
+    ND_PRINT("\n\t\t packet is too short");

 }
 }