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-dccack.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-dccack.c')
-rw-r--r-- | plugins/docsis/packet-dccack.c | 143 |
1 files changed, 70 insertions, 73 deletions
diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c index e6d7eb7f9f..31204ab637 100644 --- a/plugins/docsis/packet-dccack.c +++ b/plugins/docsis/packet-dccack.c @@ -42,8 +42,7 @@ static int hf_docsis_dccack_hmac_digest = -1; /* Initialize the subtree pointers */ static gint ett_docsis_dccack = -1; - -/* Code to actually dissect the packets */ +/* Dissection */ static void dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { @@ -60,110 +59,95 @@ dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tree) { dcc_item = - proto_tree_add_protocol_format (tree, proto_docsis_dccack, tvb, 0, - -1, "DCC-ACK Message"); + proto_tree_add_protocol_format (tree, proto_docsis_dccack, tvb, 0, + -1, "DCC-ACK Message"); dcc_tree = proto_item_add_subtree (dcc_item, ett_docsis_dccack); proto_tree_add_item (dcc_tree, hf_docsis_dccack_tran_id, tvb, 0, 2, ENC_BIG_ENDIAN); pos = 2; while (pos < len) - { - type = tvb_get_guint8 (tvb, pos++); - length = tvb_get_guint8 (tvb, pos++); - switch (type) - { - case DCCACK_KEY_SEQ_NUM: - if (length == 1) - { - proto_tree_add_item (dcc_tree, hf_docsis_dccack_key_seq_num, tvb, - pos, length, ENC_BIG_ENDIAN); - } - else - { - THROW (ReportedBoundsError); - } - break; - case DCCACK_HMAC_DIGEST: - if (length == 20) - { - proto_tree_add_item (dcc_tree, hf_docsis_dccack_hmac_digest, tvb, - pos, length, ENC_NA); - } - else - { - THROW (ReportedBoundsError); - } - break; - } /* switch(type) */ - pos = pos + length; - } /* while (pos < len) */ - } /* if (tree) */ - + { + type = tvb_get_guint8 (tvb, pos++); + length = tvb_get_guint8 (tvb, pos++); + switch (type) + { + case DCCACK_KEY_SEQ_NUM: + if (length == 1) + { + proto_tree_add_item (dcc_tree, hf_docsis_dccack_key_seq_num, tvb, + pos, length, ENC_BIG_ENDIAN); + } + else + { + THROW (ReportedBoundsError); + } + break; + case DCCACK_HMAC_DIGEST: + if (length == 20) + { + proto_tree_add_item (dcc_tree, hf_docsis_dccack_hmac_digest, tvb, + pos, length, ENC_NA); + } + else + { + THROW (ReportedBoundsError); + } + break; + } /* switch(type) */ + pos = pos + length; + } /* while (pos < len) */ + } /* if (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. -*/ - +/* Register the protocol with Wireshark */ void proto_register_docsis_dccack (void) { -/* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { {&hf_docsis_dccack_tran_id , - { - "Transaction ID", - "docsis_dccack.tran_id", - FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, - HFILL - } + { + "Transaction ID", + "docsis_dccack.tran_id", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, + HFILL + } }, {&hf_docsis_dccack_key_seq_num , - { - "Auth Key Sequence Number", - "docsis_dccack.key_seq_num", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, - HFILL - } + { + "Auth Key Sequence Number", + "docsis_dccack.key_seq_num", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, + HFILL + } }, {&hf_docsis_dccack_hmac_digest , - { - "HMAC-DigestNumber", - "docsis_dccack.hmac_digest", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, - HFILL - } + { + "HMAC-DigestNumber", + "docsis_dccack.hmac_digest", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, + HFILL + } }, }; -/* Setup protocol subtree array */ static gint *ett[] = { &ett_docsis_dccack, }; -/* Register the protocol name and description */ proto_docsis_dccack = proto_register_protocol ("DOCSIS Downstream Channel Change Acknowledge", - "DOCSIS DCC-ACK", "docsis_dccack"); + "DOCSIS DCC-ACK", "docsis_dccack"); -/* Required function calls to register the header fields and subtrees used */ proto_register_field_array (proto_docsis_dccack, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); register_dissector ("docsis_dccack", dissect_dccack, proto_docsis_dccack); } - -/* 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_dccack (void) { @@ -173,3 +157,16 @@ proto_reg_handoff_docsis_dccack (void) dissector_add_uint ("docsis_mgmt", 0x19, docsis_dccack_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: + */ |