From Henning Rogge:

I have restructured the old code, pushed both IPv4 and IPv6 into the same
codepath and put each OLSR message into a subtree of it's own.

In addition to this the new dissector supports the custom message types of the
NRL-OLSR and Olsr.org implementation (the custom messages are used for
linkquality support and nameservices). The optional messages can be switched of
in the OLSR preferences page.

svn path=/trunk/; revision=26823

1 files changed, 922 insertions, 594 deletions

diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c
index 4cebda3c25..7e2c6b250f 100644
--- a/epan/dissectors/packet-olsr.c
+++ b/epan/dissectors/packet-olsr.c
@@ -6,6 +6,7 @@
  * the Naval Research Laboratory
  * Currently maintained by Jeff Weston <weston@itd.nrl.navy.mil>.
  *
+ * Updated to Olsr.org and NRLOLSR packages by Henning Rogge <rogge@fgan.de>
  * http://www.ietf.org/rfc/rfc3626.txt
  *
  * $Id$
@@ -13,17 +14,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -48,17 +49,26 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/prefs.h>
 
-#define UDP_PORT_OLSR	698
-#define HELLO	1
-#define TC	2
-#define MID	3
-#define HNA	4
+#define UDP_PORT_OLSR   698
+#define HELLO   1
+#define TC      2
+#define MID     3
+#define HNA     4
+
+#define OLSR_ORG_NAMESERVICE 130
+#define OLSR_ORG_LQ_HELLO    201
+#define OLSR_ORG_LQ_TC       202
+#define NRLOLSR_TC_EXTRA     241
 
 /* Initialize the protocol and registered fields */
 static int proto_olsr = -1;
+
 static int hf_olsr_packet_len = -1;
 static int hf_olsr_packet_seq_num = -1;
+
+static int hf_olsr_message = -1;
 static int hf_olsr_message_type = -1;
 static int hf_olsr_vtime = -1;
 static int hf_olsr_message_size = -1;
@@ -73,614 +83,932 @@ static int hf_olsr_link_type = -1;
 static int hf_olsr_link_message_size = -1;
 static int hf_olsr_ansn = -1;
 
+static int hf_olsr_neighbor = -1;
 static int hf_olsr_origin_addr = -1;
 static int hf_olsr_neighbor_addr = -1;
 static int hf_olsr_interface_addr = -1;
-static int hf_olsr_netmask	= -1;
+static int hf_olsr_netmask = -1;
 static int hf_olsr_network_addr = -1;
+
+static int hf_olsr_neighbor6 = -1;
 static int hf_olsr_origin6_addr = -1;
 static int hf_olsr_neighbor6_addr = -1;
 static int hf_olsr_interface6_addr = -1;
 static int hf_olsr_netmask6 = -1;
 static int hf_olsr_network6_addr = -1;
 
+static int hf_olsrorg_lq = -1;
+static int hf_olsrorg_nlq = -1;
+static int hf_nrlolsr_f1 = -1;
+static int hf_nrlolsr_f2 = -1;
+
+static int hf_olsrorg_ns_version = -1;
+static int hf_olsrorg_ns_count = -1;
+
+static int hf_olsrorg_ns = -1;
+static int hf_olsrorg_ns_type = -1;
+static int hf_olsrorg_ns_length = -1;
+static int hf_olsrorg_ns_ip = -1;
+static int hf_olsrorg_ns_ip6 = -1;
+static int hf_olsrorg_ns_content = -1;
+
 static int hf_olsr_data = -1;
 
 /* Initialize the subtree pointers*/
 static gint ett_olsr = -1;
+static gint ett_olsr_message[G_MAXUINT8 + 1];
+static gint ett_olsr_message_linktype = -1;
+static gint ett_olsr_message_neigh = -1;
+static gint ett_olsr_message_neigh6 = -1;
+static gint ett_olsr_message_ns = -1;
 
 static const value_string message_type_vals[] = {
-	{ HELLO, "HELLO" },
-	{ TC,    "TC" },
-	{ MID,   "MID" },
-	{ HNA,   "HNA" },
-	{ 0,     NULL }
+    { HELLO, "HELLO" },
+    { TC, "TC" },
+    { MID, "MID" },
+    { HNA, "HNA" },
+    { OLSR_ORG_LQ_HELLO, "HELLO (LQ, olsr.org)" },
+    { OLSR_ORG_LQ_TC, "TC (LQ, olsr.org)" },
+    { OLSR_ORG_NAMESERVICE, "Nameservice (olsr.org)" },
+    { NRLOLSR_TC_EXTRA, "TC (LQ, nrlolsr)" },
+    { 0, NULL }
 };
 
