diff options
Diffstat (limited to 'epan/dissectors')
51 files changed, 178 insertions, 130 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index e850a60346..8c246ff57e 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -1146,8 +1146,9 @@ proto_register_aim(void) aim_module = prefs_register_protocol(proto_aim, NULL); prefs_register_bool_preference(aim_module, "desegment", - "Desegment all AIM messages spanning multiple TCP segments", - "Whether the AIM dissector should desegment all messages spanning multiple TCP segments", + "Reassemble AIM messages spanning multiple TCP segments", + "Whether the AIM dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &aim_desegment); subdissector_table = register_dissector_table("aim.family", diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index f74520ef27..bd340e0358 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -2244,8 +2244,8 @@ proto_register_atalk(void) atp_module = prefs_register_protocol(proto_atp, NULL); prefs_register_bool_preference(atp_module, "desegment", - "Desegment all ATP messages spanning multiple DDP packets", - "Whether the ATP dissector should desegment all messages spanning multiple DDP packets", + "Reassemble ATP messages spanning multiple DDP packets", + "Whether the ATP dissector should reassemble messages spanning multiple DDP packets", &atp_defragment); proto_rtmp = proto_register_protocol("Routing Table Maintenance Protocol", diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index a0b91350f3..0f99e50a85 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -2783,8 +2783,9 @@ proto_register_bgp(void) bgp_module = prefs_register_protocol(proto_bgp, NULL); prefs_register_bool_preference(bgp_module, "desegment", - "Desegment all BGP messages spanning multiple TCP segments", - "Whether the BGP dissector should desegment all messages spanning multiple TCP segments", + "Reassemble BGP messages spanning multiple TCP segments", + "Whether the BGP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &bgp_desegment); prefs_register_enum_preference(bgp_module, "asn_len", "Length of the AS number", diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c index 2c1d36a0bb..0ca8795d5c 100644 --- a/epan/dissectors/packet-cast.c +++ b/epan/dissectors/packet-cast.c @@ -1759,8 +1759,9 @@ proto_register_cast(void) cast_module = prefs_register_protocol(proto_cast, NULL); prefs_register_bool_preference(cast_module, "reassembly", /*"desegment",*/ - "Desegment all CAST messages spanning multiple TCP segments", - "Whether the CAST dissector should desegment all messages spanning multiple TCP segments", + "Reassemble CAST messages spanning multiple TCP segments", + "Whether the CAST dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &cast_desegment); } diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 68139bd7cf..686e769eac 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -2379,7 +2379,8 @@ void proto_register_cotp(void) prefs_register_bool_preference(cotp_module, "reassemble", "Reassemble segmented COTP datagrams", - "Whether segmented COTP datagrams should be reassembled", + "Whether segmented COTP datagrams should be reassembled." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &cotp_reassemble); prefs_register_enum_preference(cotp_module, "tsap_display", diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 8db35e43ed..a0a5f08c7a 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1986,8 +1986,9 @@ void proto_register_cops(void) "Set the TCP port for COPS messages", 10,&global_cops_tcp_port); prefs_register_bool_preference(cops_module, "desegment", - "Desegment all COPS messages\nspanning multiple TCP segments", - "Whether the COPS dissector should desegment all messages spanning multiple TCP segments", + "Reassemble COPS messages spanning multiple TCP segments", + "Whether the COPS dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &cops_desegment); /* For PacketCable */ diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index afcafacf5a..19c79fea6a 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -4755,13 +4755,14 @@ proto_register_dcerpc (void) dcerpc_module = prefs_register_protocol (proto_dcerpc, NULL); prefs_register_bool_preference (dcerpc_module, "desegment_dcerpc", - "Desegment all DCE/RPC over TCP", - "Whether the DCE/RPC dissector should desegment all DCE/RPC over TCP", + "Reassemble DCE/RPC messages spanning multiple TCP segments", + "Whether the DCE/RPC dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &dcerpc_cn_desegment); prefs_register_bool_preference (dcerpc_module, "reassemble_dcerpc", "Reassemble DCE/RPC fragments", - "Whether the DCE/RPC dissector should reassemble all fragmented PDUs", + "Whether the DCE/RPC dissector should reassemble fragmented DCE/RPC PDUs", &dcerpc_reassemble); register_init_routine(dcerpc_reassemble_init); dcerpc_uuids = g_hash_table_new (dcerpc_uuid_hash, dcerpc_uuid_equal); diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index f03bb07631..562783a215 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -1942,8 +1942,9 @@ proto_register_diameter(void) /* Desegmentation */ prefs_register_bool_preference(diameter_module, "desegment", - "Desegment all Diameter messages\nspanning multiple TCP segments", - "Whether the Diameter dissector should desegment all messages spanning multiple TCP segments", + "Reassemble Diameter messages\nspanning multiple TCP segments", + "Whether the Diameter dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &gbl_diameter_desegment); /* Allow zero as valid application ID */ prefs_register_bool_preference(diameter_module, "allow_zero_as_app_id", diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index a17e2d2ddd..114707bd7e 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -405,8 +405,9 @@ proto_register_distcc(void) 10, &glb_distcc_tcp_port); prefs_register_bool_preference(distcc_module, "desegment_distcc_over_tcp", - "Desegment all DISTCC-over-TCP messages", - "Whether the DISTCC dissector should desegment all DISTCC-over-TCP messages", + "Reassemble DISTCC-over-TCP messages\nspanning multiple TCP segments", + "Whether the DISTCC dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &distcc_desegment); } diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index e402f86817..fcb87cc4bb 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -2488,8 +2488,9 @@ proto_register_dns(void) dns_module = prefs_register_protocol(proto_dns, NULL); prefs_register_bool_preference(dns_module, "desegment_dns_messages", - "Desegment all DNS messages spanning multiple TCP segments", - "Whether the DNS dissector should desegment all messages spanning multiple TCP segments", + "Reassemble DNS messages spanning multiple TCP segments", + "Whether the DNS dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &dns_desegment); } diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index adbc28ed64..6c985e1928 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -828,8 +828,9 @@ proto_register_dsi(void) dsi_module = prefs_register_protocol(proto_dsi, NULL); prefs_register_bool_preference(dsi_module, "desegment", - "Desegment all DSI messages spanning multiple TCP segments", - "Whether the DSI dissector should desegment all messages spanning multiple TCP segments", + "Reassemble DSI messages spanning multiple TCP segments", + "Whether the DSI dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &dsi_desegment); } diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 0ceb080ca5..cebc342f43 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -2649,8 +2649,9 @@ proto_register_cipencap(void) cipencap_module = prefs_register_protocol(proto_cipencap, NULL); prefs_register_bool_preference(cipencap_module, "desegment", - "Desegment all EtherNet/IP messages spanning multiple TCP segments", - "Whether the EtherNet/IP dissector should desegment all messages spanning multiple TCP segments", + "Reassemble EtherNet/IP messages spanning multiple TCP segments", + "Whether the EtherNet/IP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &cipencap_desegment); } /* end of proto_register_cipencap() */ diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 194ff1c82b..98250526ee 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -644,8 +644,9 @@ proto_register_fcip (void) fcip_module = prefs_register_protocol(proto_fcip, NULL); prefs_register_bool_preference(fcip_module, "desegment", - "Desegment FCIP messages", - "When enabled, FCIP messages that span multiple TCP segments are desegmented", + "Reassemble FCIP messages spanning multiple TCP segments", + "Whether the FCIP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &fcip_desegment); prefs_register_uint_preference(fcip_module, "target_port", diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 7da3f330cd..a745f1460c 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -10512,8 +10512,9 @@ proto_register_h225(void) proto_register_subtree_array(ett, array_length(ett)); h225_module = prefs_register_protocol(proto_h225, NULL); prefs_register_bool_preference(h225_module, "reassembly", - "Reassemble H.225 over TCP", - "Whether the dissector should reassemble H.225 PDUs spanning multiple TCP segments", + "Reassemble H.225 messages spanning multiple TCP segments", + "Whether the H.225 dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &h225_reassembly); register_dissector("h225", dissect_h225_H323UserInformation, proto_h225); diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 899dab9fb6..0d4c0d9272 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -22431,8 +22431,9 @@ proto_register_h245(void) proto_register_subtree_array(ett, array_length(ett)); h245_module = prefs_register_protocol(proto_h245, NULL); prefs_register_bool_preference(h245_module, "reassembly", - "Reassemble H.245 over TCP", - "Whether the dissector should reassemble H.245 PDUs spanning multiple TCP segments", + "Reassemble H.245 messages spanning multiple TCP segments", + "Whether the H.245 dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &h245_reassembly); prefs_register_bool_preference(h245_module, "shorttypes", "Show short message types", diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index c1ce9564cb..f0b6d5892d 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -1619,16 +1619,20 @@ proto_register_http(void) proto_register_subtree_array(ett, array_length(ett)); http_module = prefs_register_protocol(proto_http, NULL); prefs_register_bool_preference(http_module, "desegment_headers", - "Desegment all HTTP headers spanning multiple TCP segments", - "Whether the HTTP dissector should desegment all headers " - "of a request spanning multiple TCP segments", + "Reassemble HTTP headers spanning multiple TCP segments", + "Whether the HTTP dissector should reassemble headers " + "of a request spanning multiple TCP segments. " + "To use this option, you must also enable " + "\"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &http_desegment_headers); prefs_register_bool_preference(http_module, "desegment_body", - "Desegment HTTP bodies spanning multiple TCP segments", + "Reassemble HTTP bodies spanning multiple TCP segments", "Whether the HTTP dissector should use the " - "\"Content-length:\" value, if present, to desegment " + "\"Content-length:\" value, if present, to reassemble " "the body of a request spanning multiple TCP segments, " - "and desegment chunked data spanning multiple TCP segments", + "and reassemble chunked data spanning multiple TCP segments. " + "To use this option, you must also enable " + "\"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &http_desegment_body); prefs_register_bool_preference(http_module, "dechunk_body", "Reassemble chunked transfer-coded bodies", diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index e2378ba6e2..43cc523ab5 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -413,8 +413,9 @@ proto_register_ipdc(void) ipdc_module = prefs_register_protocol(proto_ipdc, proto_reg_handoff_ipdc); prefs_register_bool_preference(ipdc_module, "desegment_ipdc_messages", - "Desegment all IPDC messages spanning multiple TCP segments", - "Whether the IPDC dissector should desegment all messages spanning multiple TCP segments", + "Reassemble IPDC messages spanning multiple TCP segments", + "Whether the IPDC dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ipdc_desegment); prefs_register_uint_preference(ipdc_module, "tcp.port", "IPDC monitoring port", diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index c141535e6c..daf4928a2f 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -2414,8 +2414,9 @@ proto_register_iscsi(void) prefs_register_bool_preference(iscsi_module, "desegment_iscsi_messages", - "Desegment iSCSI messages", - "When enabled, iSCSI messages that span multiple TCP segments are desegmented", + "Reassemble iSCSI messages\nspanning multiple TCP segments", + "Whether the iSCSI dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &iscsi_desegment); prefs_register_bool_preference(iscsi_module, diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index f89aa99af5..2348f6926e 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -1932,10 +1932,10 @@ void proto_register_isns(void) /* Register preferences */ isns_module = prefs_register_protocol(proto_isns, NULL); prefs_register_bool_preference(isns_module, "desegment", - "Desegment iSNS over TCP messages", - "Whether the dissector should desegment " - "multi-segment iSNS messages", &isns_desegment); - + "Reassemble iSNS messages spanning multiple TCP segments", + "Whether the iSNS dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", + &isns_desegment); } /* If this dissector uses sub-dissector registration add a registration routine. diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 7c06701dbd..672d18d92d 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -3875,9 +3875,10 @@ proto_register_kerberos(void) /* Register preferences */ krb_module = prefs_register_protocol(proto_kerberos, NULL); prefs_register_bool_preference(krb_module, "desegment", - "Desegment Kerberos over TCP messages", - "Whether the dissector should desegment " - "multi-segment Kerberos messages", &krb_desegment); + "Reassemble Kerberos over TCP messages spanning multiple TCP segments", + "Whether the Kerberos dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", + &krb_desegment); #ifdef HAVE_KERBEROS prefs_register_bool_preference(krb_module, "decrypt", "Try to decrypt Kerberos blobs", diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index 279240b06b..512e11298d 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -234,8 +234,9 @@ proto_register_laplink(void) laplink_module = prefs_register_protocol(proto_laplink, NULL); prefs_register_bool_preference(laplink_module, "desegment_laplink_over_tcp", - "Desegment all Laplink-over-TCP messages", - "Whether the Laplink dissector should desegment all Laplink-over-TCP messages", + "Reassemble Laplink over TCP messages spanning multiple TCP segments", + "Whether the Laplink dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &laplink_desegment); } diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 583b9142f1..55b72c6f3f 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -2977,8 +2977,9 @@ proto_register_ldap(void) ldap_module = prefs_register_protocol(proto_ldap, NULL); prefs_register_bool_preference(ldap_module, "desegment_ldap_messages", - "Desegment all LDAP messages spanning multiple TCP segments", - "Whether the LDAP dissector should desegment all messages spanning multiple TCP segments", + "Reassemble LDAP messages spanning multiple TCP segments", + "Whether the LDAP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ldap_desegment); proto_cldap = proto_register_protocol( diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 58c14d1805..9ccca1e752 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -3102,8 +3102,9 @@ proto_register_ldp(void) 10, &global_ldp_udp_port); prefs_register_bool_preference(ldp_module, "desegment_ldp_messages", - "Desegment all LDP messages\nspanning multiple TCP segments", - "Whether the LDP dissector should desegment all messages spanning multiple TCP segments", + "Reassemble LDP messages spanning multiple TCP segments", + "Whether the LDP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ldp_desegment); } diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 666415f7ae..237d15b49e 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -3256,12 +3256,13 @@ proto_register_mq(void) mq_module = prefs_register_protocol(proto_mq, NULL); prefs_register_bool_preference(mq_module, "desegment", - "Desegment all MQ messages spanning multiple TCP segments", - "Whether the MQ dissector should desegment all messages spanning multiple TCP segments", + "Reassemble MQ messages spanning multiple TCP segments", + "Whether the MQ dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &mq_desegment); prefs_register_bool_preference(mq_module, "reassembly", "Reassemble segmented MQ messages", - "Whether the MQ dissector should reassemble all MQ messages spanning multiple TSH segments", + "Whether the MQ dissector should reassemble MQ messages spanning multiple TSH segments", &mq_reassembly); } diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index bda5bf6fb3..8f74533cf6 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -803,8 +803,9 @@ proto_register_mysql(void) mysql_module = prefs_register_protocol(proto_mysql, NULL); prefs_register_bool_preference(mysql_module, "desegment_buffers", - "Desegment all MySQL buffers spanning multiple TCP segments", - "Whether the MySQL dissector should desegment all MySQL buffers spanning multiple TCP segments", + "Reassemble MySQL buffers spanning multiple TCP segments", + "Whether the MySQL dissector should reassemble MySQL buffers spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &mysql_desegment); } diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index e2d51d206c..d938fb0aed 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -1906,8 +1906,9 @@ proto_register_nbt(void) nbss_module = prefs_register_protocol(proto_nbss, NULL); prefs_register_bool_preference(nbss_module, "desegment_nbss_commands", - "Desegment all NBSS packets spanning multiple TCP segments", - "Whether NBSS dissector should desegment all packets spanning multiple TCP segments", + "Reassemble NBSS packets spanning multiple TCP segments", + "Whether the NBSS dissector should reassemble packets spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &nbss_desegment); } diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 6f5e5c4e93..162e70ddb7 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -1046,12 +1046,13 @@ proto_register_ncp(void) ncp_module = prefs_register_protocol(proto_ncp, NULL); prefs_register_obsolete_preference(ncp_module, "initial_hash_size"); prefs_register_bool_preference(ncp_module, "desegment", - "Desegment all NCP-over-TCP messages spanning multiple segments", - "Whether the NCP dissector should desegment all messages spanning multiple TCP segments", + "Reassemble NCP-over-TCP messages spanning multiple TCP segments", + "Whether the NCP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ncp_desegment); prefs_register_bool_preference(ncp_module, "defragment_nds", - "Defragment all NDS messages spanning multiple packets", - "Whether the NCP dissector should defragment all NDS messages spanning multiple packets", + "Reassemble fragmented NDS messages spanning multiple packets", + "Whether the NCP dissector should defragment NDS messages spanning multiple packets.", &nds_defragment); register_init_routine(&mncp_init_protocol); register_postseq_cleanup_routine(&mncp_postseq_cleanup); diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 4bf431a815..52b5826c83 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3474,12 +3474,13 @@ proto_register_ndmp(void) ndmp_protocol_versions, FALSE); prefs_register_bool_preference(ndmp_module, "desegment", - "Desegment all NDMP messages spanning multiple TCP segments", - "Whether the dissector should desegment NDMP messages", + "Reassemble NDMP messages spanning multiple TCP segments", + "Whether the NDMP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ndmp_desegment); prefs_register_bool_preference(ndmp_module, "defragment", - "Defragment all multi-fragment NDMP messages", - "Whether the dissector should defragment multi-fragment NDMP messages", + "Reassemble fragmented NDMP messages spanning multiple packets", + "Whether the dissector should defragment NDMP messages spanning multiple packets.", &ndmp_defragment); } diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 17d890e2e2..6ab3644735 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -8846,12 +8846,13 @@ proto_register_ndps(void) ndps_module = prefs_register_protocol(proto_ndps, NULL); prefs_register_bool_preference(ndps_module, "desegment_tcp", - "Desegment all NDPS messages spanning multiple TCP segments", - "Whether the NDPS dissector should desegment all messages spanning multiple TCP segments", + "Reassemble NDPS messages spanning multiple TCP segments", + "Whether the NDPS dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ndps_desegment); prefs_register_bool_preference(ndps_module, "desegment_spx", - "Desegment all NDPS messages spanning multiple SPX packets", - "Whether the NDPS dissector should desegment all messages spanning multiple SPX packets", + "Reassemble fragmented NDPS messages spanning multiple SPX packets", + "Whether the NDPS dissector should reassemble fragmented NDPS messages spanning multiple SPX packets", &ndps_defragment); prefs_register_bool_preference(ndps_module, "show_oid", "Display NDPS Details", diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 973731b77f..ed1081d34f 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1411,8 +1411,8 @@ void proto_register_netbios(void) netbios_module = prefs_register_protocol(proto_netbios, NULL); prefs_register_bool_preference(netbios_module, "defragment", - "Defragment all NetBIOS messages spanning multiple frames", - "Whether the NetBIOS dissector should defragment all messages spanning multiple frames", + "Reassemble fragmented NetBIOS messages spanning multiple frames", + "Whether the NetBIOS dissector should defragment messages spanning multiple frames", &netbios_defragment); register_init_routine(netbios_init); diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 10da9f3c95..1c0715de49 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -3134,8 +3134,9 @@ proto_register_q931(void) q931_module = prefs_register_protocol(proto_q931, NULL); prefs_register_bool_preference(q931_module, "desegment_h323_messages", - "Desegment all Q.931 messages spanning multiple TCP segments", - "Whether the Q.931 dissector should desegment all messages spanning multiple TCP segments", + "Reassemble Q.931 messages spanning multiple TCP segments", + "Whether the Q.931 dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &q931_desegment); prefs_register_bool_preference(q931_module, "reassembly", "Reassemble segmented Q.931 messages", diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 07de41b8f5..c6b1774569 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -3494,18 +3494,19 @@ proto_register_rpc(void) rpc_module = prefs_register_protocol(proto_rpc, NULL); prefs_register_bool_preference(rpc_module, "desegment_rpc_over_tcp", - "Desegment all RPC-over-TCP messages", - "Whether the RPC dissector should desegment all RPC-over-TCP messages", + "Reassemble RPC over TCP messages\nspanning multiple TCP segments", + "Whether the RPC dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &rpc_desegment); prefs_register_bool_preference(rpc_module, "defragment_rpc_over_tcp", - "Defragment all RPC-over-TCP messages", - "Whether the RPC dissector should defragment multi-fragment RPC-over-TCP messages", + "Reassemble fragmented RPC-over-TCP messages", + "Whether the RPC dissector should defragment RPC-over-TCP messages.", &rpc_defragment); prefs_register_uint_preference(rpc_module, "max_tcp_pdu_size", "Maximum size of a RPC-over-TCP PDU", "Set the maximum size of RPCoverTCP PDUs. " " If the size field of the record marker is larger " - "than this value it will not be considered a valid RPC PDU", + "than this value it will not be considered a valid RPC PDU.", 10, &max_rpc_tcp_pdu_size); prefs_register_bool_preference(rpc_module, "dissect_unknown_programs", diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index 0195e06ed3..b69f8db6ee 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -326,9 +326,10 @@ proto_register_rsync(void) 10, &glb_rsync_tcp_port); prefs_register_bool_preference(rsync_module, "desegment", - "Desegment all RSYNC messages\nspanning multiple TCP segments", - "Whether the RSYNC dissector should desegment all messages spanning multiple TCP segments", - &rsync_desegment); + "Reassemble RSYNC messages spanning multiple TCP segments", + "Whether the RSYNC dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", + &rsync_desegment); } void proto_reg_handoff_rsync(void) diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 1a1453494e..bcfef06fa1 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -1173,9 +1173,10 @@ proto_register_rtsp(void) "Set the alternate TCP port for RTSP messages", 10, &global_rtsp_tcp_alternate_port); prefs_register_bool_preference(rtsp_module, "desegment_headers", - "Desegment all RTSP headers\nspanning multiple TCP segments", - "Whether the RTSP dissector should desegment all headers " - "of a request spanning multiple TCP segments", + "Reassemble RTSP headers spanning multiple TCP segments", + "Whether the RTSP dissector should reassemble headers " + "of a request spanning multiple TCP segments. " + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &rtsp_desegment_headers); prefs_register_bool_preference(rtsp_module, "desegment_body", "Trust the \"Content-length:\" header and\ndesegment RTSP " diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index b1f00d845c..6bdf9adf9f 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -1724,8 +1724,8 @@ proto_register_ses(void) ses_module = prefs_register_protocol(proto_ses, NULL); /* prefs_register_bool_preference(ses_module, "desegment", - "Desegment all session packets ", - "Whether the session dissector should desegment all messages spanning multiple SES segments", + "Reassemble session packets ", + "Whether the session dissector should reassemble messages spanning multiple SES segments", &ses_desegment); */ /* diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index ff8b025799..0ffb1b100c 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -4238,8 +4238,9 @@ proto_register_skinny(void) skinny_module = prefs_register_protocol(proto_skinny, NULL); prefs_register_bool_preference(skinny_module, "desegment", - "Desegment all SCCP messages spanning multiple TCP segments", - "Whether the SCCP dissector should desegment all messages spanning multiple TCP segments", + "Reassemble SCCP messages spanning multiple TCP segments", + "Whether the SCCP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &skinny_desegment); } diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index a9f75795e8..ad1b55d9cb 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -2454,8 +2454,9 @@ proto_register_slsk(void) /* Registers the options in the menu preferences */ prefs_register_bool_preference(slsk_module, "desegment", - "Desegment all SoulSeek messages spanning multiple TCP segments", - "Whether the SoulSeek dissector should desegment all messages spanning multiple TCP segments", + "Reassemble SoulSeek messages spanning multiple TCP segments", + "Whether the SoulSeek dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &slsk_desegment); #ifdef HAVE_LIBZ prefs_register_bool_preference(slsk_module, "decompress", diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 5d92afc530..0a4161b805 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -2729,8 +2729,9 @@ proto_register_smpp(void) smpp_module = prefs_register_protocol (proto_smpp, NULL); prefs_register_bool_preference (smpp_module, "reassemble_smpp_over_tcp", - "Reassemble SMPP over TCP", - "Reassemble TCP segments that convey SMPP traffic.", + "Reassemble SMPP over TCP messages spanning multiple TCP segments", + "Whether the SMPP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &reassemble_over_tcp); } diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index a2d612b0b9..be12066500 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -581,8 +581,9 @@ proto_register_smtp(void) smtp_module = prefs_register_protocol(proto_smtp, NULL); prefs_register_bool_preference(smtp_module, "desegment_lines", - "Desegment all SMTP command and response lines\nspanning multiple TCP segments", - "Whether the SMTP dissector should desegment all command and response lines spanning multiple TCP segments", + "Reassemble SMTP command and response lines\nspanning multiple TCP segments", + "Whether the SMTP dissector should reassemble command and response lines spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &smtp_desegment); } diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index eb227c98df..514f8ec823 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -2524,9 +2524,9 @@ proto_register_snmp(void) "List of MIB modules to load (the list is set to environment variable MIBS if the variable is not already set)", &mib_modules); prefs_register_bool_preference(snmp_module, "desegment", - "Desegment all SNMP-over-TCP messages\nspanning multiple TCP segments", - "Whether the SNMP dissector should desegment all messages " - "spanning multiple TCP segments", + "Reassemble SNMP-over-TCP messages\nspanning multiple TCP segments", + "Whether the SNMP dissector should reassemble messages spanning multiple TCP segments." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &snmp_desegment); } diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index a5a099b249..fea2c4c7f6 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -1682,8 +1682,9 @@ proto_register_srvloc(void) proto_register_subtree_array(ett, array_length(ett)); srvloc_module = prefs_register_protocol(proto_srvloc, NULL); prefs_register_bool_preference(srvloc_module, "desegment_tcp", - "Desegment all SRVLOC messages spanning multiple TCP segments", - "Whether the SRVLOC dissector should desegment all messages spanning multiple TCP segments", + "Reassemble SRVLOC messages spanning multiple TCP segments", + "Whether the SRVLOC dissector should reassemble messages spanning multiple TCP segments. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &srvloc_desegment); } diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 6e65f14ded..401b6bcac2 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -923,8 +923,9 @@ proto_register_ssh(void) ssh_module = prefs_register_protocol(proto_ssh, NULL); prefs_register_bool_preference(ssh_module, "desegment_buffers", - "Desegment all SSH buffers spanning multiple TCP segments", - "Whether the SSH dissector should desegment all SSH buffers spanning multiple TCP segments", + "Reassemble SSH buffers spanning multiple TCP segments", + "Whether the SSH dissector should reassemble SSH buffers spanning multiple TCP segments. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ssh_desegment); } diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 488b5c7187..495c335aaf 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -3436,10 +3436,11 @@ proto_register_ssl(void) { module_t *ssl_module = prefs_register_protocol(proto_ssl, NULL); prefs_register_bool_preference(ssl_module, - "desegment_ssl_records", - "Desegment SSL records", - "When enabled, SSL records that span multiple TCP segments are desegmented", - &ssl_desegment); + "desegment_ssl_records", + "Reassemble SSL records spanning multiple TCP segments", + "Whether the SSL dissector should reassemble SSL records spanning multiple TCP segments. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", + &ssl_desegment); } register_dissector("ssl", dissect_ssl, proto_ssl); diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 5fe112dbc1..a5f02776cc 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -896,7 +896,8 @@ proto_register_t38(void) prefs_register_bool_preference(t38_module, "reassembly", "Reassemble T.38 PDUs over TPKT over TCP", "Whether the dissector should reassemble T.38 PDUs spanning multiple TCP segments " - "when TPKT is used over TCP", + "when TPKT is used over TCP. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &t38_tpkt_reassembly); prefs_register_enum_preference(t38_module, "tpkt_usage", "TPKT used over TCP", diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 1199b6ee37..8826486109 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1677,7 +1677,7 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, tvb_set_child_real_data_tvbuff(tvb, next_tvb); /* add desegmented data to the data source list */ - add_new_data_source(pinfo, next_tvb, "Desegmented TCP"); + add_new_data_source(pinfo, next_tvb, "Reassembled TCP"); /* * Supply the sequence number of the first of the @@ -1902,7 +1902,7 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCP"); } if (check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO, "[Desegmented TCP]"); + col_set_str(pinfo->cinfo, COL_INFO, "[Reassembled TCP]"); } } @@ -3092,15 +3092,15 @@ proto_register_tcp(void) { &hf_tcp_segment_multiple_tails, { "Multiple tail segments found", "tcp.segment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, - "Several tails were found when desegmenting the pdu", HFILL }}, + "Several tails were found when reassembling the pdu", HFILL }}, { &hf_tcp_segment_too_long_fragment, { "Segment too long", "tcp.segment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Segment contained data past end of the pdu", HFILL }}, { &hf_tcp_segment_error, - { "Desegmentation error", "tcp.segment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, - "Desegmentation error due to illegal segments", HFILL }}, + { "Reassembling error", "tcp.segment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, + "Reassembling error due to illegal segments", HFILL }}, { &hf_tcp_segment, { "TCP Segment", "tcp.segment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, @@ -3212,8 +3212,8 @@ proto_register_tcp(void) "Whether to check the validity of the TCP checksum", &tcp_check_checksum); prefs_register_bool_preference(tcp_module, "desegment_tcp_streams", - "Allow subdissector to desegment TCP streams", - "Whether subdissector can request TCP streams to be desegmented", + "Allow subdissector to reassemble TCP streams", + "Whether subdissector can request TCP streams to be reassembled", &tcp_desegment); prefs_register_bool_preference(tcp_module, "analyze_sequence_numbers", "Analyze TCP sequence numbers", diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 826c4c1680..27f4cd32d0 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -1757,12 +1757,13 @@ proto_register_netlib(void) tds_module = prefs_register_protocol(proto_tds, NULL); prefs_register_bool_preference(tds_module, "desegment_buffers", - "Desegment all TDS buffers spanning multiple TCP segments", - "Whether the TDS dissector should desegment all TDS buffers spanning multiple TCP segments", + "Reassemble TDS buffers spanning multiple TCP segments", + "Whether the TDS dissector should reassemble TDS buffers spanning multiple TCP segments. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &tds_desegment); prefs_register_bool_preference(tds_module, "defragment", - "Defragment all TDS messages with multiple buffers", - "Whether the TDS dissector should defragment all messages spanning multiple Netlib buffers", + "Reassemble fragmented TDS messages with multiple buffers", + "Whether the TDS dissector should defragment messages spanning multiple Netlib buffers", &tds_defragment); register_init_routine(tds_init); diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index f3e0d50ed7..b42e75ca51 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -1325,8 +1325,9 @@ void proto_register_tns(void) tns_module = prefs_register_protocol(proto_tns, NULL); prefs_register_bool_preference(tns_module, "desegment_tns_messages", - "Desegment all TNS messages spanning multiple TCP segments", - "Whether the TNS dissector should desegment all messages spanning multiple TCP segments", + "Reassemble TNS messages spanning multiple TCP segments", + "Whether the TNS dissector should reassemble messages spanning multiple TCP segments. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &tns_desegment); } diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 88938f56fe..1841b4ef37 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -379,8 +379,9 @@ proto_register_tpkt(void) tpkt_module = prefs_register_protocol(proto_tpkt, NULL); prefs_register_bool_preference(tpkt_module, "desegment", - "Desegment all TPKT messages spanning multiple TCP segments", - "Whether the TPKT dissector should desegment all messages spanning multiple TCP segments", + "Reassemble TPKT messages spanning multiple TCP segments", + "Whether the TPKT dissector should reassemble messages spanning multiple TCP segments. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &tpkt_desegment); } diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index dc7a16751c..d21c1cd653 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -5363,8 +5363,9 @@ void proto_register_x11(void) x11_module = prefs_register_protocol(proto_x11, NULL); prefs_register_bool_preference(x11_module, "desegment", - "Desegment all X11 messages spanning multiple TCP segments", - "Whether the X11 dissector should desegment all messages spanning multiple TCP segments", + "Reassemble X11 messages spanning multiple TCP segments", + "Whether the X11 dissector should reassemble messages spanning multiple TCP segments. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &x11_desegment); } diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c index 6c3f56fe15..18bb79ceb0 100644 --- a/epan/dissectors/packet-xot.c +++ b/epan/dissectors/packet-xot.c @@ -154,8 +154,9 @@ proto_register_xot(void) xot_module = prefs_register_protocol(proto_xot, NULL); prefs_register_bool_preference(xot_module, "desegment", - "Desegment all X.25-over-TCP messages spanning multiple TCP segments", - "Whether the X.25-over-TCP dissector should desegment all messages spanning multiple TCP segments", + "Reassemble X.25-over-TCP messages spanning multiple TCP segments", + "Whether the X.25-over-TCP dissector should reassemble messages spanning multiple TCP segments. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &xot_desegment); } diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index a9ed099730..29dd3e22f9 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -411,8 +411,9 @@ proto_register_ymsg(void) ymsg_module = prefs_register_protocol(proto_ymsg, NULL); prefs_register_bool_preference(ymsg_module, "desegment", - "Desegment all YMSG messages spanning multiple TCP segments", - "Whether the YMSG dissector should desegment all messages spanning multiple TCP segments", + "Reasssemble YMSG messages spanning multiple TCP segments", + "Whether the YMSG dissector should reasssemble messages spanning multiple TCP segments. " + "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ymsg_desegment); } |