diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-08-28 08:47:57 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-08-28 07:13:21 +0000 |
| commit | 14b0d710f500c45e023e8175876f88a6ecc1c539 (patch) | |
| tree | bfef70aabe3b1ae7b926a1991906107aa22c6d6f /epan/dissectors/packet-rpki-rtr.c | |
| parent | 845b781dfb393e634a8b855adefc99292e12c906 (diff) | |
RPKI-RTR: enhance dissector
* fix no display all append COL_INFO... (reset by col_set_clear...)
* fix dissection when type is unknown
* fix warning about soft-deprecated (tvb_length..)
* fix indent
* fix some typo (IPV6 => IPv6...)
Ping-Bug:8296
Change-Id: I246b04098200afd1528f632cc709f631422e745b
Reviewed-on: https://code.wireshark.org/review/3888
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-rpki-rtr.c')
| -rw-r--r-- | epan/dissectors/packet-rpki-rtr.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/epan/dissectors/packet-rpki-rtr.c b/epan/dissectors/packet-rpki-rtr.c index 6f0aa3157b..fa3eeadb36 100644 --- a/epan/dissectors/packet-rpki-rtr.c +++ b/epan/dissectors/packet-rpki-rtr.c @@ -78,8 +78,8 @@ static const value_string rtr_pdu_type_vals[] = { { RPKI_RTR_SERIAL_QUERY_PDU, "Serial Query" }, { RPKI_RTR_RESET_QUERY_PDU, "Reset Query" }, { RPKI_RTR_CACHE_RESPONSE_PDU, "Cache Response" }, - { RPKI_RTR_IPV4_PREFIX_PDU, "IPV4 Prefix" }, - { RPKI_RTR_IPV6_PREFIX_PDU, "IPV6 Prefix" }, + { RPKI_RTR_IPV4_PREFIX_PDU, "IPv4 Prefix" }, + { RPKI_RTR_IPV6_PREFIX_PDU, "IPv6 Prefix" }, { RPKI_RTR_END_OF_DATA_PDU, "End of Data" }, { RPKI_RTR_CACHE_RESET_PDU, "Cache Reset" }, { RPKI_RTR_ERROR_REPORT_PDU, "Error Report" }, @@ -125,27 +125,25 @@ static int dissect_rpkirtr_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree *rpkirtr_tree = NULL, *flags_tree = NULL; int offset = 0; guint8 pdu_type; - - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPKI-RTR"); - col_clear(pinfo->cinfo, COL_INFO); + guint length; while (tvb_reported_length_remaining(tvb, offset) != 0) { - if (tree) { - ti = proto_tree_add_item(tree, proto_rpkirtr, tvb, 0, -1, ENC_NA); + ti = proto_tree_add_item(tree, proto_rpkirtr, tvb, 0, -1, ENC_NA); - rpkirtr_tree = proto_item_add_subtree(ti, ett_rpkirtr); - } + rpkirtr_tree = proto_item_add_subtree(ti, ett_rpkirtr); proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN); pdu_type = tvb_get_guint8(tvb, offset); - col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, val_to_str(pdu_type, rtr_pdu_type_vals, "Unknown %d")); + col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, val_to_str(pdu_type, rtr_pdu_type_vals, "Unknown (%d)")); proto_item_append_text(ti, " (%s)", val_to_str(pdu_type, rtr_pdu_type_vals, "Unknown %d")); offset += 1; + length = tvb_get_ntohl(tvb, offset); + switch (pdu_type) { case RPKI_RTR_SERIAL_NOTIFY_PDU: /* Serial Notify (0) */ case RPKI_RTR_SERIAL_QUERY_PDU: /* Serial Query (1) */ @@ -194,7 +192,7 @@ static int dissect_rpkirtr_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_as_number, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; break; - case RPKI_RTR_IPV6_PREFIX_PDU: /* IPv4 Prefix (6) */ + case RPKI_RTR_IPV6_PREFIX_PDU: /* IPv6 Prefix (6) */ proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_reserved, tvb, offset, 2, ENC_NA); offset += 2; proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_length, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -231,23 +229,27 @@ static int dissect_rpkirtr_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_length_text, tvb, offset, 4, ENC_BIG_ENDIAN); len_text = tvb_get_ntohl(tvb, offset); offset += 4, - proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_error_text, tvb, offset, len_text, ENC_ASCII|ENC_NA); + proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_error_text, tvb, offset, len_text, ENC_ASCII|ENC_NA); offset += len_text; } default: /* No default ? */ + offset += length; break; } } - return tvb_length(tvb); + return tvb_reported_length(tvb); } static int dissect_rpkirtr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPKI-RTR"); + col_clear(pinfo->cinfo, COL_INFO); + tcp_dissect_pdus(tvb, pinfo, tree, 1, 8, get_rpkirtr_pdu_len, dissect_rpkirtr_pdu, data); - return tvb_length(tvb); + return tvb_reported_length(tvb); } void |