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 a8ab62f2d97e09d4ecdaac6f199fb2981f463dff..5591c17a7193c5543ce520a4a4867275ff418e91 100644 (file)
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -21,12 +21,11 @@
 
 /* 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"
 

+#define ND_LONGJMP_FROM_TCHECK

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


@@ -231,7 +230,7 @@ static uint32_t deserialize_gw_speed(uint8_t value) {
 /*
  * print a neighbor list with LQ extensions.
  */
 /*
  * print a neighbor list with LQ extensions.
  */

-static int
+static void

 olsr_print_lq_neighbor4(netdissect_options *ndo,
                         const u_char *msg_data, u_int hello_len)
 {
 olsr_print_lq_neighbor4(netdissect_options *ndo,
                         const u_char *msg_data, u_int hello_len)
 {


@@ -244,19 +243,16 @@ olsr_print_lq_neighbor4(netdissect_options *ndo,
 
         ND_PRINT("\n\t      neighbor %s, link-quality %.2f%%"
                ", neighbor-link-quality %.2f%%",
 
         ND_PRINT("\n\t      neighbor %s, link-quality %.2f%%"
                ", neighbor-link-quality %.2f%%",

-               ipaddr_string(ndo, lq_neighbor->neighbor),
+               GET_IPADDR_STRING(lq_neighbor->neighbor),

                ((double) GET_U_1(lq_neighbor->link_quality)/2.55),
                ((double) GET_U_1(lq_neighbor->neighbor_link_quality)/2.55));
 
         msg_data += sizeof(struct olsr_lq_neighbor4);
         hello_len -= sizeof(struct olsr_lq_neighbor4);
     }
                ((double) GET_U_1(lq_neighbor->link_quality)/2.55),
                ((double) GET_U_1(lq_neighbor->neighbor_link_quality)/2.55));
 
         msg_data += sizeof(struct olsr_lq_neighbor4);
         hello_len -= sizeof(struct olsr_lq_neighbor4);
     }

-    return (0);
-trunc:
-    return -1;

 }
 
 }
 

-static int
+static void

 olsr_print_lq_neighbor6(netdissect_options *ndo,
                         const u_char *msg_data, u_int hello_len)
 {
 olsr_print_lq_neighbor6(netdissect_options *ndo,
                         const u_char *msg_data, u_int hello_len)
 {


@@ -269,22 +265,19 @@ olsr_print_lq_neighbor6(netdissect_options *ndo,
 
         ND_PRINT("\n\t      neighbor %s, link-quality %.2f%%"
                ", neighbor-link-quality %.2f%%",
 
         ND_PRINT("\n\t      neighbor %s, link-quality %.2f%%"
                ", neighbor-link-quality %.2f%%",

-               ip6addr_string(ndo, lq_neighbor->neighbor),
+               GET_IP6ADDR_STRING(lq_neighbor->neighbor),

                ((double) GET_U_1(lq_neighbor->link_quality)/2.55),
                ((double) GET_U_1(lq_neighbor->neighbor_link_quality)/2.55));
 
         msg_data += sizeof(struct olsr_lq_neighbor6);
         hello_len -= sizeof(struct olsr_lq_neighbor6);
     }
                ((double) GET_U_1(lq_neighbor->link_quality)/2.55),
                ((double) GET_U_1(lq_neighbor->neighbor_link_quality)/2.55));
 
         msg_data += sizeof(struct olsr_lq_neighbor6);
         hello_len -= sizeof(struct olsr_lq_neighbor6);
     }

-    return (0);
-trunc:
-    return -1;

 }
 
 /*
  * print a neighbor list.
  */
 }
 
 /*
  * print a neighbor list.
  */

-static int
+static void

 olsr_print_neighbor(netdissect_options *ndo,
                     const u_char *msg_data, u_int hello_len)
 {
 olsr_print_neighbor(netdissect_options *ndo,
                     const u_char *msg_data, u_int hello_len)
 {


@@ -294,19 +287,13 @@ olsr_print_neighbor(netdissect_options *ndo,
     neighbor = 1;
 
     while (hello_len >= sizeof(nd_ipv4)) {
     neighbor = 1;
 
     while (hello_len >= sizeof(nd_ipv4)) {

-
-        ND_TCHECK_LEN(msg_data, sizeof(nd_ipv4));

         /* print 4 neighbors per line */
         /* print 4 neighbors per line */

-
-        ND_PRINT("%s%s", ipaddr_string(ndo, msg_data),
+        ND_PRINT("%s%s", GET_IPADDR_STRING(msg_data),

                neighbor % 4 == 0 ? "\n\t\t" : " ");
 
         msg_data += sizeof(nd_ipv4);
         hello_len -= sizeof(nd_ipv4);
     }
                neighbor % 4 == 0 ? "\n\t\t" : " ");
 
         msg_data += sizeof(nd_ipv4);
         hello_len -= sizeof(nd_ipv4);
     }

-    return (0);
-trunc:
-    return -1;

 }
 
 
 }
 
 


@@ -333,17 +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)) {
-        goto trunc;
-    }
+    nd_print_protocol_caps(ndo);
+    ND_PRINT("v%u", (is_ipv6) ? 6 : 4);

 
 

