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-bintrngreq.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-bintrngreq.c')
-rw-r--r-- | plugins/docsis/packet-bintrngreq.c | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c index 24eaab39c5..d3455cd014 100644 --- a/plugins/docsis/packet-bintrngreq.c +++ b/plugins/docsis/packet-bintrngreq.c @@ -37,11 +37,10 @@ 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 */ +/* Dissection */ static void dissect_bintrngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { @@ -52,55 +51,49 @@ dissect_bintrngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) md_ds_sg_id = tvb_get_ntohs (tvb, 0); 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 ); + 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"); + 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, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item( bintrngreq_tree, hf_docsis_bintrngreq_capflags_frag, - tvb, offset, 1, ENC_BIG_ENDIAN ); + tvb, offset, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( bintrngreq_tree, hf_docsis_bintrngreq_capflags_encrypt, - tvb, offset, 1, ENC_BIG_ENDIAN ); + tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_mddsgid, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_down_chid, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_up_chid, - tvb, offset, 1, ENC_BIG_ENDIAN); + tvb, offset, 1, ENC_BIG_ENDIAN); } } /* 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_capflags, {"Capability Flags", "docsis_bintrngreq.capflags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, - { &hf_docsis_bintrngreq_capflags_frag, + {&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, + {&hf_docsis_bintrngreq_capflags_encrypt, {"Early Auth. & Encrypt", "docsis_bintrngreq.capflags.encrypt", FT_BOOLEAN, 8, NULL, (1<<6), "Early Authentication and Encryption supported", HFILL } @@ -122,28 +115,20 @@ proto_register_docsis_bintrngreq (void) }, }; -/* 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"); + "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) { @@ -152,3 +137,16 @@ proto_reg_handoff_docsis_bintrngreq (void) docsis_bintrngreq_handle = find_dissector ("docsis_bintrngreq"); dissector_add_uint ("docsis_mgmt", 0x22, docsis_bintrngreq_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: + */ |