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

[tcpdump] / print-stp.c

diff --git a/print-stp.c b/print-stp.c
index 4d0e86985388ccafd734885f64d364744faa707c..7e928b33f3b12dd1406e43d974a1d747a232dcb6 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -10,9 +10,7 @@
 
 /* \summary: IEEE 802.1d Spanning Tree Protocol (STP) printer */
 
 
 /* \summary: IEEE 802.1d Spanning Tree Protocol (STP) printer */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -84,8 +82,6 @@ static const struct tok rstp_obj_port_role_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-#define ND_TCHECK_BRIDGE_ID(p) ND_TCHECK_8(p)
-

 static char *
 stp_print_bridge_id(netdissect_options *ndo, const u_char *p)
 {
 static char *
 stp_print_bridge_id(netdissect_options *ndo, const u_char *p)
 {


@@ -100,28 +96,25 @@ stp_print_bridge_id(netdissect_options *ndo, const u_char *p)
     return bridge_id_str;
 }
 
     return bridge_id_str;
 }
 

-static int
+static void

 stp_print_config_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
                       u_int length)
 {
     uint8_t bpdu_flags;
 
 stp_print_config_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
                       u_int length)
 {
     uint8_t bpdu_flags;
 

-    ND_TCHECK_1(stp_bpdu->flags);

     bpdu_flags = GET_U_1(stp_bpdu->flags);
     ND_PRINT(", Flags [%s]",
            bittok2str(stp_bpdu_flag_values, "none", bpdu_flags));
 
     bpdu_flags = GET_U_1(stp_bpdu->flags);
     ND_PRINT(", Flags [%s]",
            bittok2str(stp_bpdu_flag_values, "none", bpdu_flags));
 

-    ND_TCHECK_2(stp_bpdu->port_id);

     ND_PRINT(", bridge-id %s.%04x, length %u",
            stp_print_bridge_id(ndo, stp_bpdu->bridge_id),
            GET_BE_U_2(stp_bpdu->port_id), length);
 
     /* in non-verbose mode just print the bridge-id */
     if (!ndo->ndo_vflag) {
     ND_PRINT(", bridge-id %s.%04x, length %u",
            stp_print_bridge_id(ndo, stp_bpdu->bridge_id),
            GET_BE_U_2(stp_bpdu->port_id), length);
 
     /* in non-verbose mode just print the bridge-id */
     if (!ndo->ndo_vflag) {

-        return 1;
+        return;

     }
 
     }
 

-    ND_TCHECK_2(stp_bpdu->forward_delay);

     ND_PRINT("\n\tmessage-age %.2fs, max-age %.2fs"
            ", hello-time %.2fs, forwarding-delay %.2fs",
            (float) GET_BE_U_2(stp_bpdu->message_age) / STP_TIME_BASE,
     ND_PRINT("\n\tmessage-age %.2fs, max-age %.2fs"
            ", hello-time %.2fs, forwarding-delay %.2fs",
            (float) GET_BE_U_2(stp_bpdu->message_age) / STP_TIME_BASE,


@@ -139,10 +132,6 @@ stp_print_config_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
                tok2str(rstp_obj_port_role_values, "Unknown",
                        RSTP_EXTRACT_PORT_ROLE(bpdu_flags)));
     }
                tok2str(rstp_obj_port_role_values, "Unknown",
                        RSTP_EXTRACT_PORT_ROLE(bpdu_flags)));
     }

-    return 1;
-
-trunc:
-    return 0;

 }
 
 /*
 }
 
 /*


@@ -153,7 +142,7 @@ trunc:
  *
  * 2 -  bytes Protocol Id
  * 1 -  byte  Protocol Ver.
  *
  * 2 -  bytes Protocol Id
  * 1 -  byte  Protocol Ver.

- * 1 -  byte  BPDU tye
+ * 1 -  byte  BPDU type

  * 1 -  byte  Flags
  * 8 -  bytes CIST Root Identifier
  * 4 -  bytes CIST External Path Cost
  * 1 -  byte  Flags
  * 8 -  bytes CIST Root Identifier
  * 4 -  bytes CIST External Path Cost


@@ -212,7 +201,7 @@ trunc:
 #define MST_BPDU_MSTI_LENGTH               16
 #define MST_BPDU_CONFIG_INFO_LENGTH        64
 
 #define MST_BPDU_MSTI_LENGTH               16
 #define MST_BPDU_CONFIG_INFO_LENGTH        64
 

-/* Offsets of fields from the begginning for the packet */
+/* Offsets of fields from the beginning for the packet */

 #define MST_BPDU_VER3_LEN_OFFSET           36
 #define MST_BPDU_CONFIG_NAME_OFFSET        39
 #define MST_BPDU_CONFIG_DIGEST_OFFSET      73
 #define MST_BPDU_VER3_LEN_OFFSET           36
 #define MST_BPDU_CONFIG_NAME_OFFSET        39
 #define MST_BPDU_CONFIG_DIGEST_OFFSET      73