+static const value_string link_type_vals[] = {
+    { 0, "Unspecified Link" },
+    { 1, "Asymmetric Link" },
+    { 3, "Lost Link" },
+    { 5, "Pending Link" },
+    { 6, "Symmetric Link" },
+    { 10, "MPR Link" },
+    { 0, NULL }
+};
+
+static const value_string willingness_type_vals[] = {
+    { 0, "never" },
+    { 7, "always" },
+    { 0, NULL }
+};
+
+static const value_string nameservice_type_vals[] = {
+    { 0, "HOST" },
+    { 1, "FORWARDER" },
+    { 2, "SERVICE" },
+    { 3, "LATLON" },
+    { 0, NULL }
+};
+
+static gboolean global_olsr_olsrorg = TRUE;
+static gboolean global_olsr_nrlolsr = TRUE;
+
+static double getOlsrTime(guint8 time) {
+  int high_bits, low_bits;
+
+  high_bits = ((time & 0xF0) >> 4);
+  low_bits = (time & 0x0F);
+  return ((1 << low_bits) / 16.0) * (1 + (high_bits / 16.0));
+}
+
+/*------------------------- TC Dissecting Code-------------------------*/
+static int dissect_olsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) {
+  if (message_end - offset < 4) {
+    proto_tree_add_bytes_format(olsr_tree, hf_olsr_ansn, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset,
+        message_end - offset), "Not enough bytes for TC");
+    return message_end;
+  }
+
+  proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, FALSE);
+  offset += 4;
+
+  while (offset < message_end) {
+    if (message_end - offset < pinfo->src.len) {
+      proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, message_end - offset, tvb_get_ptr(tvb,
+          offset, message_end - offset), "Not enough bytes for last neighbor");
+      return message_end;
+    }
+    if (pinfo->src.type == AT_IPv4) {
+      proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE);
+      offset += 4;
+    } else if (pinfo->src.type == AT_IPv6) {
+      proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE);
+      offset += 16;
+    } else {
+      break; /* unknown address type should be handled in dissect_olsr, just be sure */
+    }
+  }
+  return message_end;
+}
+
+static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) {
+
+  if (message_end - offset < 4) {
+    proto_tree_add_bytes_format(olsr_tree, hf_olsr_ansn, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset,
+        message_end - offset), "Not enough bytes for Olsr.org LQ-TC");
+    return message_end;
+  }
+  proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, FALSE);
+  offset += 4;
+
+  while (offset < message_end) {
+    proto_item *address_group;
+    proto_tree *address_tree;
+    const guint8 *ptr;
+    guint8 lq, nlq;
+
+    if (pinfo->src.type == AT_IPv4) {
+      if (message_end - offset < 8) {
+        proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, message_end - offset, tvb_get_ptr(tvb,
+            offset, message_end - offset), "Not enough bytes for last entry (need 8 bytes)");
+        return message_end;
+      }
+      ptr = tvb_get_ptr(tvb, offset, 8);
+      lq = tvb_get_guint8(tvb, offset + 4);
+      nlq = tvb_get_guint8(tvb, offset + 5);
+
+      address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 8, ptr,
+          "Neighbor Address: %s (%d/%d)", ip_to_str(ptr), lq, nlq);
+
+      address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh);
+
+      proto_tree_add_item(address_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE);
+      offset += 4;
+    } else if (pinfo->src.type == AT_IPv6) {
+      if (message_end - offset < 20) {
+        proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, message_end - offset, tvb_get_ptr(tvb,
+            offset, message_end - offset), "Not enough bytes for last entry (need 20 bytes)");
+        return message_end;
+      }
+      ptr = tvb_get_ptr(tvb, offset, 20);
+      lq = tvb_get_guint8(tvb, offset + 16);
+      nlq = tvb_get_guint8(tvb, offset + 17);
+
+      address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 20, ptr,
+          "Neighbor Address: %s (%d/%d)", ip6_to_str((const struct e_in6_addr *) ptr), lq, nlq);
+
+      address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh);
+
+      proto_tree_add_item(address_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE);
+      offset += 16;
+    } else {
+      break; /* unknown address type should be handled in dissect_olsr, just be sure */
+    }
+
+    proto_tree_add_item(address_tree, hf_olsrorg_lq, tvb, offset++, 1, FALSE);
+    proto_tree_add_item(address_tree, hf_olsrorg_nlq, tvb, offset++, 1, FALSE);
+    offset += 2;
+  }
+  return message_end;
+}
+
+static int dissect_nrlolsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) {
+  int field1Ptr, field2Ptr, saneEnd;
+  if (message_end - offset < 4) {
+    proto_tree_add_bytes_format(olsr_tree, hf_olsr_ansn, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset,
+        message_end - offset), "Not enough bytes for NRLOLSR LQ-TC");
+    return message_end;
+  }
+
+  proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, FALSE);
+  offset += 4;
+
+  field1Ptr = offset + (message_end - offset) / (pinfo->src.len + 2) * (pinfo->src.len);
+  field2Ptr = offset + (message_end - offset) / (pinfo->src.len + 2) * (pinfo->src.len + 1);
+
+  saneEnd = message_end - ((message_end - offset) % (pinfo->src.len + 2));
+  while (field2Ptr < saneEnd) {
+    if (pinfo->src.type == AT_IPv4) {
+      proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE);
+      offset += 4;
+    } else if (pinfo->src.type == AT_IPv6) {
+      proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE);
+      offset += 16;
+    } else {
+      break; /* unknown address type should be handled in dissect_olsr, just be sure */
+    }
+
+    proto_tree_add_item(olsr_tree, hf_nrlolsr_f1, tvb, field1Ptr++, 1, FALSE);
+    proto_tree_add_item(olsr_tree, hf_nrlolsr_f2, tvb, field2Ptr++, 1, FALSE);
+  }
+  return message_end;
+}
+
+/*------------------------- Hello Dissecting Code-------------------------*/
+static int dissect_olsr_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end,
+    int(*handleNeighbors)(tvbuff_t *, packet_info *, proto_tree *, int, int)) {
+  double hTime;
+  proto_item *ti;
+  proto_tree *link_type_tree;
+
+  guint16 message_size = 0;
+
+  if (message_end - offset < 4) {
+    proto_tree_add_bytes_format(olsr_tree, hf_olsr_htime, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset,
+        message_end - offset), "Not enough bytes for Hello");
+    return message_end;
+  }
+
+  offset += 2;
+
+  /*---------------------Dissect Hello Emission Invertal-------------------*/
+  hTime = getOlsrTime(tvb_get_guint8(tvb, offset));
+  proto_tree_add_double_format(olsr_tree, hf_olsr_htime, tvb, offset, 1, hTime,
+      "Hello Emission Interval: %.3f (in seconds)", hTime);
+  offset++;
+
+  /*-------------------------Dissect Willingness---------------------------*/
+  proto_tree_add_item(olsr_tree, hf_olsr_willingness, tvb, offset++, 1, FALSE);
+
+  while (offset < message_end) {
+    if (message_end - offset < 4) {
+      proto_tree_add_bytes_format(olsr_tree, hf_olsr_link_type, tvb, offset, message_end - offset, tvb_get_ptr(tvb,
+          offset, message_end - offset), "Not enough bytes for last Hello entry");
+      return message_end;
+    }
+
+    /*------------------------------Dissect Link Type---------------------------------- */
+    ti = proto_tree_add_item(olsr_tree, hf_olsr_link_type, tvb, offset++, 1, FALSE);
+    link_type_tree = proto_item_add_subtree(ti, ett_olsr_message_linktype);
+
+    /* reserved byte */
+    offset++;
+
+    /*----------------------Dissect Link Message Size--------------------------*/
+    message_size = tvb_get_ntohs(tvb, offset);
+    ti = proto_tree_add_item(link_type_tree, hf_olsr_link_message_size, tvb, offset, 2, FALSE);
+    offset += 2;
+
+    if (message_size < 4) {
+      proto_item_append_string(ti, "(too short, must be >= 4)");
+      return message_end;
+    }
+    offset = handleNeighbors(tvb, pinfo, link_type_tree, offset, offset + message_size - 4);
+  }
+  return message_end;
+}
+
+static int handle_olsr_hello_rfc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset,
+    int link_message_end) {
+  /*-------------------Dissect Neighbor Addresses--------------------*/
+  while (offset < link_message_end) {
+    if (link_message_end - offset < pinfo->src.len) {
+      proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, link_message_end - offset, tvb_get_ptr(tvb,
+          offset, link_message_end - offset), "Not enough bytes for last Hello entry");
+      return link_message_end;
+    }
+    if (pinfo->src.type == AT_IPv4) {
+      proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE);
+      offset += 4;
+    } else if (pinfo->src.type == AT_IPv6) {
+      proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE);
+      offset += 16;
+    } else {
+      break; /* unknown address type should be handled in dissect_olsr, just be sure */
+    }
+  } /* end while */
+  return link_message_end;
+}
+
+static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset,
+    int link_message_end) {
+  /*-------------------Dissect Neighbor Addresses--------------------*/
+
+  while (offset < link_message_end) {
+    proto_item *address_group;
+    proto_tree *address_tree;
+    const guint8 *ptr;
+    guint8 lq, nlq;
+
+    if (link_message_end - offset < pinfo->src.len + 4) {
+      proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, link_message_end - offset, tvb_get_ptr(tvb,
+          offset, link_message_end - offset), "Not enough bytes for last Olsr.org LQ-Hello entry");
+      return link_message_end;
+    }
+
+    if (pinfo->src.type == AT_IPv4) {
+      ptr = tvb_get_ptr(tvb, offset, 8);
+      lq = tvb_get_guint8(tvb, offset + 4);
+      nlq = tvb_get_guint8(tvb, offset + 5);
+
+      address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 8, ptr,
+          "Neighbor Address: %s (%d/%d)", ip_to_str(ptr), lq, nlq);
+
+      address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh);
+
+      proto_tree_add_item(address_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE);
+      offset += 4;
+    } else if (pinfo->src.type == AT_IPv6) {
+      ptr = tvb_get_ptr(tvb, offset, 20);
+      lq = tvb_get_guint8(tvb, offset + 16);
+      nlq = tvb_get_guint8(tvb, offset + 17);
+
+      address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 20, ptr,
+          "Neighbor Address: %s (%d/%d)", ip6_to_str((const struct e_in6_addr *) ptr), lq, nlq);
+
+      address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh);
+
+      proto_tree_add_item(address_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE);
+      offset += 16;
+    } else {
+      break; /* unknown address type should be handled in dissect_olsr, just be sure */
+    }
+
+    proto_tree_add_item(address_tree, hf_olsrorg_lq, tvb, offset++, 1, FALSE);
+    proto_tree_add_item(address_tree, hf_olsrorg_nlq, tvb, offset++, 1, FALSE);
+    offset += 2;
+  } /* end while */
+  return link_message_end;
+}
+
+/*------------------------- MID Dissecting Code-------------------------*/
+static int dissect_olsr_mid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) {
+  while (offset < message_end) {
+    if (message_end - offset < pinfo->src.len) {
+      proto_tree_add_bytes_format(olsr_tree, hf_olsr_interface_addr, tvb, offset, message_end - offset, tvb_get_ptr(
+          tvb, offset, message_end - offset), "Not enough bytes for last MID entry");
+      return message_end;
+    }
+    if (pinfo->src.type == AT_IPv4) {
+      proto_tree_add_item(olsr_tree, hf_olsr_interface_addr, tvb, offset, 4, FALSE);
+      offset += 4;
+    } else if (pinfo->src.type == AT_IPv6) {
+      proto_tree_add_item(olsr_tree, hf_olsr_interface6_addr, tvb, offset, 16, FALSE);
+      offset += 16;
+    } else {
+      break; /* unknown address type should be handled in dissect_olsr, just be sure */
+    }
+  } /* end while for MID */
+  return message_end;
+}
+
+/*------------------------- HNA Dissecting Code-------------------------*/
+static int dissect_olsr_hna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) {
+  while (offset < message_end) {
+    if (message_end - offset < pinfo->src.len * 2) {
+      proto_tree_add_bytes_format(olsr_tree, hf_olsr_network_addr, tvb, offset, message_end - offset, tvb_get_ptr(tvb,
+          offset, message_end - offset), "Not enough bytes for last HNA entry");
+      return message_end;
+    }
+
+    if (pinfo->src.type == AT_IPv4) {
+      proto_tree_add_item(olsr_tree, hf_olsr_network_addr, tvb, offset, 4, FALSE);
+      offset += 4;
+      proto_tree_add_item(olsr_tree, hf_olsr_netmask, tvb, offset, 4, FALSE);
+      offset += 4;
+    } else if (pinfo->src.type == AT_IPv6) {
+      proto_tree_add_item(olsr_tree, hf_olsr_network6_addr, tvb, offset, 4, FALSE);
+      offset += 16;
+      proto_tree_add_item(olsr_tree, hf_olsr_netmask6, tvb, offset, 4, FALSE);
+      offset += 16;
+    } else {
+      break; /* unknown address type should be handled in dissect_olsr, just be sure */
+    }
+  } /* end while for HNA */
+  return message_end;
+}
+
+/*------------------------- MID Dissecting Code-------------------------*/
+static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset,
+    int message_end) {
+  guint16 version, count;
+
+  proto_item *olsr_ns_item;
+  proto_tree *olsr_ns_tree;
+
+  if (message_end - offset < 4) {
+    proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns_version, tvb, offset, message_end - offset, tvb_get_ptr(tvb,
+        offset, message_end - offset), "Not enough bytes for Olsr.org Nameservice message");
+    return message_end;
+  }
+
+  version = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_item(olsr_tree, hf_olsrorg_ns_version, tvb, offset, 2, FALSE);
+
+  count = tvb_get_ntohs(tvb, offset + 2);
+  proto_tree_add_item(olsr_tree, hf_olsrorg_ns_count, tvb, offset + 2, 2, FALSE);
+
+  offset += 4;
+
+  if (version != 1) {
+    proto_tree_add_bytes_format(olsr_tree, hf_olsr_data, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset,
+        message_end - offset), "Unkown nameservice protocol version %d", version);
+    return message_end;
+  }
+
+  while (offset < message_end && count-- > 0) {
+    guint16 type, length;
+    int total_length;
+
+    if (message_end - offset < 20) {
+      proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset,
+          message_end - offset), "Not enough bytes for last nameservice entry");
+      return message_end;
+    }
+
+    type = tvb_get_ntohs(tvb, offset);
+    length = tvb_get_ntohs(tvb, offset + 2);
+
+    total_length = 4 + 16 + ((length - 1) | 3) + 1;
+
+    olsr_ns_item = proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns, tvb, offset, total_length, tvb_get_ptr(tvb,
+        offset, total_length), "Nameservice: %s (%d)", val_to_str(type, nameservice_type_vals, "UNKNOWN"), type);
+
+    olsr_ns_tree = proto_item_add_subtree(olsr_ns_item, ett_olsr_message_ns);
+
+    proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_type, tvb, offset, 2, FALSE);
+    proto_tree_add_uint(olsr_ns_tree, hf_olsrorg_ns_length, tvb, offset + 2, 2, length);
+
+    if (pinfo->src.type == AT_IPv4) {
+      proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_ip, tvb, offset + 4, 4, FALSE);
+    } else if (pinfo->src.type == AT_IPv6) {
+      proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_ip6, tvb, offset + 4, 16, FALSE);
+    } else {
+      break; /* unknown address type should be handled in dissect_olsr, just be sure */
+    }
+
+    if (message_end - offset < total_length) {
+      proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset,
+          message_end - offset), "Not enough bytes for content of last nameservice entry");
+      return message_end;
+    }
+    proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_content, tvb, offset + 20, length, FALSE);
+    offset += 4 + 16 + ((length - 1) | 3) + 1;
+  }
+  return message_end;
+}
+
 /*------------------------- Packet Dissecting Code-------------------------*/
