Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-olsr.c

diff --git a/print-olsr.c b/print-olsr.c
index 174a51eac9437ff1f18d1d6d61b121c5d3a03096..fdfe706bb1e205e24c966361e2993d5b23cd72b4 100644 (file)
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 1998-2007 The TCPDUMP project
 /*
  * Copyright (c) 1998-2007 The TCPDUMP project

+ * Copyright (c) 2009  Florian Forster

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code


@@ -12,24 +13,23 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *

- * Optimized Link State Protocl (OLSR) as per rfc3626
- *
- * Original code by Hannes Gredler <[email protected]>
+ * Original code by Hannes Gredler <[email protected]>
+ * IPv6 additions by Florian Forster <octo at verplant.org>

  */
 
  */
 

+/* \summary: Optimized Link State Routing Protocol (OLSR) printer */
+
+/* specification: RFC 3626 */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include <stdio.h>
-#include <string.h>
-
-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

-#include "extract.h"           
-#include "ip.h"
+#include "extract.h"

 
 /*
  * RFC 3626 common header
 
 /*
  * RFC 3626 common header


@@ -63,8 +63,8 @@
  */
 
 struct olsr_common {
  */
 
 struct olsr_common {

-    u_int8_t packet_len[2];
-    u_int8_t packet_seq[2];
+    uint8_t packet_len[2];
+    uint8_t packet_seq[2];

 };
 
 #define OLSR_HELLO_MSG         1 /* rfc3626 */
 };
 
 #define OLSR_HELLO_MSG         1 /* rfc3626 */


