diff options
Diffstat (limited to 'plugins/docsis/packet-dccack.c')
| -rw-r--r-- | plugins/docsis/packet-dccack.c | 116 |
1 files changed, 74 insertions, 42 deletions
diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c index 38c4a665e7..4a20920008 100644 --- a/plugins/docsis/packet-dccack.c +++ b/plugins/docsis/packet-dccack.c @@ -35,12 +35,21 @@ void proto_reg_handoff_docsis_dccack(void); /* Initialize the protocol and registered fields */ static int proto_docsis_dccack = -1; +static int hf_docsis_dcc_type = -1; +static int hf_docsis_dcc_length = -1; static int hf_docsis_dccack_tran_id = -1; static int hf_docsis_dccack_key_seq_num = -1; static int hf_docsis_dccack_hmac_digest = -1; /* Initialize the subtree pointers */ static gint ett_docsis_dccack = -1; +static gint ett_docsis_dccack_tlv = -1; + +static const value_string dccack_tlv_vals[] = { + {DCCACK_HMAC_DIGEST, "HMAC-DigestNumber"}, + {DCCACK_KEY_SEQ_NUM, "Auth Key Sequence Number"}, + {0, NULL} +}; static expert_field ei_docsis_dccack_tlvlen_bad = EI_INIT; @@ -51,55 +60,59 @@ static int dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_) { guint16 pos; - guint8 type, length; - proto_tree *dcc_tree; - proto_item *dcc_item; - guint16 len; - - len = tvb_reported_length(tvb); + guint8 type; + guint32 length; + proto_tree *dcc_tree, *tlv_tree; + proto_item *dcc_item, *tlv_item, *tlv_len_item; - col_set_str(pinfo->cinfo, COL_INFO, "DCC-ACK Message: "); + col_set_str(pinfo->cinfo, COL_INFO, "DCC-ACK Message"); - dcc_item = - proto_tree_add_protocol_format (tree, proto_docsis_dccack, tvb, 0, - -1, "DCC-ACK Message"); + dcc_item = proto_tree_add_item(tree, proto_docsis_dccack, tvb, 0, -1, ENC_NA); 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) + while (tvb_reported_length_remaining(tvb, pos) > 0) + { + type = tvb_get_guint8 (tvb, pos); + tlv_tree = proto_tree_add_subtree(dcc_tree, tvb, pos, -1, + ett_docsis_dccack_tlv, &tlv_item, + val_to_str(type, dccack_tlv_vals, + "Unknown TLV (%u)")); + proto_tree_add_uint (tlv_tree, hf_docsis_dcc_type, tvb, pos, 1, type); + pos++; + tlv_len_item = proto_tree_add_item_ret_uint (tlv_tree, hf_docsis_dcc_length, tvb, pos, 1, ENC_NA, &length); + pos++; + proto_item_set_len(tlv_item, length + 2); + + switch (type) { - 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 - { - expert_add_info_format(pinfo, dcc_item, &ei_docsis_dccack_tlvlen_bad, "Wrong TLV length: %u", length); - } - 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 - { - expert_add_info_format(pinfo, dcc_item, &ei_docsis_dccack_tlvlen_bad, "Wrong TLV length: %u", length); - } - break; - } /* switch(type) */ - pos = pos + length; - } /* while (pos < len) */ - - return tvb_captured_length(tvb); + case DCCACK_KEY_SEQ_NUM: + if (length == 1) + { + proto_tree_add_item (tlv_tree, hf_docsis_dccack_key_seq_num, tvb, pos, length, ENC_BIG_ENDIAN); + } + else + { + expert_add_info_format(pinfo, tlv_len_item, &ei_docsis_dccack_tlvlen_bad, "Wrong TLV length: %u", length); + } + break; + case DCCACK_HMAC_DIGEST: + if (length == 20) + { + proto_tree_add_item (tlv_tree, hf_docsis_dccack_hmac_digest, tvb, pos, length, ENC_NA); + } + else + { + expert_add_info_format(pinfo, tlv_len_item, &ei_docsis_dccack_tlvlen_bad, "Wrong TLV length: %u", length); + } + break; + } /* switch(type) */ + + pos += length; + } /* while (tvb_reported_length_remaining(tvb, pos) > 0) */ + + return tvb_captured_length(tvb); } /* Register the protocol with Wireshark */ @@ -107,6 +120,24 @@ void proto_register_docsis_dccack (void) { static hf_register_info hf[] = { + {&hf_docsis_dcc_type, + { + "Type", + "docsis_dccack.tlvtype", + FT_UINT8, BASE_DEC, VALS(dccack_tlv_vals), 0x0, + NULL, + HFILL + } + }, + {&hf_docsis_dcc_length, + { + "Length", + "docsis_dccack.tlvlen", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, + HFILL + } + }, {&hf_docsis_dccack_tran_id , { "Transaction ID", @@ -139,6 +170,7 @@ proto_register_docsis_dccack (void) static gint *ett[] = { &ett_docsis_dccack, + &ett_docsis_dccack_tlv, }; static ei_register_info ei[] = { |