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

[tcpdump] / print-olsr.c

diff --git a/print-olsr.c b/print-olsr.c
index eca30142eb4600dea8f6226106e99e7623c5361b..5591c17a7193c5543ce520a4a4867275ff418e91 100644 (file)
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -21,9 +21,7 @@
 
 /* specification: RFC 3626 */
 
 
 /* specification: RFC 3626 */
 

-#ifdef HAVE_CONFIG_H

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

-#endif

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


@@ -322,16 +320,15 @@ olsr_print(netdissect_options *ndo,
     ndo->ndo_protocol = "olsr";
     tptr = pptr;
 
     ndo->ndo_protocol = "olsr";
     tptr = pptr;
 

-    if (length < sizeof(struct olsr_common)) {
-        ND_PRINT(" (packet length < %lu)", sizeof(struct olsr_common));
-        goto invalid;
-    }
+    nd_print_protocol_caps(ndo);
+    ND_PRINT("v%u", (is_ipv6) ? 6 : 4);
+
+    ND_ICHECKMSG_ZU("packet length", length, <, sizeof(struct olsr_common));

 
     ptr.common = (const struct olsr_common *)tptr;
     length = ND_MIN(length, GET_BE_U_2(ptr.common->packet_len));
 
 
     ptr.common = (const struct olsr_common *)tptr;
     length = ND_MIN(length, GET_BE_U_2(ptr.common->packet_len));
 

-    ND_PRINT("OLSRv%i, seq 0x%04x, length %u",
-            (is_ipv6 == 0) ? 4 : 6,
+    ND_PRINT(", seq 0x%04x, length %u",

             GET_BE_U_2(ptr.common->packet_seq),
             length);
 
             GET_BE_U_2(ptr.common->packet_seq),
             length);
 


@@ -352,8 +349,7 @@ olsr_print(netdissect_options *ndo,
         } msgptr;
         int msg_len_valid = 0;
 
         } msgptr;
         int msg_len_valid = 0;
 

-        if (is_ipv6)
-        {
+        if (is_ipv6) {

             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg6));
             msgptr.v6 = (const struct olsr_msg6 *) tptr;
             msg_type = GET_U_1(msgptr.v6->msg_type);
             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg6));
             msgptr.v6 = (const struct olsr_msg6 *) tptr;
             msg_type = GET_U_1(msgptr.v6->msg_type);


@@ -382,9 +378,7 @@ olsr_print(netdissect_options *ndo,
 
             msg_tlen = msg_len - sizeof(struct olsr_msg6);
             msg_data = tptr + sizeof(struct olsr_msg6);
 
             msg_tlen = msg_len - sizeof(struct olsr_msg6);
             msg_data = tptr + sizeof(struct olsr_msg6);

-        }
-        else /* (!is_ipv6) */
-        {
+        } else {       /* (!is_ipv6) */

             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg4));
             msgptr.v4 = (const struct olsr_msg4 *) tptr;
             msg_type = GET_U_1(msgptr.v4->msg_type);
             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg4));
             msgptr.v4 = (const struct olsr_msg4 *) tptr;
             msg_type = GET_U_1(msgptr.v4->msg_type);