@@ -76,7 +76,7 @@ struct olsr_common {
 #define OLSR_HELLO_LQ_MSG    201 /* LQ extensions olsr.org */
 #define OLSR_TC_LQ_MSG       202 /* LQ extensions olsr.org */
 
 #define OLSR_HELLO_LQ_MSG    201 /* LQ extensions olsr.org */
 #define OLSR_TC_LQ_MSG       202 /* LQ extensions olsr.org */
 

-static struct tok olsr_msg_values[] = {
+static const struct tok olsr_msg_values[] = {

     { OLSR_HELLO_MSG, "Hello" },
     { OLSR_TC_MSG, "TC" },
     { OLSR_MID_MSG, "MID" },
     { OLSR_HELLO_MSG, "Hello" },
     { OLSR_TC_MSG, "TC" },
     { OLSR_MID_MSG, "MID" },


@@ -88,43 +88,78 @@ static struct tok olsr_msg_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-struct olsr_msg {
-    u_int8_t msg_type;
-    u_int8_t vtime;
-    u_int8_t msg_len[2];
-    u_int8_t originator[4];
-    u_int8_t ttl;
-    u_int8_t hopcount;
-    u_int8_t msg_seq[2];
+struct olsr_msg4 {
+    uint8_t msg_type;
+    uint8_t vtime;
+    uint8_t msg_len[2];
+    uint8_t originator[4];
+    uint8_t ttl;
+    uint8_t hopcount;
+    uint8_t msg_seq[2];
+};
+
+struct olsr_msg6 {
+    uint8_t msg_type;
+    uint8_t vtime;
+    uint8_t msg_len[2];
+    uint8_t originator[16];
+    uint8_t ttl;
+    uint8_t hopcount;
+    uint8_t msg_seq[2];

 };
 
 struct olsr_hello {
 };
 
 struct olsr_hello {

-    u_int8_t res[2];
-    u_int8_t htime;
-    u_int8_t will;
+    uint8_t res[2];
+    uint8_t htime;
+    uint8_t will;

 };
 
 struct olsr_hello_link {
 };
 
 struct olsr_hello_link {

-    u_int8_t link_code;
-    u_int8_t res;
-    u_int8_t len[2];
+    uint8_t link_code;
+    uint8_t res;
+    uint8_t len[2];

 };
 
 struct olsr_tc {
 };
 
 struct olsr_tc {

-    u_int8_t ans_seq[2];
-    u_int8_t res[2];
+    uint8_t ans_seq[2];
+    uint8_t res[2];
+};
+
+struct olsr_hna4 {
+    uint8_t network[4];
+    uint8_t mask[4];
+};
+
+struct olsr_hna6 {
+    uint8_t network[16];
+    uint8_t mask[16];

 };
 
 };
 

-struct olsr_hna {
-    u_int8_t network[4];
-    u_int8_t mask[4];
+
+/** gateway HNA flags */
+enum gateway_hna_flags {
+  GW_HNA_FLAG_LINKSPEED   = 1 << 0,
+  GW_HNA_FLAG_IPV4        = 1 << 1,
+  GW_HNA_FLAG_IPV4_NAT    = 1 << 2,
+  GW_HNA_FLAG_IPV6        = 1 << 3,
+  GW_HNA_FLAG_IPV6PREFIX  = 1 << 4
+};
+
+/** gateway HNA field byte offsets in the netmask field of the HNA */
+enum gateway_hna_fields {
+  GW_HNA_PAD              = 0,
+  GW_HNA_FLAGS            = 1,
+  GW_HNA_UPLINK           = 2,
+  GW_HNA_DOWNLINK         = 3,
+  GW_HNA_V6PREFIXLEN      = 4,
+  GW_HNA_V6PREFIX         = 5

 };
 
 
 #define OLSR_EXTRACT_LINK_TYPE(link_code) (link_code & 0x3)
 #define OLSR_EXTRACT_NEIGHBOR_TYPE(link_code) (link_code >> 2)
 
 };
 
 
 #define OLSR_EXTRACT_LINK_TYPE(link_code) (link_code & 0x3)
 #define OLSR_EXTRACT_NEIGHBOR_TYPE(link_code) (link_code >> 2)
 

-static struct tok olsr_link_type_values[] = {
+static const struct tok olsr_link_type_values[] = {

     { 0, "Unspecified" },
     { 1, "Asymmetric" },
     { 2, "Symmetric" },
     { 0, "Unspecified" },
     { 1, "Asymmetric" },
     { 2, "Symmetric" },


@@ -132,20 +167,58 @@ static struct tok olsr_link_type_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-static struct tok olsr_neighbor_type_values[] = {
+static const struct tok olsr_neighbor_type_values[] = {

     { 0, "Not-Neighbor" },
     { 1, "Symmetric" },
     { 2, "Symmetric-MPR" },
     { 0, NULL}
 };
 
     { 0, "Not-Neighbor" },
     { 1, "Symmetric" },
     { 2, "Symmetric-MPR" },
     { 0, NULL}
 };
 

-struct olsr_lq_neighbor {
-    u_int8_t neighbor[4];
-    u_int8_t link_quality;
-    u_int8_t neighbor_link_quality;
-    u_int8_t res[2];
+struct olsr_lq_neighbor4 {
+    uint8_t neighbor[4];
+    uint8_t link_quality;
+    uint8_t neighbor_link_quality;
+    uint8_t res[2];
+};
+
+struct olsr_lq_neighbor6 {
+    uint8_t neighbor[16];
+    uint8_t link_quality;
+    uint8_t neighbor_link_quality;
+    uint8_t res[2];

 };
 
 };
 

+#define MAX_SMARTGW_SPEED    320000000
+
+/**
+ * Convert an encoded 1 byte transport value (5 bits mantissa, 3 bits exponent)
+ * to an uplink/downlink speed value
+ *
+ * @param value the encoded 1 byte transport value
+ * @return the uplink/downlink speed value (in kbit/s)
+ */
+static uint32_t deserialize_gw_speed(uint8_t value) {
+  uint32_t speed;
+  uint32_t exp;
+
+  if (!value) {
+    return 0;
+  }
+
+  if (value == UINT8_MAX) {
+    /* maximum value: also return maximum value */
+    return MAX_SMARTGW_SPEED;
+  }
+
+  speed = (value >> 3) + 1;
+  exp = value & 7;
+
+  while (exp-- > 0) {
+    speed *= 10;
+  }
+  return speed;
+}
+

 /*
  * macro to convert the 8-bit mantissa/exponent to a double float
  * taken from olsr.org.
 /*
  * macro to convert the 8-bit mantissa/exponent to a double float
  * taken from olsr.org.


@@ -157,160 +230,254 @@ struct olsr_lq_neighbor {
 /*
  * print a neighbor list with LQ extensions.
  */
 /*
  * print a neighbor list with LQ extensions.
  */

-static void
-olsr_print_lq_neighbor (const u_char *msg_data, u_int hello_len)
+static int
+olsr_print_lq_neighbor4(netdissect_options *ndo,
+                        const u_char *msg_data, u_int hello_len)

 {
 {

-    struct olsr_lq_neighbor *lq_neighbor;
+    const struct olsr_lq_neighbor4 *lq_neighbor;

 
 

-    while (hello_len >= sizeof(struct olsr_lq_neighbor)) {
+    while (hello_len >= sizeof(struct olsr_lq_neighbor4)) {

 
 

-        lq_neighbor = (struct olsr_lq_neighbor *)msg_data;
+        lq_neighbor = (const struct olsr_lq_neighbor4 *)msg_data;
+        if (!ND_TTEST(*lq_neighbor))
+            return (-1);

 
 

-        printf("\n\t      neighbor %s, link-quality %.2lf%%"
-               ", neighbor-link-quality %.2lf%%",
-               ipaddr_string(lq_neighbor->neighbor),
+        ND_PRINT((ndo, "\n\t      neighbor %s, link-quality %.2f%%"
+               ", neighbor-link-quality %.2f%%",
+               ipaddr_string(ndo, lq_neighbor->neighbor),

                ((double)lq_neighbor->link_quality/2.55),
                ((double)lq_neighbor->link_quality/2.55),

-               ((double)lq_neighbor->neighbor_link_quality/2.55));
+               ((double)lq_neighbor->neighbor_link_quality/2.55)));

 
 

-        msg_data += sizeof(struct olsr_lq_neighbor);
-        hello_len -= sizeof(struct olsr_lq_neighbor);
+        msg_data += sizeof(struct olsr_lq_neighbor4);
+        hello_len -= sizeof(struct olsr_lq_neighbor4);

     }
     }

+    return (0);
+}
+
+static int
+olsr_print_lq_neighbor6(netdissect_options *ndo,
+                        const u_char *msg_data, u_int hello_len)
+{
+    const struct olsr_lq_neighbor6 *lq_neighbor;
+
+    while (hello_len >= sizeof(struct olsr_lq_neighbor6)) {
+
+        lq_neighbor = (const struct olsr_lq_neighbor6 *)msg_data;
+        if (!ND_TTEST(*lq_neighbor))
+            return (-1);
+
+        ND_PRINT((ndo, "\n\t      neighbor %s, link-quality %.2f%%"
+               ", neighbor-link-quality %.2f%%",
+               ip6addr_string(ndo, lq_neighbor->neighbor),
+               ((double)lq_neighbor->link_quality/2.55),
+               ((double)lq_neighbor->neighbor_link_quality/2.55)));
+
+        msg_data += sizeof(struct olsr_lq_neighbor6);
+        hello_len -= sizeof(struct olsr_lq_neighbor6);
+    }
+    return (0);

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

-static void
-olsr_print_neighbor (const u_char *msg_data, u_int hello_len)
+static int
+olsr_print_neighbor(netdissect_options *ndo,
+                    const u_char *msg_data, u_int hello_len)

 {
     int neighbor;
 
 {
     int neighbor;
 

-    printf("\n\t      neighbor\n\t\t");
+    ND_PRINT((ndo, "\n\t      neighbor\n\t\t"));

     neighbor = 1;
 
     while (hello_len >= sizeof(struct in_addr)) {
 
     neighbor = 1;
 
     while (hello_len >= sizeof(struct in_addr)) {
 

+        if (!ND_TTEST2(*msg_data, sizeof(struct in_addr)))
+            return (-1);

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

-        printf("%s%s", ipaddr_string(msg_data),
-               neighbor % 4 == 0 ? "\n\t\t" : " ");
+        ND_PRINT((ndo, "%s%s", ipaddr_string(ndo, msg_data),
+               neighbor % 4 == 0 ? "\n\t\t" : " "));

 
         msg_data += sizeof(struct in_addr);
         hello_len -= sizeof(struct in_addr);
     }
 
         msg_data += sizeof(struct in_addr);
         hello_len -= sizeof(struct in_addr);
     }

+    return (0);

 }
 
 
 void
 }
 
 
 void

-olsr_print (const u_char *pptr, u_int length)
+olsr_print(netdissect_options *ndo,
+           const u_char *pptr, u_int length, int is_ipv6)

 {
     union {
         const struct olsr_common *common;
 {
     union {
         const struct olsr_common *common;

-        const struct olsr_msg *msg;
+        const struct olsr_msg4 *msg4;
+        const struct olsr_msg6 *msg6;

         const struct olsr_hello *hello;
         const struct olsr_hello_link *hello_link;
         const struct olsr_hello *hello;
         const struct olsr_hello_link *hello_link;

-        const struct olsr_lq_neighbor *lq_neighbor;

         const struct olsr_tc *tc;
         const struct olsr_tc *tc;

-        const struct olsr_hna *hna;
+        const struct olsr_hna4 *hna;

     } ptr;
 
     } ptr;
 

-    u_int msg_type, msg_len, msg_tlen, hello_len, prefix;
-    u_int8_t link_type, neighbor_type;
+    u_int msg_type, msg_len, msg_tlen, hello_len;
+    uint16_t name_entry_type, name_entry_len;
+    u_int name_entry_padding;
+    uint8_t link_type, neighbor_type;

     const u_char *tptr, *msg_data;
 
     const u_char *tptr, *msg_data;
 

-    tptr = pptr; 
+    tptr = pptr;

 
     if (length < sizeof(struct olsr_common)) {
         goto trunc;
     }
 
 
     if (length < sizeof(struct olsr_common)) {
         goto trunc;
     }
 

-    if (!TTEST2(*tptr, sizeof(struct olsr_common))) {
-       goto trunc;
-    }
+    ND_TCHECK2(*tptr, sizeof(struct olsr_common));

 
 

-    ptr.common = (struct olsr_common *)tptr;
-    length = MIN(length, EXTRACT_16BITS(ptr.common->packet_len));
+    ptr.common = (const struct olsr_common *)tptr;
+    length = min(length, EXTRACT_BE_U_2(ptr.common->packet_len));

 
 

-    printf("OLSR, seq 0x%04x, length %u",
-           EXTRACT_16BITS(ptr.common->packet_seq),
-           length);
+    ND_PRINT((ndo, "OLSRv%i, seq 0x%04x, length %u",
+            (is_ipv6 == 0) ? 4 : 6,
+            EXTRACT_BE_U_2(ptr.common->packet_seq),
+            length));

 
     tptr += sizeof(struct olsr_common);
 
     /*
      * In non-verbose mode, just print version.
      */
 
     tptr += sizeof(struct olsr_common);
 
     /*
      * In non-verbose mode, just print version.
      */

-    if (vflag < 1) {
-       return;
+    if (ndo->ndo_vflag < 1) {
+        return;

     }
 
     while (tptr < (pptr+length)) {
     }
 
     while (tptr < (pptr+length)) {

+        union
+        {
+            const struct olsr_msg4 *v4;
+            const struct olsr_msg6 *v6;
+        } msgptr;
+        int msg_len_valid = 0;
+
+        if (is_ipv6)
+        {
+            ND_TCHECK2(*tptr, sizeof(struct olsr_msg6));
+            msgptr.v6 = (const struct olsr_msg6 *) tptr;
+            msg_type = msgptr.v6->msg_type;
+            msg_len = EXTRACT_BE_U_2(msgptr.v6->msg_len);
+            if ((msg_len >= sizeof (struct olsr_msg6))
+                    && (msg_len <= length))
+                msg_len_valid = 1;
+
+            /* infinite loop check */
+            if (msg_type == 0 || msg_len == 0) {
+                return;
+            }

 
 

-        if (!TTEST2(*tptr, sizeof(struct olsr_msg)))   
-            goto trunc;
-
-        ptr.msg = (struct olsr_msg *)tptr;
-
-        msg_type = ptr.msg->msg_type;
-        msg_len = EXTRACT_16BITS(ptr.msg->msg_len);
+            ND_PRINT((ndo, "\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),
+                    msgptr.v6->ttl,
+                    msgptr.v6->hopcount,
+                    ME_TO_DOUBLE(msgptr.v6->vtime),
+                    EXTRACT_BE_U_2(msgptr.v6->msg_seq),
+                    msg_len, (msg_len_valid == 0) ? " (invalid)" : ""));
+            if (!msg_len_valid) {
+                return;
+            }

 
 

-        /* infinite loop check */
-        if (msg_type == 0 || msg_len == 0) {
-            return;
+            msg_tlen = msg_len - sizeof(struct olsr_msg6);
+            msg_data = tptr + sizeof(struct olsr_msg6);

         }
         }

+        else /* (!is_ipv6) */
+        {
+            ND_TCHECK2(*tptr, sizeof(struct olsr_msg4));
+            msgptr.v4 = (const struct olsr_msg4 *) tptr;
+            msg_type = msgptr.v4->msg_type;
+            msg_len = EXTRACT_BE_U_2(msgptr.v4->msg_len);
+            if ((msg_len >= sizeof (struct olsr_msg4))
+                    && (msg_len <= length))
+                msg_len_valid = 1;
+
+            /* infinite loop check */
+            if (msg_type == 0 || msg_len == 0) {
+                return;
+            }

 
 

-        printf("\n\t%s Message (%u), originator %s, ttl %u, hop %u"
-               "\n\t  vtime %.3lfs, msg-seq 0x%04x, length %u",
-               tok2str(olsr_msg_values, "Unknown", msg_type),
-               msg_type, ipaddr_string(ptr.msg->originator),
-               ptr.msg->ttl,
-               ptr.msg->hopcount,
-               ME_TO_DOUBLE(ptr.msg->vtime),
-               EXTRACT_16BITS(ptr.msg->msg_seq),
-               msg_len);
+            ND_PRINT((ndo, "\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),
+                    msgptr.v4->ttl,
+                    msgptr.v4->hopcount,
+                    ME_TO_DOUBLE(msgptr.v4->vtime),
+                    EXTRACT_BE_U_2(msgptr.v4->msg_seq),
+                    msg_len, (msg_len_valid == 0) ? " (invalid)" : ""));
+            if (!msg_len_valid) {
+                return;
+            }

 
 

-        msg_tlen = msg_len - sizeof(struct olsr_msg);
-        msg_data = tptr + sizeof(struct olsr_msg);
+            msg_tlen = msg_len - sizeof(struct olsr_msg4);
+            msg_data = tptr + sizeof(struct olsr_msg4);
+        }

 
         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 (!TTEST2(*msg_data, sizeof(struct olsr_hello))) 
+            if (msg_tlen < sizeof(struct olsr_hello))

                 goto trunc;
                 goto trunc;

+            ND_TCHECK2(*msg_data, sizeof(struct olsr_hello));

 
 

-            ptr.hello = (struct olsr_hello *)msg_data;
-            printf("\n\t  hello-time %.3lfs, MPR willingness %u",
-                   ME_TO_DOUBLE(ptr.hello->htime), ptr.hello->will);
+            ptr.hello = (const struct olsr_hello *)msg_data;
+            ND_PRINT((ndo, "\n\t  hello-time %.3fs, MPR willingness %u",
+                   ME_TO_DOUBLE(ptr.hello->htime), ptr.hello->will));

             msg_data += sizeof(struct olsr_hello);
             msg_tlen -= sizeof(struct olsr_hello);
 
             while (msg_tlen >= sizeof(struct olsr_hello_link)) {
             msg_data += sizeof(struct olsr_hello);
             msg_tlen -= sizeof(struct olsr_hello);
 
             while (msg_tlen >= sizeof(struct olsr_hello_link)) {

+                int hello_len_valid = 0;

 
                 /*
                  * link-type.
                  */
 
                 /*
                  * link-type.
                  */

-                if (!TTEST2(*msg_data, sizeof(struct olsr_hello_link)))        
-                    goto trunc;
+                ND_TCHECK2(*msg_data, sizeof(struct olsr_hello_link));

 
 

-                ptr.hello_link = (struct olsr_hello_link *)msg_data;
+                ptr.hello_link = (const struct olsr_hello_link *)msg_data;

 
 

-                hello_len = EXTRACT_16BITS(ptr.hello_link->len);
+                hello_len = EXTRACT_BE_U_2(ptr.hello_link->len);

                 link_type = OLSR_EXTRACT_LINK_TYPE(ptr.hello_link->link_code);
                 neighbor_type = OLSR_EXTRACT_NEIGHBOR_TYPE(ptr.hello_link->link_code);
 
                 link_type = OLSR_EXTRACT_LINK_TYPE(ptr.hello_link->link_code);
                 neighbor_type = OLSR_EXTRACT_NEIGHBOR_TYPE(ptr.hello_link->link_code);
 

-                printf("\n\t    link-type %s, neighbor-type %s, len %u",
+                if ((hello_len <= msg_tlen)
+                        && (hello_len >= sizeof(struct olsr_hello_link)))
+                    hello_len_valid = 1;
+
+                ND_PRINT((ndo, "\n\t    link-type %s, neighbor-type %s, len %u%s",

                        tok2str(olsr_link_type_values, "Unknown", link_type),
                        tok2str(olsr_neighbor_type_values, "Unknown", neighbor_type),
                        tok2str(olsr_link_type_values, "Unknown", link_type),
                        tok2str(olsr_neighbor_type_values, "Unknown", neighbor_type),

-                       hello_len);
+                       hello_len,
+                       (hello_len_valid == 0) ? " (invalid)" : ""));
+
+                if (hello_len_valid == 0)
+                    break;

 
                 msg_data += sizeof(struct olsr_hello_link);
                 msg_tlen -= sizeof(struct olsr_hello_link);
                 hello_len -= sizeof(struct olsr_hello_link);
 
 
                 msg_data += sizeof(struct olsr_hello_link);
                 msg_tlen -= sizeof(struct olsr_hello_link);
                 hello_len -= sizeof(struct olsr_hello_link);
 

+                ND_TCHECK2(*msg_data, hello_len);

                 if (msg_type == OLSR_HELLO_MSG) {
                 if (msg_type == OLSR_HELLO_MSG) {

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

                 } else {
                 } else {

-                    olsr_print_lq_neighbor(msg_data, hello_len);
+                    if (is_ipv6) {
+                        if (olsr_print_lq_neighbor6(ndo, msg_data, hello_len) == -1)
+                            goto trunc;
+                    } else {
+                        if (olsr_print_lq_neighbor4(ndo, msg_data, hello_len) == -1)
+                            goto trunc;
+                    }

                 }
 
                 msg_data += hello_len;
                 }
 
                 msg_data += hello_len;


@@ -320,73 +487,228 @@ olsr_print (const u_char *pptr, u_int length)
 
         case OLSR_TC_MSG:
         case OLSR_TC_LQ_MSG:
 
         case OLSR_TC_MSG:
         case OLSR_TC_LQ_MSG:

-            if (!TTEST2(*msg_data, sizeof(struct olsr_tc)))    
+            if (msg_tlen < sizeof(struct olsr_tc))

                 goto trunc;
                 goto trunc;

+            ND_TCHECK2(*msg_data, sizeof(struct olsr_tc));

 
 

-            ptr.tc = (struct olsr_tc *)msg_data;
-            printf("\n\t    advertised neighbor seq 0x%04x",
-                   EXTRACT_16BITS(ptr.tc->ans_seq));
+            ptr.tc = (const struct olsr_tc *)msg_data;
+            ND_PRINT((ndo, "\n\t    advertised neighbor seq 0x%04x",
+                   EXTRACT_BE_U_2(ptr.tc->ans_seq)));

             msg_data += sizeof(struct olsr_tc);
             msg_tlen -= sizeof(struct olsr_tc);
 
             if (msg_type == OLSR_TC_MSG) {
             msg_data += sizeof(struct olsr_tc);
             msg_tlen -= sizeof(struct olsr_tc);
 
             if (msg_type == OLSR_TC_MSG) {

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

             } else {
             } else {

-                olsr_print_lq_neighbor(msg_data, msg_tlen);
+                if (is_ipv6) {
+                    if (olsr_print_lq_neighbor6(ndo, msg_data, msg_tlen) == -1)
+                        goto trunc;
+                } else {
+                    if (olsr_print_lq_neighbor4(ndo, msg_data, msg_tlen) == -1)
+                        goto trunc;
+                }

             }
             break;
 
         case OLSR_MID_MSG:
             }
             break;
 
         case OLSR_MID_MSG:

-            if (!TTEST2(*msg_data, sizeof(struct in_addr)))    
-                goto trunc;
+        {
+            size_t addr_size = sizeof(struct in_addr);
+
+            if (is_ipv6)
+                addr_size = sizeof(struct in6_addr);

 
 

-            while (msg_tlen >= sizeof(struct in_addr)) {
-                printf("\n\t  interface address %s", ipaddr_string(msg_data));
-                msg_data += sizeof(struct in_addr);
-                msg_tlen -= sizeof(struct in_addr);
+            while (msg_tlen >= addr_size) {
+                ND_TCHECK2(*msg_data, addr_size);
+                ND_PRINT((ndo, "\n\t  interface address %s",
+                        is_ipv6 ? ip6addr_string(ndo, msg_data) :
+                        ipaddr_string(ndo, msg_data)));
+
+                msg_data += addr_size;
+                msg_tlen -= addr_size;

             }
             break;
             }
             break;

+        }

 
         case OLSR_HNA_MSG:
 
         case OLSR_HNA_MSG:

-            prefix = 1;
-            printf("\n\t  advertised networks\n\t    ");
-            while (msg_tlen >= sizeof(struct olsr_hna)) {
-                if (!TTEST2(*msg_data, sizeof(struct olsr_hna)))       
-                    goto trunc;
+            if (is_ipv6)
+            {
+                int i = 0;
+
+                ND_PRINT((ndo, "\n\t  Advertised networks (total %u)",
+                        (unsigned int) (msg_tlen / sizeof(struct olsr_hna6))));
+
+                while (msg_tlen >= sizeof(struct olsr_hna6)) {
+                    const struct olsr_hna6 *hna6;

 
 

-                ptr.hna = (struct olsr_hna *)msg_data;
+                    ND_TCHECK2(*msg_data, sizeof(struct olsr_hna6));

 
 

-                /* print 4 prefixes per line */
+                    hna6 = (const struct olsr_hna6 *)msg_data;

 
 

-                printf("%s/%u%s",
-                       ipaddr_string(ptr.hna->network),
-                       mask2plen(EXTRACT_32BITS(ptr.hna->mask)),                       
-                       prefix % 4 == 0 ? "\n\t    " : " ");
+                    ND_PRINT((ndo, "\n\t    #%i: %s/%u",
+                            i, ip6addr_string(ndo, hna6->network),
+                            mask62plen (hna6->mask)));

 
 

-                msg_data += sizeof(struct olsr_hna);
-                msg_tlen -= sizeof(struct olsr_hna);
-                prefix ++;
+                    msg_data += sizeof(struct olsr_hna6);
+                    msg_tlen -= sizeof(struct olsr_hna6);
+                }
+            }
+            else
+            {
+                int col = 0;
+
+                ND_PRINT((ndo, "\n\t  Advertised networks (total %u)",
+                        (unsigned int) (msg_tlen / sizeof(struct olsr_hna4))));
+
+                while (msg_tlen >= sizeof(struct olsr_hna4)) {
+                    ND_TCHECK2(*msg_data, sizeof(struct olsr_hna4));
+
+                    ptr.hna = (const struct olsr_hna4 *)msg_data;
+
+                    /* print 4 prefixes per line */
+                    if (!ptr.hna->network[0] && !ptr.hna->network[1] &&
+                        !ptr.hna->network[2] && !ptr.hna->network[3] &&
+                        !ptr.hna->mask[GW_HNA_PAD] &&
+                        ptr.hna->mask[GW_HNA_FLAGS]) {
+                            /* smart gateway */
+                            ND_PRINT((ndo, "%sSmart-Gateway:%s%s%s%s%s %u/%u",
+                                col == 0 ? "\n\t    " : ", ", /* indent */
+                                /* sgw */
+                                /* LINKSPEED */
+                                (ptr.hna->mask[GW_HNA_FLAGS] &
+                                 GW_HNA_FLAG_LINKSPEED) ? " LINKSPEED" : "",
+                                /* IPV4 */
+                                (ptr.hna->mask[GW_HNA_FLAGS] &
+                                 GW_HNA_FLAG_IPV4) ? " IPV4" : "",
+                                /* IPV4-NAT */
+                                (ptr.hna->mask[GW_HNA_FLAGS] &
+                                 GW_HNA_FLAG_IPV4_NAT) ? " IPV4-NAT" : "",
+                                /* IPV6 */
+                                (ptr.hna->mask[GW_HNA_FLAGS] &
+                                 GW_HNA_FLAG_IPV6) ? " IPV6" : "",
+                                /* IPv6PREFIX */
+                                (ptr.hna->mask[GW_HNA_FLAGS] &
+                                 GW_HNA_FLAG_IPV6PREFIX) ? " IPv6-PREFIX" : "",
+                                /* uplink */
+                                (ptr.hna->mask[GW_HNA_FLAGS] &
+                                 GW_HNA_FLAG_LINKSPEED) ?
+                                 deserialize_gw_speed(ptr.hna->mask[GW_HNA_UPLINK]) : 0,
+                                /* downlink */
+                                (ptr.hna->mask[GW_HNA_FLAGS] &
+                                 GW_HNA_FLAG_LINKSPEED) ?
+                                 deserialize_gw_speed(ptr.hna->mask[GW_HNA_DOWNLINK]) : 0
+                                ));
+                    } else {
+                        /* normal route */
+                        ND_PRINT((ndo, "%s%s/%u",
+                                col == 0 ? "\n\t    " : ", ",
+                                ipaddr_string(ndo, ptr.hna->network),
+                                mask2plen(EXTRACT_BE_U_4(ptr.hna->mask))));
+                    }
+
+                    msg_data += sizeof(struct olsr_hna4);
+                    msg_tlen -= sizeof(struct olsr_hna4);
+
+                    col = (col + 1) % 4;
+                }

             }
             break;
 
             }
             break;
 

+        case OLSR_NAMESERVICE_MSG:
+        {
+            u_int name_entries;
+            u_int addr_size;
+            int name_entries_valid;
+            u_int i;
+
+            if (msg_tlen < 4)
+                goto trunc;
+            ND_TCHECK_4(msg_data);
+
+            name_entries = EXTRACT_BE_U_2(msg_data + 2);
+            addr_size = 4;
+            if (is_ipv6)
+                addr_size = 16;
+
+            name_entries_valid = 0;
+            if ((name_entries > 0)
+                    && ((name_entries * (4 + addr_size)) <= msg_tlen))
+                name_entries_valid = 1;
+
+            ND_PRINT((ndo, "\n\t  Version %u, Entries %u%s",
+                   EXTRACT_BE_U_2(msg_data),
+                   name_entries, (name_entries_valid == 0) ? " (invalid)" : ""));
+
+            if (name_entries_valid == 0)
+                break;
+
+            msg_data += 4;
+            msg_tlen -= 4;
+
+            for (i = 0; i < name_entries; i++) {
+                int name_entry_len_valid = 0;
+
+                if (msg_tlen < 4)
+                    break;
+                ND_TCHECK_4(msg_data);
+
+                name_entry_type = EXTRACT_BE_U_2(msg_data);
+                name_entry_len = EXTRACT_BE_U_2(msg_data + 2);
+
+                msg_data += 4;
+                msg_tlen -= 4;
+
+                if ((name_entry_len > 0) && ((addr_size + name_entry_len) <= msg_tlen))
+                    name_entry_len_valid = 1;
+
+                ND_PRINT((ndo, "\n\t    #%u: type %#06x, length %u%s",
+                        (unsigned int) i, name_entry_type,
+                        name_entry_len, (name_entry_len_valid == 0) ? " (invalid)" : ""));
+
+                if (name_entry_len_valid == 0)
+                    break;
+
+                /* 32-bit alignment */
+                name_entry_padding = 0;
+                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_TCHECK2(*msg_data, addr_size + name_entry_len + name_entry_padding);
+
+                if (is_ipv6)
+                    ND_PRINT((ndo, ", address %s, name \"",
+                            ip6addr_string(ndo, msg_data)));
+                else
+                    ND_PRINT((ndo, ", address %s, name \"",
+                            ipaddr_string(ndo, msg_data)));
+                (void)fn_printn(ndo, msg_data + addr_size, name_entry_len, NULL);
+                ND_PRINT((ndo, "\""));
+
+                msg_data += addr_size + name_entry_len + name_entry_padding;
+                msg_tlen -= addr_size + name_entry_len + name_entry_padding;
+            } /* for (i = 0; i < name_entries; i++) */
+            break;
+        } /* case OLSR_NAMESERVICE_MSG */
+

             /*
              * FIXME those are the defined messages that lack a decoder
              * you are welcome to contribute code ;-)
              */
             /*
              * FIXME those are the defined messages that lack a decoder
              * you are welcome to contribute code ;-)
              */

-

         case OLSR_POWERINFO_MSG:
         case OLSR_POWERINFO_MSG:

-        case OLSR_NAMESERVICE_MSG:

         default:
         default:

-           print_unknown_data(msg_data, "\n\t    ", msg_tlen);
+            print_unknown_data(ndo, msg_data, "\n\t    ", msg_tlen);

             break;
             break;

-        }      
+        } /* switch (msg_type) */

         tptr += msg_len;
         tptr += msg_len;

-    }
+    } /* while (tptr < (pptr+length)) */

 
     return;
 
  trunc:
 
     return;
 
  trunc:

-    printf("[|olsr]");
+    ND_PRINT((ndo, "[|olsr]"));

 }
 
 /*
 }
 
 /*