Restore the possibility of building when remote is enabled in libpcap

[tcpdump] / print-slow.c

diff --git a/print-slow.c b/print-slow.c
index 7d7e43fbb42600f2943fca4ceac3671548724009..118381808fdad8c8fef075c540341a8d9d65dbcd 100644 (file)
--- a/print-slow.c
+++ b/print-slow.c
@@ -15,34 +15,23 @@
  * support for the IEEE "slow protocols" LACP, MARKER as per 802.3ad
  *                                       OAM as per 802.3ah
  *
  * support for the IEEE "slow protocols" LACP, MARKER as per 802.3ad
  *                                       OAM as per 802.3ah
  *

- * Original code by Hannes Gredler (hannes@juniper.net)
+ * Original code by Hannes Gredler (hannes@gredler.at)

  */
 
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-slow.c,v 1.4 2006-05-16 21:57:26 hannes Exp $";
-#endif
+/* \summary: IEEE "slow protocols" (802.3ad/802.3ah) printer */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"

 #include "extract.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "addrtoname.h"

-#include "ether.h"

 #include "oui.h"
 
 #include "oui.h"
 

-struct slow_common_header_t {
-    u_int8_t proto_subtype;
-    u_int8_t version;
-};

 
 #define        SLOW_PROTO_LACP                     1
 #define        SLOW_PROTO_MARKER                   2
 
 #define        SLOW_PROTO_LACP                     1
 #define        SLOW_PROTO_MARKER                   2


@@ -67,7 +56,7 @@ static const struct tok slow_oam_flag_values[] = {
     { 0x0020, "Remote Evaluating" },
     { 0x0040, "Remote Stable" },
     { 0, NULL}
     { 0x0020, "Remote Evaluating" },
     { 0x0040, "Remote Stable" },
     { 0, NULL}

-}; 
+};

 
 #define SLOW_OAM_CODE_INFO          0x00
 #define SLOW_OAM_CODE_EVENT_NOTIF   0x01
 
 #define SLOW_OAM_CODE_INFO          0x00
 #define SLOW_OAM_CODE_EVENT_NOTIF   0x01


@@ -87,15 +76,15 @@ static const struct tok slow_oam_code_values[] = {
 };
 
 struct slow_oam_info_t {
 };
 
 struct slow_oam_info_t {

-    u_int8_t info_type;
-    u_int8_t info_len;
-    u_int8_t oam_version;
-    u_int8_t revision[2];
-    u_int8_t state;
-    u_int8_t oam_config;
-    u_int8_t oam_pdu_config;
-    u_int8_t oui[3];
-    u_int8_t vendor_private[4];
+    nd_uint8_t info_type;
+    nd_uint8_t info_length;
+    nd_uint8_t oam_version;
+    nd_uint16_t revision;
+    nd_uint8_t state;
+    nd_uint8_t oam_config;
+    nd_uint16_t oam_pdu_config;
+    nd_uint24_t oui;
+    nd_uint32_t vendor_private;

 };
 
 #define SLOW_OAM_INFO_TYPE_END_OF_TLV 0x00
 };
 
 #define SLOW_OAM_INFO_TYPE_END_OF_TLV 0x00


