DOCSIS: Simplify all MAC Management into a single file.

Removes a bunch of duplication set up because commands were all in
different files.

Change-Id: I950bc70da0edcdef7aaf21a43328cf69267f79af
Reviewed-on: https://code.wireshark.org/review/21613
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 0 insertions, 144 deletions

diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c
deleted file mode 100644
index 6676fa857b..0000000000
--- a/plugins/docsis/packet-bpkmreq.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* packet-bpkmreq.c
- * Routines for Baseline Privacy Key Management Request dissection
- * Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
- *
- * 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 <epan/packet.h>
-
-void proto_register_docsis_bpkmreq(void);
-void proto_reg_handoff_docsis_bpkmreq(void);
-
-/* Initialize the protocol and registered fields */
-static int proto_docsis_bpkmreq = -1;
-static int hf_docsis_bpkmreq_code = -1;
-static int hf_docsis_bpkmreq_length = -1;
-static int hf_docsis_bpkmreq_ident = -1;
-
-static const value_string code_field_vals[] = {
-  { 0, "Reserved"},
-  { 1, "Reserved"},
-  { 2, "Reserved"},
-  { 3, "Reserved"},
-  { 4, "Auth Request"},
-  { 5, "Auth Reply"},
-  { 6, "Auth Reject"},
-  { 7, "Key Request"},
-  { 8, "Key Reply"},
-  { 9, "Key Reject"},
-  {10, "Auth Invalid"},
-  {11, "TEK Invalid"},
-  {12, "Authent Info"},
-  {13, "Map Request"},
-  {14, "Map Reply"},
-  {15, "Map Reject"},
-  {0, NULL},
-};
-
-/* Initialize the subtree pointers */
-static gint ett_docsis_bpkmreq = -1;
-
-static dissector_handle_t attrs_handle;
-static dissector_handle_t docsis_bpkmreq_handle;
-
-/* Dissection */
-static int
-dissect_bpkmreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
-{
-  proto_item *it;
-  proto_tree *bpkmreq_tree;
-  guint32 code;
-  tvbuff_t *attrs_tvb;
-
-  it = proto_tree_add_item(tree, proto_docsis_bpkmreq, tvb, 0, -1, ENC_NA);
-  bpkmreq_tree = proto_item_add_subtree (it, ett_docsis_bpkmreq);
-  proto_tree_add_item_ret_uint (bpkmreq_tree, hf_docsis_bpkmreq_code, tvb, 0, 1,
-                           ENC_BIG_ENDIAN, &code);
-
-  col_add_fstr (pinfo->cinfo, COL_INFO, "BPKM Request (%s)",
-                val_to_str (code, code_field_vals, "%d"));
-
-  proto_tree_add_item (bpkmreq_tree, hf_docsis_bpkmreq_ident, tvb, 1, 1, ENC_BIG_ENDIAN);
-  proto_tree_add_item (bpkmreq_tree, hf_docsis_bpkmreq_length, tvb, 2, 2, ENC_BIG_ENDIAN);
-
-  attrs_tvb = tvb_new_subset_remaining (tvb, 4);
-  call_dissector (attrs_handle, attrs_tvb, pinfo, tree);
-  return tvb_captured_length(tvb);
-}
-
-/* Register the protocol with Wireshark */
-void
-proto_register_docsis_bpkmreq (void)
-{
-  static hf_register_info hf[] = {
-    {&hf_docsis_bpkmreq_code,
-     {"BPKM Code", "docsis_bpkmreq.code",
-      FT_UINT8, BASE_DEC, VALS (code_field_vals), 0x0,
-      "BPKM Request Message", HFILL}
-    },
-    {&hf_docsis_bpkmreq_ident,
-     {"BPKM Identifier", "docsis_bpkmreq.ident",
-      FT_UINT8, BASE_DEC, NULL, 0x0,
-      NULL, HFILL}
-    },
-    {&hf_docsis_bpkmreq_length,
-     {"BPKM Length", "docsis_bpkmreq.length",
-      FT_UINT16, BASE_DEC, NULL, 0x0,
-      NULL, HFILL}
-    },
-  };
-
-  static gint *ett[] = {
-    &ett_docsis_bpkmreq,
-  };
-
-  proto_docsis_bpkmreq =
-    proto_register_protocol ("DOCSIS Baseline Privacy Key Management Request",
-                             "DOCSIS BPKM-REQ", "docsis_bpkmreq");
-
-  proto_register_field_array (proto_docsis_bpkmreq, hf, array_length (hf));
-  proto_register_subtree_array (ett, array_length (ett));
-
-  docsis_bpkmreq_handle = register_dissector ("docsis_bpkmreq", dissect_bpkmreq,
-                      proto_docsis_bpkmreq);
-}
-
-
-void
-proto_reg_handoff_docsis_bpkmreq (void)
-{
-  attrs_handle = find_dissector ("docsis_bpkmattr");
-  dissector_add_uint ("docsis_mgmt", 0x0C, docsis_bpkmreq_handle);
-}
-
-/*
- * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
- *
- * Local Variables:
- * c-basic-offset: 2
- * tab-width: 8
- * indent-tabs-mode: nil
- * End:
- *
- * ex: set shiftwidth=2 tabstop=8 expandtab:
- * :indentSize=2:tabSize=8:noTabs=true:
- */