diff options
Diffstat (limited to 'epan/dissectors/packet-idmp.c')
| -rw-r--r-- | epan/dissectors/packet-idmp.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c index f27c393b55..5a16b18e84 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -89,6 +89,7 @@ static int hf_idmp_fragment_error = -1; static int hf_idmp_fragment_count = -1; static int hf_idmp_reassembled_in = -1; static int hf_idmp_reassembled_length = -1; +static int hf_idmp_segment_data = -1; static gint ett_idmp_fragment = -1; static gint ett_idmp_fragments = -1; @@ -172,7 +173,7 @@ static int hf_idmp_present = -1; /* INTEGER */ static int hf_idmp_absent = -1; /* NULL */ /*--- End of included file: packet-idmp-hf.c ---*/ -#line 131 "../../asn1/idmp/packet-idmp-template.c" +#line 132 "../../asn1/idmp/packet-idmp-template.c" /* Initialize the subtree pointers */ static gint ett_idmp = -1; @@ -191,7 +192,7 @@ static gint ett_idmp_Code = -1; static gint ett_idmp_InvokeId = -1; /*--- End of included file: packet-idmp-ett.c ---*/ -#line 135 "../../asn1/idmp/packet-idmp-template.c" +#line 136 "../../asn1/idmp/packet-idmp-template.c" /*--- Included file: packet-idmp-fn.c ---*/ @@ -619,7 +620,7 @@ dissect_idmp_IDM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U /*--- End of included file: packet-idmp-fn.c ---*/ -#line 137 "../../asn1/idmp/packet-idmp-template.c" +#line 138 "../../asn1/idmp/packet-idmp-template.c" void register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _U_, const char *name) @@ -683,9 +684,7 @@ static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr idmp_length, !idmp_final); if(fd_head && fd_head->next) { - proto_tree_add_text(tree, tvb, offset, (idmp_length) ? -1 : 0, - "IDMP segment data (%u byte%s)", idmp_length, - plurality(idmp_length, "", "s")); + proto_tree_add_item(tree, hf_idmp_segment_data, tvb, offset, (idmp_length) ? -1 : 0, ENC_NA); if (idmp_final) { /* This is the last segment */ @@ -705,9 +704,8 @@ static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr col_append_fstr(pinfo->cinfo, COL_INFO, " [IDMP fragment, %u byte%s, IDMP reassembly not enabled]", idmp_length, plurality(idmp_length, "", "s")); - proto_tree_add_text(tree, tvb, offset, (idmp_length) ? -1 : 0, - "IDMP segment data (%u byte%s) (IDMP reassembly not enabled)", idmp_length, - plurality(idmp_length, "", "s")); + proto_tree_add_bytes_format_value(tree, hf_idmp_segment_data, tvb, offset, (idmp_length) ? -1 : 0, + NULL, "(IDMP reassembly not enabled)"); } } /* not reassembling - just dissect */ @@ -796,6 +794,9 @@ void proto_register_idmp(void) { &hf_idmp_reassembled_length, { "Reassembled IDMP length", "idmp.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, "The total length of the reassembled payload", HFILL } }, + { &hf_idmp_segment_data, + { "IDMP segment data", "idmp.segment_data", FT_BYTES, BASE_NONE, + NULL, 0x00, NULL, HFILL } }, /*--- Included file: packet-idmp-hfarr.c ---*/ @@ -930,7 +931,7 @@ void proto_register_idmp(void) NULL, HFILL }}, /*--- End of included file: packet-idmp-hfarr.c ---*/ -#line 315 "../../asn1/idmp/packet-idmp-template.c" +#line 316 "../../asn1/idmp/packet-idmp-template.c" }; /* List of subtrees */ @@ -953,7 +954,7 @@ void proto_register_idmp(void) &ett_idmp_InvokeId, /*--- End of included file: packet-idmp-ettarr.c ---*/ -#line 323 "../../asn1/idmp/packet-idmp-template.c" +#line 324 "../../asn1/idmp/packet-idmp-template.c" }; module_t *idmp_module; |