@@ -111,8 +100,6 @@ static const struct tok slow_oam_info_type_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-#define SLOW_OAM_INFO_TYPE_LOCAL_REMOTE_MINLEN 16
-

 #define OAM_INFO_TYPE_PARSER_MASK 0x3
 static const struct tok slow_oam_info_type_state_parser_values[] = {
     { 0x00, "forwarding" },
 #define OAM_INFO_TYPE_PARSER_MASK 0x3
 static const struct tok slow_oam_info_type_state_parser_values[] = {
     { 0x00, "forwarding" },


@@ -141,26 +128,47 @@ static const struct tok slow_oam_info_type_oam_config_values[] = {
 /* 11 Bits */
 #define OAM_INFO_TYPE_PDU_SIZE_MASK 0x7ff
 
 /* 11 Bits */
 #define OAM_INFO_TYPE_PDU_SIZE_MASK 0x7ff
 

-struct slow_oam_eventnotification_t {
-    u_int8_t event_type;
-    u_int8_t event_length;
-    u_int8_t event_time_stamp[2];
-    u_int8_t window[8];
-    u_int8_t threshold[8];
-    u_int8_t errors[8];
-    u_int8_t errors_running_total[8];
-    u_int8_t event_running_total[4];
+#define SLOW_OAM_LINK_EVENT_END_OF_TLV 0x00
+#define SLOW_OAM_LINK_EVENT_ERR_SYM_PER 0x01
+#define SLOW_OAM_LINK_EVENT_ERR_FRM 0x02
+#define SLOW_OAM_LINK_EVENT_ERR_FRM_PER 0x03
+#define SLOW_OAM_LINK_EVENT_ERR_FRM_SUMM 0x04
+#define SLOW_OAM_LINK_EVENT_ORG_SPECIFIC 0xfe
+
+static const struct tok slow_oam_link_event_values[] = {
+    { SLOW_OAM_LINK_EVENT_END_OF_TLV, "End of TLV marker" },
+    { SLOW_OAM_LINK_EVENT_ERR_SYM_PER, "Errored Symbol Period Event" },
+    { SLOW_OAM_LINK_EVENT_ERR_FRM, "Errored Frame Event" },
+    { SLOW_OAM_LINK_EVENT_ERR_FRM_PER, "Errored Frame Period Event" },
+    { SLOW_OAM_LINK_EVENT_ERR_FRM_SUMM, "Errored Frame Seconds Summary Event" },
+    { SLOW_OAM_LINK_EVENT_ORG_SPECIFIC, "Organization specific" },
+    { 0, NULL}
+};
+
+struct slow_oam_link_event_t {
+    nd_uint8_t event_type;
+    nd_uint8_t event_length;
+    nd_uint16_t time_stamp;
+    nd_uint64_t window;
+    nd_uint64_t threshold;
+    nd_uint64_t errors;
+    nd_uint64_t errors_running_total;
+    nd_uint32_t event_running_total;

 };
 
 struct slow_oam_variablerequest_t {
 };
 
 struct slow_oam_variablerequest_t {

-    u_int8_t branch;
-    u_int8_t leaf[2];
+    nd_uint8_t branch;
+    nd_uint16_t leaf;

 };
 
 struct slow_oam_variableresponse_t {
 };
 
 struct slow_oam_variableresponse_t {

-    u_int8_t branch;
-    u_int8_t leaf[2];
-    u_int8_t length;
+    nd_uint8_t branch;
+    nd_uint16_t leaf;
+    nd_uint8_t length;
+};
+
+struct slow_oam_loopbackctrl_t {
+    nd_uint8_t command;

 };
 
 static const struct tok slow_oam_loopbackctrl_cmd_values[] = {
 };
 
 static const struct tok slow_oam_loopbackctrl_cmd_values[] = {


@@ -170,38 +178,38 @@ static const struct tok slow_oam_loopbackctrl_cmd_values[] = {
 };
 
 struct tlv_header_t {
 };
 
 struct tlv_header_t {

-    u_int8_t type;
-    u_int8_t length;
+    nd_uint8_t type;
+    nd_uint8_t length;

 };
 
 };
 

-#define LACP_TLV_TERMINATOR     0x00
-#define LACP_TLV_ACTOR_INFO     0x01
-#define LACP_TLV_PARTNER_INFO   0x02
-#define LACP_TLV_COLLECTOR_INFO 0x03
+#define LACP_MARKER_TLV_TERMINATOR     0x00  /* same code for LACP and Marker */
+
+#define LACP_TLV_ACTOR_INFO            0x01
+#define LACP_TLV_PARTNER_INFO          0x02
+#define LACP_TLV_COLLECTOR_INFO        0x03

 
 

-#define MARKER_TLV_TERMINATOR   0x00
-#define MARKER_TLV_MARKER_INFO  0x01
+#define MARKER_TLV_MARKER_INFO         0x01

 
 static const struct tok slow_tlv_values[] = {
 
 static const struct tok slow_tlv_values[] = {

-    { (SLOW_PROTO_LACP << 8) + LACP_TLV_TERMINATOR, "Terminator"},
+    { (SLOW_PROTO_LACP << 8) + LACP_MARKER_TLV_TERMINATOR, "Terminator"},

     { (SLOW_PROTO_LACP << 8) + LACP_TLV_ACTOR_INFO, "Actor Information"},
     { (SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO, "Partner Information"},
     { (SLOW_PROTO_LACP << 8) + LACP_TLV_COLLECTOR_INFO, "Collector Information"},
 
     { (SLOW_PROTO_LACP << 8) + LACP_TLV_ACTOR_INFO, "Actor Information"},
     { (SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO, "Partner Information"},
     { (SLOW_PROTO_LACP << 8) + LACP_TLV_COLLECTOR_INFO, "Collector Information"},
 

-    { (SLOW_PROTO_MARKER << 8) + MARKER_TLV_TERMINATOR, "Terminator"},
+    { (SLOW_PROTO_MARKER << 8) + LACP_MARKER_TLV_TERMINATOR, "Terminator"},

     { (SLOW_PROTO_MARKER << 8) + MARKER_TLV_MARKER_INFO, "Marker Information"},
     { 0, NULL}
 };
 
 struct lacp_tlv_actor_partner_info_t {
     { (SLOW_PROTO_MARKER << 8) + MARKER_TLV_MARKER_INFO, "Marker Information"},
     { 0, NULL}
 };
 
 struct lacp_tlv_actor_partner_info_t {

-    u_int8_t sys_pri[2];
-    u_int8_t sys[ETHER_ADDR_LEN];
-    u_int8_t key[2];
-    u_int8_t port_pri[2];
-    u_int8_t port[2];
-    u_int8_t state;
-    u_int8_t pad[3];
-};          
+    nd_uint16_t sys_pri;
+    nd_mac_addr sys;
+    nd_uint16_t key;
+    nd_uint16_t port_pri;
+    nd_uint16_t port;
+    nd_uint8_t state;
+    nd_byte    pad[3];
+};

 
 static const struct tok lacp_tlv_actor_partner_info_state_values[] = {
     { 0x01, "Activity"},
 
 static const struct tok lacp_tlv_actor_partner_info_state_values[] = {
     { 0x01, "Activity"},


@@ -216,49 +224,57 @@ static const struct tok lacp_tlv_actor_partner_info_state_values[] = {
 };
 
 struct lacp_tlv_collector_info_t {
 };
 
 struct lacp_tlv_collector_info_t {

-    u_int8_t max_delay[2];
-    u_int8_t pad[12];
-}; 
+    nd_uint16_t max_delay;
+    nd_byte     pad[12];
+};

 
 struct marker_tlv_marker_info_t {
 
 struct marker_tlv_marker_info_t {

-    u_int8_t req_port[2];
-    u_int8_t req_sys[ETHER_ADDR_LEN];
-    u_int8_t req_trans_id[4];
-    u_int8_t pad[2];
-}; 
+    nd_uint16_t req_port;
+    nd_mac_addr req_sys;
+    nd_uint32_t req_trans_id;
+    nd_byte     pad[2];
+};

 
 struct lacp_marker_tlv_terminator_t {
 
 struct lacp_marker_tlv_terminator_t {

-    u_int8_t pad[50];
-}; 
-
-void slow_marker_lacp_print(register const u_char *, register u_int);
-void slow_oam_print(register const u_char *, register u_int);
+    nd_byte     pad[50];
+};

 
 

-const struct slow_common_header_t *slow_com_header;
+static void slow_marker_lacp_print(netdissect_options *, const u_char *, u_int, u_int);
+static void slow_oam_print(netdissect_options *, const u_char *, u_int);

 
 void
 
 void

-slow_print(register const u_char *pptr, register u_int len) {
-
+slow_print(netdissect_options *ndo,
+           const u_char *pptr, u_int len)
+{

     int print_version;
     int print_version;

+    u_int subtype;

 
 

-    slow_com_header = (const struct slow_common_header_t *)pptr;
-    TCHECK(*slow_com_header);
+    ndo->ndo_protocol = "slow";
+    if (len < 1)
+        goto tooshort;
+    subtype = GET_U_1(pptr);

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

-    switch (slow_com_header->proto_subtype) {
+    switch (subtype) {

     case SLOW_PROTO_LACP:
     case SLOW_PROTO_LACP:

-        if (slow_com_header->version != LACP_VERSION) {
-            printf("LACP version %u packet not supported",slow_com_header->version);
+        if (len < 2)
+            goto tooshort;
+        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;
         break;
 
     case SLOW_PROTO_MARKER:
             return;
         }
         print_version = 1;
         break;
 
     case SLOW_PROTO_MARKER:

-        if (slow_com_header->version != MARKER_VERSION) {
-            printf("MARKER version %u packet not supported",slow_com_header->version);
+        if (len < 2)
+            goto tooshort;
+        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;


@@ -274,55 +290,63 @@ slow_print(register const u_char *pptr, register u_int len) {
         break;
     }
 
         break;
     }
 

-    if (print_version) {
-        printf("%sv%u, length %u",
-               tok2str(slow_proto_values, "unknown (%u)",slow_com_header->proto_subtype),
-               slow_com_header->version,
+    if (print_version == 1) {
+        ND_PRINT("%sv%u, length %u",
+               tok2str(slow_proto_values, "unknown (%u)", subtype),
+               GET_U_1((pptr + 1)),

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

-        printf("%s, length %u",
-               tok2str(slow_proto_values, "unknown (%u)",slow_com_header->proto_subtype),
+        ND_PRINT("%s, length %u",
+               tok2str(slow_proto_values, "unknown (%u)", subtype),

                len);
     }
 
     /* unrecognized subtype */
     if (print_version == -1) {
                len);
     }
 
     /* unrecognized subtype */
     if (print_version == -1) {

-        print_unknown_data(pptr, "\n\t", len);
+        print_unknown_data(ndo, pptr, "\n\t", len);

         return;
     }
 
         return;
     }
 

-    if (!vflag)
+    if (!ndo->ndo_vflag)

         return;
 
         return;
 

-    switch (slow_com_header->proto_subtype) {
+    switch (subtype) {

     default: /* should not happen */
         break;
 
     case SLOW_PROTO_OAM:
     default: /* should not happen */
         break;
 
     case SLOW_PROTO_OAM:

-        /* skip proto_subtype */
-        slow_oam_print(pptr+1, len-1);
+        /* skip subtype */
+        len -= 1;
+        pptr += 1;
+        slow_oam_print(ndo, pptr, len);

         break;
 
     case SLOW_PROTO_LACP:   /* LACP and MARKER share the same semantics */
     case SLOW_PROTO_MARKER:
         break;
 
     case SLOW_PROTO_LACP:   /* LACP and MARKER share the same semantics */
     case SLOW_PROTO_MARKER:

-        /* skip slow_common_header */
-        len -= sizeof(const struct slow_common_header_t);
-        pptr += sizeof(const struct slow_common_header_t);
-        slow_marker_lacp_print(pptr, len);
+        /* skip subtype and version */
+        len -= 2;
+        pptr += 2;
+        slow_marker_lacp_print(ndo, pptr, len, subtype);

         break;
     }
     return;
 
         break;
     }
     return;
 

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

 }
 
 }
 

-void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) {
-
+static void
+slow_marker_lacp_print(netdissect_options *ndo,
+                       const u_char *tptr, u_int tlen,
+                       u_int proto_subtype)
+{

     const struct tlv_header_t *tlv_header;
     const u_char *tlv_tptr;
     const struct tlv_header_t *tlv_header;
     const u_char *tlv_tptr;

-    u_int tlv_len, tlv_tlen;
+    u_int tlv_type, tlv_len, tlv_tlen;

 
     union {
         const struct lacp_marker_tlv_terminator_t *lacp_marker_tlv_terminator;
 
     union {
         const struct lacp_marker_tlv_terminator_t *lacp_marker_tlv_terminator;


@@ -330,99 +354,116 @@ void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) {
         const struct lacp_tlv_collector_info_t *lacp_tlv_collector_info;
         const struct marker_tlv_marker_info_t *marker_tlv_marker_info;
     } tlv_ptr;
         const struct lacp_tlv_collector_info_t *lacp_tlv_collector_info;
         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 ? */
         /* did we capture enough for fully decoding the tlv header ? */

-        TCHECK2(*tptr, sizeof(struct tlv_header_t));

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

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

 
 

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

                tok2str(slow_tlv_values,
                        "Unknown",
                tok2str(slow_tlv_values,
                        "Unknown",

-                       (slow_com_header->proto_subtype << 8) + tlv_header->type),
-               tlv_header->type,
+                       (proto_subtype << 8) + tlv_type),
+               tlv_type,

                tlv_len);
 
                tlv_len);
 

-        if ((tlv_len < sizeof(struct tlv_header_t) ||
-            tlv_len > tlen) &&
-            tlv_header->type != LACP_TLV_TERMINATOR &&
-            tlv_header->type != MARKER_TLV_TERMINATOR) {
-            printf("\n\t-----trailing data-----");
-            print_unknown_data(tptr+sizeof(sizeof(struct tlv_header_t)),"\n\t  ",tlen);
+        if (tlv_type == LACP_MARKER_TLV_TERMINATOR) {
+            /*
+             * This TLV has a length of zero, and means there are no
+             * more TLVs to process.
+             */

             return;
         }
 
             return;
         }
 

-        tlv_tptr=tptr+sizeof(struct tlv_header_t);
-        tlv_tlen=tlv_len-sizeof(struct tlv_header_t);
+        /* length includes the type and length fields */
+        if (tlv_len < sizeof(struct tlv_header_t)) {
+            ND_PRINT("\n\t    ERROR: illegal length - should be >= %zu",
+                     sizeof(struct tlv_header_t));
+            return;
+        }

 
 

+        /* is the packet big enough to include the tlv ? */
+        if (tlen < tlv_len)
+            goto tooshort;

         /* did we capture enough for fully decoding the tlv ? */
         /* did we capture enough for fully decoding the tlv ? */

-        TCHECK2(*tptr, tlv_len);
+        ND_TCHECK_LEN(tptr, tlv_len);
+
+        tlv_tptr=tptr+sizeof(struct tlv_header_t);
+        tlv_tlen=tlv_len-sizeof(struct tlv_header_t);

 
 

-        switch((slow_com_header->proto_subtype << 8) + tlv_header->type) {
+        switch((proto_subtype << 8) + tlv_type) {

 
             /* those two TLVs have the same structure -> fall through */
         case ((SLOW_PROTO_LACP << 8) + LACP_TLV_ACTOR_INFO):
         case ((SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO):
 
             /* those two TLVs have the same structure -> fall through */
         case ((SLOW_PROTO_LACP << 8) + LACP_TLV_ACTOR_INFO):
         case ((SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO):

+            if (tlv_tlen !=
+                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;
 
             tlv_ptr.lacp_tlv_actor_partner_info = (const struct lacp_tlv_actor_partner_info_t *)tlv_tptr;
 

-            printf("\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(tlv_ptr.lacp_tlv_actor_partner_info->sys),
-                   EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->sys_pri),
-                   EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->key),
-                   EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->port),
-                   EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->port_pri),
+                   GET_ETHERADDR_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",

-                              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):
 
             break;
 
         case ((SLOW_PROTO_LACP << 8) + LACP_TLV_COLLECTOR_INFO):

+            if (tlv_tlen !=
+                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;
 
             tlv_ptr.lacp_tlv_collector_info = (const struct lacp_tlv_collector_info_t *)tlv_tptr;
 

-            printf("\n\t  Max Delay %u",
-                   EXTRACT_16BITS(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):
 
             break;
 
         case ((SLOW_PROTO_MARKER << 8) + MARKER_TLV_MARKER_INFO):

-            tlv_ptr.marker_tlv_marker_info = (const struct marker_tlv_marker_info_t *)tlv_tptr;
-
-            printf("\n\t  Request System %s, Request Port %u, Request Transaction ID 0x%08x",
-                   etheraddr_string(tlv_ptr.marker_tlv_marker_info->req_sys),
-                   EXTRACT_16BITS(tlv_ptr.marker_tlv_marker_info->req_port),
-                   EXTRACT_32BITS(tlv_ptr.marker_tlv_marker_info->req_trans_id));
+            if (tlv_tlen !=
+                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;
+            }

 
 

-            break;
+            tlv_ptr.marker_tlv_marker_info = (const struct marker_tlv_marker_info_t *)tlv_tptr;

 
 

-            /* those two TLVs have the same structure -> fall through */
-        case ((SLOW_PROTO_LACP << 8) + LACP_TLV_TERMINATOR):
-        case ((SLOW_PROTO_MARKER << 8) + LACP_TLV_TERMINATOR):
-            tlv_ptr.lacp_marker_tlv_terminator = (const struct lacp_marker_tlv_terminator_t *)tlv_tptr;
-            if (tlv_len == 0) {
-                tlv_len = sizeof(tlv_ptr.lacp_marker_tlv_terminator->pad) +
-                    sizeof(struct tlv_header_t);
-                /* tell the user that we modified the length field  */
-                if (vflag>1)
-                    printf(" (=%u)",tlv_len);
-                /* we have messed around with the length field - now we need to check
-                 * again if there are enough bytes on the wire for the hexdump */
-                TCHECK2(tlv_ptr.lacp_marker_tlv_terminator->pad[0],
-                        sizeof(tlv_ptr.lacp_marker_tlv_terminator->pad));
-            }
+            ND_PRINT("\n\t  Request System %s, Request Port %u, Request Transaction ID 0x%08x",
+                   GET_ETHERADDR_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;
 
         default:
 
             break;
 
         default:

-            if (vflag <= 1)
-                print_unknown_data(tlv_tptr,"\n\t  ",tlv_tlen);
+            if (ndo->ndo_vflag <= 1)
+                print_unknown_data(ndo, tlv_tptr, "\n\t  ", tlv_tlen);

             break;
         }
             break;
         }

+
+    badlength:

         /* do we want to see an additional hexdump ? */
         /* do we want to see an additional hexdump ? */

-        if (vflag > 1) {
-            print_unknown_data(tptr+sizeof(sizeof(struct tlv_header_t)),"\n\t  ",
+        if (ndo->ndo_vflag > 1) {
+            print_unknown_data(ndo, tptr+sizeof(struct tlv_header_t), "\n\t  ",

                                tlv_len-sizeof(struct tlv_header_t));
         }
 
                                tlv_len-sizeof(struct tlv_header_t));
         }
 


@@ -430,113 +471,267 @@ void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) {
         tlen-=tlv_len;
     }
     return;
         tlen-=tlv_len;
     }
     return;

-trunc:
-    printf("\n\t\t packet exceeded snapshot");
+
+tooshort:
+    ND_PRINT("\n\t\t packet is too short");

 }
 
 }
 

-void slow_oam_print(register const u_char *tptr, register u_int tlen) {
+static void
+slow_oam_print(netdissect_options *ndo,
+               const u_char *tptr, u_int tlen)
+{
+    uint8_t code;
+    uint8_t type, length;
+    uint8_t state;
+    uint8_t command;
+    u_int hexdump;

 
     struct slow_oam_common_header_t {
 
     struct slow_oam_common_header_t {

-        u_int8_t flags[2];
-        u_int8_t code;
+        nd_uint16_t flags;
+        nd_uint8_t code;
+    };
+
+    struct slow_oam_tlv_header_t {
+        nd_uint8_t type;
+        nd_uint8_t length;

     };
     };

-    const struct slow_oam_common_header_t *slow_oam_common_header;

 
     union {
 
     union {

-       const struct slow_oam_info_t *slow_oam_info;
-        const struct slow_oam_eventnotification_t *slow_oam_eventnotification;
+        const struct slow_oam_common_header_t *slow_oam_common_header;
+        const struct slow_oam_tlv_header_t *slow_oam_tlv_header;
+    } ptr;
+
+    union {
+        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_variablerequest_t *slow_oam_variablerequest;
         const struct slow_oam_variableresponse_t *slow_oam_variableresponse;

+        const struct slow_oam_loopbackctrl_t *slow_oam_loopbackctrl;

     } tlv;
     } tlv;

-    
-    slow_oam_common_header = (struct slow_oam_common_header_t *)tptr;
+
+    ptr.slow_oam_common_header = (const struct slow_oam_common_header_t *)tptr;
+    if (tlen < sizeof(*ptr.slow_oam_common_header))
+        goto tooshort;
+    ND_TCHECK_SIZE(ptr.slow_oam_common_header);

     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);
 

-    printf("\n\tCode %s OAM PDU, Flags [%s]",
-           tok2str(slow_oam_code_values, "Unknown (%u)", slow_oam_common_header->code),
+    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",
            bittok2str(slow_oam_flag_values,
                       "none",

-                      EXTRACT_16BITS(&slow_oam_common_header->flags)));
+                      GET_BE_U_2(ptr.slow_oam_common_header->flags)));

 
 

-    switch (slow_oam_common_header->code) {
+    switch (code) {

     case SLOW_OAM_CODE_INFO:
         while (tlen > 0) {
     case SLOW_OAM_CODE_INFO:
         while (tlen > 0) {

-           tlv.slow_oam_info = (const struct slow_oam_info_t *)tptr;
-            printf("\n\t  %s Information Type (%u), Version %u, Rev %u, length %u",
-                   tok2str(slow_oam_info_type_values, "Reserved", tlv.slow_oam_info->info_type),
-                   tlv.slow_oam_info->info_type,
-                   tlv.slow_oam_info->oam_version,
-                   EXTRACT_16BITS(&tlv.slow_oam_info->revision),
-                   tlv.slow_oam_info->info_len);
-
-            switch (tlv.slow_oam_info->info_type) {
-            case SLOW_OAM_INFO_TYPE_END_OF_TLV:
-                
-                if (tlv.slow_oam_info->info_len != 0) {
-                    printf("\n\t    ERROR: illegal length - should be 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);
+            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,
+                   length);
+
+            if (type == SLOW_OAM_INFO_TYPE_END_OF_TLV) {
+                /*
+                 * As IEEE Std 802.3-2015 says for the End of TLV Marker,
+                 * "(the length and value of the Type 0x00 TLV can be ignored)".
+                 */
+                return;
+            }
+
+            /* length includes the type and length fields */
+            if (length < 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;

-                
+            }
+
+            if (tlen < length)
+                goto tooshort;
+            ND_TCHECK_LEN(tptr, length);
+
+            hexdump = FALSE;
+            switch (type) {

             case SLOW_OAM_INFO_TYPE_LOCAL: /* identical format - fall through */
             case SLOW_OAM_INFO_TYPE_REMOTE:
             case SLOW_OAM_INFO_TYPE_LOCAL: /* identical format - fall through */
             case SLOW_OAM_INFO_TYPE_REMOTE:

-                
-                if (tlv.slow_oam_info->info_len !=
-                    SLOW_OAM_INFO_TYPE_LOCAL_REMOTE_MINLEN) {
-                    printf("\n\t    ERROR: illegal length - should be %u",
-                           SLOW_OAM_INFO_TYPE_LOCAL_REMOTE_MINLEN);
-                    return;
+                tlv.slow_oam_info = (const struct slow_oam_info_t *)tptr;
+
+                if (GET_U_1(tlv.slow_oam_info->info_length) !=
+                    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;

                 }
                 }

-                
-                printf("\n\t    State-MUX-Action %s, State-Parser-Action %s",
+
+                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 = 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",
                        tok2str(slow_oam_info_type_state_parser_values, "Reserved",

-                               tlv.slow_oam_info->state & OAM_INFO_TYPE_PARSER_MASK),
+                               state & OAM_INFO_TYPE_PARSER_MASK),

                        tok2str(slow_oam_info_type_state_mux_values, "Reserved",
                        tok2str(slow_oam_info_type_state_mux_values, "Reserved",

-                               tlv.slow_oam_info->state & OAM_INFO_TYPE_MUX_MASK));
-                printf("\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",

-                                  tlv.slow_oam_info->oam_config),
-                       EXTRACT_16BITS(&tlv.slow_oam_info->oam_pdu_config) &
+                                  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);
                        OAM_INFO_TYPE_PDU_SIZE_MASK);

-                printf("\n\t    OUI %s (0x%06x), Vendor-Private 0x%08x",
+                ND_PRINT("\n\t    OUI %s (0x%06x), Vendor-Private 0x%08x",

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

-                               EXTRACT_24BITS(&tlv.slow_oam_info->oui)),
-                       EXTRACT_24BITS(&tlv.slow_oam_info->oui),
-                       EXTRACT_32BITS(&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;
                 break;

-                
+

             case SLOW_OAM_INFO_TYPE_ORG_SPECIFIC:
             case SLOW_OAM_INFO_TYPE_ORG_SPECIFIC:

-                /* FIXME hexdump */
+                hexdump = TRUE;

                 break;
                 break;

-                
+

             default:
             default:

+                hexdump = TRUE;

                 break;
             }
 
                 break;
             }
 

-            /* infinite loop check */
-            if (!tlv.slow_oam_info->info_len) {
-                return;
+        badlength_code_info:
+            /* do we also want to see a hex dump ? */
+            if (ndo->ndo_vflag > 1 || hexdump==TRUE) {
+                print_unknown_data(ndo, tptr, "\n\t  ",
+                                   length);

             }
             }

-            tlen -= tlv.slow_oam_info->info_len;
-            tptr += tlv.slow_oam_info->info_len;
+
+            tlen -= length;
+            tptr += length;

         }
         break;
         }
         break;

-        /* FIXME no codes yet known - just hexdump for now */
+

     case SLOW_OAM_CODE_EVENT_NOTIF:
     case SLOW_OAM_CODE_EVENT_NOTIF:

+        /* Sequence number */
+        if (tlen < 2)
+            goto tooshort;
+        ND_PRINT("\n\t  Sequence Number %u", GET_BE_U_2(tptr));
+        tlen -= 2;
+        tptr += 2;
+
+        /* TLVs */
+        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;
+            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,
+                   length);
+
+            if (type == SLOW_OAM_INFO_TYPE_END_OF_TLV) {
+                /*
+                 * As IEEE Std 802.3-2015 says for the End of TLV Marker,
+                 * "(the length and value of the Type 0x00 TLV can be ignored)".
+                 */
+                return;
+            }
+
+            /* length includes the type and length fields */
+            if (length < 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;
+            }
+
+            if (tlen < length)
+                goto tooshort;
+            ND_TCHECK_LEN(tptr, length);
+
+            hexdump = FALSE;
+            switch (type) {
+            case SLOW_OAM_LINK_EVENT_ERR_SYM_PER: /* identical format - fall through */
+            case SLOW_OAM_LINK_EVENT_ERR_FRM:
+            case SLOW_OAM_LINK_EVENT_ERR_FRM_PER:
+            case SLOW_OAM_LINK_EVENT_ERR_FRM_SUMM:
+                tlv.slow_oam_link_event = (const struct slow_oam_link_event_t *)tptr;
+
+                if (GET_U_1(tlv.slow_oam_link_event->event_length) !=
+                    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;
+                }
+
+                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",
+                       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:
+                hexdump = TRUE;
+                break;
+
+            default:
+                hexdump = TRUE;
+                break;
+            }
+
+        badlength_event_notif:
+            /* do we also want to see a hex dump ? */
+            if (ndo->ndo_vflag > 1 || hexdump==TRUE) {
+                print_unknown_data(ndo, tptr, "\n\t  ",
+                                   length);
+            }
+
+            tlen -= length;
+            tptr += length;
+        }
+        break;
+
+    case SLOW_OAM_CODE_LOOPBACK_CTRL:
+        tlv.slow_oam_loopbackctrl = (const struct slow_oam_loopbackctrl_t *)tptr;
+        if (tlen < sizeof(*tlv.slow_oam_loopbackctrl))
+            goto tooshort;
+        command = GET_U_1(tlv.slow_oam_loopbackctrl->command);
+        ND_PRINT("\n\t  Command %s (%u)",
+               tok2str(slow_oam_loopbackctrl_cmd_values,
+                       "Unknown",
+                       command),
+               command);
+        tptr ++;
+        tlen --;
+        break;
+
+        /*
+         * FIXME those are the defined codes that lack a decoder
+         * you are welcome to contribute code ;-)
+         */

     case SLOW_OAM_CODE_VAR_REQUEST:
     case SLOW_OAM_CODE_VAR_RESPONSE:
     case SLOW_OAM_CODE_VAR_REQUEST:
     case SLOW_OAM_CODE_VAR_RESPONSE:

-    case SLOW_OAM_CODE_LOOPBACK_CTRL:

     case SLOW_OAM_CODE_PRIVATE:
     default:
     case SLOW_OAM_CODE_PRIVATE:
     default:

-        if (vflag <= 1) {
-            print_unknown_data(tptr,"\n\t  ", tlen);
+        if (ndo->ndo_vflag <= 1) {
+            print_unknown_data(ndo, tptr, "\n\t  ", tlen);

         }
         break;
     }
         }
         break;
     }

-    /* do we want to see an additional hexdump ? */
-    if (vflag > 1) {
-        print_unknown_data(tptr,"\n\t  ", tlen);
-    }
-

     return;
     return;

+
+tooshort:
+    ND_PRINT("\n\t\t packet is too short");

 }
 }