-static int
-dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	proto_item *ti;
-	proto_tree *olsr_tree;
-        
-	int offset, link_message_size, message_size, message_len, message_type, packet_size, position;
-	int high_bits, low_bits, vtime, htime;
-	double Vtime, Htime;
-	
-	guint16 packet_len;
-	
-	/* Does this packet have a valid message type at the beginning? */
-	if (tvb_length(tvb) < 2)
-		return 0;	/* not enough bytes for the packet length */
-	packet_len = tvb_get_ntohs(tvb, 0);
-	if (packet_len < 4)
-		return 0;	/* length not enough for a packet header */
-	if (packet_len > 4) {
-		/*
-		 * The packet claims to have more than just a packet
-		 * header.
-		 */
-		if (packet_len < 8) {
-			/*
-			 * ...but it doesn't claim to have enough for
-			 * a full message header.
-			 */
-			return 0;
-		}
-
-		/*
-		 * OK, let's look at the type of the first message and
-		 * at its size field.
-		 */
-		if (!tvb_bytes_exist(tvb, 4, 4))
-			return 0;	/* not enough bytes for them */
-		/* OK, what about the message length? */
-		message_len = tvb_get_ntohs(tvb, 4+2);
-		if (message_len < 4)
-			return 0;	/* length not enough for a message header */
-	}
-
-	/*-------------Setting the Protocol and Info Columns in the Wireshark Display----------*/
-	if (check_col(pinfo->cinfo, COL_PROTOCOL)) 
-		col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDP");
-	if (check_col(pinfo->cinfo, COL_INFO)) 
-		col_clear(pinfo->cinfo, COL_INFO);
-
-	if (check_col(pinfo->cinfo, COL_INFO) && (pinfo->src.type==AT_IPv4))
-		col_add_fstr(pinfo->cinfo, COL_INFO, "OLSR (IPv4) Packet,  Length: %u Bytes", packet_len);
-	else if(check_col(pinfo->cinfo, COL_INFO) && (pinfo->src.type==AT_IPv6))
-		col_add_fstr(pinfo->cinfo, COL_INFO, "OLSR (IPv6) Packet,  Length: %u Bytes", packet_len);
-
-/*-----------------------------------------------------Fetching Info from IPv4 Packet and Adding to Tree-------------------------------------------*/
-	if (tree && (pinfo->src.type==AT_IPv4)) {
-		ti = proto_tree_add_item(tree, proto_olsr, tvb, 0, -1, FALSE);
-		olsr_tree = proto_item_add_subtree(ti, ett_olsr);
-
-		proto_tree_add_uint_format(olsr_tree, hf_olsr_packet_len, tvb, 0, 2, packet_len, "Packet Length: %u bytes", packet_len);
-		proto_tree_add_item(olsr_tree, hf_olsr_packet_seq_num, tvb, 2, 2, FALSE);
-		
-		packet_size = (packet_len - 4) / 4;
-		position = 4;
-
-		while(packet_size>0)   {
-			message_type = tvb_get_guint8(tvb, position);
-			proto_tree_add_uint(olsr_tree, hf_olsr_message_type, tvb, position, 1, message_type);
-			
-			/*-------------Dissect Validity Time-------------------------*/
-			vtime = tvb_get_guint8(tvb, position+1);
-			high_bits = ((vtime & 0xF0) >> 4);
-			low_bits = (vtime & 0x0F);
-			Vtime = ((1<<low_bits)/16.0)*(1+(high_bits/16.0));
-			proto_tree_add_double_format(olsr_tree, hf_olsr_vtime, tvb, position+1, 1, Vtime, "Validity Time: %.3f (in seconds)", Vtime);
-			
-			/*-------------Dissect Message Size---------------------------*/
-			message_len = tvb_get_ntohs(tvb, position+2);
-			if (message_len < 4) {
-				proto_tree_add_uint_format(olsr_tree, hf_olsr_message_size, tvb, position+2, 2, message_len,"Message Size: %u bytes (too short, must be >= 4)", message_len);
-				break;
-			}
-			proto_tree_add_uint_format(olsr_tree, hf_olsr_message_size, tvb, position+2, 2, message_len,"Message Size: %u bytes", message_len);
-			
-			packet_size--;
-			message_size = (message_len - 4) /4;
-			offset = position + 4;
-			position = offset;
-			
-			/*-----------------Dissecting: Origin Addr, TTL, Hop Count, and Message Seq Number*/
-			if(message_size > 0)	{
-				proto_tree_add_item(olsr_tree, hf_olsr_origin_addr, tvb, offset, 4, FALSE);
-				message_size--;
-				packet_size--;
-				offset+=4;
-			}
-			if(message_size > 0)	{
-				proto_tree_add_item(olsr_tree, hf_olsr_ttl, tvb, offset, 1, FALSE);
-				proto_tree_add_item(olsr_tree, hf_olsr_hop_count, tvb, offset+1, 1, FALSE);
-				proto_tree_add_item(olsr_tree, hf_olsr_message_seq_num, tvb, offset+2, 2, FALSE);
-				message_size--;
-				packet_size--;
-				offset+=4;
-			}
-			
-			position = offset;
-			
-			/* --------------Dissecting TC message--------------------- */
-			if(message_size>0 && message_type == TC)   {
-				proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, FALSE);
-
-				offset+=4;
-				message_size--;
-				packet_size--;
-
-				while(message_size>0)  {
-					proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE);
-					message_size--;
-					offset+=4;
-					packet_size--;
-					}
-				position = offset;
-			}
-
-			/* -------------Dissect HELLO message----------------------- */
-			else if(message_size>0 && message_type == HELLO)  {
-				/*---------------------Dissect Hello Emission Invertal-------------------*/
-				htime = tvb_get_guint8(tvb, offset+2);
-				high_bits = ((htime & 0xF0) >> 4);
-				low_bits = (htime & 0x0F);
-				Htime = ((1<<low_bits)/16.0)*(1+(high_bits/16.0));
-				proto_tree_add_double_format(olsr_tree, hf_olsr_htime, tvb, offset+2, 1, Htime, "Hello Emission Interval: %.3f (in seconds)", Htime);
-				
-				/*-------------------------Dissect Willingness---------------------------*/
-				switch(tvb_get_guint8(tvb, offset+3))	{
-					case 0:
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Never");
-						break;
-					case 1:
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Low");
-						break;
-					case 3:
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Default");
-						break;
-					case 6:
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: High");
-						break;
-					case 7:	
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Always");
-						break;
-					default :
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Invalid!");
-						break;
-				}/* end switch Willingness */
-				
-				offset+=4;
-				message_size--;
-				packet_size--;
-				
-				while(message_size>0)   {
-					/*------------------------------Dissect Link Type---------------------------------- */
-					switch(tvb_get_guint8(tvb, offset))	{
-						case 0:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Unspecified Link");
-							break;
-						case 1:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Asymmetric Link");
-							break;
-						case 6:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Symmetric Link");
-							break;
-						case 3:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Lost Link");
-							break;
-						case 10:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: MPR Link");
-							break;
-						case 5:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Pending");
-							break;
-						default:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Invalid");
-							break;
-					}/* end switch Link Type */
-
-					/*----------------------Dissect Link Message Size--------------------------*/
-					proto_tree_add_uint_format(olsr_tree, hf_olsr_link_message_size, tvb, offset+2, 2, tvb_get_ntohs(tvb, offset+2), "Link Message Size: %u bytes", tvb_get_ntohs(tvb, offset+2));
-
-					link_message_size = (tvb_get_ntohs(tvb, offset+2) - 4) / 4;
-					offset+=4;
-					message_size--;
-					packet_size--;
-											
-					/*-------------------Dissect Neighbor Addresses--------------------*/
-					while(link_message_size>0)   {
-						proto_tree_add_item(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, 4, FALSE);
-						offset+=4;
-						message_size--;
-						packet_size--;
-						link_message_size--;
-					} /* end while */
-				} /* end while */
-				position = offset;
-			} /* end if for Hello */
-			/*---------------------------------Dissect MID Message----------------------------------*/
-			else if(message_size>0 && message_type==MID)	{
-				while(message_size>0)	{
-					proto_tree_add_item(olsr_tree, hf_olsr_interface_addr, tvb, offset, 4, FALSE);
-					message_size--;
-					offset+=4;
-					packet_size--;
-				} /* end while for MID */
-				position = offset;
-			} /* end if for MID */
-			/*-----------------------------Dissect HNA Message--------------------------------*/
-			else if(message_size>0 && message_type==HNA)	{
-				while(message_size>0)	{
-					proto_tree_add_item(olsr_tree, hf_olsr_network_addr, tvb, offset, 4, FALSE);
-					message_size--;
-					packet_size--;
-					offset+=4;
-					proto_tree_add_item(olsr_tree, hf_olsr_netmask, tvb, offset, 4, FALSE);
-					message_size--;
-					packet_size--;
-					offset+=4;
-				} /* end while for HNA */
-				position = offset;
-			} /* end if for HNA */
-			/*-----------------------------Undefined message types-----------------------------*/
-			else if(message_size>0) {
-				if((message_len-12)%4) {
-					proto_tree_add_bytes_format(olsr_tree, hf_olsr_data, tvb, position, 1, tvb_get_ptr(tvb, position, 1), "Data (%u bytes) (must be aligned on 32 bits)", message_len-12);
-					break;
-				}
-				proto_tree_add_bytes_format(olsr_tree, hf_olsr_data, tvb, position, message_len-12, tvb_get_ptr(tvb, position, message_len-12), "Data (%u bytes)", message_len-12);
-				packet_size -= (message_len-12)/4;
-				message_size = 0;
-				offset += message_len-12;
-				position = offset;
-			} /* end if for undefined message types */
-			
-		} /* end while for message alive */
-	} /* end if for IPV4 */
-
-
-/*-----------------------------------------------------Fetching Info from IPv6 Packet and Adding to Tree-------------------------------------------------*/
-	if (tree && (pinfo->src.type==AT_IPv6)) {
-		ti = proto_tree_add_item(tree, proto_olsr, tvb, 0, -1, FALSE);
-		olsr_tree = proto_item_add_subtree(ti, ett_olsr);
-
-		proto_tree_add_uint_format(olsr_tree, hf_olsr_packet_len, tvb, 0, 2, packet_len, "Packet Length: %u bytes", packet_len);
-		proto_tree_add_item(olsr_tree, hf_olsr_packet_seq_num, tvb, 2, 2, FALSE);
-
-		
-		packet_size = (packet_len - 4) / 4;
-		position = 4;
-
-		while(packet_size>0)   {
-			message_type = tvb_get_guint8(tvb, position);
-			proto_tree_add_uint(olsr_tree, hf_olsr_message_type, tvb, position, 1, message_type);
-
-			/*-------------Dissect Validity Time-------------------------*/
-			vtime = tvb_get_guint8(tvb, position+1);
-			high_bits = ((vtime & 0xF0) >> 4);
-			low_bits = (vtime & 0x0F);
-			Vtime = ((1<<low_bits)/16.0)*(1.0+(high_bits/16.0));
-			proto_tree_add_double_format(olsr_tree, hf_olsr_vtime, tvb, position+1, 1, Vtime, "Validity Time: %.3f (in seconds)", Vtime);
-				 
-			/*-------------Dissect Message Size---------------------------*/
-			message_len = tvb_get_ntohs(tvb, position+2);
-			if (message_len < 4) {
-				proto_tree_add_uint_format(olsr_tree, hf_olsr_message_size, tvb, position+2, 2, message_len,"Message Size: %u bytes (too short, must be >= 4)", message_len);
-				break;
-			}
-			proto_tree_add_uint_format(olsr_tree, hf_olsr_message_size, tvb, position+2, 2, message_len,"Message Size: %u bytes", message_len);
-			
-			packet_size--;
-			message_size = (message_len - 4) /4;
-
-			offset = position + 4;
-			position = offset;
-
-			/*-----------------Dissecting: Origin Addr, TTL, Hop Count, and Message Seq Number */
-			if(message_size > 0)	{
-				proto_tree_add_item(olsr_tree, hf_olsr_origin6_addr, tvb, offset, 16, FALSE);
-				offset+=16;
-				message_size-=4;
-				packet_size-=4;
-			}
-			if(message_size > 0)	{
-				proto_tree_add_item(olsr_tree, hf_olsr_ttl, tvb, offset, 1, FALSE);
-				proto_tree_add_item(olsr_tree, hf_olsr_hop_count, tvb, offset+1, 1, FALSE);
-				proto_tree_add_item(olsr_tree, hf_olsr_message_seq_num, tvb, offset+2, 2, FALSE);
-				message_size--;
-				packet_size--;
-				offset+=4;
-			}
-	
-			position = offset;
-			
-			/* --------------Dissecting TC message--------------------- */
-			if(message_size>0 && message_type == TC)   {
-				proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, FALSE);
-
-				offset+=4;
-				message_size--;
-				packet_size--;
-
-				while(message_size>0)  {
-					proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE);
-					message_size-=4;
-					offset+=16;
-					packet_size-=4;
-					}
-				position = offset;
-			}
-
-			/* -------------Dissect HELLO message----------------------- */
-			else if(message_size>0 && message_type == HELLO)  {
-				/*---------------------Dissect Hellow Emission Invertal-------------------*/
-				htime = tvb_get_guint8(tvb, offset+2);
-				high_bits = ((htime & 0xF0) >> 4);
-				low_bits = (htime & 0x0F);
-				Htime = ((1<<low_bits)/16.0)*(1.0+(high_bits/16.0));
-				proto_tree_add_double_format(olsr_tree, hf_olsr_htime, tvb, offset+2, 1, Htime, "Hello Emission Interval: %.3f (in seconds)", Htime);
-
-				/*---------------------Dissect Willingness----------------------------------*/
-				switch(tvb_get_guint8(tvb, offset+3))	{
-					case 0:
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Never");
-						break;
-					case 1:
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Low");
-						break;
-					case 3:
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Default");
-						break;
-					case 6:
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: High");
-						break;
-					case 7:	
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Always");
-						break;
-					default :
-						proto_tree_add_uint_format(olsr_tree, hf_olsr_willingness, tvb, offset+3, 1, tvb_get_guint8(tvb, offset+2), "Willingness: Invalid!");
-						break;
-				} /* end switch for willingness */
-				
-				offset+=4;
-				message_size--;
-				packet_size--;
-				
-				while(message_size>0)   {
-					/*----------------------Dissect Link Type------------------------------------*/
-					switch(tvb_get_guint8(tvb, offset))	{
-						case 0:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Unspecified Link");
-							break;
-						case 1:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Asymmetric Link");
-							break;
-						case 6:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Symmetric Link");
-							break;
-						case 3:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Lost Link");
-							break;
-						case 10:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: MPR Link");
-							break;
-						case 5:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Pending");
-							break;
-						default:
-							proto_tree_add_uint_format(olsr_tree, hf_olsr_link_type, tvb, offset, 1, tvb_get_guint8(tvb, offset), "Link Type: Invalid");
-							break;
-					} /* end switch Link Type */
-				
-					/*-------------------------Dissect Link Message Size-----------------------------*/
-					proto_tree_add_uint_format(olsr_tree, hf_olsr_link_message_size, tvb, offset+2, 2, tvb_get_ntohs(tvb, offset+2), "Link Message Size: %u bytes", tvb_get_ntohs(tvb, offset+2));
-
-					link_message_size = (tvb_get_ntohs(tvb, offset+2) - 4) / 4;
-					offset+=4;
-					message_size--;
-					packet_size--;
-											
-					/*--------------------------Dissect Neighbor Addresses---------------------------*/
-					while(link_message_size>0)   {
-						proto_tree_add_item(olsr_tree, hf_olsr_neighbor6_addr, tvb, offset, 16, FALSE);
-						offset+=16;
-						message_size-=4;
-						packet_size-=4;
-						link_message_size-=4;
-					} /* end while */
-				} /* end while */
-				position = offset;
-			} /* end if for Hello */
-			/*---------------------------------Dissect MID Message----------------------------------*/
-			else if(message_size>0 && message_type==MID)	{
-				while(message_size>0)	{
-					proto_tree_add_item(olsr_tree, hf_olsr_interface6_addr, tvb, offset, 16, FALSE);
-					message_size-=4;
-					offset+=16;
-					packet_size-=4;
-				} /* end while for MID */
-				position = offset;
-			} /* end if for MID */
-			/*-----------------------------Dissect HNA Message--------------------------------*/
-			else if(message_size>0 && message_type==HNA)	{
-				while(message_size>0)	{
-					proto_tree_add_item(olsr_tree, hf_olsr_network6_addr, tvb, offset, 16, FALSE);
-					offset+=16;
-					message_size-=4;
-					packet_size-=4;
-					proto_tree_add_item(olsr_tree, hf_olsr_netmask6, tvb, offset, 16, FALSE);
-					message_size-=4;
-					packet_size-=4;
-					offset+=16;
-				} /* end while for HNA */
-				position = offset;
-			} /* end if for HNA */
-			/*-----------------------------Undefined message types-----------------------------*/
-			else if(message_size>0) {
-				if((message_len-24)%4) {
-					proto_tree_add_bytes_format(olsr_tree, hf_olsr_data, tvb, position, 1, tvb_get_ptr(tvb, position, 1), "Data (%u bytes) (must be aligned on 32 bits)", message_len-24);
-					break;
-				}
-				proto_tree_add_bytes_format(olsr_tree, hf_olsr_data, tvb, position, message_len-24, tvb_get_ptr(tvb, position, message_len-24), "Data (%u bytes)", message_len-24);
-				packet_size -= (message_len-24)/4;
-				message_size = 0;
-				offset += message_len-24;
-				position = offset;
-			} /* end if for undefined message types */
-		} /* end while for message alive */
-	} /* end if for IPV6 */
-	return tvb_length(tvb);
+static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+  proto_item *ti;
+  proto_tree *olsr_tree;
+
+  int offset, message_len, message_end;
+  guint message_type;
+  double vTime;
+
+  guint16 packet_len;
+
+  /* Does this packet have a valid message type at the beginning? */
+  if (tvb_length(tvb) < 4) {
+    if (check_col(pinfo->cinfo, COL_INFO)) {
+      col_add_fstr(pinfo->cinfo, COL_INFO, "OLSR Packet,  Length: %u Bytes (not enough data in packet)",
+          tvb_length(tvb));
+    }
+    return 0; /* not enough bytes for the packet length */
+  }
+  packet_len = tvb_get_ntohs(tvb, 0);
+  if (packet_len > tvb_length(tvb)) {
+    if (check_col(pinfo->cinfo, COL_INFO)) {
+      col_add_fstr(pinfo->cinfo, COL_INFO, "OLSR Packet,  Length: %u Bytes (not enough data in packet)", packet_len);
+    }
+    return 0;
+  }
+  /*-------------Setting the Protocol and Info Columns in the Wireshark Display----------*/
+  if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "OLSR v1");
+  if (check_col(pinfo->cinfo, COL_INFO))
+    col_clear(pinfo->cinfo, COL_INFO);
+
+  if ((pinfo->src.type != AT_IPv4) && (pinfo->src.type != AT_IPv6)) {
+    if (check_col(pinfo->cinfo, COL_INFO)) {
+      col_add_fstr(pinfo->cinfo, COL_INFO, "OLSR (unknown address type) Packet,  Length: %u Bytes", packet_len);
+    }
+    return 0;
+  }
+  if (check_col(pinfo->cinfo, COL_INFO) && (pinfo->src.type == AT_IPv4)) {
+    col_add_fstr(pinfo->cinfo, COL_INFO, "OLSR (IPv4) Packet,  Length: %u Bytes", packet_len);
+  } else if (check_col(pinfo->cinfo, COL_INFO) && (pinfo->src.type == AT_IPv6)) {
+    col_add_fstr(pinfo->cinfo, COL_INFO, "OLSR (IPv6) Packet,  Length: %u Bytes", packet_len);
+  }
+
+  /*-----------------Fetching Info from IP Packet and Adding to Tree------------------------*/
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_olsr, tvb, 0, -1, FALSE);
+    olsr_tree = proto_item_add_subtree(ti, ett_olsr);
+
+    proto_tree_add_item(olsr_tree, hf_olsr_packet_len, tvb, 0, 2, FALSE);
+    proto_tree_add_item(olsr_tree, hf_olsr_packet_seq_num, tvb, 2, 2, FALSE);
+
+    offset = 4;
+
+    while (offset < packet_len) {
+      proto_item *message_item;
+      proto_tree *message_tree;
+
+      if (packet_len - offset < 4) {
+        message_item = proto_tree_add_bytes_format(olsr_tree, hf_olsr_message, tvb, offset, packet_len - offset,
+            tvb_get_ptr(tvb, offset, packet_len - offset), "Message too short !");
+        break;
+      }
+
+      message_type = tvb_get_guint8(tvb, offset);
+      vTime = getOlsrTime(tvb_get_guint8(tvb, offset + 1));
+      message_len = tvb_get_ntohs(tvb, offset + 2);
+
+      message_item = proto_tree_add_bytes_format(olsr_tree, hf_olsr_message, tvb, offset, message_len, tvb_get_ptr(tvb,
+          offset, message_len), "Message: %s (%d)", val_to_str(message_type, message_type_vals, "UNKNOWN"),
+          message_type);
+      message_tree = proto_item_add_subtree(message_item, ett_olsr_message[message_type]);
+
+      proto_tree_add_uint(message_tree, hf_olsr_message_type, tvb, offset, 1, message_type);
+      offset++;
+
+      /*-------------Dissect Validity Time-------------------------*/
+      proto_tree_add_double_format(message_tree, hf_olsr_vtime, tvb, offset, 1, vTime,
+          "Validity Time: %.3f (in seconds)", vTime);
+      offset++;
+
+      /*-------------Dissect Message Size---------------------------*/
+      ti = proto_tree_add_item(message_tree, hf_olsr_message_size, tvb, offset, 2, FALSE);
+      offset += 2;
+
+      if (message_len < 8 + pinfo->src.len) {
+        proto_item_append_text(ti, "(too short, must be >= %d)", 8 + pinfo->src.len);
+        break;
+      }
+
+      message_end = offset + message_len - 4;
+      if (message_end > packet_len) {
+        proto_item_append_string(ti, "(not enough data for message)");
+        break;
+      }
+
+      /*-----------------Dissecting: Origin Addr, TTL, Hop Count, and Message Seq Number*/
+      if (pinfo->src.type == AT_IPv4) {
+        proto_tree_add_item(message_tree, hf_olsr_origin_addr, tvb, offset, 4, FALSE);
+        offset += 4;
+      } else if (pinfo->src.type == AT_IPv6) {
+        proto_tree_add_item(message_tree, hf_olsr_origin6_addr, tvb, offset, 16, FALSE);
+        offset += 16;
+      } else {
+        break; /* unknown address type should be handled before this loop, just be sure */
+      }
+
+      proto_tree_add_item(message_tree, hf_olsr_ttl, tvb, offset, 1, FALSE);
+      proto_tree_add_item(message_tree, hf_olsr_hop_count, tvb, offset + 1, 1, FALSE);
+      proto_tree_add_item(message_tree, hf_olsr_message_seq_num, tvb, offset + 2, 2, FALSE);
+      offset += 4;
+
+      if (offset < message_end) {
+        /* --------------Dissecting TC message--------------------- */
+        if (message_type == TC) {
+          offset = dissect_olsr_tc(tvb, pinfo, message_tree, offset, message_end);
+        }
+        /* -------------Dissect HELLO message----------------------- */
+        else if (message_type == HELLO) {
+          offset = dissect_olsr_hello(tvb, pinfo, message_tree, offset, message_end, &handle_olsr_hello_rfc);
+        }
+        /*---------------------------------Dissect MID Message----------------------------------*/
+        else if (message_type == MID) {
+          offset = dissect_olsr_mid(tvb, pinfo, message_tree, offset, message_end);
+        }
+        /*-----------------------------Dissect HNA Message--------------------------------*/
+        else if (message_type == HNA) {
+          offset = dissect_olsr_hna(tvb, pinfo, message_tree, offset, message_end);
+        }
+        /*-----------------------------Dissect Olsr.org Hello Message--------------------------------*/
+        else if (global_olsr_olsrorg && message_type == OLSR_ORG_LQ_HELLO) {
+          offset = dissect_olsr_hello(tvb, pinfo, message_tree, offset, message_end, &handle_olsr_hello_olsrorg);
+        }
+        /*-----------------------------Dissect Olsr.org TC Message--------------------------------*/
+        else if (global_olsr_olsrorg && message_type == OLSR_ORG_LQ_TC) {
+          offset = dissect_olsrorg_lq_tc(tvb, pinfo, message_tree, offset, message_end);
+        }
+
+        /*-----------------------------Dissect Olsr.org NS Message--------------------------------*/
+        else if (global_olsr_olsrorg && message_type == OLSR_ORG_NAMESERVICE) {
+          offset = dissect_olsrorg_nameservice(tvb, pinfo, message_tree, offset, message_end);
+        }
+        /*-----------------------Dissect NRL OLSR TC Message-------------------------------------*/
+        else if (global_olsr_nrlolsr && message_type == NRLOLSR_TC_EXTRA) {
+          offset = dissect_nrlolsr_tc(tvb, pinfo, message_tree, offset, message_end);
+        }
+
+        /*-----------------------------Undefined message types-----------------------------*/
+        else {
+          if ((message_len - 12) % 4) {
+            proto_tree_add_bytes_format(message_tree, hf_olsr_data, tvb, offset, message_len - 12, tvb_get_ptr(tvb,
+                offset, message_len - 12), "Data (%u bytes) (must be aligned on 32 bits)", message_len - 12);
+            break;
+          }
+          proto_tree_add_bytes_format(message_tree, hf_olsr_data, tvb, offset, message_len - 12, tvb_get_ptr(tvb,
+              offset, message_len - 12), "Data (%u bytes)", message_len - 12);
+          offset += message_len - 12;
+        } /* end if for undefined message types */
+      }
+      offset = message_end;
+    } /* end while for message alive */
+  }
+
+  return tvb_length(tvb);
 } /* end Dissecting */