@@ -240,7 +229,7 @@ trunc:
 #define SPB_BPDU_AGREEMENT_RES2_OFFSET    SPB_BPDU_AGREEMENT_RES1_OFFSET + 4
 #define SPB_BPDU_AGREEMENT_DIGEST_OFFSET  SPB_BPDU_AGREEMENT_RES2_OFFSET + 4
 
 #define SPB_BPDU_AGREEMENT_RES2_OFFSET    SPB_BPDU_AGREEMENT_RES1_OFFSET + 4
 #define SPB_BPDU_AGREEMENT_DIGEST_OFFSET  SPB_BPDU_AGREEMENT_RES2_OFFSET + 4
 

-static int
+static void

 stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
                     u_int length)
 {
 stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
                     u_int length)
 {


@@ -252,7 +241,6 @@ stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
     u_int          offset;
 
     ptr = (const u_char *)stp_bpdu;
     u_int          offset;
 
     ptr = (const u_char *)stp_bpdu;

-    ND_TCHECK_1(stp_bpdu->flags);

     bpdu_flags = GET_U_1(stp_bpdu->flags);
     ND_PRINT(", CIST Flags [%s], length %u",
            bittok2str(stp_bpdu_flag_values, "none", bpdu_flags), length);
     bpdu_flags = GET_U_1(stp_bpdu->flags);
     ND_PRINT(", CIST Flags [%s], length %u",
            bittok2str(stp_bpdu_flag_values, "none", bpdu_flags), length);


@@ -261,26 +249,22 @@ stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
      * in non-verbose mode just print the flags.
      */
     if (!ndo->ndo_vflag) {
      * in non-verbose mode just print the flags.
      */
     if (!ndo->ndo_vflag) {

-        return 1;
+        return;

     }
 
     ND_PRINT("\n\tport-role %s, ",
            tok2str(rstp_obj_port_role_values, "Unknown",
                    RSTP_EXTRACT_PORT_ROLE(bpdu_flags)));
 
     }
 
     ND_PRINT("\n\tport-role %s, ",
            tok2str(rstp_obj_port_role_values, "Unknown",
                    RSTP_EXTRACT_PORT_ROLE(bpdu_flags)));
 

-    ND_TCHECK_4(stp_bpdu->root_path_cost);

     ND_PRINT("CIST root-id %s, CIST ext-pathcost %u",
            stp_print_bridge_id(ndo, stp_bpdu->root_id),
            GET_BE_U_4(stp_bpdu->root_path_cost));
 
     ND_PRINT("CIST root-id %s, CIST ext-pathcost %u",
            stp_print_bridge_id(ndo, stp_bpdu->root_id),
            GET_BE_U_4(stp_bpdu->root_path_cost));
 

-    ND_TCHECK_SIZE(&stp_bpdu->bridge_id);

     ND_PRINT("\n\tCIST regional-root-id %s, ",
            stp_print_bridge_id(ndo, stp_bpdu->bridge_id));
 
     ND_PRINT("\n\tCIST regional-root-id %s, ",
            stp_print_bridge_id(ndo, stp_bpdu->bridge_id));
 

-    ND_TCHECK_2(stp_bpdu->port_id);

     ND_PRINT("CIST port-id %04x,", GET_BE_U_2(stp_bpdu->port_id));
 
     ND_PRINT("CIST port-id %04x,", GET_BE_U_2(stp_bpdu->port_id));
 

-    ND_TCHECK_2(stp_bpdu->forward_delay);

     ND_PRINT("\n\tmessage-age %.2fs, max-age %.2fs"
            ", hello-time %.2fs, forwarding-delay %.2fs",
            (float) GET_BE_U_2(stp_bpdu->message_age) / STP_TIME_BASE,
     ND_PRINT("\n\tmessage-age %.2fs, max-age %.2fs"
            ", hello-time %.2fs, forwarding-delay %.2fs",
            (float) GET_BE_U_2(stp_bpdu->message_age) / STP_TIME_BASE,


@@ -288,12 +272,9 @@ stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
            (float) GET_BE_U_2(stp_bpdu->hello_time) / STP_TIME_BASE,
            (float) GET_BE_U_2(stp_bpdu->forward_delay) / STP_TIME_BASE);
 
            (float) GET_BE_U_2(stp_bpdu->hello_time) / STP_TIME_BASE,
            (float) GET_BE_U_2(stp_bpdu->forward_delay) / STP_TIME_BASE);
 

-    ND_TCHECK_2(ptr + MST_BPDU_VER3_LEN_OFFSET);

     ND_PRINT("\n\tv3len %u, ", GET_BE_U_2(ptr + MST_BPDU_VER3_LEN_OFFSET));
     ND_PRINT("\n\tv3len %u, ", GET_BE_U_2(ptr + MST_BPDU_VER3_LEN_OFFSET));

-    ND_TCHECK_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 12);

     ND_PRINT("MCID Name ");
     ND_PRINT("MCID Name ");

