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-dpvreq.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-dpvreq.c')
-rw-r--r-- | plugins/docsis/packet-dpvreq.c | 79 |
1 files changed, 37 insertions, 42 deletions
diff --git a/plugins/docsis/packet-dpvreq.c b/plugins/docsis/packet-dpvreq.c index 6356409fef..6b7f5a6b15 100644 --- a/plugins/docsis/packet-dpvreq.c +++ b/plugins/docsis/packet-dpvreq.c @@ -43,7 +43,7 @@ static int hf_docsis_dpvreq_ts_end = -1; /* Initialize the subtree pointers */ static gint ett_docsis_dpvreq = -1; -/* Code to actually dissect the packets */ +/* Dissection */ static void dissect_dpvreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { @@ -56,120 +56,102 @@ dissect_dpvreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) dschan = tvb_get_guint8 (tvb, 2); col_add_fstr (pinfo->cinfo, COL_INFO, - "DOCSIS Path Verify Request: Transaction-Id = %u DS-Ch %d", - transid, dschan); + "DOCSIS Path Verify Request: Transaction-Id = %u DS-Ch %d", + transid, dschan); if (tree) { it = - proto_tree_add_protocol_format (tree, proto_docsis_dpvreq, tvb, 0, -1, - "DPV Request"); + proto_tree_add_protocol_format (tree, proto_docsis_dpvreq, tvb, 0, -1, + "DPV Request"); dpvreq_tree = proto_item_add_subtree (it, ett_docsis_dpvreq); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_tranid, tvb, - 0, 2, ENC_BIG_ENDIAN); + 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_dschan, tvb, - 2, 1, ENC_BIG_ENDIAN); + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_flags, tvb, - 3, 1, ENC_BIG_ENDIAN); + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_us_sf, tvb, - 4, 4, ENC_BIG_ENDIAN); + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_n, tvb, - 8, 2, ENC_BIG_ENDIAN); + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_start, tvb, - 10, 1, ENC_BIG_ENDIAN); + 10, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_end, tvb, - 11, 1, ENC_BIG_ENDIAN); + 11, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_start, tvb, - 12, 4, ENC_BIG_ENDIAN); + 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_end, tvb, - 16, 4, ENC_BIG_ENDIAN); + 16, 4, ENC_BIG_ENDIAN); } } - - - /* 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_dpvreq (void) { - -/* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { {&hf_docsis_dpvreq_tranid, {"Transaction Id", "docsis_dpvreq.tranid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} - }, + }, {&hf_docsis_dpvreq_dschan, {"Downstream Channel ID", "docsis_dpvreq.dschan", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} - }, + }, {&hf_docsis_dpvreq_flags, {"Flags", "docsis_dpvreq.flags", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} - }, + }, {&hf_docsis_dpvreq_us_sf, {"Upstream Service Flow ID", "docsis_dpvreq.us_sf", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} - }, + }, {&hf_docsis_dpvreq_n, {"N (Measurement avaraging factor)", "docsis_dpvreq.n", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} - }, + }, {&hf_docsis_dpvreq_start, {"Start Reference Point", "docsis_dpvreq.start", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} - }, + }, {&hf_docsis_dpvreq_end, {"End Reference Point", "docsis_dpvreq.end", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} - }, + }, {&hf_docsis_dpvreq_ts_start, {"Timestamp Start", "docsis_dpvreq.ts_start", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} - }, + }, {&hf_docsis_dpvreq_ts_end, {"Timestamp End", "docsis_dpvreq.ts_end", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} - }, + }, }; -/* Setup protocol subtree array */ static gint *ett[] = { &ett_docsis_dpvreq, }; -/* Register the protocol name and description */ proto_docsis_dpvreq = proto_register_protocol ("DOCSIS Path Verify Request", - "DOCSIS DPV-REQ", "docsis_dpvreq"); + "DOCSIS DPV-REQ", "docsis_dpvreq"); -/* Required function calls to register the header fields and subtrees used */ proto_register_field_array (proto_docsis_dpvreq, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); register_dissector ("docsis_dpvreq", dissect_dpvreq, proto_docsis_dpvreq); } - -/* 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_dpvreq (void) { @@ -178,3 +160,16 @@ proto_reg_handoff_docsis_dpvreq (void) docsis_dpvreq_handle = find_dissector ("docsis_dpvreq"); dissector_add_uint ("docsis_mgmt", 0x27, docsis_dpvreq_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: + */ |