From Geoffrey Kimball:

DOCSIS 3.0 includes a new Bonded Initial Ranging Request (B-INIT-RNG-REQ) MAC
Management type (34).  A simple dissector is needed to decode this message.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29487 f5534014-38df-0310-8fa8-9805f1628bb7

4 files changed, 181 insertions, 0 deletions

diff --git a/plugins/docsis/Makefile.common b/plugins/docsis/Makefile.common
index 99eacb7183..7966f83843 100644
--- a/plugins/docsis/Makefile.common
+++ b/plugins/docsis/Makefile.common
@@ -28,6 +28,7 @@ PLUGIN_NAME = docsis
 
 # the dissector sources (without any helpers)
 DISSECTOR_SRC = \
+	packet-bintrngreq.c \
 	packet-bpkmattr.c \
 	packet-bpkmreq.c \
 	packet-bpkmrsp.c \
diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c
new file mode 100644
index 0000000000..fe6f1c5f82
--- /dev/null
+++ b/plugins/docsis/packet-bintrngreq.c
@@ -0,0 +1,174 @@
+/* packet-bintrngreq.c
+ * Routines for DOCSIS 3.0 Bonded Intial Ranging Request Message dissection.
+ * Copyright 2009, Geoffrey Kimball <gekimbal[AT]cisco.com>
+ *
+ * $Id$
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "moduleinfo.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <gmodule.h>
+
+#include <epan/packet.h>
+
+
+/* Initialize the protocol and registered fields */
+static int proto_docsis_bintrngreq = -1;
+static int hf_docsis_bintrngreq = -1;
+static int hf_docsis_bintrngreq_down_chid = -1;
+static int hf_docsis_bintrngreq_mddsgid = -1;
+static int hf_docsis_bintrngreq_capflags = -1;
+static int hf_docsis_bintrngreq_up_chid = -1;
+static int hf_docsis_bintrngreq_capflags_frag = -1;
+static int hf_docsis_bintrngreq_capflags_encrypt = -1;
+
+
+/* Initialize the subtree pointers */
+static gint ett_docsis_bintrngreq = -1;
+
+/* Code to actually dissect the packets */
+static void
+dissect_bintrngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
+{
+  proto_item *bintrngreq_item;
+  proto_tree *bintrngreq_tree;
+  guint16 md_ds_sg_id;
+
+  md_ds_sg_id = tvb_get_ntohs (tvb, 0);
+
+  if (check_col (pinfo->cinfo, COL_INFO))
+  {
+      col_clear (pinfo->cinfo, COL_INFO);
+      col_add_fstr (pinfo->cinfo, COL_INFO, "Bonded Ranging Request: MD-DS-SG-ID = %u (0x%X)",
+					md_ds_sg_id, md_ds_sg_id );
+  }
+
+  if (tree)
+  {
+    guint16 offset = 0;
+    bintrngreq_item = proto_tree_add_protocol_format (tree, proto_docsis_bintrngreq,
+										   tvb, offset, tvb_length_remaining (tvb, 0),
+										   "Bonded Initial Ranging Request");
+    bintrngreq_tree = proto_item_add_subtree (bintrngreq_item, ett_docsis_bintrngreq);
+    proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_capflags,
+						   tvb, offset, 1, FALSE);
+    proto_tree_add_item( bintrngreq_tree, hf_docsis_bintrngreq_capflags_frag,
+						   tvb, offset, 1, FALSE );
+    proto_tree_add_item( bintrngreq_tree, hf_docsis_bintrngreq_capflags_encrypt,
+						   tvb, offset, 1, FALSE );
+    offset++;
+    proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_mddsgid,
+						   tvb, offset, 1, FALSE);
+    offset++;
+    proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_down_chid,
+						   tvb, offset, 1, FALSE);
+    offset++;
+    proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_up_chid,
+						   tvb, offset, 1, FALSE);
+  }
+}
+
+/* Register the protocol with Wireshark */
+
+/* 
+ * this format is required because a script is used to build the C function  
+ * that calls all the protocol registration.
+ */ 
+void
+proto_register_docsis_bintrngreq (void)
+{
+  /* Setup list of header fields  See Section 1.6.1 for details*/
+  static hf_register_info hf[] = {
+    {&hf_docsis_bintrngreq,
+     {"RNG-REQ Message", "docsis_bintrngreq",
+      FT_BYTES, BASE_NONE, NULL, 0x0,
+      "Ranging Request Message", HFILL}
+    },
+    {&hf_docsis_bintrngreq_capflags,
+     {"Capability Flags", "docsis_bintrngreq.capflags",
+      FT_UINT8, BASE_HEX, NULL, 0x0,
+      NULL, HFILL}
+    },
+    { &hf_docsis_bintrngreq_capflags_frag,
+     {"Pre-3.0 Fragmentation", "docsis_bintrngreq.capflags.frag",
+      FT_BOOLEAN, 8, NULL, (1<<7),
+      "Pre-3.0 DOCSIS fragmentation is supported prior to registration", HFILL }
+    },
+    { &hf_docsis_bintrngreq_capflags_encrypt,
+     {"Early Auth. & Encrypt", "docsis_bintrngreq.capflags.encrypt",
+      FT_BOOLEAN, 8, NULL, (1<<6),
+      "Early Authentication and Encryption supported", HFILL }
+    },
+    {&hf_docsis_bintrngreq_mddsgid,
+     {"MD-DS-SG-ID", "docsis_bintrngreq.mddsgid",
+      FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
+      "MAC Domain Downstream Service Group Identifier", HFILL}
+    },
+    {&hf_docsis_bintrngreq_down_chid,
+     {"DS Chan ID ", "docsis_bintrngreq.downchid",
+      FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
+      NULL, HFILL}
+    },
+    {&hf_docsis_bintrngreq_up_chid,
+     {"US Chan ID ", "docsis_bintrngreq.upchid",
+      FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
+      NULL, HFILL}
+    },
+  };
+
+/* Setup protocol subtree array */
+  static gint *ett[] = {
+    &ett_docsis_bintrngreq,
+  };
+
+/* Register the protocol name and description */
+  proto_docsis_bintrngreq = proto_register_protocol ("DOCSIS Bonded Initial Ranging Message",
+						 "DOCSIS B-INT-RNG-REQ",
+						 "docsis_bintrngreq");
+
+/* Required function calls to register the header fields and subtrees used */
+  proto_register_field_array (proto_docsis_bintrngreq, hf, array_length (hf));
+  proto_register_subtree_array (ett, array_length (ett));
+
+  register_dissector ("docsis_bintrngreq", dissect_bintrngreq, proto_docsis_bintrngreq);
+}
+
+
+/* If this dissector uses sub-dissector registration add a registration routine.
+   This format is required because a script is used to find these routines and
+   create the code that calls these routines.
+*/
+void
+proto_reg_handoff_docsis_bintrngreq (void)
+{
+  dissector_handle_t docsis_bintrngreq_handle;
+
+  docsis_bintrngreq_handle = find_dissector ("docsis_bintrngreq");
+  dissector_add ("docsis_mgmt", 0x22, docsis_bintrngreq_handle);
+}
diff --git a/plugins/docsis/packet-docsis.h b/plugins/docsis/packet-docsis.h
index 1bdb07919c..950d3e2486 100644
--- a/plugins/docsis/packet-docsis.h
+++ b/plugins/docsis/packet-docsis.h
@@ -24,6 +24,7 @@
 #ifndef __PACKET_DOCSIS_H__
 #define __PACKET_DOCSIS_H__
 
