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

[tcpdump] / print-vtp.c

diff --git a/print-vtp.c b/print-vtp.c
index e2b1f9ff927d29e5ddc8e44d9fe4e3f51382841f..82dfe2b3234463b2093871af2b7325465636efa6 100644 (file)
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -13,20 +13,19 @@
  * FOR A PARTICULAR PURPOSE.
  *
  * Reference documentation:
  * FOR A PARTICULAR PURPOSE.
  *
  * Reference documentation:

- *  http://www.cisco.com/c/en/us/support/docs/lan-switching/vtp/10558-21.html
- *  http://docstore.mik.ua/univercd/cc/td/doc/product/lan/trsrb/frames.htm
+ *  https://www.cisco.com/c/en/us/support/docs/lan-switching/vtp/10558-21.html
+ *  https://docstore.mik.ua/univercd/cc/td/doc/product/lan/trsrb/frames.htm

  *
  * Original code ode by Carles Kishimoto <[email protected]>
  */
 
 /* \summary: Cisco VLAN Trunking Protocol (VTP) printer */
 
  *
  * Original code ode by Carles Kishimoto <[email protected]>
  */
 
 /* \summary: Cisco VLAN Trunking Protocol (VTP) printer */
 

-#ifdef HAVE_CONFIG_H

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

-#endif

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

+#define ND_LONGJMP_FROM_TCHECK

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


