diff options
Diffstat (limited to 'epan/dissectors/packet-dtp.c')
| -rw-r--r-- | epan/dissectors/packet-dtp.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index b1bc248df7..e9aa16f925 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -33,26 +33,28 @@ void proto_register_dtp(void); void proto_reg_handoff_dtp(void); -static int proto_dtp = -1; -static int hf_dtp_version = -1; -static int hf_dtp_domain = -1; -static int hf_dtp_tlvtype = -1; -static int hf_dtp_tlvlength = -1; -static int hf_dtp_senderid = -1; -static int hf_dtp_tot = -1; -static int hf_dtp_tat = -1; -static int hf_dtp_tos = -1; -static int hf_dtp_tas = -1; -static int hf_dtp_data = -1; - -static gint ett_dtp = -1; -static gint ett_dtp_tlv = -1; -static gint ett_dtp_status = -1; -static gint ett_dtp_type = -1; - -static expert_field ei_dtp_tlv_length_too_short = EI_INIT; -static expert_field ei_dtp_tlv_length_invalid = EI_INIT; -static expert_field ei_dtp_truncated = EI_INIT; +static dissector_handle_t dtp_handle; + +static int proto_dtp; +static int hf_dtp_version; +static int hf_dtp_domain; +static int hf_dtp_tlvtype; +static int hf_dtp_tlvlength; +static int hf_dtp_senderid; +static int hf_dtp_tot; +static int hf_dtp_tat; +static int hf_dtp_tos; +static int hf_dtp_tas; +static int hf_dtp_data; + +static gint ett_dtp; +static gint ett_dtp_tlv; +static gint ett_dtp_status; +static gint ett_dtp_type; + +static expert_field ei_dtp_tlv_length_too_short; +static expert_field ei_dtp_tlv_length_invalid; +static expert_field ei_dtp_truncated; static void dissect_dtp_tlv(packet_info *pinfo, tvbuff_t *tvb, int offset, int length, @@ -206,7 +208,7 @@ dissect_dtp_tlv(packet_info *pinfo, tvbuff_t *tvb, int offset, int length, case DTP_TLV_DOMAIN: if (length <= 33) { /* VTP domain name is at most 32 bytes long and is null-terminated */ proto_item_append_text(ti, ": %s", tvb_format_text(pinfo->pool, tvb, offset, length - 1)); - proto_tree_add_item(tree, hf_dtp_domain, tvb, offset, length, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_dtp_domain, tvb, offset, length, ENC_ASCII); } else expert_add_info(pinfo, tlv_length_item, &ei_dtp_tlv_length_invalid); @@ -348,14 +350,13 @@ proto_register_dtp(void) expert_dtp = expert_register_protocol(proto_dtp); expert_register_field_array(expert_dtp, ei, array_length(ei)); + + dtp_handle = register_dissector("dtp", dissect_dtp, proto_dtp); } void proto_reg_handoff_dtp(void) { - dissector_handle_t dtp_handle; - - dtp_handle = create_dissector_handle(dissect_dtp, proto_dtp); dissector_add_uint("llc.cisco_pid", CISCO_PID_DTP, dtp_handle); } |