+void proto_reg_handoff_docsis_bintrngreq (void);
 void proto_reg_handoff_docsis_bpkmattr (void);
 void proto_reg_handoff_docsis_bpkmreq (void);
 void proto_reg_handoff_docsis_bpkmrsp (void);
@@ -56,6 +57,7 @@ void proto_reg_handoff_docsis_vsif (void);
 void proto_reg_handoff_docsis_intrngreq (void);
   
 
+void proto_register_docsis_bintrngreq (void);
 void proto_register_docsis_bpkmattr (void);
 void proto_register_docsis_bpkmreq (void);
 void proto_register_docsis_bpkmrsp (void);
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c
index e2ebff7d6b..bc6afad882 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/docsis/packet-macmgmt.c
@@ -66,6 +66,8 @@
 #define MGT_DCI_RSP 27
 #define MGT_UP_DIS 28
 #define MGT_TYPE29UCD 29
+#define MGT_INIT_RNG_REQ 30
+#define MGT_B_INIT_RNG_REQ 34
 
 
 /* Initialize the protocol and registered fields */
@@ -119,6 +121,8 @@ static const value_string mgmt_type_vals[] = {
   {MGT_DCI_REQ, "Device Class Identification Request"},
   {MGT_DCI_RSP, "Device Class Identification Response"},
   {MGT_UP_DIS, "Upstream Channel Disable"},
+  {MGT_INIT_RNG_REQ, "Initial Ranging Request"},
+  {MGT_B_INIT_RNG_REQ, "Bonded Initial Ranging Request"},
   {0, NULL}
 };