-    ND_TCHECK_LEN(tptr, sizeof(struct olsr_common));
+    ND_ICHECKMSG_ZU("packet length", length, <, sizeof(struct olsr_common));

 
     ptr.common = (const struct olsr_common *)tptr;
 
     ptr.common = (const struct olsr_common *)tptr;

-    length = min(length, GET_BE_U_2(ptr.common->packet_len));
+    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);
 


@@ -364,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,7 +366,7 @@ olsr_print(netdissect_options *ndo,
             ND_PRINT("\n\t%s Message (%#04x), originator %s, ttl %u, hop %u"
                     "\n\t  vtime %.3fs, msg-seq 0x%04x, length %u%s",
                     tok2str(olsr_msg_values, "Unknown", msg_type),
             ND_PRINT("\n\t%s Message (%#04x), originator %s, ttl %u, hop %u"
                     "\n\t  vtime %.3fs, msg-seq 0x%04x, length %u%s",
                     tok2str(olsr_msg_values, "Unknown", msg_type),

-                    msg_type, ip6addr_string(ndo, msgptr.v6->originator),
+                    msg_type, GET_IP6ADDR_STRING(msgptr.v6->originator),

                     GET_U_1(msgptr.v6->ttl),
                     GET_U_1(msgptr.v6->hopcount),
                     ME_TO_DOUBLE(GET_U_1(msgptr.v6->vtime)),
                     GET_U_1(msgptr.v6->ttl),
                     GET_U_1(msgptr.v6->hopcount),
                     ME_TO_DOUBLE(GET_U_1(msgptr.v6->vtime)),


@@ -394,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);


@@ -413,7 +395,7 @@ olsr_print(netdissect_options *ndo,
             ND_PRINT("\n\t%s Message (%#04x), originator %s, ttl %u, hop %u"
                     "\n\t  vtime %.3fs, msg-seq 0x%04x, length %u%s",
                     tok2str(olsr_msg_values, "Unknown", msg_type),
             ND_PRINT("\n\t%s Message (%#04x), originator %s, ttl %u, hop %u"
                     "\n\t  vtime %.3fs, msg-seq 0x%04x, length %u%s",
                     tok2str(olsr_msg_values, "Unknown", msg_type),

-                    msg_type, ipaddr_string(ndo, msgptr.v4->originator),
+                    msg_type, GET_IPADDR_STRING(msgptr.v4->originator),

                     GET_U_1(msgptr.v4->ttl),
                     GET_U_1(msgptr.v4->hopcount),
                     ME_TO_DOUBLE(GET_U_1(msgptr.v4->vtime)),
                     GET_U_1(msgptr.v4->ttl),
                     GET_U_1(msgptr.v4->hopcount),
                     ME_TO_DOUBLE(GET_U_1(msgptr.v4->vtime)),


@@ -430,9 +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))
-                goto trunc;
-            ND_TCHECK_LEN(msg_data, sizeof(struct olsr_hello));
+            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",


@@ -474,15 +455,12 @@ olsr_print(netdissect_options *ndo,
 
                 ND_TCHECK_LEN(msg_data, hello_len);
                 if (msg_type == OLSR_HELLO_MSG) {
 
                 ND_TCHECK_LEN(msg_data, hello_len);
                 if (msg_type == OLSR_HELLO_MSG) {

-                    if (olsr_print_neighbor(ndo, msg_data, hello_len) == -1)
-                        goto trunc;
+                    olsr_print_neighbor(ndo, msg_data, hello_len);

                 } else {
                     if (is_ipv6) {
                 } else {
                     if (is_ipv6) {

-                        if (olsr_print_lq_neighbor6(ndo, msg_data, hello_len) == -1)
-                            goto trunc;
+                        olsr_print_lq_neighbor6(ndo, msg_data, hello_len);

                     } else {
                     } else {

-                        if (olsr_print_lq_neighbor4(ndo, msg_data, hello_len) == -1)
-                            goto trunc;
+                        olsr_print_lq_neighbor4(ndo, msg_data, hello_len);

                     }
                 }
 
                     }
                 }
 


@@ -493,8 +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 trunc;
+            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;


@@ -504,15 +482,12 @@ olsr_print(netdissect_options *ndo,
             msg_tlen -= sizeof(struct olsr_tc);
 
             if (msg_type == OLSR_TC_MSG) {
             msg_tlen -= sizeof(struct olsr_tc);
 
             if (msg_type == OLSR_TC_MSG) {

-                if (olsr_print_neighbor(ndo, msg_data, msg_tlen) == -1)
-                    goto trunc;
+                olsr_print_neighbor(ndo, msg_data, msg_tlen);

             } else {
                 if (is_ipv6) {
             } else {
                 if (is_ipv6) {

-                    if (olsr_print_lq_neighbor6(ndo, msg_data, msg_tlen) == -1)
-                        goto trunc;
+                    olsr_print_lq_neighbor6(ndo, msg_data, msg_tlen);

                 } else {
                 } else {

-                    if (olsr_print_lq_neighbor4(ndo, msg_data, msg_tlen) == -1)
-                        goto trunc;
+                    olsr_print_lq_neighbor4(ndo, msg_data, msg_tlen);

                 }
             }
             break;
                 }
             }
             break;


@@ -527,8 +502,8 @@ olsr_print(netdissect_options *ndo,
             while (msg_tlen >= addr_size) {
                 ND_TCHECK_LEN(msg_data, addr_size);
                 ND_PRINT("\n\t  interface address %s",
             while (msg_tlen >= addr_size) {
                 ND_TCHECK_LEN(msg_data, addr_size);
                 ND_PRINT("\n\t  interface address %s",

-                        is_ipv6 ? ip6addr_string(ndo, msg_data) :
-                        ipaddr_string(ndo, msg_data));
+                        is_ipv6 ? GET_IP6ADDR_STRING(msg_data) :
+                        GET_IPADDR_STRING(msg_data));

 
                 msg_data += addr_size;
                 msg_tlen -= addr_size;
 
                 msg_data += addr_size;
                 msg_tlen -= addr_size;


@@ -537,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)",


@@ -552,15 +526,13 @@ olsr_print(netdissect_options *ndo,
                     hna6 = (const struct olsr_hna6 *)msg_data;
 
                     ND_PRINT("\n\t    #%i: %s/%u",
                     hna6 = (const struct olsr_hna6 *)msg_data;
 
                     ND_PRINT("\n\t    #%i: %s/%u",

-                            i, ip6addr_string(ndo, hna6->network),
+                            i, GET_IP6ADDR_STRING(hna6->network),

                             mask62plen (hna6->mask));
 
                     msg_data += sizeof(struct olsr_hna6);
                     msg_tlen -= sizeof(struct olsr_hna6);
                 }
                             mask62plen (hna6->mask));
 
                     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)",


@@ -608,7 +580,7 @@ olsr_print(netdissect_options *ndo,
                         /* normal route */
                         ND_PRINT("%s%s/%u",
                                 col == 0 ? "\n\t    " : ", ",
                         /* normal route */
                         ND_PRINT("%s%s/%u",
                                 col == 0 ? "\n\t    " : ", ",

-                                ipaddr_string(ndo, ptr.hna->network),
+                                GET_IPADDR_STRING(ptr.hna->network),

                                 mask2plen(GET_BE_U_4(ptr.hna->mask)));
                     }
 
                                 mask2plen(GET_BE_U_4(ptr.hna->mask)));
                     }
 


@@ -627,9 +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)
-                goto trunc;
-            ND_TCHECK_4(msg_data);
+            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;


@@ -656,7 +626,6 @@ olsr_print(netdissect_options *ndo,
 
                 if (msg_tlen < 4)
                     break;
 
                 if (msg_tlen < 4)
                     break;

-                ND_TCHECK_4(msg_data);

 
                 name_entry_type = GET_BE_U_2(msg_data);
                 name_entry_len = GET_BE_U_2(msg_data + 2);
 
                 name_entry_type = GET_BE_U_2(msg_data);
                 name_entry_len = GET_BE_U_2(msg_data + 2);


@@ -679,19 +648,19 @@ 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)
-                    goto trunc;
+                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);
 
                 if (is_ipv6)
                     ND_PRINT(", address %s, name \"",
 
                 ND_TCHECK_LEN(msg_data,
                               addr_size + name_entry_len + name_entry_padding);
 
                 if (is_ipv6)
                     ND_PRINT(", address %s, name \"",

-                            ip6addr_string(ndo, msg_data));
+                            GET_IP6ADDR_STRING(msg_data));

                 else
                     ND_PRINT(", address %s, name \"",
                 else
                     ND_PRINT(", address %s, name \"",

-                            ipaddr_string(ndo, msg_data));
-                (void)nd_printn(ndo, msg_data + addr_size, name_entry_len, NULL);
+                            GET_IPADDR_STRING(msg_data));
+                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;


@@ -714,6 +683,6 @@ olsr_print(netdissect_options *ndo,
 
     return;
 
 
     return;
 

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

 }
 }