Added a new DSR dissector

Added a new dissector for the Dynamic Source Routing (DSR) protocol (RFC 4728)
It should correctly dissect all DSR packets, including the "Flow State
Extension" DSR packets.

See Bug #10499 for capture file

Change-Id: Ie33a1a2fe095cab19d5abfbfa8e1c79fec664a35
Reviewed-on: https://code.wireshark.org/review/4251
Reviewed-by: Bill Meier <wmeier@newsguy.com>

1 files changed, 776 insertions, 0 deletions

diff --git a/epan/dissectors/packet-dsr.c b/epan/dissectors/packet-dsr.c
new file mode 100755
index 0000000000..e53caec903
--- /dev/null
+++ b/epan/dissectors/packet-dsr.c
@@ -0,0 +1,776 @@
+/* packet-dsr.c
+ * Routines for DSR dissection
+ * Copyright 2014, ENAC - Gilles Roudiere <gilles.roudiere@enac.fr or gilles@roudiere.net>
+ * ENAC's URL : http://www.enac.fr/
+ * Mail to : gilles.roudiere@enac.fr or nicolas.larrieu@enac.fr
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+
+#include <epan/packet.h>
+#include <epan/ipproto.h>
+#include <epan/addr_resolv.h>
+
+/* Please refer to rfc4728 for DSR protocol specifications */
+
+/* Forward declaration that is needed below if using the
+ * proto_reg_handoff_dsr function as a callback for when protocol
+ * preferences get changed. */
+void proto_reg_handoff_dsr(void);
+void proto_register_dsr(void);
+
+static dissector_handle_t data_handle;
+static dissector_table_t ip_dissector_table;
+
+/* Initialize the protocol and registered fields */
+static int proto_dsr = -1;
+/* DSR global fields */
+static int hf_dsr_nexthdr = -1;
+static int hf_dsr_flowstate = -1;
+static int hf_dsr_reserved = -1;
+static int hf_dsr_length = -1;
+static int hf_dsr_opttype = -1;
+static int hf_dsr_optlen = -1;
+static int hf_dsr_fs_hopcount = -1;
+static int hf_dsr_fs_id = -1;
+/* RREQ option fields */
+static int hf_dsr_opt_rreq_id = -1;
+static int hf_dsr_opt_rreq_targetaddress = -1;
+static int hf_dsr_opt_rreq_address = -1;
+/* RREP option fields */
+static int hf_dsr_opt_rrep_lasthopex = -1;
+static int hf_dsr_opt_rrep_reserved = -1;
+static int hf_dsr_opt_rrep_address = -1;
+/* RERR option fields */
+static int hf_dsr_opt_err_type = -1;
+static int hf_dsr_opt_err_reserved = -1;
+static int hf_dsr_opt_err_salvage = -1;
+static int hf_dsr_opt_err_src = -1;
+static int hf_dsr_opt_err_dest = -1;
+static int hf_dsr_opt_err_unreach_addr = -1;
+static int hf_dsr_opt_err_unsupportedoption = -1;
+static int hf_dsr_opt_err_unknownflow_dest = -1;
+static int hf_dsr_opt_err_unknownflow_id = -1;
+static int hf_dsr_opt_err_defaultflowunknown_dest = -1;
+/* ACK REQuest option fields */
+static int hf_dsr_opt_ack_req_id = -1;
+static int hf_dsr_opt_ack_req_address = -1;
+/* ACK option fields */
+static int hf_dsr_opt_ack_id = -1;
+static int hf_dsr_opt_ack_src = -1;
+static int hf_dsr_opt_ack_dest = -1;
+/* SRCRT option fields */
+static int hf_dsr_opt_srcrt_firsthopext = -1;
+static int hf_dsr_opt_srcrt_lasthopext = -1;
+static int hf_dsr_opt_srcrt_reserved = -1;
+static int hf_dsr_opt_srcrt_salvage = -1;
+static int hf_dsr_opt_srcrt_segsleft = -1;
+static int hf_dsr_opt_srcrt_address = -1;
+/* Flow State Extentions */
+/* Timout option fields */
+static int hf_dsr_fs_opt_timeout_timeout = -1;
+/* Flow ID / destination option fields */
+static int hf_dsr_fs_opt_destflowid_id = -1;
+static int hf_dsr_fs_opt_destflowid_dest = -1;
+
+/* Initialize the subtree pointers */
+static gint ett_dsr = -1;
+/* DSR options tree */
+static gint ett_dsr_options = -1;
+static gint ett_dsr_rreq_opt = -1;
+static gint ett_dsr_rrep_opt = -1;
+static gint ett_dsr_rerr_opt = -1;
+static gint ett_dsr_ackreq_opt = -1;
+static gint ett_dsr_ack_opt = -1;
+static gint ett_dsr_srcrt_opt = -1;
+static gint ett_dsr_padn_opt = -1;
+static gint ett_dsr_pad1_opt = -1;
+static gint ett_dsr_fs_timeout_opt = -1;
+static gint ett_dsr_fs_destflowid_opt = -1;
+
+/* hoplist trees */
+static gint ett_dsr_rreq_hoplist = -1;
+static gint ett_dsr_rrep_hoplist = -1;
+static gint ett_dsr_srcrt_hoplist = -1;
+
+/* A sample #define of the minimum length (in bytes) of the protocol data.
+ * If data is received with fewer than this many bytes it is rejected by
+ * the current dissector. */
+#define DSR_MIN_LENGTH 4
+
+/* DSR option types */
+#define DSR_OPT_TYPE_RREQ 1
+#define DSR_OPT_TYPE_RREP 2
+#define DSR_OPT_TYPE_RERR 3
+#define DSR_OPT_TYPE_ACKREQ 160
+#define DSR_OPT_TYPE_ACK 32
+#define DSR_OPT_TYPE_SRCRT 96
+#define DSR_OPT_TYPE_PAD1 224
+#define DSR_OPT_TYPE_PADN 0
+/* DSR Flow State extention types */
+#define DSR_FS_OPT_TYPE_TIMEOUT 128
+#define DSR_FS_OPT_TYPE_DESTFLOWID 129
+/* Route error types */
+#define DSR_RERR_TYPE_UNREACHABLE 1
+#define DSR_RERR_TYPE_FLOWSTATENOTSUPPORTED 2
+#define DSR_RERR_TYPE_OPTIONNOTSUPPORTED 3
+#define DSR_RERR_TYPE_UNKNOWNFLOW 129
+#define DSR_RERR_TYPE_DEFAULTFLOWUNKNOWN 130
+
+/* DSR option names */
+static const value_string dsropttypenames[] ={
+        {DSR_OPT_TYPE_RREQ,   "Route request"},
+        {DSR_OPT_TYPE_RREP,   "Route reply"},
+        {DSR_OPT_TYPE_RERR,   "Route error"},
+        {DSR_OPT_TYPE_ACKREQ, "Acknowledgement request"},
+        {DSR_OPT_TYPE_ACK,    "Acknowledgement"},
+        {DSR_OPT_TYPE_SRCRT,  "Source route"},
+        {DSR_OPT_TYPE_PAD1,   "Padding by 1"},
+        {DSR_OPT_TYPE_PADN,   "Padding by N"},
+        {0, NULL}
+};
+
+/* DSR Route error names */
+static const value_string dsrrerrtypenames[] ={
+        {DSR_RERR_TYPE_UNREACHABLE,           "Unreachable node"},
+        {DSR_RERR_TYPE_FLOWSTATENOTSUPPORTED, "Flow state not supported"},
+        {DSR_RERR_TYPE_OPTIONNOTSUPPORTED,    "Option not supported"},
+        {DSR_RERR_TYPE_UNKNOWNFLOW,           "Unknown flow"},
+        {DSR_RERR_TYPE_UNKNOWNFLOW,           "Default flow unknown"},
+        {0, NULL}
+};
+
+/* Code to actually dissect the packets */
+static int
+dissect_dsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+        void *data _U_)
+{
+    /* Set up structures needed to add the protocol subtree and manage it */
+    proto_item *ti_main, *ti, *ti_hoplist;
+    proto_tree *dsr_tree, *opt_tree, *options_tree, *opt_hoplist_tree;
+    /* Other misc. local variables. */
+    guint offset = 0;           /* Global offset in DSR packet */
+    guint offset_in_option = 0; /* Per-option offset */
+    guint nexthdr, opt_tot_len, opt_len, opt_type, opt_id, opt_err_type, flowstate_hdr;
+    guint i;
+
+    tvbuff_t *next_tvb;
+
+    /* Check that the packet is long enough for it to belong to us. */
+    if (tvb_reported_length(tvb) < DSR_MIN_LENGTH)
+        return 0;
+
+    /* Set the Protocol column to the constant string of dsr */
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "DSR");
+    col_add_str(pinfo->cinfo, COL_INFO, "Options : ");
+
+    /* create display subtree for the protocol */
+    ti_main = proto_tree_add_item(tree, proto_dsr, tvb, 0, -1, ENC_NA);
+    dsr_tree = proto_item_add_subtree(ti_main, ett_dsr);
+
+    proto_tree_add_item(dsr_tree, hf_dsr_nexthdr, tvb, offset, 1, ENC_BIG_ENDIAN); /* Next header */
+    nexthdr = tvb_get_guint8(tvb, offset);
+    offset += 1;
+
+    proto_tree_add_item(dsr_tree, hf_dsr_flowstate, tvb, offset, 1, ENC_BIG_ENDIAN); /* Flowstate */
+    flowstate_hdr = tvb_get_bits8(tvb, offset*8, 1);
+
+    /*DSR normal header*/
+    if (!flowstate_hdr) {
+        proto_tree_add_item(dsr_tree, hf_dsr_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); /* Reserved */
+        offset += 1;
+
+        proto_tree_add_item(dsr_tree, hf_dsr_length, tvb, offset, 2, ENC_BIG_ENDIAN);  /* Dsr opt tot length */
+        opt_tot_len = tvb_get_ntohs(tvb, offset);
+        proto_item_set_len(ti_main, opt_tot_len+4);
+        offset += 2;
+
+        options_tree = proto_tree_add_subtree(dsr_tree, tvb, offset, opt_tot_len, ett_dsr_options, NULL, "Options"); /* DSR options */
+
+        /* DSR options dissection */
+        while (offset - 4 < opt_tot_len) {
+                opt_type = tvb_get_guint8(tvb, offset);
+                offset_in_option = offset;
+                opt_len = 0;
+                switch(opt_type) {
+                        case DSR_OPT_TYPE_RREQ:
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_rreq_opt, &ti, "Route request"); /* Opt subtree */
+                                col_append_str(pinfo->cinfo, COL_INFO, "Route request");
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_optlen, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt len */
+                                opt_len = tvb_get_guint8(tvb, offset_in_option);
+                                proto_item_set_len(ti, opt_len+2);
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_rreq_id, tvb, offset_in_option, 2, ENC_BIG_ENDIAN); /* Opt rreq id */
+                                opt_id = tvb_get_ntohs(tvb, offset_in_option);
+                                col_append_fstr(pinfo->cinfo, COL_INFO, " (id=0x%x)", opt_id);
+                                offset_in_option += 2;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_rreq_targetaddress, tvb, offset_in_option, 4, ENC_NA); /* Opt rreq target address */
+                                offset_in_option += 4;
+
+                                if(opt_len > 6) {
+                                        opt_hoplist_tree = proto_tree_add_subtree(opt_tree, tvb, offset_in_option, 1, ett_dsr_rreq_hoplist, &ti_hoplist, "Hop list" ); /* Opt hop list */
+                                        proto_item_append_text(ti_hoplist, " :");
+                                        for(i=0;i<(opt_len-4)/4;i++) {
+                                                proto_tree_add_item(opt_hoplist_tree, hf_dsr_opt_rreq_address, tvb, offset_in_option, 4, ENC_NA); /* Opt rreq address */
+                                                proto_item_append_text(ti_hoplist, " %s", tvb_ip_to_str(tvb, offset_in_option));
+                                                offset_in_option += 4;
+                                        }
+                                }
+                                break;
+                        case DSR_OPT_TYPE_RREP:
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_rrep_opt, &ti, "Route reply"); /* Opt subtree */
+                                col_append_str(pinfo->cinfo, COL_INFO, "Route reply");
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_optlen, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt len */
+                                opt_len = tvb_get_guint8(tvb, offset_in_option);
+                                proto_item_set_len(ti, opt_len+2);
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_rrep_lasthopex, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt rrep reserved */
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_rrep_reserved, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt rrep reserved */
+                                offset_in_option += 1;
+
+                                if(opt_len > 2) {
+                                        opt_hoplist_tree = proto_tree_add_subtree(opt_tree, tvb, offset_in_option, 1, ett_dsr_rrep_hoplist, &ti_hoplist, "Hop list" ); /* Opt hop list */
+                                        proto_item_append_text(ti_hoplist, " :");
+                                        for(i=0;i<(opt_len-1)/4;i++) {
+                                                proto_tree_add_item(opt_hoplist_tree, hf_dsr_opt_rrep_address, tvb, offset_in_option, 4, ENC_NA); /*Opt rrep address */
+                                                proto_item_append_text(ti_hoplist, " %s", tvb_ip_to_str(tvb, offset_in_option));
+                                                offset_in_option += 4;
+                                        }
+                                }
+                                break;
+                        case DSR_OPT_TYPE_RERR:
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_rerr_opt, &ti, "Route error"); /* Opt subtree */
+                                col_append_str(pinfo->cinfo, COL_INFO, "Route error");
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_optlen, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt len */
+                                opt_len = tvb_get_guint8(tvb, offset_in_option);
+                                proto_item_set_len(ti, opt_len+2);
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_err_type, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt err type */
+                                opt_err_type = tvb_get_guint8(tvb, offset_in_option);
+                                offset_in_option += 1;
+
+                                proto_tree_add_bits_item(opt_tree, hf_dsr_opt_err_reserved, tvb, offset_in_option*8, 4, ENC_BIG_ENDIAN); /*Opt err reserved */
+                                proto_tree_add_bits_item(opt_tree, hf_dsr_opt_err_salvage, tvb, offset_in_option*8+4, 4, ENC_BIG_ENDIAN); /*Opt err salvage */
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_err_src, tvb, offset_in_option, 4, ENC_NA); /*Opt err source address */
+                                offset_in_option += 4;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_err_dest, tvb, offset_in_option, 4, ENC_NA); /* Opt err dest address */
+                                offset_in_option += 4;
+
+                                switch(opt_err_type) {
+                                        case DSR_RERR_TYPE_UNREACHABLE:
+                                                proto_tree_add_item(opt_tree, hf_dsr_opt_err_unreach_addr, tvb, offset_in_option, 4, ENC_NA); /* Opt err unreachable node address */
+                                                offset_in_option += 4;
+                                                break;
+                                        case DSR_RERR_TYPE_FLOWSTATENOTSUPPORTED:
+                                                break;
+                                        case DSR_RERR_TYPE_OPTIONNOTSUPPORTED:
+                                                proto_tree_add_item(opt_tree, hf_dsr_opt_err_unsupportedoption, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt err unsupported opt */
+                                                offset_in_option += 1;
+                                                break;
+                                        case DSR_RERR_TYPE_UNKNOWNFLOW:
+                                                proto_tree_add_item(opt_tree, hf_dsr_opt_err_unknownflow_dest, tvb, offset_in_option, 4, ENC_NA);/* Opt err unknown flow original ip destination address */
+                                                offset_in_option += 4;
+
+                                                proto_tree_add_item(opt_tree, hf_dsr_opt_err_unknownflow_id, tvb, offset_in_option, 2, ENC_BIG_ENDIAN);/* Opt err unknown flow flow id */
+                                                offset_in_option += 1;
+                                                break;
+                                        case DSR_RERR_TYPE_DEFAULTFLOWUNKNOWN:
+                                                proto_tree_add_item(opt_tree, hf_dsr_opt_err_defaultflowunknown_dest, tvb, offset_in_option, 4, ENC_NA);/* opt err default flow unknown original ip destination address */
+                                                offset_in_option += 4;
+                                                break;
+                                }
+                                break;
+                        case DSR_OPT_TYPE_ACKREQ:
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_ackreq_opt, &ti, "Acknowledgement request"); /* Opt subtree */
+                                col_append_str(pinfo->cinfo, COL_INFO, "Ack request");
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_optlen, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt len */
+                                opt_len = tvb_get_guint8(tvb, offset_in_option);
+                                proto_item_set_len(ti, opt_len+2);
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_ack_req_id, tvb, offset_in_option, 2, ENC_BIG_ENDIAN); /* Opt ack req id */
+                                opt_id = tvb_get_ntohs(tvb, offset_in_option);
+                                col_append_fstr(pinfo->cinfo, COL_INFO, " (id=0x%x)", opt_id);
+                                offset_in_option += 2;
+
+                                if(opt_len >= 6) {
+                                        proto_tree_add_item(opt_tree, hf_dsr_opt_ack_req_address, tvb, offset_in_option, 4, ENC_NA); /* Opt ack req id */
+                                        offset_in_option += 4;
+                                }
+                                break;
+                        case DSR_OPT_TYPE_ACK:
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_ack_opt, &ti, "Acknowledgement"); /* Opt subtree */
+                                col_append_str(pinfo->cinfo, COL_INFO, "Ack");
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_optlen, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt len */
+                                opt_len = tvb_get_guint8(tvb, offset_in_option);
+                                proto_item_set_len(ti, opt_len+2);
+                                offset_in_option += 1;
+
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_ack_id, tvb, offset_in_option, 2, ENC_BIG_ENDIAN); /* Opt ack id */
+                                opt_id = tvb_get_ntohs(tvb, offset_in_option);
+                                col_append_fstr(pinfo->cinfo, COL_INFO, " (id=0x%x)", opt_id);
+                                offset_in_option += 2;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_ack_src, tvb, offset_in_option, 4, ENC_NA); /* Opt ack source address */
+                                offset_in_option += 4;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_ack_dest, tvb, offset_in_option, 4, ENC_NA); /* Opt ack dest address */
+                                offset_in_option += 4;
+                                break;
+                        case DSR_OPT_TYPE_SRCRT:
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_srcrt_opt, &ti, "Source route"); /* Opt subtree */
+                                col_append_str(pinfo->cinfo, COL_INFO, "Source route");
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_optlen, tvb, offset_in_option,  1, ENC_BIG_ENDIAN); /* Opt len */
+                                opt_len = tvb_get_guint8(tvb, offset_in_option );
+                                proto_item_set_len(ti, opt_len+2);
+                                offset_in_option += 1;
+
+                                proto_tree_add_bits_item(opt_tree, hf_dsr_opt_srcrt_firsthopext, tvb, offset_in_option*8, 1, ENC_BIG_ENDIAN); /* Opt srcrt first hop external */
+                                proto_tree_add_bits_item(opt_tree, hf_dsr_opt_srcrt_lasthopext, tvb, offset_in_option*8+1, 1, ENC_BIG_ENDIAN); /* Opt srcrt last hop external */
+                                proto_tree_add_bits_item(opt_tree, hf_dsr_opt_srcrt_reserved, tvb, offset_in_option*8+2, 4, ENC_BIG_ENDIAN); /* Opt srcrt reserved */
+                                proto_tree_add_bits_item(opt_tree, hf_dsr_opt_srcrt_salvage, tvb, offset_in_option*8+6, 4, ENC_BIG_ENDIAN); /* Opt srcrt salvage */
+                                offset_in_option += 1;
+                                proto_tree_add_item(opt_tree, hf_dsr_opt_srcrt_segsleft, tvb, offset_in_option , 1, ENC_BIG_ENDIAN); /* Opt srcrt segs left */
+                                offset_in_option  += 1;
+
+                                if(opt_len > 2) {
+                                        opt_hoplist_tree = proto_tree_add_subtree(opt_tree, tvb, offset_in_option, 1, ett_dsr_srcrt_hoplist, &ti_hoplist, "Hop list" ); /* Opt hop list */
+
+                                        proto_item_append_text(ti_hoplist, " :");
+                                        for(i=0;i<(opt_len-2)/4;i++) {
+                                                proto_tree_add_item(opt_hoplist_tree, hf_dsr_opt_srcrt_address, tvb, offset_in_option , 4, ENC_NA); /* Opt srcrt addresses */
+                                                proto_item_append_text(ti_hoplist, " %s", tvb_ip_to_str(tvb, offset_in_option));
+                                                offset_in_option  += 4;
+                                        }
+                                }
+                                break;
+                        case DSR_OPT_TYPE_PADN:
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_padn_opt, &ti, "PadN"); /* Opt subtree */
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option , 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option  += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_optlen, tvb, offset_in_option , 1, ENC_BIG_ENDIAN); /* Opt len */
+                                opt_len = tvb_get_guint8(tvb, offset_in_option );
+                                proto_item_set_len(ti, opt_len+2);
+                                offset_in_option += 1;
+                                offset_in_option += opt_len;
+                                break;
+                        case DSR_OPT_TYPE_PAD1:
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_pad1_opt, &ti, "Pad1"); /* Opt subtree */
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option , 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option += 1;
+                                break;
+
+                        case DSR_FS_OPT_TYPE_TIMEOUT :
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_fs_timeout_opt, &ti, "Timeout"); /* Opt subtree */
+                                col_append_str(pinfo->cinfo, COL_INFO, "Timeout");
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_optlen, tvb, offset_in_option,  1, ENC_BIG_ENDIAN); /* Opt len */
+                                opt_len = tvb_get_guint8(tvb, offset_in_option );
+                                proto_item_set_len(ti, opt_len+2);
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_fs_opt_timeout_timeout, tvb, offset_in_option, 2, ENC_BIG_ENDIAN); /* Timeout */
+                                offset_in_option += 2;
+                                break;
+                        case DSR_FS_OPT_TYPE_DESTFLOWID:
+                                opt_tree = proto_tree_add_subtree(options_tree, tvb, offset_in_option, 1, ett_dsr_fs_destflowid_opt, &ti, "Destination and flow id"); /* Opt subtree */
+                                col_append_str(pinfo->cinfo, COL_INFO, "Dest&FlowId");
+
+                                proto_tree_add_item(opt_tree, hf_dsr_opttype, tvb, offset_in_option, 1, ENC_BIG_ENDIAN); /* Opt type */
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_optlen, tvb, offset_in_option,  1, ENC_BIG_ENDIAN); /* Opt len */
+                                opt_len = tvb_get_guint8(tvb, offset_in_option );
+                                proto_item_set_len(ti, opt_len+2);
+                                offset_in_option += 1;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_fs_opt_destflowid_id, tvb, offset_in_option, 2, ENC_BIG_ENDIAN); /* Flow ID */
+                                offset_in_option += 2;
+
+                                proto_tree_add_item(opt_tree, hf_dsr_fs_opt_destflowid_dest, tvb, offset_in_option, 4, ENC_NA); /* Original IP Dest Address */
+                                offset_in_option += 4;
+                                break;
+                }
+                if (opt_type != DSR_OPT_TYPE_PAD1)
+                        offset += 2+opt_len;
+                else
+                        offset += 1;
+                if(offset-4 < opt_tot_len && opt_type != DSR_OPT_TYPE_PAD1 && opt_type != DSR_OPT_TYPE_PADN) {
+                        col_append_str(pinfo->cinfo, COL_INFO, ", ");
+                }
+        }
+    } else { /* DSR Flow state header */
+        proto_tree_add_item(dsr_tree, hf_dsr_fs_hopcount, tvb, offset, 1, ENC_BIG_ENDIAN); /* Hop count */
+        offset += 1;
+
+        proto_tree_add_item(dsr_tree, hf_dsr_fs_id, tvb, offset, 1, ENC_BIG_ENDIAN); /* Flow identifier */
+        offset += 2;
+    }
+
+    /* Call other dissectors if needed */
+    next_tvb = tvb_new_subset_remaining(tvb, offset);
+    if (!dissector_try_uint(ip_dissector_table, nexthdr, next_tvb, pinfo, tree)) {
+        call_dissector(data_handle, next_tvb, pinfo, tree);
+    }
+
+    return offset+4;
+}
+
+/* Register DSR with Wireshark.*/
+void
+proto_register_dsr(void)
+{
+    /* Setup list of header fields */
+    static hf_register_info hf[] = {
+        { &hf_dsr_nexthdr,
+            { "Next header", "dsr.nexthdr",
+               FT_UINT8, BASE_HEX | BASE_EXT_STRING,
+               &ipproto_val_ext, 0x0,
+               "Next header protocol type", HFILL }
+        },
+        { &hf_dsr_flowstate,
+            { "Flow state", "dsr.flowstate",
+               FT_BOOLEAN, 8,
+               NULL, 0x80,
+               NULL, HFILL }
+        },
+        /* DSR normal header */
+        { &hf_dsr_reserved,
+            { "Reserved", "dsr.reserved",
+               FT_UINT8, BASE_HEX,
+               NULL, 0x7F,
+               NULL, HFILL }
+        },
+        { &hf_dsr_length,
+            { "Length", "dsr.len",
+               FT_UINT8, BASE_DEC,
+               NULL, 0x0,
+              "Payload length", HFILL }
+        },
+        { &hf_dsr_opttype,
+            { "Type", "dsr.option.type",
+               FT_UINT8, BASE_DEC,
+               VALS(dsropttypenames), 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_optlen,
+            { "Length", "dsr.option.len",
+               FT_UINT8, BASE_DEC,
+               NULL, 0x0,
+               "Option length", HFILL }
+        },
+        /* RREQ fields */
+        { &hf_dsr_opt_rreq_id,
+            { "Id", "dsr.option.rreq.id",
+               FT_UINT16, BASE_HEX_DEC,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_rreq_targetaddress,
+            { "Target address", "dsr.option.rreq.targetaddress",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x0,
+               "Target IP address", HFILL }
+        },
+        { &hf_dsr_opt_rreq_address,
+            { "Hop", "dsr.option.rreq.address",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        /* RREP fields */
+        { &hf_dsr_opt_rrep_lasthopex,
+            { "Last hop external", "dsr.option.rrep.lasthopex",
+               FT_BOOLEAN, 8,
+               NULL, 0x80,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_rrep_reserved,
+            { "Reserved", "dsr.option.rrep.reserved",
+               FT_UINT8, BASE_HEX,
+               NULL, 0x7F,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_rrep_address,
+            { "Hop", "dsr.option.rrep.address",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        /* RERR fields */
+        { &hf_dsr_opt_err_type,
+            { "Type", "dsr.option.err.type",
+               FT_UINT8, BASE_DEC,
+               VALS(dsrrerrtypenames), 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_err_reserved,
+            {  "Reserved", "dsr.option.err.reserved",
+               FT_UINT8, BASE_HEX,
+               NULL, 0x00,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_err_salvage,
+            {  "Salvage", "dsr.option.err.salvage",
+               FT_UINT8, BASE_HEX,
+
+               NULL, 0x00,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_err_src,
+            {  "Source address", "dsr.option.err.src",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x00,
+               "Source IP address", HFILL }
+        },
+        { &hf_dsr_opt_err_dest,
+            {  "Destination address", "dsr.option.err.dest",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x00,
+               "Destination IP address", HFILL }
+        },
+        { &hf_dsr_opt_err_unreach_addr,
+            {  "Unreachable node address", "dsr.option.err.unreachablenode",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x00,
+               "Unreachable node IP address", HFILL }
+        },
+        { &hf_dsr_opt_err_unsupportedoption,
+            {  "Unsupported option", "dsr.option.err.unsupportedoption",
+               FT_UINT8, BASE_HEX,
+               NULL, 0x00,
+               NULL, HFILL }
+        },
+        /* ACKREQ fields */
+        { &hf_dsr_opt_ack_req_id,
+            { "Id", "dsr.option.ackreq.id",
+               FT_UINT16, BASE_HEX_DEC,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_ack_req_address,
+            { "Source address", "dsr.option.ackreq.address",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x0,
+               "Source IP address", HFILL }
+        },
+        /* ACK fields */
+        { &hf_dsr_opt_ack_id,
+            { "Id", "dsr.option.ack.id",
+               FT_UINT16, BASE_HEX_DEC,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_ack_src,
+            { "Source IP", "dsr.option.ack.source",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x0,
+               "Source IP address", HFILL }
+        },
+        { &hf_dsr_opt_ack_dest,
+            { "Destination IP", "dsr.option.ack.dest",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x0,
+               "Destination IP address", HFILL }
+        },
+        /* SRCRT fields */
+        { &hf_dsr_opt_srcrt_firsthopext,
+            { "First hop external", "dsr.option.srcrt.firsthopext",
+               FT_BOOLEAN, BASE_NONE,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_srcrt_lasthopext,
+            { "Last hop external", "dsr.option.srcrt.lasthopext",
+               FT_BOOLEAN, BASE_NONE,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_srcrt_reserved,
+            { "Reserved", "dsr.option.srcrt.reserved",
+               FT_UINT8, BASE_HEX,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_srcrt_salvage,
+            { "Salvage", "dsr.option.srcrt.salvage",
+               FT_UINT8, BASE_HEX,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_srcrt_segsleft,
+            { "Segments left", "dsr.option.srcrt.segsleft",
+               FT_UINT8, BASE_DEC,
+               NULL, 0x3F,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_srcrt_address,
+            { "Hop", "dsr.option.ack.address",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x0,
+               "Hop IP address", HFILL }
+        },
+        /* DSR flow state */
+        { &hf_dsr_fs_hopcount,
+            { "Hop count", "dsr.fs.hopcount",
+               FT_UINT8, BASE_DEC,
+               NULL, 0x7F,
+               NULL, HFILL }
+        },
+        { &hf_dsr_fs_id,
+            { "Flow id", "dsr.fs.id",
+               FT_UINT16, BASE_HEX_DEC,
+               NULL, 0x00,
+               NULL, HFILL }
+        },
+        { &hf_dsr_fs_opt_timeout_timeout,
+            { "Timeout", "dsr.option.timeout.timeout",
+               FT_UINT16, BASE_DEC,
+               NULL, 0x0,
+               NULL, HFILL }
+        },
+        { &hf_dsr_fs_opt_destflowid_id,
+            { "Flow id", "dsr.option.destflowid.id",
+               FT_UINT16, BASE_HEX_DEC,
+               NULL, 0x0,
+               "New flow identifier", HFILL }
+        },
+        { &hf_dsr_fs_opt_destflowid_dest,
+            { "Destination IP", "dsr.option.destflowid.dest",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x0,
+               "New IP destination address", HFILL }
+        },
+        { &hf_dsr_opt_err_unknownflow_dest,
+            {  "Original IP destination", "dsr.option.err.unknownflow.dest",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x00,
+               "Original IP destination address", HFILL }
+        },
+        { &hf_dsr_opt_err_unknownflow_id,
+            {  "Flow id", "dsr.option.err.unknownflow.id",
+               FT_UINT16, BASE_HEX_DEC,
+               NULL, 0x00,
+               NULL, HFILL }
+        },
+        { &hf_dsr_opt_err_defaultflowunknown_dest,
+            {  "Original IP destination", "dsr.option.err.defaultflowunknow.dest",
+               FT_IPv4, BASE_NONE,
+               NULL, 0x00,
+               "Original IP destination address", HFILL }
+        },
+    };
+
+    /* Setup protocol subtree array */
+    static gint *ett[] = {
+        &ett_dsr,
+        &ett_dsr_options,
+        &ett_dsr_rreq_opt,
+        &ett_dsr_rrep_opt,
+        &ett_dsr_rerr_opt,
+        &ett_dsr_ackreq_opt,
+        &ett_dsr_ack_opt,
+        &ett_dsr_srcrt_opt,
+        &ett_dsr_padn_opt,
+        &ett_dsr_pad1_opt,
+        &ett_dsr_fs_timeout_opt,
+        &ett_dsr_fs_destflowid_opt,
+        &ett_dsr_rreq_hoplist,
+        &ett_dsr_rrep_hoplist,
+        &ett_dsr_srcrt_hoplist
+    };
+
+    /* Register the protocol name and description */
+    proto_dsr = proto_register_protocol(
+                        "Dynamic Source Routing",
+                        "DSR",
+                        "dsr");
+
+    /* Required function calls to register the header fields and subtrees */
+    proto_register_field_array(proto_dsr, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+
+}
+
+void
+proto_reg_handoff_dsr(void)
+{
+    dissector_handle_t dsr_handle;
+
+    data_handle = find_dissector("data");
+
+    ip_dissector_table = find_dissector_table("ip.proto");
+
+    dsr_handle = new_create_dissector_handle(dissect_dsr, proto_dsr);
+    dissector_add_uint("ip.proto", IP_PROTO_DSR, dsr_handle);
+}
+/*
+ * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vim: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */