diff options
34 files changed, 152 insertions, 184 deletions
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 9db9e3f4a0..a6a5984ea8 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -705,7 +705,7 @@ proto_register_t38(void) {"Reassembled in", "t38.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_t38_reassembled_length, - {"Reassembled length", "t38.reassembled.length", + {"Reassembled T38 length", "t38.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, }; diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index ef54961705..80f9f4a96a 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -111,7 +111,7 @@ VAL_PTR=&Data_Field_field_type_value } new_tvb = process_reassembled_data(tvb, offset, actx->pinfo, - "Reassembled Message", frag_msg, &data_frag_items, NULL, tree); + "Reassembled T38", frag_msg, &data_frag_items, NULL, tree); /* Now reset fragmentation information in pinfo */ actx->pinfo->fragmented = save_fragmented; @@ -121,7 +121,7 @@ VAL_PTR=&Data_Field_field_type_value } else { new_tvb = process_reassembled_data(tvb, offset, actx->pinfo, - "Reassembled Message", frag_msg, &data_frag_items, NULL, tree); + "Reassembled T38", frag_msg, &data_frag_items, NULL, tree); /* Now reset fragmentation information in pinfo */ actx->pinfo->fragmented = save_fragmented; @@ -200,7 +200,7 @@ VAL_PTR=&Data_Field_field_type_value TRUE); /* More fragments */ new_tvb = process_reassembled_data(tvb, offset, actx->pinfo, - "Reassembled Message", frag_msg, &data_frag_items, NULL, tree); + "Reassembled T38", frag_msg, &data_frag_items, NULL, tree); if (!frag_msg) { /* Not last packet of reassembled */ if (Data_Field_field_type_value == 0) { diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index e13c599c02..daa112e41c 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -1949,7 +1949,7 @@ dissect_6lowpan_frag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole /* Attempt reassembly. */ new_tvb = process_reassembled_data(tvb, offset, pinfo, - "Reassembled Message", frag_data, &lowpan_frag_items, + "Reassembled 6LowPAN", frag_data, &lowpan_frag_items, NULL, tree); /* If reassembly was successful, then return the completed datagram. */ @@ -2168,7 +2168,7 @@ proto_register_6lowpan(void) { &hf_6lowpan_reassembled_in, { "Reassembled in", "6lowpan.reassembled.in",FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_6lowpan_reassembled_length, - { "Reassembled length", "6lowpan.reassembled.length",FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }} + { "Reassembled 6LowPAN length", "6lowpan.reassembled.length",FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }} }; static gint *ett[] = { diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index d26bb944bc..685cc8962e 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -8610,11 +8610,9 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bacapp_type = (flag >> 4) & 0x0f; /* show some descriptive text in the INFO column */ - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_add_fstr(pinfo->cinfo, COL_INFO, "%-16s", - val_to_str(bacapp_type, BACnetTypeName, "# unknown APDU #")); - } + col_add_fstr(pinfo->cinfo, COL_INFO, "%-16s", + val_to_str(bacapp_type, BACnetTypeName, "# unknown APDU #")); + switch (bacapp_type) { case BACAPP_TYPE_CONFIRMED_SERVICE_REQUEST: @@ -8634,28 +8632,25 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bacapp_invoke_id = tvb_get_guint8(tvb, offset + 2); bacapp_service = tvb_get_guint8(tvb, offset + 3); } - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", - val_to_str(bacapp_service, - BACnetConfirmedServiceChoice, - bacapp_unknown_service_str),bacapp_invoke_id); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", + val_to_str(bacapp_service, + BACnetConfirmedServiceChoice, + bacapp_unknown_service_str),bacapp_invoke_id); break; case BACAPP_TYPE_UNCONFIRMED_SERVICE_REQUEST: bacapp_service = tvb_get_guint8(tvb, offset + 1); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", - val_to_str(bacapp_service, - BACnetUnconfirmedServiceChoice, - bacapp_unknown_service_str)); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", + val_to_str(bacapp_service, + BACnetUnconfirmedServiceChoice, + bacapp_unknown_service_str)); break; case BACAPP_TYPE_SIMPLE_ACK: bacapp_invoke_id = tvb_get_guint8(tvb, offset + 1); bacapp_service = tvb_get_guint8(tvb, offset + 2); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ - val_to_str(bacapp_service, - BACnetConfirmedServiceChoice, - bacapp_unknown_service_str), bacapp_invoke_id); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ + val_to_str(bacapp_service, + BACnetConfirmedServiceChoice, + bacapp_unknown_service_str), bacapp_invoke_id); break; case BACAPP_TYPE_COMPLEX_ACK: /* segmented messages have 2 additional bytes */ @@ -8674,11 +8669,10 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bacapp_invoke_id = tvb_get_guint8(tvb, offset + 1); bacapp_service = tvb_get_guint8(tvb, offset + 2); } - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ - val_to_str(bacapp_service, - BACnetConfirmedServiceChoice, - bacapp_unknown_service_str), bacapp_invoke_id); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ + val_to_str(bacapp_service, + BACnetConfirmedServiceChoice, + bacapp_unknown_service_str), bacapp_invoke_id); break; case BACAPP_TYPE_SEGMENT_ACK: /* nothing more to add */ @@ -8686,33 +8680,30 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case BACAPP_TYPE_ERROR: bacapp_invoke_id = tvb_get_guint8(tvb, offset + 1); bacapp_service = tvb_get_guint8(tvb, offset + 2); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ - val_to_str(bacapp_service, - BACnetConfirmedServiceChoice, - bacapp_unknown_service_str), bacapp_invoke_id); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ + val_to_str(bacapp_service, + BACnetConfirmedServiceChoice, + bacapp_unknown_service_str), bacapp_invoke_id); break; case BACAPP_TYPE_REJECT: bacapp_invoke_id = tvb_get_guint8(tvb, offset + 1); bacapp_reason = tvb_get_guint8(tvb, offset + 2); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ - val_to_split_str(bacapp_reason, - 64, - BACnetRejectReason, - ASHRAE_Reserved_Fmt, - Vendor_Proprietary_Fmt), bacapp_invoke_id); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ + val_to_split_str(bacapp_reason, + 64, + BACnetRejectReason, + ASHRAE_Reserved_Fmt, + Vendor_Proprietary_Fmt), bacapp_invoke_id); break; case BACAPP_TYPE_ABORT: bacapp_invoke_id = tvb_get_guint8(tvb, offset + 1); bacapp_reason = tvb_get_guint8(tvb, offset + 2); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ - val_to_split_str(bacapp_reason, - 64, - BACnetAbortReason, - ASHRAE_Reserved_Fmt, - Vendor_Proprietary_Fmt), bacapp_invoke_id); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s[%3u] ", /* "original-invokeID" replaced */ + val_to_split_str(bacapp_reason, + 64, + BACnetAbortReason, + ASHRAE_Reserved_Fmt, + Vendor_Proprietary_Fmt), bacapp_invoke_id); break; /* UNKNOWN */ default: @@ -8744,16 +8735,15 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_reported_length_remaining(tvb, bacapp_seqno == 0 ? 0 : data_offset), /* fragment length - to the end */ flag & BACAPP_MORE_SEGMENTS); /* Last fragment reached? */ new_tvb = process_reassembled_data(tvb, bacapp_seqno == 0 ? 0 : data_offset, pinfo, - "Reassembled Message", frag_msg, &msg_frag_items, + "Reassembled BACapp", frag_msg, &msg_frag_items, NULL, tree); if (frag_msg) { /* Reassembled */ col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); } else { /* Not last packet of reassembled Short Message */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, - " (Message fragment %u)", bacapp_seqno); + col_append_fstr(pinfo->cinfo, COL_INFO, + " (Message fragment %u)", bacapp_seqno); } if (new_tvb) { /* take it all */ real_size = tvb_reported_length_remaining(new_tvb, 0); @@ -8954,33 +8944,33 @@ proto_register_bacapp(void) FT_UINT16, BASE_DEC, VALS(BACnetObjectType), 0x00, "Object Type", HFILL } }, {&hf_msg_fragments, - {"Message fragments", "msg.fragments", + {"Message fragments", "bacapp.fragments", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_msg_fragment, - {"Message fragment", "msg.fragment", + {"Message fragment", "bacapp.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_msg_fragment_overlap, - {"Message fragment overlap", "msg.fragment.overlap", + {"Message fragment overlap", "bacapp.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_msg_fragment_overlap_conflicts, {"Message fragment overlapping with conflicting data", - "msg.fragment.overlap.conflicts", + "bacapp.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_msg_fragment_multiple_tails, {"Message has multiple tail fragments", - "msg.fragment.multiple_tails", + "bacapp.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_msg_fragment_too_long_fragment, - {"Message fragment too long", "msg.fragment.too_long_fragment", + {"Message fragment too long", "bacapp.fragment.too_long_fragment", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_msg_fragment_error, - {"Message defragmentation error", "msg.fragment.error", + {"Message defragmentation error", "bacapp.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_msg_reassembled_in, - {"Reassembled in", "msg.reassembled.in", + {"Reassembled in", "bacapp.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_msg_reassembled_length, - {"Reassembled length", "msg.reassembled.length", + {"Reassembled BACapp length", "bacapp.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } } }; static gint *ett[] = { diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 60d421d35d..c2c3cc884f 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -1384,7 +1384,7 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fragment_more); next_tvb = process_reassembled_data(tvb, offset, pinfo, - "Reassembled CAPWAP Data", frag_msg, + "Reassembled CAPWAP", frag_msg, &capwap_frag_items, NULL, tree); if (next_tvb == NULL) @@ -1465,7 +1465,7 @@ dissect_capwap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fragment_more); next_tvb = process_reassembled_data(tvb, offset, pinfo, - "Reassembled CAPWAP Data", frag_msg, + "Reassembled CAPWAP", frag_msg, &capwap_frag_items, NULL, tree); if (next_tvb == NULL) @@ -2147,7 +2147,7 @@ proto_register_capwap_control(void) { "Reassembled in", "capwap.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_msg_reassembled_length, - { "Reassembled length", "capwap.reassembled.length", FT_UINT32, BASE_DEC, + { "Reassembled CAPWAP length", "capwap.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 3015409e2f..44187ddf46 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -5460,7 +5460,7 @@ proto_register_dcerpc (void) NULL, 0x0, "The DCE/RPC PDU is completely reassembled in the packet with this number", HFILL }}, { &hf_dcerpc_reassembled_length, - { "Reassembled length", "dcerpc.reassembled.length", FT_UINT32, BASE_DEC, + { "Reassembled DCE/RPC length", "dcerpc.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, { &hf_dcerpc_unknown_if_id, diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 3b66fe9e1b..3d0cd1f528 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -277,7 +277,7 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, rx_min++; if (fdx) new_tvb = process_reassembled_data (tvb, offset, pinfo, - "Reassembled Message", + "Reassembled DCP (ETSI)", fdx, &dcp_frag_items, NULL, tree); else { @@ -330,7 +330,7 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, } if(frag) new_tvb = process_reassembled_data (tvb, offset, pinfo, - "Reassembled Message", + "Reassembled DCP (ETSI)", frag, &dcp_frag_items, NULL, tree); } @@ -407,7 +407,7 @@ dissect_pft_fragmented(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, ); } else { new_tvb = process_reassembled_data (tvb, offset, pinfo, - "Reassembled Message", + "Reassembled DCP (ETSI)", frag_edcp, &dcp_frag_items, NULL, tree); } @@ -824,7 +824,7 @@ proto_register_dcp_etsi (void) {"Reassembled in", "dcp-pft.reassembled.in", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL}}, {&hf_edcp_reassembled_length, - {"Reassembled length", "dcp-pft.reassembled.length", + {"Reassembled DCP (ETSI) length", "dcp-pft.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL}}, {&hf_edcp_c_max, {"C max", "dcp-pft.cmax", diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index a8abee79b8..ba3861f70f 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -3038,7 +3038,7 @@ proto_register_dnp3(void) "This PDU is reassembled in this frame", HFILL }}, { &hf_dnp3_fragment_reassembled_length, - { "Reassembled length", "dnp3.al.fragment.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Reassembled DNP length", "dnp3.al.fragment.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }} }; diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 44dca723ca..9be9a74b70 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -1035,7 +1035,7 @@ dissect_dtls_handshake(tvbuff_t *tvb, packet_info *pinfo, { /* Reassembled */ new_tvb = process_reassembled_data(tvb, offset+12, pinfo, - "Reassembled Message", + "Reassembled DTLS", frag_msg, &dtls_frag_items, NULL, tree); @@ -2217,7 +2217,7 @@ proto_register_dtls(void) FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_dtls_reassembled_length, - { "Reassembled length", "dtls.reassembled.length", + { "Reassembled DTLS length", "dtls.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index c4c0a904f6..32e1bcf196 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -353,7 +353,7 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bundle_tree = proto_item_add_subtree(ti, ett_bundle); new_tvb = process_reassembled_data(tvb, frame_offset + convergence_hdr_size, - pinfo, "Reassembled Message", frag_msg, + pinfo, "Reassembled DTN", frag_msg, &msg_frag_items, NULL, bundle_tree); } if(new_tvb){ @@ -2239,7 +2239,7 @@ proto_register_bundle(void) FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL} }, {&hf_msg_reassembled_length, - {"Reassembled length", "bundle.msg.reassembled.length", + {"Reassembled DTN length", "bundle.msg.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} }, {&hf_bundle_procflags, diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 0f56e47ebf..6f89c2ab3b 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -1253,7 +1253,7 @@ proto_register_eap(void) FT_FRAMENUM, BASE_NONE, NULL, 0x0, "Defragmentation error due to illegal fragments", HFILL }}, { &hf_eaptls_reassembled_length, - { "Reassembled length", "eaptls.reassembled.length", + { "Reassembled EAP-TLS length", "eaptls.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index e6277ccca2..e1511234f6 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -2647,9 +2647,8 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb else { /* Not last packet of reassembled Short Message */ - if (check_col (g_pinfo->cinfo, COL_INFO)) - col_append_fstr (g_pinfo->cinfo, COL_INFO, - " (Short Message fragment %u of %u)", g_frag, g_frags); + col_append_fstr (g_pinfo->cinfo, COL_INFO, + " (Short Message fragment %u of %u)", g_frag, g_frags); } } /* Else: not fragmented */ if (! sm_tvb) /* One single Short Message, or not reassembled */ @@ -3575,7 +3574,7 @@ proto_register_gsm_sms(void) } }, { &hf_gsm_sms_ud_reassembled_length, - { "Reassembled length", + { "Reassembled Short Message length", "gsm-sms-ud.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, "The total length of the reassembled payload", HFILL diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index 9491a0251b..9f73791859 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -369,9 +369,8 @@ parse_gsm_sms_ud_message(proto_tree *sm_tree, tvbuff_t *tvb, packet_info *pinfo, " (Short Message Reassembled)"); } else { /* Not last packet of reassembled Short Message */ - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_fstr (pinfo->cinfo, COL_INFO, - " (Short Message fragment %u of %u)", frag, frags); + col_append_fstr (pinfo->cinfo, COL_INFO, + " (Short Message fragment %u of %u)", frag, frags); } } /* Else: not fragmented */ @@ -576,7 +575,7 @@ proto_register_gsm_sms_ud(void) } }, { &hf_gsm_sms_ud_reassembled_length, - { "Reassembled length", + { "Reassembled Short Message length", "gsm-sms-ud.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, "The total length of the reassembled payload", HFILL diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index 3ce355dbd5..c9d19863ae 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -557,7 +557,7 @@ proto_register_gssapi(void) { "Reassembled In", "gss-api.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "The frame where this pdu is reassembled", HFILL }}, { &hf_gssapi_reassembled_length, - { "Reassembled length", "gss-api.reassembled.length", FT_UINT32, BASE_DEC, + { "Reassembled GSSAPI length", "gss-api.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, }; diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 658f2c12db..ab8a883ef3 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -1453,7 +1453,7 @@ void proto_register_h223 (void) "This H.223 MUX-PDU packet is reassembled in this frame", HFILL }}, { &hf_h223_mux_reassembled_length, - { "Reassembled length", "h223.mux.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Reassembled H.223 MUX-PDU length", "h223.mux.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, /* fields for h.223-al fragments */ @@ -1490,7 +1490,7 @@ void proto_register_h223 (void) "This H.223 AL-PDU packet is reassembled in this frame", HFILL }}, { &hf_h223_al_reassembled_length, - { "Reassembled length", "h223.al.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Reassembled H.223 AL-PDU length", "h223.al.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, /* h223-als */ diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 85a23632d1..f4562f5b7a 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -2562,7 +2562,7 @@ proto_register_iax2 (void) "This IAX2 packet is reassembled in this frame", HFILL }}, {&hf_iax2_reassembled_length, - {"Reassembled length", "iax2.reassembled.length", + {"Reassembled IAX2 length", "iax2.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }} }; diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index aa84d88bb8..0cc7010dec 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2039,7 +2039,7 @@ dissect_cisco_fragmentation(tvbuff_t *tvb, int offset, int length, proto_tree *t tvb_length_remaining(tvb, offset), /* fragment length - to the end */ last); /* More fragments? */ defrag_isakmp_tvb = process_reassembled_data(tvb, offset, pinfo, - "Reassembled Message", frag_msg, &isakmp_frag_items, + "Reassembled ISAKMP", frag_msg, &isakmp_frag_items, NULL, ptree); if (defrag_isakmp_tvb) { /* take it all */ @@ -3872,33 +3872,33 @@ proto_register_isakmp(void) FT_UINT8, BASE_DEC, VALS(frag_last_vals), 0x0, "ISAKMP last fragment", HFILL }}, { &hf_isakmp_fragments, - {"Message fragments", "msg.fragments", + {"Message fragments", "isakmp.fragments", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_isakmp_fragment, - {"Message fragment", "msg.fragment", + {"Message fragment", "isakmp.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_isakmp_fragment_overlap, - {"Message fragment overlap", "msg.fragment.overlap", + {"Message fragment overlap", "isakmp.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isakmp_fragment_overlap_conflicts, {"Message fragment overlapping with conflicting data", - "msg.fragment.overlap.conflicts", + "isakmp.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isakmp_fragment_multiple_tails, {"Message has multiple tail fragments", - "msg.fragment.multiple_tails", + "isakmp.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isakmp_fragment_too_long_fragment, - {"Message fragment too long", "msg.fragment.too_long_fragment", + {"Message fragment too long", "isakmp.fragment.too_long_fragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_isakmp_fragment_error, - {"Message defragmentation error", "msg.fragment.error", + {"Message defragmentation error", "isakmp.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_isakmp_reassembled_in, - {"Reassembled in", "msg.reassembled.in", + {"Reassembled in", "isakmp.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_isakmp_reassembled_length, - {"Reassembled length", "msg.reassembled.length", + {"Reassembled ISAKMP length", "isakmp.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_isakmp_certificate_authority, { "Certificate Authority Distinguished Name", "ike.cert_authority_dn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index f95355fea5..0296241906 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -3467,7 +3467,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf } new_tvb = process_reassembled_data(parameter_tvb, offset, pinfo, - "Reassembled Message", frag_msg, &isup_apm_msg_frag_items, + "Reassembled ISUP", frag_msg, &isup_apm_msg_frag_items, NULL, parameter_tree); if (frag_msg) { /* Reassembled */ @@ -7102,26 +7102,23 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->ctype = CT_ISUP; pinfo->circuit_id = cic; - if (check_col(pinfo->cinfo, COL_INFO)) - { - if (isup_show_cic_in_info){ - switch (isup_standard){ - case ITU_STANDARD: - col_add_fstr(pinfo->cinfo, COL_INFO, "%s (CIC %u) ", val_to_str(message_type, isup_message_type_value_acro, "reserved"), cic); - break; - case ANSI_STANDARD: - col_add_fstr(pinfo->cinfo, COL_INFO, "%s (CIC %u) ", val_to_str(message_type, ansi_isup_message_type_value_acro, "reserved"), cic); - break; - } - }else{ - switch (isup_standard){ - case ITU_STANDARD: - col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_type, isup_message_type_value_acro, "reserved")); - break; - case ANSI_STANDARD: - col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_type, ansi_isup_message_type_value_acro, "reserved")); - break; - } + if (isup_show_cic_in_info){ + switch (isup_standard){ + case ITU_STANDARD: + col_add_fstr(pinfo->cinfo, COL_INFO, "%s (CIC %u) ", val_to_str(message_type, isup_message_type_value_acro, "reserved"), cic); + break; + case ANSI_STANDARD: + col_add_fstr(pinfo->cinfo, COL_INFO, "%s (CIC %u) ", val_to_str(message_type, ansi_isup_message_type_value_acro, "reserved"), cic); + break; + } + }else{ + switch (isup_standard){ + case ITU_STANDARD: + col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_type, isup_message_type_value_acro, "reserved")); + break; + case ANSI_STANDARD: + col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_type, ansi_isup_message_type_value_acro, "reserved")); + break; } } @@ -7166,12 +7163,10 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->circuit_id = bicc_cic; - if (check_col(pinfo->cinfo, COL_INFO)) { - if (isup_show_cic_in_info) { - col_add_fstr(pinfo->cinfo, COL_INFO, "%s (CIC %u) ", val_to_str(message_type, isup_message_type_value_acro, "reserved"), bicc_cic); - } else { - col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_type, isup_message_type_value_acro, "reserved")); - } + if (isup_show_cic_in_info) { + col_add_fstr(pinfo->cinfo, COL_INFO, "%s (CIC %u) ", val_to_str(message_type, isup_message_type_value_acro, "reserved"), bicc_cic); + } else { + col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_type, isup_message_type_value_acro, "reserved")); } /* dissect CIC in main dissector since pass-along message type carrying complete BICC/ISUP message w/o CIC needs * recursive message dissector call @@ -7206,8 +7201,7 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Extract message type field */ message_type = tvb_get_guint8(tvb, 0); /* application/ISUP has no CIC */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_sep_fstr(pinfo->cinfo, COL_INFO, ", ", "ISUP:%s", val_to_str(message_type, isup_message_type_value_acro, "reserved")); + col_append_sep_fstr(pinfo->cinfo, COL_INFO, ", ", "ISUP:%s", val_to_str(message_type, isup_message_type_value_acro, "reserved")); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ @@ -8187,7 +8181,7 @@ proto_register_isup(void) FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_isup_apm_msg_reassembled_length, - {"Reassembled length", "isup_apm.msg.reassembled.length", + {"Reassembled ISUP length", "isup_apm.msg.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, {&hf_isup_cvr_rsp_ind, diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index 4fdf74a389..e4718facac 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -305,7 +305,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) m); /* More fragments? */ reassembled = process_reassembled_data(payload, 0, pinfo, - "Reassembled Message", fd_m, &lapdm_frag_items, + "Reassembled LAPDm", fd_m, &lapdm_frag_items, NULL, lapdm_tree); /* Reassembled into this packet @@ -453,7 +453,7 @@ proto_register_lapdm(void) NULL, 0x00, "LAPDm Message has been reassembled in this packet.", HFILL }}, { &hf_lapdm_reassembled_length, - { "Reassembled length", "lapdm.reassembled.length", FT_UINT32, BASE_DEC, + { "Reassembled LAPDm length", "lapdm.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, "The total length of the reassembled payload", HFILL }} }; diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 503da1b66f..90e537d698 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -295,7 +295,7 @@ mp2t_depi_docsis_fragmentation_handle(tvbuff_t *tvb, guint offset, !fragment_last); new_tvb = process_reassembled_data(tvb, offset, pinfo, - "Reassembled Message", + "Reassembled MP2T", frag_msg, &depi_msg_frag_items, NULL, tree); @@ -1323,7 +1323,7 @@ proto_register_mp2t(void) FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_depi_msg_reassembled_length, { - "Reassembled length", "mp2t.depi_msg.reassembled.length", + "Reassembled MP2T length", "mp2t.depi_msg.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index b85941b669..1d4fbb18a7 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -4258,11 +4258,11 @@ proto_register_ndmp(void) FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_ndmp_fragment_overlap_conflicts, {"NDMP fragment overlapping with conflicting data", - "msg.fragment.overlap.conflicts", + "ndmp.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_ndmp_fragment_multiple_tails, {"NDMP has multiple tail fragments", - "msg.fragment.multiple_tails", + "ndmp.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_ndmp_fragment_too_long_fragment, {"NDMP fragment too long", "ndmp.fragment.too_long_fragment", @@ -4274,7 +4274,7 @@ proto_register_ndmp(void) {"Reassembled in", "ndmp.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_ndmp_reassembled_length, - {"Reassembled length", "ndmp.reassembled.length", + {"Reassembled NDMP length", "ndmp.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 1dc70327ec..d4ccd6c23f 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -9362,7 +9362,7 @@ proto_register_ndps(void) NULL, 0x0, "Desegmentation error due to illegal segments", HFILL }}, { &hf_ndps_reassembled_length, - {"Reassembled length", "ndps.reassembled.length", FT_UINT32, BASE_DEC, + {"Reassembled NDPS length", "ndps.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, { &hf_ndps_segment, diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index f7edfe6a7a..22b69bc959 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1400,7 +1400,7 @@ void proto_register_netbios(void) NULL, 0x0, NULL, HFILL }}, { &hf_netb_reassembled_length, - {"Reassembled length", "netbios.reassembled.length", FT_UINT32, BASE_DEC, + {"Reassembled NetBIOS length", "netbios.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, }; module_t *netbios_module; diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index 41ddf417d6..25873291ef 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -1300,7 +1300,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) p_mul_reassembled_table, seq_no - 1, data_len, TRUE); new_tvb = process_reassembled_data (tvb, offset, pinfo, - "Reassembled Data", frag_msg, + "Reassembled P_MUL", frag_msg, &p_mul_frag_items, NULL, tree); if (frag_msg) @@ -1489,7 +1489,7 @@ void proto_register_p_mul (void) { "Reassembled in", "p_mul.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_msg_reassembled_length, - { "Reassembled Data length", "p_mul.reassembled.length", FT_UINT32, BASE_DEC, + { "Reassembled P_MUL length", "p_mul.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, /* diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 9a64dc591a..19673d05c8 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -3748,7 +3748,7 @@ proto_register_rpc(void) NULL, HFILL }}, { &hf_rpc_reassembled_length, - { "Reassembled length", "rpc.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Reassembled RPC length", "rpc.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, }; static gint *ett[] = { diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 93b4de401a..9af21cb2ee 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -2327,7 +2327,7 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, more); /* More fragments? */ new_tvb = process_reassembled_data(tvb, variable_pointer1 + 1, pinfo, - "Reassembled Message", frag_msg, + "Reassembled SCCP", frag_msg, &sccp_xudt_msg_frag_items, NULL, tree); @@ -2565,7 +2565,7 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, fragment_set_tot_len(pinfo, source_local_ref, sccp_xudt_msg_fragment_table,(octet & 0xf)); new_tvb = process_reassembled_data(tvb, variable_pointer3 + 1, - pinfo, "Reassembled Message", + pinfo, "Reassembled SCCP", frag_msg, &sccp_xudt_msg_frag_items, NULL, tree); @@ -2648,7 +2648,7 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, fragment_set_tot_len(pinfo, source_local_ref, sccp_xudt_msg_fragment_table,(octet & 0xf)); new_tvb = process_reassembled_data(tvb, variable_pointer3 + 1, - pinfo, "Reassembled Message", + pinfo, "Reassembled SCCP", frag_msg, &sccp_xudt_msg_frag_items, NULL, tree); @@ -3286,7 +3286,7 @@ proto_register_sccp(void) FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_sccp_xudt_msg_reassembled_length, - {"Reassembled length", "sccp.msg.reassembled.length", + {"Reassembled SCCP length", "sccp.msg.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_sccp_assoc_id, diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index eee92bff83..eff9a21acc 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -3921,7 +3921,7 @@ proto_register_smb_pipe(void) { "This PDU is reassembled in", "pipe.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "The DCE/RPC PDU is completely reassembled in this frame", HFILL }}, { &hf_pipe_reassembled_length, - { "Reassembled length", "pipe.reassembled.length", FT_UINT32, + { "Reassembled SMB Pipe length", "pipe.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, }; static gint *ett[] = { diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index f672c02c79..68cc2237ae 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -19269,7 +19269,7 @@ proto_register_smb(void) "Defragmentation error due to illegal fragments", HFILL }}, { &hf_smb_reassembled_length, - { "Reassembled length", "smb.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Reassembled SMB length", "smb.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL }}, { &hf_smb_opened_in, diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index bca8d247a4..731c9c12c5 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -519,7 +519,7 @@ proto_register_sndcp(void) } }, { &hf_npdu_reassembled_length, - { "Reassembled length", + { "Reassembled N-PDU length", "npdu.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index d1722f0ac2..fec03899c0 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -627,7 +627,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } new_tvb = process_reassembled_data(tvb, offset, actx->pinfo, - "Reassembled Message", frag_msg, &data_frag_items, NULL, tree); + "Reassembled T38", frag_msg, &data_frag_items, NULL, tree); /* Now reset fragmentation information in pinfo */ actx->pinfo->fragmented = save_fragmented; @@ -637,7 +637,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } else { new_tvb = process_reassembled_data(tvb, offset, actx->pinfo, - "Reassembled Message", frag_msg, &data_frag_items, NULL, tree); + "Reassembled T38", frag_msg, &data_frag_items, NULL, tree); /* Now reset fragmentation information in pinfo */ actx->pinfo->fragmented = save_fragmented; @@ -726,7 +726,7 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ TRUE); /* More fragments */ new_tvb = process_reassembled_data(tvb, offset, actx->pinfo, - "Reassembled Message", frag_msg, &data_frag_items, NULL, tree); + "Reassembled T38", frag_msg, &data_frag_items, NULL, tree); if (!frag_msg) { /* Not last packet of reassembled */ if (Data_Field_field_type_value == 0) { @@ -1360,7 +1360,7 @@ proto_register_t38(void) {"Reassembled in", "t38.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, {&hf_t38_reassembled_length, - {"Reassembled length", "t38.reassembled.length", + {"Reassembled T38 length", "t38.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 2a68dd56dc..f4c0bf572c 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -426,7 +426,7 @@ static void ts2_standard_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree * pinfo->fragmented = TRUE; fragment_number = tvb_get_letohs(tvb, 18); frag_msg = fragment_add_seq_check(tvb, 24, pinfo, type, msg_fragment_table, msg_reassembled_table, frag->frag_num, tvb_length_remaining(tvb, 24), fragment_number); - new_tvb = process_reassembled_data(tvb, 24, pinfo,"Reassembled Message", frag_msg, &msg_frag_items, NULL, ts2_tree); + new_tvb = process_reassembled_data(tvb, 24, pinfo,"Reassembled TeamSpeak2", frag_msg, &msg_frag_items, NULL, ts2_tree); if (frag_msg) { /* Reassembled */ col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); @@ -1124,7 +1124,7 @@ void proto_register_ts2(void) NULL, HFILL } }, { &hf_msg_reassembled_length, - {"Reassembled length", "ts2.reassembled.length", + {"Reassembled TeamSpeak2 length", "ts2.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 8d4b5bafeb..53a25ad07c 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -1411,7 +1411,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i (message_type != TIPCv2_USER_LAST_FRAGMENT)); /* More fragments? */ new_tvb = process_reassembled_data(tipc_tvb, offset, pinfo, - "Reassembled Message", frag_msg, &tipc_msg_frag_items, + "Reassembled TIPC", frag_msg, &tipc_msg_frag_items, NULL, tipc_tree); if (frag_msg) { /* Reassembled */ @@ -1963,7 +1963,7 @@ dissect_tipc_int_prot_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tipc_tr } new_tvb = process_reassembled_data(tvb, offset, pinfo, - "Reassembled Message", frag_msg, &tipc_msg_frag_items, + "Reassembled TIPC", frag_msg, &tipc_msg_frag_items, NULL, tipc_tree); if (frag_msg) { /* Reassembled */ @@ -2353,7 +2353,7 @@ proto_register_tipc(void) FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_tipc_msg_reassembled_length, - { "Reassembled length", "tipc.msg.reassembled.length", + { "Reassembled TIPC length", "tipc.msg.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_tipc_ver, diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index ae05fc78a9..77f2ccdc28 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -1039,7 +1039,7 @@ proto_register_wtp(void) } }, { &hf_wtp_reassembled_length, - { "Reassembled length", + { "Reassembled WTP length", "wtp.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, "The total length of the reassembled payload", HFILL diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 5c477f6119..48cc7b84e6 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -586,10 +586,8 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { proto_item_append_text(proto_root, " %s", val_to_str(packet.type, zbee_aps_frame_types, "Unknown Type")); } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - col_append_str(pinfo->cinfo, COL_INFO, val_to_str(packet.type, zbee_aps_frame_types, "Unknown Frame Type")); - } + col_clear(pinfo->cinfo, COL_INFO); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(packet.type, zbee_aps_frame_types, "Unknown Frame Type")); /* Display the FCF */ if (tree) { @@ -686,9 +684,7 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += sizeof(guint8); /* Update the info column. */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Dst Endpt: %d", packet.dst); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ", Dst Endpt: %d", packet.dst); } /* If the group address is present, display it. */ @@ -701,9 +697,7 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += sizeof(guint16); /* Update the info column. */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Group: 0x%04x", packet.group); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ", Group: 0x%04x", packet.group); } /* Get and display the cluster ID. */ @@ -747,17 +741,13 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += sizeof(guint8); /* Update the info column. */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Src Endpt: %d", packet.src); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ", Src Endpt: %d", packet.src); } /* Display the profile ID now that the source endpoint was listed. */ if (packet.type == ZBEE_APS_FCF_DATA) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_append_fstr(pinfo->cinfo, COL_PROTOCOL, " %s", - rval_to_str(packet.profile, zbee_aps_apid_abbrs, "")); - } + col_append_fstr(pinfo->cinfo, COL_PROTOCOL, " %s", + rval_to_str(packet.profile, zbee_aps_apid_abbrs, "")); } /* Jump here if there is no endpoint addressing in this frame. */ @@ -866,14 +856,12 @@ dissect_zbee_aps_no_endpt: frag_msg = fragment_add_seq_check(payload_tvb, 0, pinfo, msg_id, zbee_aps_fragment_table, zbee_aps_reassembled_table, block_num, tvb_length(payload_tvb), TRUE); - new_tvb = process_reassembled_data(payload_tvb, 0, pinfo, "Reassembled Packet" , + new_tvb = process_reassembled_data(payload_tvb, 0, pinfo, "Reassembled ZigBee APS" , frag_msg, &zbee_aps_frag_items, NULL, aps_tree); /* Update the info column regarding the fragmentation. */ - if (check_col(pinfo->cinfo, COL_INFO)) { - if (frag_msg) col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); - else col_append_fstr(pinfo->cinfo, COL_INFO, " (Message fragment %u)", packet.counter); - } + if (frag_msg) col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); + else col_append_fstr(pinfo->cinfo, COL_INFO, " (Message fragment %u)", packet.counter); if (new_tvb) { /* The reassembly handler defragmented the message, and created a new tvbuff. */ @@ -967,9 +955,7 @@ static void dissect_zbee_aps_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree * offset += sizeof(guint8); /* Add the command name to the info column. */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmd_id, zbee_aps_cmd_names, "Unknown Command")); - } + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmd_id, zbee_aps_cmd_names, "Unknown Command")); /* Handle the contents of the command frame. */ switch(cmd_id){ @@ -1926,7 +1912,7 @@ void proto_register_zbee_aps(void) NULL, HFILL }}, { &hf_zbee_aps_reassembled_length, - { "Reassembled length", "zbee.aps.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, + { "Reassembled ZigBee APS length", "zbee.aps.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }} }; |