-    if (nd_printzp(ndo, ptr + MST_BPDU_CONFIG_NAME_OFFSET, 32, ndo->ndo_snapend))
-       goto trunc;
+    nd_printjnp(ndo, ptr + MST_BPDU_CONFIG_NAME_OFFSET, 32);

     ND_PRINT(", rev %u,"
             "\n\t\tdigest %08x%08x%08x%08x, ",
                  GET_BE_U_2(ptr + MST_BPDU_CONFIG_NAME_OFFSET + 32),
     ND_PRINT(", rev %u,"
             "\n\t\tdigest %08x%08x%08x%08x, ",
                  GET_BE_U_2(ptr + MST_BPDU_CONFIG_NAME_OFFSET + 32),


@@ -302,27 +283,21 @@ stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
                  GET_BE_U_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 8),
                  GET_BE_U_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 12));
 
                  GET_BE_U_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 8),
                  GET_BE_U_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 12));
 

-    ND_TCHECK_4(ptr + MST_BPDU_CIST_INT_PATH_COST_OFFSET);

     ND_PRINT("CIST int-root-pathcost %u,",
             GET_BE_U_4(ptr + MST_BPDU_CIST_INT_PATH_COST_OFFSET));
 
     ND_PRINT("CIST int-root-pathcost %u,",
             GET_BE_U_4(ptr + MST_BPDU_CIST_INT_PATH_COST_OFFSET));
 

-    ND_TCHECK_BRIDGE_ID(ptr + MST_BPDU_CIST_BRIDGE_ID_OFFSET);

     ND_PRINT("\n\tCIST bridge-id %s, ",
            stp_print_bridge_id(ndo, ptr + MST_BPDU_CIST_BRIDGE_ID_OFFSET));
 
     ND_PRINT("\n\tCIST bridge-id %s, ",
            stp_print_bridge_id(ndo, ptr + MST_BPDU_CIST_BRIDGE_ID_OFFSET));
 

-    ND_TCHECK_1(ptr + MST_BPDU_CIST_REMAIN_HOPS_OFFSET);

     ND_PRINT("CIST remaining-hops %u",
              GET_U_1(ptr + MST_BPDU_CIST_REMAIN_HOPS_OFFSET));
 
     /* Dump all MSTI's */
     ND_PRINT("CIST remaining-hops %u",
              GET_U_1(ptr + MST_BPDU_CIST_REMAIN_HOPS_OFFSET));
 
     /* Dump all MSTI's */

-    ND_TCHECK_2(ptr + MST_BPDU_VER3_LEN_OFFSET);

     v3len = GET_BE_U_2(ptr + MST_BPDU_VER3_LEN_OFFSET);
     if (v3len > MST_BPDU_CONFIG_INFO_LENGTH) {
         len = v3len - MST_BPDU_CONFIG_INFO_LENGTH;
         offset = MST_BPDU_MSTI_OFFSET;
         while (len >= MST_BPDU_MSTI_LENGTH) {
     v3len = GET_BE_U_2(ptr + MST_BPDU_VER3_LEN_OFFSET);
     if (v3len > MST_BPDU_CONFIG_INFO_LENGTH) {
         len = v3len - MST_BPDU_CONFIG_INFO_LENGTH;
         offset = MST_BPDU_MSTI_OFFSET;
         while (len >= MST_BPDU_MSTI_LENGTH) {

-            ND_TCHECK_LEN(ptr + offset, MST_BPDU_MSTI_LENGTH);
-

             msti = GET_BE_U_2(ptr + offset + MST_BPDU_MSTI_ROOT_PRIO_OFFSET);
             msti = msti & 0x0FFF;
 
             msti = GET_BE_U_2(ptr + offset + MST_BPDU_MSTI_ROOT_PRIO_OFFSET);
             msti = msti & 0x0FFF;
 


@@ -344,13 +319,9 @@ stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
             offset += MST_BPDU_MSTI_LENGTH;
         }
     }
             offset += MST_BPDU_MSTI_LENGTH;
         }
     }

