diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-10-05 16:12:34 -0400 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-10-05 20:19:53 +0000 |
commit | ad6134bb4b686e7c70503ff169eb10f8fe463c97 (patch) | |
tree | ed5ab5bb2f8d8e2bc9ef2c4613adeab62a7df1d6 /plugins/docsis/packet-dscack.c | |
parent | 0b18d6cb77022494a875e6e0d9d2ad27fb6ac6d9 (diff) |
docsis: Add editor modelines; Adjust whitespace; Remove boilerplate comments.
Change-Id: I78f9815616f4fc3c14204339c5826f0ca7d0680e
Reviewed-on: https://code.wireshark.org/review/4485
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'plugins/docsis/packet-dscack.c')
-rw-r--r-- | plugins/docsis/packet-dscack.c | 58 |
1 files changed, 23 insertions, 35 deletions
diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c index 68ffc68f35..3ab6ac8e92 100644 --- a/plugins/docsis/packet-dscack.c +++ b/plugins/docsis/packet-dscack.c @@ -34,17 +34,15 @@ 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[]; -/* Code to actually dissect the packets */ +/* Dissection */ static void dissect_dscack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { - proto_item *it; proto_tree *dscack_tree = NULL; guint16 transid; @@ -55,78 +53,56 @@ dissect_dscack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) response = tvb_get_guint8 (tvb, 2); col_add_fstr (pinfo->cinfo, COL_INFO, - "Dynamic Service Change Ack ID = %u (%s)", transid, - val_to_str (response, docsis_conf_code, "%d")); + "Dynamic Service Change Ack ID = %u (%s)", transid, + val_to_str (response, docsis_conf_code, "%d")); if (tree) { it = - proto_tree_add_protocol_format (tree, proto_docsis_dscack, tvb, 0, -1, - "DSC Acknowledge"); + proto_tree_add_protocol_format (tree, proto_docsis_dscack, tvb, 0, -1, + "DSC Acknowledge"); dscack_tree = proto_item_add_subtree (it, ett_docsis_dscack); proto_tree_add_item (dscack_tree, hf_docsis_dscack_tranid, tvb, 0, 2, - ENC_BIG_ENDIAN); + ENC_BIG_ENDIAN); proto_tree_add_item (dscack_tree, hf_docsis_dscack_response, tvb, 2, 1, - ENC_BIG_ENDIAN); + ENC_BIG_ENDIAN); } /* 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); - - - } - - - /* Register the protocol with Wireshark */ - -/* this format is require because a script is used to build the C function - that calls all the protocol registration. -*/ - - void proto_register_docsis_dscack (void) { - -/* Setup list of header fields See Section 1.6.1 for details*/ 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} - }, + }, }; -/* Setup protocol subtree array */ static gint *ett[] = { &ett_docsis_dscack, }; -/* Register the protocol name and description */ proto_docsis_dscack = proto_register_protocol ("DOCSIS Dynamic Service Change Acknowledgement", - "DOCSIS DSC-ACK", "docsis_dscack"); + "DOCSIS DSC-ACK", "docsis_dscack"); -/* Required function calls to register the header fields and subtrees used */ proto_register_field_array (proto_docsis_dscack, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); register_dissector ("docsis_dscack", dissect_dscack, proto_docsis_dscack); } - -/* 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_dscack (void) { @@ -135,5 +111,17 @@ proto_reg_handoff_docsis_dscack (void) docsis_dscack_handle = find_dissector ("docsis_dscack"); 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: + */ |