On Solaris, for 64-bit builds, use the 64-bit pcap-config.

[tcpdump] / print-olsr.c

diff --git a/print-olsr.c b/print-olsr.c
index e640ee18192d16b607ea2d3ee53c093087e86e25..df796d955d6aa42d9393701e1880ecc3cf7b8680 100644 (file)
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -27,6 +27,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -231,7 +232,7 @@ static uint32_t deserialize_gw_speed(uint8_t value) {
 /*
  * 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)
 {
@@ -251,12 +252,9 @@ olsr_print_lq_neighbor4(netdissect_options *ndo,
         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)
 {
@@ -276,15 +274,12 @@ olsr_print_lq_neighbor6(netdissect_options *ndo,
         msg_data += sizeof(struct olsr_lq_neighbor6);
         hello_len -= sizeof(struct olsr_lq_neighbor6);
     }
-    return (0);
-trunc:
-    return -1;
 }
 
 /*
  * print a neighbor list.
  */
-static int
+static void
 olsr_print_neighbor(netdissect_options *ndo,
                     const u_char *msg_data, u_int hello_len)
 {
@@ -294,19 +289,13 @@ olsr_print_neighbor(netdissect_options *ndo,
     neighbor = 1;
 
     while (hello_len >= sizeof(nd_ipv4)) {
-
-        ND_TCHECK_LEN(msg_data, sizeof(nd_ipv4));
         /* print 4 neighbors per line */
-
         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);
     }
-    return (0);
-trunc:
-    return -1;
 }
 
 
@@ -333,17 +322,15 @@ olsr_print(netdissect_options *ndo,
     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_LCHECKMSG_ZU(length, sizeof(struct olsr_common), "packet length");
 
     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);
 
@@ -430,9 +417,7 @@ olsr_print(netdissect_options *ndo,
         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_LCHECKMSG_ZU(msg_tlen, sizeof(struct olsr_hello), "message length");
 
             ptr.hello = (const struct olsr_hello *)msg_data;
             ND_PRINT("\n\t  hello-time %.3fs, MPR willingness %u",
@@ -474,15 +459,12 @@ olsr_print(netdissect_options *ndo,
 
                 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) {
-                        if (olsr_print_lq_neighbor6(ndo, msg_data, hello_len) == -1)
-                            goto trunc;
+                        olsr_print_lq_neighbor6(ndo, msg_data, hello_len);
                     } 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 +475,7 @@ olsr_print(netdissect_options *ndo,
 
         case OLSR_TC_MSG:
         case OLSR_TC_LQ_MSG:
-            if (msg_tlen < sizeof(struct olsr_tc))
-                goto trunc;
+            ND_LCHECKMSG_ZU(msg_tlen, sizeof(struct olsr_tc), "message length");
             ND_TCHECK_LEN(msg_data, sizeof(struct olsr_tc));
 
             ptr.tc = (const struct olsr_tc *)msg_data;
@@ -504,15 +485,12 @@ olsr_print(netdissect_options *ndo,
             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) {
-                    if (olsr_print_lq_neighbor6(ndo, msg_data, msg_tlen) == -1)
-                        goto trunc;
+                    olsr_print_lq_neighbor6(ndo, msg_data, msg_tlen);
                 } else {
-                    if (olsr_print_lq_neighbor4(ndo, msg_data, msg_tlen) == -1)
-                        goto trunc;
+                    olsr_print_lq_neighbor4(ndo, msg_data, msg_tlen);
                 }
             }
             break;
@@ -627,9 +605,7 @@ olsr_print(netdissect_options *ndo,
             int name_entries_valid;
             u_int i;
 
-            if (msg_tlen < 4)
-                goto trunc;
-            ND_TCHECK_4(msg_data);
+            ND_LCHECKMSG_U(msg_tlen, 4, "message length");
 
             name_entries = GET_BE_U_2(msg_data + 2);
             addr_size = 4;
@@ -656,7 +632,6 @@ olsr_print(netdissect_options *ndo,
 
                 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);
@@ -679,8 +654,8 @@ olsr_print(netdissect_options *ndo,
                 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_LCHECKMSG_U(msg_tlen, addr_size + name_entry_len + name_entry_padding,
+                               "name entry length");
 
                 ND_TCHECK_LEN(msg_data,
                               addr_size + name_entry_len + name_entry_padding);
@@ -691,7 +666,7 @@ olsr_print(netdissect_options *ndo,
                 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;
@@ -714,6 +689,6 @@ olsr_print(netdissect_options *ndo,
 
     return;
 
- trunc:
-    nd_print_trunc(ndo);
+invalid:
+    nd_print_invalid(ndo);
 }