@@ -418,10 +412,8 @@ olsr_print(netdissect_options *ndo,
         switch (msg_type) {
         case OLSR_HELLO_MSG:
         case OLSR_HELLO_LQ_MSG:
         switch (msg_type) {
         case OLSR_HELLO_MSG:
         case OLSR_HELLO_LQ_MSG:

-            if (msg_tlen < sizeof(struct olsr_hello)) {
-                ND_PRINT(" (message length < %lu)", sizeof(struct olsr_hello));
-                goto invalid;
-            }
+            ND_ICHECKMSG_ZU("message length", msg_tlen, <,
+                            sizeof(struct olsr_hello));

 
             ptr.hello = (const struct olsr_hello *)msg_data;
             ND_PRINT("\n\t  hello-time %.3fs, MPR willingness %u",
 
             ptr.hello = (const struct olsr_hello *)msg_data;
             ND_PRINT("\n\t  hello-time %.3fs, MPR willingness %u",


@@ -479,10 +471,8 @@ olsr_print(netdissect_options *ndo,
 
         case OLSR_TC_MSG:
         case OLSR_TC_LQ_MSG:
 
         case OLSR_TC_MSG:
         case OLSR_TC_LQ_MSG:

-            if (msg_tlen < sizeof(struct olsr_tc)) {
-                goto invalid;
-                ND_PRINT(" (message length < %lu)", sizeof(struct olsr_tc));
-            }
+            ND_ICHECKMSG_ZU("message length", msg_tlen, <,
+                            sizeof(struct olsr_tc));

             ND_TCHECK_LEN(msg_data, sizeof(struct olsr_tc));
 
             ptr.tc = (const struct olsr_tc *)msg_data;
             ND_TCHECK_LEN(msg_data, sizeof(struct olsr_tc));
 
             ptr.tc = (const struct olsr_tc *)msg_data;


@@ -522,8 +512,7 @@ olsr_print(netdissect_options *ndo,
         }
 
         case OLSR_HNA_MSG:
         }
 
         case OLSR_HNA_MSG:

-            if (is_ipv6)
-            {
+            if (is_ipv6) {

                 int i = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",
                 int i = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",


@@ -543,9 +532,7 @@ olsr_print(netdissect_options *ndo,
                     msg_data += sizeof(struct olsr_hna6);
                     msg_tlen -= sizeof(struct olsr_hna6);
                 }
                     msg_data += sizeof(struct olsr_hna6);
                     msg_tlen -= sizeof(struct olsr_hna6);
                 }

-            }
-            else
-            {
+            } else {

                 int col = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",
                 int col = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",


@@ -612,10 +599,7 @@ olsr_print(netdissect_options *ndo,
             int name_entries_valid;
             u_int i;
 
             int name_entries_valid;
             u_int i;
 

-            if (msg_tlen < 4) {
-                ND_PRINT(" (message length < 4)");
-                goto invalid;
-            }
+            ND_ICHECKMSG_U("message length", msg_tlen, <, 4);

 
             name_entries = GET_BE_U_2(msg_data + 2);
             addr_size = 4;
 
             name_entries = GET_BE_U_2(msg_data + 2);
             addr_size = 4;


@@ -664,10 +648,8 @@ olsr_print(netdissect_options *ndo,
                 if (name_entry_len%4 != 0)
                     name_entry_padding = 4-(name_entry_len%4);
 
                 if (name_entry_len%4 != 0)
                     name_entry_padding = 4-(name_entry_len%4);
 

-                if (msg_tlen < addr_size + name_entry_len + name_entry_padding) {
-                    ND_PRINT(" (oversized name entry)");
-                    goto invalid;
-                }
+                ND_ICHECKMSG_U("name entry length", msg_tlen, <,
+                               addr_size + name_entry_len + name_entry_padding);

 
                 ND_TCHECK_LEN(msg_data,
                               addr_size + name_entry_len + name_entry_padding);
 
                 ND_TCHECK_LEN(msg_data,
                               addr_size + name_entry_len + name_entry_padding);


@@ -678,7 +660,7 @@ olsr_print(netdissect_options *ndo,
                 else
                     ND_PRINT(", address %s, name \"",
                             GET_IPADDR_STRING(msg_data));
                 else
                     ND_PRINT(", address %s, name \"",
                             GET_IPADDR_STRING(msg_data));

-                (void)nd_printn(ndo, msg_data + addr_size, name_entry_len, NULL);
+                nd_printjn(ndo, msg_data + addr_size, name_entry_len);

                 ND_PRINT("\"");
 
                 msg_data += addr_size + name_entry_len + name_entry_padding;
                 ND_PRINT("\"");
 
                 msg_data += addr_size + name_entry_len + name_entry_padding;