-	
+
 /*-----------Register the Dissector for OLSR--------------*/
-void
-proto_register_olsr(void)
-{                 
-	static hf_register_info hf[] = {
-		{ &hf_olsr_packet_len,
-			{ "Packet Length", "olsr.packet_len",
-			   FT_UINT16, BASE_DEC, NULL, 0,          
-			  "Packet Length in Bytes", HFILL }},
-
-		{ &hf_olsr_packet_seq_num,
-			{ "Packet Sequence Number", "olsr.packet_seq_num",
-			   FT_UINT16, BASE_DEC, NULL, 0,
-			  "Packet Sequence Number", HFILL }},
-
-		{ &hf_olsr_message_type,
-			{ "Message Type", "olsr.message_type",
-			   FT_UINT8, BASE_DEC, VALS(message_type_vals), 0,
-			  "Message Type", HFILL }},
-
-		{ &hf_olsr_message_size,
-			{ "Message", "olsr.message_size",
-			   FT_UINT16, BASE_DEC, NULL, 0,          
-			  "Message Size in Bytes", HFILL }},
-
-		{ &hf_olsr_message_seq_num,
-			{ "Message Sequence Number", "olsr.message_seq_num",
-			   FT_UINT16, BASE_DEC, NULL, 0,          
-			  "Message Sequence Number", HFILL }},
-
-		{ &hf_olsr_vtime,
-			{ "Validity Time", "olsr.vtime",
-			   FT_DOUBLE, BASE_NONE, NULL, 0,
-			  "Validity Time", HFILL }},
-		
-		{ &hf_olsr_ansn,
-			{ "Advertised Neighbor Sequence Number (ANSN)", "olsr.ansn",
-			   FT_UINT16, BASE_DEC, NULL, 0,
-			  "Advertised Neighbor Sequence Number (ANSN)", HFILL }},
-
-		{ &hf_olsr_htime,
-			{ "Hello emission interval", "olsr.htime",
-		 	   FT_DOUBLE, BASE_NONE, NULL, 0,
-			  "Hello emission interval", HFILL }},
-
-		{ &hf_olsr_willingness,
-			{ "Willingness to Carry and Forward", "olsr.willingness",
-			   FT_UINT8, BASE_DEC, NULL, 0,
-			  "Willingness to Carry and Forward", HFILL }},
-			  
-		{ &hf_olsr_ttl,
-			{ "Time to Live", "olsr.ttl",
-			   FT_UINT8, BASE_DEC, NULL, 0,
-			  "Time to Live", HFILL }},
-			  			  
-		{ &hf_olsr_link_type,
-			{ "Link Type", "olsr.link_type",
-			   FT_UINT8, BASE_DEC, NULL, 0,
-			  "Link Type", HFILL }},
-
-		{ &hf_olsr_link_message_size,
-			{ "Link Message Size", "olsr.link_message_size",
-			   FT_UINT16, BASE_DEC, NULL, 0,
-			  "Link Message Size", HFILL }},
-
-		{ &hf_olsr_hop_count,
-			{ "Hop Count", "olsr.hop_count",
-			   FT_UINT8, BASE_DEC, NULL, 0,
-			  "Hop Count", HFILL }},
-
-		{ &hf_olsr_origin_addr,
-			{ "Originator Address", "olsr.origin_addr",
-			   FT_IPv4, BASE_NONE, NULL, 0,
-			  "Originator Address", HFILL }},
-
-		{ &hf_olsr_neighbor_addr,
-			{ "Neighbor Address", "olsr.neighbor_addr",
-			   FT_IPv4, BASE_NONE, NULL, 0,
-			  "Neighbor Address", HFILL }},
-
-		
-		{ &hf_olsr_network_addr,
-			{ "Network Address", "olsr.network_addr",
-			   FT_IPv4, BASE_NONE, NULL, 0,
-			  "Network Address", HFILL }},
-
-	        { &hf_olsr_interface_addr,
-			{ "Interface Address", "olsr.interface_addr",
-			   FT_IPv4, BASE_NONE, NULL, 0,
-			  "Interface Address", HFILL }},
-
-		{ &hf_olsr_netmask,
-			{ "Netmask", "olsr.netmask",
-			   FT_IPv4, BASE_NONE, NULL, 0,
-			  "Netmask", HFILL }},
-			  
-		{ &hf_olsr_origin6_addr,
-			{ "Originator Address", "olsr.origin6_addr",
-			   FT_IPv6, BASE_NONE, NULL, 0,
-			  "Originator Address", HFILL }},
-
-		{ &hf_olsr_neighbor6_addr,
-			{ "Neighbor Address", "olsr.neighbor6_addr",
-			   FT_IPv6, BASE_NONE, NULL, 0,
-			  "Neighbor Address", HFILL }},
-
-		{ &hf_olsr_network6_addr,
-			{ "Network Address", "olsr.network6_addr",
-			   FT_IPv6, BASE_NONE, NULL, 0,
-			  "Network Address", HFILL }},
-
-	        { &hf_olsr_interface6_addr,
-			{ "Interface Address", "olsr.interface6_addr",
-			   FT_IPv6, BASE_NONE, NULL, 0,
-			  "Interface Address", HFILL }},
-
-		{ &hf_olsr_netmask6,
-			{ "Netmask", "olsr.netmask6",
-			   FT_IPv6, BASE_NONE, NULL, 0,
-			  "Netmask", HFILL }},
-
-		{ &hf_olsr_data,
-			{ "Data", "olsr.data",
-			   FT_BYTES, BASE_HEX, NULL, 0,
-			  "Data", HFILL }},
-	};
-
-
-	static gint *ett[] = {
-		&ett_olsr,
-	};
-
-
-	proto_olsr = proto_register_protocol("Optimized Link State Routing Protocol",
-	    "OLSR", "olsr");
-
-	proto_register_field_array(proto_olsr, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
+void proto_register_olsr(void) {
+  static hf_register_info hf[] = {
+    { &hf_olsr_packet_len,
+      { "Packet Length", "olsr.packet_len",
+        FT_UINT16, BASE_DEC, NULL, 0,
+        "Packet Length in Bytes", HFILL
+      }
+    },
+
+    { &hf_olsr_packet_seq_num,
+      { "Packet Sequence Number", "olsr.packet_seq_num",
+        FT_UINT16, BASE_DEC, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_message,
+      { "Message", "olsr.message",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_message_type,
+      { "Message Type", "olsr.message_type",
+        FT_UINT8, BASE_DEC, VALS(message_type_vals), 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_message_size,
+      { "Message", "olsr.message_size",
+        FT_UINT16, BASE_DEC, NULL, 0,
+        "Message Size in Bytes", HFILL
+      }
+    },
+
+    { &hf_olsr_message_seq_num,
+      { "Message Sequence Number", "olsr.message_seq_num",
+        FT_UINT16, BASE_DEC, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_vtime,
+      { "Validity Time", "olsr.vtime",
+        FT_DOUBLE, BASE_NONE, NULL, 0,
+        "Validity Time in seconds", HFILL
+      }
+    },
+
+    { &hf_olsr_ansn,
+      { "Advertised Neighbor Sequence Number (ANSN)", "olsr.ansn",
+        FT_UINT16, BASE_DEC, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_htime,
+      { "Hello emission interval", "olsr.htime",
+        FT_DOUBLE, BASE_NONE, NULL, 0,
+        "Hello emission interval in seconds", HFILL
+      }
+    },
+
+    { &hf_olsr_willingness,
+      { "Willingness to forward messages", "olsr.willingness",
+        FT_UINT8, BASE_DEC, VALS(willingness_type_vals), 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_ttl,
+      { "TTL", "olsr.ttl",
+        FT_UINT8, BASE_DEC, NULL, 0,
+        "Time to Live in hops", HFILL
+      }
+    },
+
+    { &hf_olsr_link_type,
+      { "Link Type", "olsr.link_type",
+        FT_UINT8, BASE_DEC, VALS(link_type_vals), 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_link_message_size,
+      { "Link Message Size", "olsr.link_message_size",
+        FT_UINT16, BASE_DEC, NULL, 0,
+        "Link Message Size in bytes", HFILL
+      }
+    },
+
+    { &hf_olsr_hop_count,
+      { "Hop Count", "olsr.hop_count",
+        FT_UINT8, BASE_DEC, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_neighbor,
+      { "Neighbor Address", "olsr.neighbor",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_origin_addr,
+      { "Originator Address", "olsr.origin_addr",
+        FT_IPv4, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_neighbor_addr,
+      { "Neighbor Address", "olsr.neighbor_addr",
+        FT_IPv4, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_network_addr,
+      { "Network Address", "olsr.network_addr",
+        FT_IPv4, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_interface_addr,
+      { "Interface Address", "olsr.interface_addr",
+        FT_IPv4, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_netmask,
+      { "Netmask", "olsr.netmask",
+        FT_IPv4, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_neighbor6,
+      { "Neighbor Address", "olsr.neighbor6",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_origin6_addr,
+      { "Originator Address", "olsr.origin6_addr",
+        FT_IPv6, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_neighbor6_addr,
+      { "Neighbor Address", "olsr.neighbor6_addr",
+        FT_IPv6, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_network6_addr,
+      { "Network Address", "olsr.network6_addr",
+        FT_IPv6, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_interface6_addr,
+      { "Interface Address", "olsr.interface6_addr",
+        FT_IPv6, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_netmask6,
+      { "Netmask", "olsr.netmask6",
+        FT_IPv6, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsr_data,
+      { "Data", "olsr.data",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_olsrorg_lq,
+      { "LQ", "olsr.lq",
+        FT_UINT8, BASE_DEC, NULL, 0,
+        "Link quality", HFILL
+      }
+    },
+    { &hf_olsrorg_nlq,
+      { "NLQ", "olsr.nlq",
+        FT_UINT8, BASE_DEC, NULL, 0,
+        "Neighbor link quality", HFILL
+      }
+    },
+
+    { &hf_olsrorg_ns,
+      { "Nameservice message", "olsr.ns",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        NULL, HFILL
+      }
+    },
+    { &hf_olsrorg_ns_version,
+      { "Version", "olsr.ns.version",
+        FT_UINT16, BASE_DEC, NULL, 0,
+        NULL, HFILL
+      }
+    },
+    { &hf_olsrorg_ns_count,
+      { "Count", "olsr.nlq",
+        FT_UINT16, BASE_DEC, NULL, 0,
+        "Number of nameservice messages", HFILL
+      }
+    },
+    { &hf_olsrorg_ns_type,
+      { "Message Type", "olsr.ns.type",
+        FT_UINT16, BASE_DEC, VALS(nameservice_type_vals), 0,
+        NULL, HFILL
+      }
+    },
+    { &hf_olsrorg_ns_length,
+      { "Length", "olsr.ns.length",
+        FT_UINT16, BASE_DEC, NULL, 0,
+        NULL, HFILL
+      }
+    },
+    { &hf_olsrorg_ns_ip,
+      { "Address", "olsr.ns.ip",
+        FT_IPv4, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+    { &hf_olsrorg_ns_ip6,
+      { "Address", "olsr.ns.ip6",
+        FT_IPv6, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+    { &hf_olsrorg_ns_content,
+      { "Content", "olsr.ns.content",
+        FT_STRING, BASE_NONE, NULL, 0,
+        NULL, HFILL
+      }
+    },
+
+    { &hf_nrlolsr_f1,
+      { "NRL MINMAX", "olsr.nrl.minmax",
+        FT_UINT8, BASE_DEC, NULL, 0,
+        NULL, HFILL
+      }
+    },
+    { &hf_nrlolsr_f2,
+      { "NRL SPF", "olsr.nrl.spf",
+        FT_UINT8, BASE_DEC, NULL, 0,
+        NULL, HFILL
+      }
+    }
+  };
+
+  static gint *ett_base[] = {
+    &ett_olsr,
+    &ett_olsr_message_linktype,
+    &ett_olsr_message_neigh,
+    &ett_olsr_message_neigh6,
+    &ett_olsr_message_ns
+  };
+
+  static gint *ett[array_length(ett_base) + (G_MAXUINT8+1)];
+
+  module_t *olsr_module;
+  int i,j;
+
+  if (proto_olsr == -1) {
+    memcpy(ett, ett_base, sizeof(ett_base));
+    j = array_length(ett_base);
+    for (i=0; i<G_MAXUINT8+1; i++) {
+      ett_olsr_message[i] = -1;
+      ett[j++] = &ett_olsr_message[i];
+    }
+
+    proto_olsr = proto_register_protocol("Optimized Link State Routing Protocol", "OLSR", "olsr");
+
+    proto_register_field_array(proto_olsr, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+
+    olsr_module = prefs_register_protocol(proto_olsr, NULL);
+    prefs_register_bool_preference(olsr_module, "ff_olsrorg",
+        "Dissect olsr.org messages","Dissect custom olsr.org message types (compatible with rfc routing agents)",
+        &global_olsr_olsrorg);
+    prefs_register_bool_preference(olsr_module, "nrlolsr",
+        "Dissect NRL-Olsr TC messages", "Dissect custom nrlolsr tc message (incompatible with rfc routing agents)",
+        &global_olsr_nrlolsr);
+  }
 }
 
-void
-proto_reg_handoff_olsr(void)
-{
-	dissector_handle_t olsr_handle;
+void proto_reg_handoff_olsr(void) {
+  dissector_handle_t olsr_handle;
 
-	olsr_handle = new_create_dissector_handle(dissect_olsr, proto_olsr);
-	dissector_add("udp.port", UDP_PORT_OLSR, olsr_handle);
+  olsr_handle = new_create_dissector_handle(dissect_olsr, proto_olsr);
+  dissector_add("udp.port", UDP_PORT_OLSR, olsr_handle);
 }