@@ -117,7 +116,7 @@ static const struct tok vtp_stp_type_values[] = {
 
 void
 vtp_print(netdissect_options *ndo,
 
 void
 vtp_print(netdissect_options *ndo,

-          const u_char *pptr, u_int length)
+          const u_char *pptr, const u_int length)

 {
     u_int type, len, name_len, tlv_len, tlv_value, mgmtd_len;
     const u_char *tptr;
 {
     u_int type, len, name_len, tlv_len, tlv_value, mgmtd_len;
     const u_char *tptr;


@@ -125,7 +124,7 @@ vtp_print(netdissect_options *ndo,
 
     ndo->ndo_protocol = "vtp";
     if (length < VTP_HEADER_LEN)
 
     ndo->ndo_protocol = "vtp";
     if (length < VTP_HEADER_LEN)

-        goto trunc;
+        goto invalid;

 
     tptr = pptr;
 
 
     tptr = pptr;
 


@@ -140,17 +139,17 @@ vtp_print(netdissect_options *ndo,
 
     /* In non-verbose mode, just print version and message type */
     if (ndo->ndo_vflag < 1) {
 
     /* In non-verbose mode, just print version and message type */
     if (ndo->ndo_vflag < 1) {

-        return;
+        goto tcheck_full_packet;

     }
 
     /* verbose mode print all fields */
     ND_PRINT("\n\tDomain name: ");
     mgmtd_len = GET_U_1(tptr + 3);
     }
 
     /* verbose mode print all fields */
     ND_PRINT("\n\tDomain name: ");
     mgmtd_len = GET_U_1(tptr + 3);

-    if (mgmtd_len < 1 ||  mgmtd_len > 32) {
-       ND_PRINT(" [invalid MgmtD Len %u]", mgmtd_len);
-       return;
+    if (mgmtd_len < 1 ||  mgmtd_len > VTP_DOMAIN_NAME_LEN) {
+       ND_PRINT(" [MgmtD Len %u]", mgmtd_len);
+       goto invalid;

     }
     }

-    nd_printzp(ndo, tptr + 4, mgmtd_len, NULL);
+    nd_printjnp(ndo, tptr + 4, mgmtd_len);

     ND_PRINT(", %s: %u",
           tok2str(vtp_header_values, "Unknown", type),
           GET_U_1(tptr + 2));
     ND_PRINT(", %s: %u",
           tok2str(vtp_header_values, "Unknown", type),
           GET_U_1(tptr + 2));


@@ -181,18 +180,15 @@ vtp_print(netdissect_options *ndo,
         *
         */
 
         *
         */
 

-       ND_TCHECK_8(tptr);

        ND_PRINT("\n\t  Config Rev %x, Updater %s",
               GET_BE_U_4(tptr),
        ND_PRINT("\n\t  Config Rev %x, Updater %s",
               GET_BE_U_4(tptr),

-              ipaddr_string(ndo, tptr+4));
+              GET_IPADDR_STRING(tptr+4));

        tptr += 8;
        tptr += 8;

-       ND_TCHECK_LEN(tptr, VTP_UPDATE_TIMESTAMP_LEN);

        ND_PRINT(", Timestamp 0x%08x 0x%08x 0x%08x",
               GET_BE_U_4(tptr),
               GET_BE_U_4(tptr + 4),
               GET_BE_U_4(tptr + 8));
        tptr += VTP_UPDATE_TIMESTAMP_LEN;
        ND_PRINT(", Timestamp 0x%08x 0x%08x 0x%08x",
               GET_BE_U_4(tptr),
               GET_BE_U_4(tptr + 4),
               GET_BE_U_4(tptr + 8));
        tptr += VTP_UPDATE_TIMESTAMP_LEN;

-       ND_TCHECK_LEN(tptr, VTP_MD5_DIGEST_LEN);

        ND_PRINT(", MD5 digest: %08x%08x%08x%08x",
               GET_BE_U_4(tptr),
               GET_BE_U_4(tptr + 4),
        ND_PRINT(", MD5 digest: %08x%08x%08x%08x",
               GET_BE_U_4(tptr),
               GET_BE_U_4(tptr + 4),


@@ -223,7 +219,6 @@ vtp_print(netdissect_options *ndo,
         *
         */
 
         *
         */
 

-       ND_TCHECK_4(tptr);

        ND_PRINT(", Config Rev %x", GET_BE_U_4(tptr));
 
        /*
        ND_PRINT(", Config Rev %x", GET_BE_U_4(tptr));
 
        /*


@@ -242,9 +237,8 @@ vtp_print(netdissect_options *ndo,
         */
 
        tptr += 4;
         */
 
        tptr += 4;

-       while (tptr < (pptr+length)) {
+       while ((unsigned)(tptr - pptr) < length) {

 
 

-           ND_TCHECK_1(tptr);

            len = GET_U_1(tptr);
            if (len == 0)
                break;
            len = GET_U_1(tptr);
            if (len == 0)
                break;


@@ -253,8 +247,7 @@ vtp_print(netdissect_options *ndo,
 
            vtp_vlan = (const struct vtp_vlan_*)tptr;
            if (len < VTP_VLAN_INFO_FIXED_PART_LEN)
 
            vtp_vlan = (const struct vtp_vlan_*)tptr;
            if (len < VTP_VLAN_INFO_FIXED_PART_LEN)

-               goto trunc;
-           ND_TCHECK_SIZE(vtp_vlan);
+               goto invalid;

            ND_PRINT("\n\tVLAN info status %s, type %s, VLAN-id %u, MTU %u, SAID 0x%08x, Name ",
                   tok2str(vtp_vlan_status,"Unknown",GET_U_1(vtp_vlan->status)),
                   tok2str(vtp_vlan_type_values,"Unknown",GET_U_1(vtp_vlan->type)),
            ND_PRINT("\n\tVLAN info status %s, type %s, VLAN-id %u, MTU %u, SAID 0x%08x, Name ",
                   tok2str(vtp_vlan_status,"Unknown",GET_U_1(vtp_vlan->status)),
                   tok2str(vtp_vlan_type_values,"Unknown",GET_U_1(vtp_vlan->type)),


@@ -265,9 +258,8 @@ vtp_print(netdissect_options *ndo,
            tptr += VTP_VLAN_INFO_FIXED_PART_LEN;
            name_len = GET_U_1(vtp_vlan->name_len);
            if (len < 4*((name_len + 3)/4))
            tptr += VTP_VLAN_INFO_FIXED_PART_LEN;
            name_len = GET_U_1(vtp_vlan->name_len);
            if (len < 4*((name_len + 3)/4))

-               goto trunc;
-           ND_TCHECK_LEN(tptr, name_len);
-           nd_printzp(ndo, tptr, name_len, NULL);
+               goto invalid;
+           nd_printjnp(ndo, tptr, name_len);

 
            /*
             * Vlan names are aligned to 32-bit boundaries.
 
            /*
             * Vlan names are aligned to 32-bit boundaries.


@@ -277,18 +269,17 @@ vtp_print(netdissect_options *ndo,
 
             /* TLV information follows */
 
 
             /* TLV information follows */
 

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

 
                 /*
                  * Cisco specs say 2 bytes for type + 2 bytes for length;
 
                 /*
                  * Cisco specs say 2 bytes for type + 2 bytes for length;

-                 * see http://docstore.mik.ua/univercd/cc/td/doc/product/lan/trsrb/frames.htm
+                 * see https://docstore.mik.ua/univercd/cc/td/doc/product/lan/trsrb/frames.htm

                  * However, actual packets on the wire appear to use 1
                  * byte for the type and 1 byte for the length, so that's
                  * what we do.
                  */
                 if (len < 2)
                  * However, actual packets on the wire appear to use 1
                  * byte for the type and 1 byte for the length, so that's
                  * what we do.
                  */
                 if (len < 2)

-                    goto trunc;
-                ND_TCHECK_2(tptr);
+                    goto invalid;

                 type = GET_U_1(tptr);
                 tlv_len = GET_U_1(tptr + 1);
 
                 type = GET_U_1(tptr);
                 tlv_len = GET_U_1(tptr + 1);
 


@@ -298,7 +289,7 @@ vtp_print(netdissect_options *ndo,
 
                 if (len < tlv_len * 2 + 2) {
                     ND_PRINT(" (TLV goes past the end of the packet)");
 
                 if (len < tlv_len * 2 + 2) {
                     ND_PRINT(" (TLV goes past the end of the packet)");

-                    return;
+                    goto invalid;

                 }
                 ND_TCHECK_LEN(tptr, tlv_len * 2 + 2);
 
                 }
                 ND_TCHECK_LEN(tptr, tlv_len * 2 + 2);
 


@@ -307,8 +298,8 @@ vtp_print(netdissect_options *ndo,
                  * in units of 16-bit words.
                  */
                 if (tlv_len != 1) {
                  * in units of 16-bit words.
                  */
                 if (tlv_len != 1) {

-                    ND_PRINT(" (invalid TLV length %u != 1)", tlv_len);
-                    return;
+                    ND_PRINT(" [TLV length %u != 1]", tlv_len);
+                    goto invalid;

                 } else {
                     tlv_value = GET_BE_U_2(tptr + 2);
 
                 } else {
                     tlv_value = GET_BE_U_2(tptr + 2);
 


@@ -378,7 +369,6 @@ vtp_print(netdissect_options *ndo,
         *
         */
 
         *
         */
 

-       ND_TCHECK_4(tptr);

        ND_PRINT("\n\tStart value: %u", GET_BE_U_4(tptr));
        break;
 
        ND_PRINT("\n\tStart value: %u", GET_BE_U_4(tptr));
        break;
 


@@ -393,6 +383,8 @@ vtp_print(netdissect_options *ndo,
 
     return;
 
 
     return;
 

- trunc:
-    nd_print_trunc(ndo);
+invalid:
+    nd_print_invalid(ndo);
+tcheck_full_packet:
+    ND_TCHECK_LEN(pptr, length);

 }
 }