-    return 1;
-
-trunc:
-    return 0;

 }
 
 }
 

-static int
+static void

 stp_print_spb_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
                    u_int offset)
 {
 stp_print_spb_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
                    u_int offset)
 {


@@ -360,17 +331,14 @@ stp_print_spb_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
      * in non-verbose mode don't print anything.
      */
     if (!ndo->ndo_vflag) {
      * in non-verbose mode don't print anything.
      */
     if (!ndo->ndo_vflag) {

-        return 1;
+        return;

     }
 
     ptr = (const u_char *)stp_bpdu;
     }
 
     ptr = (const u_char *)stp_bpdu;

-    ND_TCHECK_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 16);

 
     ND_PRINT("\n\tv4len %u, ", GET_BE_U_2(ptr + offset));
     ND_PRINT("AUXMCID Name ");
 
     ND_PRINT("\n\tv4len %u, ", GET_BE_U_2(ptr + offset));
     ND_PRINT("AUXMCID Name ");

-    if (nd_printzp(ndo, ptr + offset + SPB_BPDU_CONFIG_NAME_OFFSET, 32,
-                  ndo->ndo_snapend))
-       goto trunc;
+    nd_printjnp(ndo, ptr + offset + SPB_BPDU_CONFIG_NAME_OFFSET, 32);

     ND_PRINT(", Rev %u,\n\t\tdigest %08x%08x%08x%08x",
             GET_BE_U_2(ptr + offset + SPB_BPDU_CONFIG_REV_OFFSET),
             GET_BE_U_4(ptr + offset + SPB_BPDU_CONFIG_DIGEST_OFFSET),
     ND_PRINT(", Rev %u,\n\t\tdigest %08x%08x%08x%08x",
             GET_BE_U_2(ptr + offset + SPB_BPDU_CONFIG_REV_OFFSET),
             GET_BE_U_4(ptr + offset + SPB_BPDU_CONFIG_DIGEST_OFFSET),


@@ -396,10 +364,6 @@ stp_print_spb_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
             GET_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 8),
             GET_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 12),
             GET_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 16));
             GET_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 8),
             GET_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 12),
             GET_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 16));

-    return 1;
-
-trunc:
-    return 0;

 }
 
 /*
 }
 
 /*


@@ -419,15 +383,13 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
 
     /* Minimum STP Frame size. */
     if (length < 4)
 
     /* Minimum STP Frame size. */
     if (length < 4)

-        goto trunc;
+        goto invalid;

 
 

-    ND_TCHECK_2(stp_bpdu->protocol_id);

     if (GET_BE_U_2(stp_bpdu->protocol_id)) {
         ND_PRINT("unknown STP version, length %u", length);
         return;
     }
 
     if (GET_BE_U_2(stp_bpdu->protocol_id)) {
         ND_PRINT("unknown STP version, length %u", length);
         return;
     }
 

-    ND_TCHECK_1(stp_bpdu->protocol_version);

     protocol_version = GET_U_1(stp_bpdu->protocol_version);
     ND_PRINT("STP %s", tok2str(stp_proto_values, "Unknown STP protocol (0x%02x)",
                          protocol_version));
     protocol_version = GET_U_1(stp_bpdu->protocol_version);
     ND_PRINT("STP %s", tok2str(stp_proto_values, "Unknown STP protocol (0x%02x)",
                          protocol_version));


@@ -442,7 +404,6 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
         return;
     }
 
         return;
     }
 

-    ND_TCHECK_1(stp_bpdu->bpdu_type);

     bpdu_type = GET_U_1(stp_bpdu->bpdu_type);
     ND_PRINT(", %s", tok2str(stp_bpdu_type_values, "Unknown BPDU Type (0x%02x)",
                            bpdu_type));
     bpdu_type = GET_U_1(stp_bpdu->bpdu_type);
     ND_PRINT(", %s", tok2str(stp_bpdu_type_values, "Unknown BPDU Type (0x%02x)",
                            bpdu_type));


