diff options
Diffstat (limited to 'epan/dissectors/packet-mpls-echo.c')
-rw-r--r-- | epan/dissectors/packet-mpls-echo.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 0324dcf032..587b7c2d21 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -549,7 +549,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto } if (length + 4 > rem) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_fec_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_fec_len, "Invalid FEC Sub-TLV Length (claimed %u, found %u)", length, rem - 4); return; @@ -575,7 +575,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto break; case TLV_FEC_STACK_RSVP_IPv4: if (length != 20) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_fec_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_fec_len, "Invalid FEC Sub-TLV Length " "(claimed %u, should be %u)", length, 20); @@ -600,7 +600,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto break; case TLV_FEC_STACK_RSVP_IPv6: if (length != 56) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_fec_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_fec_len, "Invalid FEC Sub-TLV Length " "(claimed %u, should be %u)", length, 56); @@ -669,7 +669,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto break; case TLV_FEC_STACK_L2_CID_NEW: if (length < 14) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_fec_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_fec_len, "Invalid FEC Sub-TLV Length " "(claimed %u, should be %u)", length, 14); @@ -690,7 +690,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto break; case TLV_FEC_VENDOR_PRIVATE_START: if (length < 4) { /* SMI Enterprise code */ - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_fec_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_fec_len, "Invalid FEC Sub-TLV Length " "(claimed %u, should be >= %u)", length, 4); @@ -754,7 +754,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto break; case TLV_FEC_STACK_P2MP_IPv4: if (length != 20) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_fec_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_fec_len, "Invalid FEC Sub-TLV Length " "(claimed %u, should be %u)", length, 20); @@ -784,7 +784,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto case TLV_FEC_STACK_P2MP_IPv6: if (length != 56) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_fec_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_fec_len, "Invalid FEC Sub-TLV Length " "(claimed %u, should be %u)", length, 56); @@ -864,7 +864,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto if (length % 4) { pad = 4 - (length % 4); if (length + 4 + pad > rem) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_fec_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_fec_len, "Invalid FEC Sub-TLV Padded Length (claimed %u, found %u)", length + pad, rem - 4); return; @@ -939,7 +939,7 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr (offset + 8), 4, ENC_BIG_ENDIAN); break; default: - expert_add_info_format_text(pinfo, addr_ti, &ei_mpls_echo_unknown_address_type, + expert_add_info_format(pinfo, addr_ti, &ei_mpls_echo_unknown_address_type, "Unknown Address Type (%u)", addr_type); break; } @@ -957,7 +957,7 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr rem -= 16; offset += 16; if (rem < mplen) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_ds_map_muti_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_ds_map_muti_len, "Invalid FEC Multipath (claimed %u, found %u)", mplen, rem); return; @@ -967,7 +967,7 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr switch (hash_type) { case TLV_DS_MAP_HASH_IP: if (mplen != 4) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_ds_map_muti_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_ds_map_muti_len, "Invalid FEC Multipath (claimed %u, should be 4)", mplen); break; @@ -980,7 +980,7 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr break; case TLV_DS_MAP_HASH_IP_RANGE: if (mplen != 8) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_ds_map_muti_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_ds_map_muti_len, "Invalid FEC Multipath (claimed %u, should be 8)", mplen); break; @@ -1002,7 +1002,7 @@ dissect_mpls_echo_tlv_ds_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr break; case TLV_DS_MAP_HASH_BITMASK_IP: if (mplen < 4) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_ds_map_muti_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_ds_map_muti_len, "Invalid FEC Multipath (claimed %u, should be 4)", mplen); break; @@ -1108,7 +1108,7 @@ dissect_mpls_echo_tlv_dd_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr (offset + 8), 4, ENC_BIG_ENDIAN); break; default: - expert_add_info_format_text(pinfo, ddti, &ei_mpls_echo_unknown_address_type, + expert_add_info_format(pinfo, ddti, &ei_mpls_echo_unknown_address_type, "Unknown Address Type (%u)", addr_type); break; } @@ -1133,7 +1133,7 @@ dissect_mpls_echo_tlv_dd_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr offset += 4; if (rem<subtlv_length){ - expert_add_info_format_text(pinfo, ddti, &ei_mpls_echo_tlv_dd_map_subtlv_len, + expert_add_info_format(pinfo, ddti, &ei_mpls_echo_tlv_dd_map_subtlv_len, "Invalid Sub-tlv Length (claimed %u, found %u)", subtlv_length, rem); return; @@ -1166,7 +1166,7 @@ dissect_mpls_echo_tlv_dd_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr case TLV_MULTIPATH_IP_ADDRESS: if (multipath_length != 4) { - expert_add_info_format_text(pinfo, ddsti, &ei_mpls_echo_tlv_dd_map_subtlv_len, + expert_add_info_format(pinfo, ddsti, &ei_mpls_echo_tlv_dd_map_subtlv_len, "Invalid Sub-tlv Length (claimed %u, should be 4)", multipath_length); break; @@ -1190,7 +1190,7 @@ dissect_mpls_echo_tlv_dd_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr case TLV_MULTIPATH_IP_ADDRESS_RANGE: if (multipath_length != 8) { - expert_add_info_format_text(pinfo, ddsti, &ei_mpls_echo_tlv_dd_map_subtlv_len, + expert_add_info_format(pinfo, ddsti, &ei_mpls_echo_tlv_dd_map_subtlv_len, "Invalid Sub-tlv Length (claimed %u, should be 8)", multipath_length); break; @@ -1216,7 +1216,7 @@ dissect_mpls_echo_tlv_dd_map(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr case TLV_MULTIPATH_BIT_MASKED_IP: if (multipath_length < 4) { - expert_add_info_format_text(pinfo, ddsti, &ei_mpls_echo_tlv_dd_map_subtlv_len, + expert_add_info_format(pinfo, ddsti, &ei_mpls_echo_tlv_dd_map_subtlv_len, "Invalid Sub-tlv Length (claimed %u, should be >= 4)", multipath_length); break; @@ -1515,7 +1515,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre break; case TLV_ILSO_IPv4: if (length < 12) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_len, "Invalid TLV Length (claimed %u, should be >= 12)", length); break; @@ -1524,7 +1524,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre break; case TLV_ILSO_IPv6: if (length < 24) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_len, "Invalid TLV Length (claimed %u, should be >= 24)", length); break; @@ -1555,7 +1555,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre #endif case TLV_P2MP_ECHO_JITTER: if (length != 4) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_len, "Invalid TLV Length (claimed %u, should be 4)", length); break; @@ -1574,7 +1574,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre case TLV_P2MP_RESPONDER_IDENT_IPV4_EGRESS_ADDR: case TLV_P2MP_RESPONDER_IDENT_IPV4_NODE_ADDR: if (resp_ident_len != 4) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_len, "Invalid TLV Length (claimed %u, should be 4)", length); break; @@ -1591,7 +1591,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre case TLV_P2MP_RESPONDER_IDENT_IPV6_EGRESS_ADDR: case TLV_P2MP_RESPONDER_IDENT_IPV6_NODE_ADDR: if (resp_ident_len != 16) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_len, "Invalid TLV Length (claimed %u, should be 16)", length); break; @@ -1609,7 +1609,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre } case TLV_VENDOR_PRIVATE_START: if (length < 4) { /* SMI Enterprise code */ - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_len, "Invalid TLV Length (claimed %u, should be >= 4)", length); } else { @@ -1621,7 +1621,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre break; case TLV_DOWNSTREAM_MAPPING: if (length < 16) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_len, "Invalid TLV Length (claimed %u, should be >= 16)", length); break; @@ -1630,7 +1630,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre break; case TLV_DETAILED_DOWNSTREAM: /* [RFC 6424] */ if (length < 16) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_len, "Invalid TLV Length (claimed %u, should be >= 16)", length); break; @@ -1646,7 +1646,7 @@ dissect_mpls_echo_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre break; case TLV_REPLY_TOS: if (length != 4) { - expert_add_info_format_text(pinfo, ti, &ei_mpls_echo_tlv_len, + expert_add_info_format(pinfo, ti, &ei_mpls_echo_tlv_len, "Invalid TLV Length (claimed %u, should be 4)", length); break; |