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, 118 deletions

diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c
deleted file mode 100644
index 09803feaf4..0000000000
--- a/plugins/docsis/packet-dscack.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* packet-dscack.c
- * Routines for Dynamic Service Change Acknowledge 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_dscack(void);
-void proto_reg_handoff_docsis_dscack(void);
-
-/* Initialize the protocol and registered fields */
-static int proto_docsis_dscack = -1;
-static int hf_docsis_dscack_tranid = -1;
-static int hf_docsis_dscack_response = -1;
-static dissector_handle_t docsis_tlv_handle;
-
-/* Initialize the subtree pointers */
-static gint ett_docsis_dscack = -1;
-
-extern value_string docsis_conf_code[];
-
-static dissector_handle_t docsis_dscack_handle;
-
-/* Dissection */
-static int
-dissect_dscack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
-{
-  proto_item *it;
-  proto_tree *dscack_tree;
-  guint32 transid, response;
-  tvbuff_t *next_tvb;
-
-  it = proto_tree_add_item(tree, proto_docsis_dscack, tvb, 0, -1, ENC_NA);
-  dscack_tree = proto_item_add_subtree (it, ett_docsis_dscack);
-
-  proto_tree_add_item_ret_uint (dscack_tree, hf_docsis_dscack_tranid, tvb, 0, 2, ENC_BIG_ENDIAN, &transid);
-  proto_tree_add_item_ret_uint (dscack_tree, hf_docsis_dscack_response, tvb, 2, 1, ENC_BIG_ENDIAN, &response);
-
-  col_add_fstr (pinfo->cinfo, COL_INFO,
-                "Dynamic Service Change Ack ID = %u (%s)", transid,
-                val_to_str (response, docsis_conf_code, "%d"));
-
-  /* Call Dissector for Appendix C TLV's */
-  next_tvb = tvb_new_subset_remaining (tvb, 3);
-  call_dissector (docsis_tlv_handle, next_tvb, pinfo, dscack_tree);
-  return tvb_captured_length(tvb);
-}
-
-/* Register the protocol with Wireshark */
-void
-proto_register_docsis_dscack (void)
-{
-  static hf_register_info hf[] = {
-    {&hf_docsis_dscack_tranid,
-     {"Transaction Id", "docsis_dscack.tranid",
-      FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Service Identifier", HFILL}
-    },
-    {&hf_docsis_dscack_response,
-     {"Confirmation Code", "docsis_dscack.confcode",
-      FT_UINT8, BASE_DEC, VALS (docsis_conf_code), 0x0,
-      NULL, HFILL}
-    },
-  };
-
-  static gint *ett[] = {
-    &ett_docsis_dscack,
-  };
-
-  proto_docsis_dscack =
-    proto_register_protocol ("DOCSIS Dynamic Service Change Acknowledgement",
-                             "DOCSIS DSC-ACK", "docsis_dscack");
-
-  proto_register_field_array (proto_docsis_dscack, hf, array_length (hf));
-  proto_register_subtree_array (ett, array_length (ett));
-
-  docsis_dscack_handle = register_dissector ("docsis_dscack", dissect_dscack, proto_docsis_dscack);
-}
-
-void
-proto_reg_handoff_docsis_dscack (void)
-{
-  docsis_tlv_handle = find_dissector ("docsis_tlv");
-  dissector_add_uint ("docsis_mgmt", 0x14, docsis_dscack_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:
- */