@@ -450,53 +411,45 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
     switch (bpdu_type) {
     case STP_BPDU_TYPE_CONFIG:
         if (length < sizeof(struct stp_bpdu_) - 1) {
     switch (bpdu_type) {
     case STP_BPDU_TYPE_CONFIG:
         if (length < sizeof(struct stp_bpdu_) - 1) {

-            goto trunc;
+            goto invalid;

         }
         }

-        if (!stp_print_config_bpdu(ndo, stp_bpdu, length))
-            goto trunc;
+        stp_print_config_bpdu(ndo, stp_bpdu, length);

         break;
 
     case STP_BPDU_TYPE_RSTP:
         if (protocol_version == STP_PROTO_RAPID) {
             if (length < sizeof(struct stp_bpdu_)) {
         break;
 
     case STP_BPDU_TYPE_RSTP:
         if (protocol_version == STP_PROTO_RAPID) {
             if (length < sizeof(struct stp_bpdu_)) {

-                goto trunc;
+                goto invalid;

             }
             }

-            if (!stp_print_config_bpdu(ndo, stp_bpdu, length))
-                goto trunc;
+            stp_print_config_bpdu(ndo, stp_bpdu, length);

         } else if (protocol_version == STP_PROTO_MSTP ||
                    protocol_version == STP_PROTO_SPB) {
             if (length < STP_BPDU_MSTP_MIN_LEN) {
         } else if (protocol_version == STP_PROTO_MSTP ||
                    protocol_version == STP_PROTO_SPB) {
             if (length < STP_BPDU_MSTP_MIN_LEN) {

-                goto trunc;
+                goto invalid;

             }
 
             }
 

-            ND_TCHECK_1(stp_bpdu->v1_length);

             if (GET_U_1(stp_bpdu->v1_length) != 0) {
                 /* FIX ME: Emit a message here ? */
             if (GET_U_1(stp_bpdu->v1_length) != 0) {
                 /* FIX ME: Emit a message here ? */

-                goto trunc;
+                goto invalid;

             }
 
             /* Validate v3 length */
             }
 
             /* Validate v3 length */

-            ND_TCHECK_2(p + MST_BPDU_VER3_LEN_OFFSET);

             mstp_len = GET_BE_U_2(p + MST_BPDU_VER3_LEN_OFFSET);
             mstp_len += 2;  /* length encoding itself is 2 bytes */
             if (length < (sizeof(struct stp_bpdu_) + mstp_len)) {
             mstp_len = GET_BE_U_2(p + MST_BPDU_VER3_LEN_OFFSET);
             mstp_len += 2;  /* length encoding itself is 2 bytes */
             if (length < (sizeof(struct stp_bpdu_) + mstp_len)) {

-                goto trunc;
+                goto invalid;

             }
             }

-            if (!stp_print_mstp_bpdu(ndo, stp_bpdu, length))
-                goto trunc;
+            stp_print_mstp_bpdu(ndo, stp_bpdu, length);

 
 

-            if (protocol_version == STP_PROTO_SPB)
-            {
+            if (protocol_version == STP_PROTO_SPB) {

               /* Validate v4 length */
               /* Validate v4 length */

-              ND_TCHECK_2(p + MST_BPDU_VER3_LEN_OFFSET + mstp_len);

               spb_len = GET_BE_U_2(p + MST_BPDU_VER3_LEN_OFFSET + mstp_len);
               spb_len += 2;
               if (length < (sizeof(struct stp_bpdu_) + mstp_len + spb_len) ||
                   spb_len < SPB_BPDU_MIN_LEN) {
               spb_len = GET_BE_U_2(p + MST_BPDU_VER3_LEN_OFFSET + mstp_len);
               spb_len += 2;
               if (length < (sizeof(struct stp_bpdu_) + mstp_len + spb_len) ||
                   spb_len < SPB_BPDU_MIN_LEN) {

-                goto trunc;
+                goto invalid;

               }
               }

-              if (!stp_print_spb_bpdu(ndo, stp_bpdu, (sizeof(struct stp_bpdu_) + mstp_len)))
-                goto trunc;
+              stp_print_spb_bpdu(ndo, stp_bpdu, (sizeof(struct stp_bpdu_) + mstp_len));

             }
         }
         break;
             }
         }
         break;


@@ -508,8 +461,8 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
     default:
         break;
     }
     default:
         break;
     }

-

     return;
     return;

-trunc:
-    nd_print_trunc(ndo);
+
+invalid:
+    nd_print_invalid(ndo);

 }
 }